DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2026-06-13 16:16:38 +08:00
parent cced2ff4aa f197462b11
commit 0968dcaded
14 changed files with 1827 additions and 1270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
klp-ui/src/api/mes/is/inspectionCommission.js
View File

@@ -1,44 +0,0 @@
import request from '@/utils/request'
// 查询检验委托单表列表
export function listInspectionCommission(query) {
return request({
url: '/is/inspectionCommission/list',
method: 'get',
params: query
})
}
// 查询检验委托单表详细
export function getInspectionCommission(commissionId) {
return request({
url: '/is/inspectionCommission/' + commissionId,
method: 'get'
})
}
// 新增检验委托单表
export function addInspectionCommission(data) {
return request({
url: '/is/inspectionCommission',
method: 'post',
data: data
})
}
// 修改检验委托单表
export function updateInspectionCommission(data) {
return request({
url: '/is/inspectionCommission',
method: 'put',
data: data
})
}
// 删除检验委托单表
export function delInspectionCommission(commissionId) {
return request({
url: '/is/inspectionCommission/' + commissionId,
method: 'delete'
})
}

44
klp-ui/src/api/mes/is/inspectionTask.js
View File

@@ -1,44 +0,0 @@
import request from '@/utils/request'
// 查询检验任务表列表
export function listInspectionTask(query) {
return request({
url: '/is/inspectionTask/list',
method: 'get',
params: query
})
}
// 查询检验任务表详细
export function getInspectionTask(taskId) {
return request({
url: '/is/inspectionTask/' + taskId,
method: 'get'
})
}
// 新增检验任务表
export function addInspectionTask(data) {
return request({
url: '/is/inspectionTask',
method: 'post',
data: data
})
}
// 修改检验任务表
export function updateInspectionTask(data) {
return request({
url: '/is/inspectionTask',
method: 'put',
data: data
})
}
// 删除检验任务表
export function delInspectionTask(taskId) {
return request({
url: '/is/inspectionTask/' + taskId,
method: 'delete'
})
}

44
klp-ui/src/api/mes/is/sampleInventory.js
View File

@@ -1,44 +0,0 @@
import request from '@/utils/request'
// 查询样品库存表列表
export function listSampleInventory(query) {
return request({
url: '/is/sampleInventory/list',
method: 'get',
params: query
})
}
// 查询样品库存表详细
export function getSampleInventory(sampleId) {
return request({
url: '/is/sampleInventory/' + sampleId,
method: 'get'
})
}
// 新增样品库存表
export function addSampleInventory(data) {
return request({
url: '/is/sampleInventory',
method: 'post',
data: data
})
}
// 修改样品库存表
export function updateSampleInventory(data) {
return request({
url: '/is/sampleInventory',
method: 'put',
data: data
})
}
// 删除样品库存表
export function delSampleInventory(sampleId) {
return request({
url: '/is/sampleInventory/' + sampleId,
method: 'delete'
})
}

44
klp-ui/src/api/mes/qc/inspectionDetail.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询检验项目明细列表
export function listInspectionDetail(query) {
return request({
url: '/wms/inspectionDetail/list',
method: 'get',
params: query
})
}
// 查询检验项目明细详细
export function getInspectionDetail(detailId) {
return request({
url: '/wms/inspectionDetail/' + detailId,
method: 'get'
})
}
// 新增检验项目明细
export function addInspectionDetail(data) {
return request({
url: '/wms/inspectionDetail',
method: 'post',
data: data
})
}
// 修改检验项目明细
export function updateInspectionDetail(data) {
return request({
url: '/wms/inspectionDetail',
method: 'put',
data: data
})
}
// 删除检验项目明细
export function delInspectionDetail(detailId) {
return request({
url: '/wms/inspectionDetail/' + detailId,
method: 'delete'
})
}

44
klp-ui/src/api/mes/qc/inspectionMain.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询检验主列表
export function listInspectionMain(query) {
return request({
url: '/wms/inspectionMain/list',
method: 'get',
params: query
})
}
// 查询检验主详细
export function getInspectionMain(mainId) {
return request({
url: '/wms/inspectionMain/' + mainId,
method: 'get'
})
}
// 新增检验主
export function addInspectionMain(data) {
return request({
url: '/wms/inspectionMain',
method: 'post',
data: data
})
}
// 修改检验主
export function updateInspectionMain(data) {
return request({
url: '/wms/inspectionMain',
method: 'put',
data: data
})
}
// 删除检验主
export function delInspectionMain(mainId) {
return request({
url: '/wms/inspectionMain/' + mainId,
method: 'delete'
})
}

44
klp-ui/src/api/mes/qc/inspectionTensile.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询金属材料室温拉伸试验主记录列表
export function listInspectionTensile(query) {
return request({
url: '/wms/inspectionTensile/list',
method: 'get',
params: query
})
}
// 查询金属材料室温拉伸试验主记录详细
export function getInspectionTensile(testId) {
return request({
url: '/wms/inspectionTensile/' + testId,
method: 'get'
})
}
// 新增金属材料室温拉伸试验主记录
export function addInspectionTensile(data) {
return request({
url: '/wms/inspectionTensile',
method: 'post',
data: data
})
}
// 修改金属材料室温拉伸试验主记录
export function updateInspectionTensile(data) {
return request({
url: '/wms/inspectionTensile',
method: 'put',
data: data
})
}
// 删除金属材料室温拉伸试验主记录
export function delInspectionTensile(testId) {
return request({
url: '/wms/inspectionTensile/' + testId,
method: 'delete'
})
}

44
klp-ui/src/api/mes/qc/inspectionTensileDetail.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询金属材料室温拉伸试验样品明细列表
export function listInspectionTensileDetail(query) {
return request({
url: '/wms/inspectionTensileDetail/list',
method: 'get',
params: query
})
}
// 查询金属材料室温拉伸试验样品明细详细
export function getInspectionTensileDetail(detailId) {
return request({
url: '/wms/inspectionTensileDetail/' + detailId,
method: 'get'
})
}
// 新增金属材料室温拉伸试验样品明细
export function addInspectionTensileDetail(data) {
return request({
url: '/wms/inspectionTensileDetail',
method: 'post',
data: data
})
}
// 修改金属材料室温拉伸试验样品明细
export function updateInspectionTensileDetail(data) {
return request({
url: '/wms/inspectionTensileDetail',
method: 'put',
data: data
})
}
// 删除金属材料室温拉伸试验样品明细
export function delInspectionTensileDetail(detailId) {
return request({
url: '/wms/inspectionTensileDetail/' + detailId,
method: 'delete'
})
}

402
klp-ui/src/views/mes/is/inspectionCommission/index.vue
View File

@@ -1,402 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
<el-form-item label="委托单号" prop="commissionNo">
<el-input
v-model="queryParams.commissionNo"
placeholder="请输入委托单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="委托单位" prop="cilent">
<el-input
v-model="queryParams.cilent"
placeholder="请输入委托单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="样品名称" prop="sampleName">
<el-input
v-model="queryParams.sampleName"
placeholder="请输入样品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="样品类型" prop="sampleType">
<el-input
v-model="queryParams.sampleType"
placeholder="请输入样品类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="样品数量" prop="quantity">
<el-input
v-model="queryParams.quantity"
placeholder="请输入样品数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检验项目" prop="inspectionItems">
<el-input
v-model="queryParams.inspectionItems"
placeholder="请输入检验项目"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="截至日期" prop="deadline">
<el-date-picker clearable
v-model="queryParams.deadline"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择要求完成日期">
</el-date-picker>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.commission_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<KLPTable v-loading="loading" :data="inspectionCommissionList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="委托单ID" align="center" prop="commissionId" v-if="false"/>
<el-table-column label="委托单号" align="center" prop="commissionNo" />
<el-table-column label="委托单位" align="center" prop="client" />
<el-table-column label="样品名称" align="center" prop="sampleName" />
<el-table-column label="样品类型" align="center" prop="sampleType" />
<el-table-column label="样品数量" align="center" prop="quantity" />
<el-table-column label="检验项目" align="center" prop="inspectionItems" />
<el-table-column label="委托日期" align="center" prop="commissionDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.commissionDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="要求完成日期" align="center" prop="deadline" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.deadline, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.commission_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
>查看</el-button>
</template>
</el-table-column>
</KLPTable>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改检验委托单表对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="委托单号" prop="commissionNo">
<el-input v-model="form.commissionNo" placeholder="请输入委托单号" />
</el-form-item>
<el-form-item label="委托单位" prop="client">
<el-input v-model="form.client" placeholder="请输入委托单位" />
</el-form-item>
<el-form-item label="样品名称" prop="sampleName">
<el-input v-model="form.sampleName" placeholder="请输入样品名称" />
</el-form-item>
<el-form-item label="样品类型" prop="sampleType">
<el-input v-model="form.sampleType" placeholder="请输入样品类型" />
</el-form-item>
<el-form-item label="样品数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入样品数量" />
</el-form-item>
<el-form-item label="检验项目" prop="inspectionItems">
<el-input v-model="form.inspectionItems" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="委托日期" prop="commissionDate">
<el-date-picker clearable
v-model="form.commissionDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择委托日期">
</el-date-picker>
</el-form-item>
<el-form-item label="要求完成日期" prop="deadline">
<el-date-picker clearable
v-model="form.deadline"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择要求完成日期">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listInspectionCommission, getInspectionCommission, delInspectionCommission, addInspectionCommission, updateInspectionCommission } from "@/api/mes/is/inspectionCommission";
export default {
name: "InspectionCommission",
dicts: ['commission_status'],
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 检验委托单表表格数据
inspectionCommissionList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
commissionNo: undefined,
cilent: undefined,
sampleName: undefined,
sampleType: undefined,
quantity: undefined,
inspectionItems: undefined,
deadline: undefined,
status: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询检验委托单表列表 */
getList() {
this.loading = true;
listInspectionCommission(this.queryParams).then(response => {
this.inspectionCommissionList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
commissionId: undefined,
commissionNo: undefined,
cilent: undefined,
sampleName: undefined,
sampleType: undefined,
quantity: undefined,
inspectionItems: undefined,
commissionDate: undefined,
deadline: undefined,
status: undefined,
delFlag: undefined,
createTime: undefined,
createBy: undefined,
updateTime: undefined,
updateBy: undefined,
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.commissionId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加检验委托单表";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const commissionId = row.commissionId || this.ids
getInspectionCommission(commissionId).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改检验委托单表";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.commissionId != null) {
updateInspectionCommission(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addInspectionCommission(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const commissionIds = row.commissionId || this.ids;
this.$modal.confirm('是否确认删除检验委托单表编号为"' + commissionIds + '"的数据项？').then(() => {
this.loading = true;
return delInspectionCommission(commissionIds);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('is/inspectionCommission/export', {
...this.queryParams
}, `inspectionCommission_${new Date().getTime()}.xlsx`)
},
handleView(row) {
this.$router.push({
path: '/is/task',
query: {
commissionId: row.commissionId
}
});
}
}
};
</script>

368
klp-ui/src/views/mes/is/inspectionTask/index.vue
View File

@@ -1,368 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
<el-form-item label="任务单号" prop="taskNo">
<el-input v-model="queryParams.taskNo" placeholder="请输入任务单号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="负责人" prop="assignedTo">
<user-select v-model="queryParams.assignedTo" placeholder="请选择负责人" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择任务开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="完成时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择任务完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="检验结果" prop="result">
<el-input v-model="queryParams.result" placeholder="请输入检验结果" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="检验结论" prop="conclusion">
<el-input v-model="queryParams.conclusion" placeholder="请输入检验结论" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="优先级" prop="priority">
<!-- <el-input v-model="queryParams.priority" placeholder="请输入优先级" clearable @keyup.enter.native="handleQuery" /> -->
<el-select v-model="queryParams.priority" placeholder="请选择优先级">
<el-option label="普通" value="1" />
<el-option label="紧急" value="2" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
@click="handleUpdate">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<KLPTable v-loading="loading" :data="inspectionTaskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="center" prop="taskId" v-if="false" />
<el-table-column label="任务单号" align="center" prop="taskNo" />
<!-- <el-table-column label="关联委托单ID" align="center" prop="commissionId" /> -->
<el-table-column label="负责人" align="center" prop="nickName" />
<el-table-column label="任务开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="任务完成时间" align="center" prop="endTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="检验结果" align="center" prop="result" />
<el-table-column label="检验结论" align="center" prop="conclusion" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="优先级" align="center" prop="priority">
<template slot-scope="scope">
<el-tag v-if="scope.row.priority == '1'" type="success">普通</el-tag>
<el-tag v-else type="danger">紧急</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-document" @click="handleResult(scope.row)">录入结果</el-button>
</template>
</el-table-column>
</KLPTable>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改检验任务表对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="任务单号" prop="taskNo">
<el-input v-model="form.taskNo" placeholder="请输入任务单号" />
</el-form-item>
<el-form-item label="负责人" prop="assignedTo">
<user-select v-model="form.assignedTo" placeholder="请选择负责人" />
</el-form-item>
<el-form-item label="任务开始时间" prop="startTime">
<el-date-picker clearable v-model="form.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择任务开始时间">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="任务完成时间" prop="endTime">
<el-date-picker clearable v-model="form.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择任务完成时间">
</el-date-picker>
</el-form-item> -->
<!-- <el-form-item label="检验结果" prop="result">
<el-input v-model="form.result" placeholder="请输入检验结果" />
</el-form-item>
<el-form-item label="检验结论" prop="conclusion">
<el-input v-model="form.conclusion" type="textarea" placeholder="请输入内容" />
</el-form-item> -->
<el-form-item label="优先级" prop="priority">
<el-select v-model="form.priority" placeholder="请选择优先级">
<el-option label="普通" value="1" />
<el-option label="紧急" value="2" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog title="检验结果" :visible.sync="resultDialogVisible" width="500px">
<el-form ref="resultForm" :model="resultForm" :rules="resultRules" label-width="120px">
<el-form-item label="检验结果" prop="result">
<el-input v-model="resultForm.result" placeholder="请输入检验结果" />
</el-form-item>
<el-form-item label="检验结论" prop="conclusion">
<el-input v-model="resultForm.conclusion" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitResult">确 定</el-button>
<el-button @click="cancelResult">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listInspectionTask, getInspectionTask, delInspectionTask, addInspectionTask, updateInspectionTask } from "@/api/mes/is/inspectionTask";
import UserSelect from "@/components/KLPService/UserSelect";
export default {
name: "InspectionTask",
components: {
UserSelect
},
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 检验任务表表格数据
inspectionTaskList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
taskNo: undefined,
commissionId: undefined,
assignedTo: undefined,
startTime: undefined,
endTime: undefined,
result: undefined,
conclusion: undefined,
status: undefined,
priority: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
},
resultDialogVisible: false,
resultForm: {},
resultRules: {
result: [{ required: true, message: "请输入检验结果", trigger: "blur" }],
conclusion: [{ required: true, message: "请输入检验结论", trigger: "blur" }]
}
};
},
watch: {
"$route.query.commissionId": {
handler(newVal) {
// if (newVal) {
this.queryParams.commissionId = newVal;
this.getList();
// }
},
immediate: true
}
},
methods: {
/** 查询检验任务表列表 */
getList() {
this.loading = true;
listInspectionTask(this.queryParams).then(response => {
this.inspectionTaskList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
taskId: undefined,
taskNo: undefined,
commissionId: this.$route.query.commissionId,
assignedTo: undefined,
startTime: undefined,
endTime: undefined,
result: undefined,
conclusion: undefined,
status: undefined,
priority: undefined,
delFlag: undefined,
createTime: undefined,
createBy: undefined,
updateTime: undefined,
updateBy: undefined,
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.taskId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加检验任务表";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const taskId = row.taskId || this.ids
getInspectionTask(taskId).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改检验任务表";
});
},
handleResult(row) {
this.resultDialogVisible = true;
this.resultForm = row;
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.taskId != null) {
updateInspectionTask(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addInspectionTask(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const taskIds = row.taskId || this.ids;
this.$modal.confirm('是否确认删除检验任务表编号为"' + taskIds + '"的数据项？').then(() => {
this.loading = true;
return delInspectionTask(taskIds);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('is/inspectionTask/export', {
...this.queryParams
}, `inspectionTask_${new Date().getTime()}.xlsx`)
},
cancelResult() {
this.resultDialogVisible = false;
this.resetForm("resultForm");
},
submitResult() {
this.$refs["resultForm"].validate(valid => {
if (valid) {
this.buttonLoading = true;
const payload = {
...this.resultForm,
endTime: this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
status: '已完成',
}
updateInspectionTask(payload).then(response => {
this.$modal.msgSuccess("修改成功");
this.resultDialogVisible = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
});
}
}
}
</script>

338
klp-ui/src/views/mes/is/sampleInventory/index.vue
View File

@@ -1,338 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="关联委托单" prop="commissionId">
<el-select v-model="queryParams.commissionId" placeholder="请选择关联委托单">
<el-option v-for="item in commissionList" :key="item.commissionId" :label="item.commissionNo" :value="item.commissionId" />
</el-select>
</el-form-item>
<el-form-item label="存放位置" prop="location">
<el-input
v-model="queryParams.location"
placeholder="请输入存放位置"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当前库存量" prop="currentQuantity">
<el-input
v-model="queryParams.currentQuantity"
placeholder="请输入当前库存量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库时间" prop="storageTime">
<el-date-picker clearable
v-model="queryParams.storageTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>
<el-form-item label="有效期至" prop="expirationDate">
<el-date-picker clearable
v-model="queryParams.expirationDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择有效期至">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<KLPTable v-loading="loading" :data="sampleInventoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="样品ID" align="center" prop="sampleId" v-if="false"/>
<el-table-column label="关联委托单" align="center" prop="commissionId" />
<el-table-column label="存放位置" align="center" prop="location" />
<el-table-column label="当前库存量" align="center" prop="currentQuantity" />
<el-table-column label="入库时间" align="center" prop="storageTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.storageTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="有效期至" align="center" prop="expirationDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.expirationDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</KLPTable>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改样品库存表对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="关联委托单" prop="commissionId">
<el-select v-model="form.commissionId" placeholder="请选择关联委托单">
<el-option v-for="item in commissionList" :key="item.commissionId" :label="item.commissionNo" :value="item.commissionId" />
</el-select>
</el-form-item>
<el-form-item label="存放位置" prop="location">
<el-input v-model="form.location" placeholder="请输入存放位置" />
</el-form-item>
<el-form-item label="当前库存量" prop="currentQuantity">
<el-input v-model="form.currentQuantity" placeholder="请输入当前库存量" />
</el-form-item>
<el-form-item label="入库时间" prop="storageTime">
<el-date-picker clearable
v-model="form.storageTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>
<el-form-item label="有效期至" prop="expirationDate">
<el-date-picker clearable
v-model="form.expirationDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择有效期至">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listSampleInventory, getSampleInventory, delSampleInventory, addSampleInventory, updateSampleInventory } from "@/api/mes/is/sampleInventory";
import { listInspectionCommission } from "@/api/mes/is/inspectionCommission";
export default {
name: "SampleInventory",
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 样品库存表表格数据
sampleInventoryList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
commissionId: undefined,
location: undefined,
currentQuantity: undefined,
storageTime: undefined,
expirationDate: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getCommissionList();
this.getList();
},
methods: {
getCommissionList() {
listInspectionCommission().then(response => {
this.commissionList = response.rows;
});
},
/** 查询样品库存表列表 */
getList() {
this.loading = true;
listSampleInventory(this.queryParams).then(response => {
this.sampleInventoryList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
sampleId: undefined,
commissionId: undefined,
location: undefined,
currentQuantity: undefined,
storageTime: undefined,
expirationDate: undefined,
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.sampleId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加样品库存表";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const sampleId = row.sampleId || this.ids
getSampleInventory(sampleId).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改样品库存表";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.sampleId != null) {
updateSampleInventory(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addSampleInventory(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const sampleIds = row.sampleId || this.ids;
this.$modal.confirm('是否确认删除样品库存表编号为"' + sampleIds + '"的数据项？').then(() => {
this.loading = true;
return delSampleInventory(sampleIds);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('is/sampleInventory/export', {
...this.queryParams
}, `sampleInventory_${new Date().getTime()}.xlsx`)
}
}
};
</script>

529
klp-ui/src/views/mes/qc/inspectionSample/index.vue Normal file
View File

@@ -0,0 +1,529 @@
<template>
<div class="app-container">
<div v-loading="filterLoading" style="margin-bottom: 16px; min-height: 50px;">
<div style="display: flex; align-items: center; margin-bottom: 6px;">
<span style="font-size: 13px; color: #909399; white-space: nowrap; margin-right: 12px; width: 68px; text-align: right;">所属单位：</span>
<el-radio-group v-model="selectedCompany" size="small" @change="handleCompanyChange">
<el-radio-button label="">全部</el-radio-button>
<el-radio-button v-for="company in companyOptions" :key="company" :label="company">{{ company }}</el-radio-button>
</el-radio-group>
</div>
<div style="display: flex; align-items: center; margin-bottom: 6px;">
<span style="font-size: 13px; color: #909399; white-space: nowrap; margin-right: 12px; width: 68px; text-align: right;">方案名称：</span>
<el-radio-group v-model="selectedScheme" size="small" @change="handleSchemeChange">
<el-radio-button label="">全部</el-radio-button>
<el-radio-button v-for="scheme in schemeOptions" :key="scheme" :label="scheme">{{ scheme }}</el-radio-button>
</el-radio-group>
</div>
<div style="display: flex; align-items: center;">
<span style="font-size: 13px; color: #909399; white-space: nowrap; margin-right: 12px; width: 68px; text-align: right;">检验日期：</span>
<el-date-picker
v-model="dateRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
size="small"
style="width: 340px;"
@change="handleDateRangeChange"
/>
</div>
</div>
<div v-if="currentTemplate">
<div class="card-header">
<h3>{{ currentTemplate.templateName }}</h3>
<div>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddMain">新增</el-button>
<el-button type="info" plain icon="el-icon-refresh" size="mini" @click="getMainList">刷新</el-button>
</div>
</div>
<el-table v-loading="mainLoading" :data="mainList" border stripe class="dynamic-table" fit max-height="calc(100vh - 260px)">
<el-table-column label="日期" align="center" width="150" fixed="left">
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.inspectionDate"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
size="mini"
class="inspect-input"
style="width: 100%;"
/>
</template>
</el-table-column>
<el-table-column label="样品名称" align="center" width="130" min-width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.sampleName" size="mini" class="inspect-input" />
</template>
</el-table-column>
<el-table-column label="样品编号" align="center" width="130" min-width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.sampleNo" size="mini" class="inspect-input" />
</template>
</el-table-column>
<el-table-column label="来样编号" align="center" width="130" min-width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.batchNo" size="mini" class="inspect-input" />
</template>
</el-table-column>
<el-table-column label="分析项目" align="center">
<el-table-column
v-for="checkItem in checkItems"
:key="checkItem.itemId"
:label="checkItem.itemName"
align="center"
min-width="130"
>
<el-table-column :label="checkItem.unit || ''" align="center" min-width="120">
<template slot-scope="scope">
<el-input
v-if="scope.row._items[checkItem.itemName]"
v-model="scope.row._items[checkItem.itemName].itemValue"
size="mini"
class="inspect-input"
/>
<span v-else>-</span>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column label="备注" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" size="mini" class="inspect-input" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="mini" :loading="scope.row._saving" @click="handleSaveMain(scope.row)">保存</el-button>
<el-button type="text" size="mini" style="color: #f56c6c;" @click="handleDeleteMain(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="mainTotal > 0"
:total="mainTotal"
:page.sync="mainQueryParams.pageNum"
:limit.sync="mainQueryParams.pageSize"
@pagination="getMainList"
/>
</div>
<el-empty v-else description="请先选择所属单位和检验方案" />
<el-dialog :title="'新增检验记录'" :visible.sync="addMainDialogVisible" width="600px" append-to-body>
<el-form ref="addMainForm" :model="addMainFormData" label-width="100px">
<el-form-item label="样品名称" prop="sampleName">
<el-input v-model="addMainFormData.sampleName" placeholder="请输入样品名称" />
</el-form-item>
<el-form-item label="样品编号" prop="sampleNo">
<el-input v-model="addMainFormData.sampleNo" placeholder="请输入样品编号" />
</el-form-item>
<el-form-item label="来样编号" prop="batchNo">
<el-input v-model="addMainFormData.batchNo" placeholder="请输入来样编号" />
</el-form-item>
<el-form-item label="检验日期" prop="inspectionDate">
<el-date-picker v-model="addMainFormData.inspectionDate" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择检验日期" style="width:100%" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="addMainFormData.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="addMainDialogVisible = false">取消</el-button>
<el-button type="primary" @click="submitAddMain">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listInspectionMain, addInspectionMain, updateInspectionMain, delInspectionMain } from '@/api/mes/qc/inspectionMain'
import { listInspectionDetail, addInspectionDetail, updateInspectionDetail } from '@/api/mes/qc/inspectionDetail'
import { listInspectionItemTemplate, getInfoByInspectionItem } from '@/api/mes/qc/inspectionItemTemplate'
export default {
name: 'InspectionSample',
data() {
return {
filterLoading: false,
mainLoading: false,
addMainDialogVisible: false,
templateList: [],
cascadeData: {},
companyOptions: [],
schemeOptions: [],
selectedCompany: '',
selectedScheme: '',
currentTemplate: null,
checkItems: [],
mainList: [],
mainTotal: 0,
mainQueryParams: {
pageNum: 1,
pageSize: 1000
},
dateRange: [],
addMainFormData: {
sampleName: '',
sampleNo: '',
batchNo: '',
inspectionDate: '',
remark: ''
}
}
},
created() {
this.initDateRange()
this.loadCascadeData()
},
methods: {
initDateRange() {
const now = new Date()
const year = now.getFullYear()
const month = now.getMonth()
const start = new Date(year, month, 1)
const end = new Date(year, month + 1, 0, 23, 59, 59)
const fmt = d => {
const y = d.getFullYear()
const m = String(d.getMonth() + 1).padStart(2, '0')
const day = String(d.getDate()).padStart(2, '0')
return `${y}-${m}-${day} 00:00:00`
}
const fmtEnd = d => {
const y = d.getFullYear()
const m = String(d.getMonth() + 1).padStart(2, '0')
const day = String(d.getDate()).padStart(2, '0')
return `${y}-${m}-${day} 23:59:59`
}
this.dateRange = [fmt(start), fmtEnd(end)]
},
parseTime(time, pattern) {
if (!time) return ''
const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
const date = new Date(time)
const year = date.getFullYear()
const month = date.getMonth() + 1
const day = date.getDate()
const hour = date.getHours()
const minute = date.getMinutes()
const second = date.getSeconds()
return format.replace('{y}', year)
.replace('{m}', month.toString().padStart(2, '0'))
.replace('{d}', day.toString().padStart(2, '0'))
.replace('{h}', hour.toString().padStart(2, '0'))
.replace('{i}', minute.toString().padStart(2, '0'))
.replace('{s}', second.toString().padStart(2, '0'))
},
loadCascadeData() {
this.filterLoading = true
listInspectionItemTemplate({ pageNum: 1, pageSize: 9999 }).then(response => {
const templates = response.rows || response.data || []
this.templateList = templates
const cascade = {}
templates.forEach(t => {
const company = t.templateUnit || '未分类'
if (!cascade[company]) {
cascade[company] = []
}
if (t.templateName && !cascade[company].includes(t.templateName)) {
cascade[company].push(t.templateName)
}
})
this.cascadeData = cascade
this.companyOptions = Object.keys(cascade).sort()
const allSchemes = new Set()
Object.values(cascade).forEach(schemes => {
schemes.forEach(s => allSchemes.add(s))
})
this.schemeOptions = [...allSchemes].sort()
}).finally(() => {
this.filterLoading = false
})
},
handleCompanyChange() {
this.selectedScheme = ''
if (this.selectedCompany) {
this.schemeOptions = this.cascadeData[this.selectedCompany] || []
} else {
const allSchemes = new Set()
Object.values(this.cascadeData).forEach(schemes => {
schemes.forEach(s => allSchemes.add(s))
})
this.schemeOptions = [...allSchemes].sort()
}
this.currentTemplate = null
this.mainList = []
},
handleSchemeChange() {
if (!this.selectedScheme) {
this.currentTemplate = null
this.mainList = []
return
}
let template
if (this.selectedCompany) {
template = this.templateList.find(t =>
t.templateName === this.selectedScheme && (t.templateUnit || '未分类') === this.selectedCompany
)
} else {
template = this.templateList.find(t => t.templateName === this.selectedScheme)
}
if (template) {
this.currentTemplate = template
this.mainQueryParams.pageNum = 1
this.loadCheckItems(template)
this.getMainList()
}
},
handleDateRangeChange() {
this.mainQueryParams.pageNum = 1
this.getMainList()
},
loadCheckItems(template) {
if (!template.inspectionItem) {
this.checkItems = []
return
}
getInfoByInspectionItem(template.inspectionItem).then(response => {
this.checkItems = response.data || []
}).catch(() => {
this.checkItems = []
})
},
getMainList() {
if (!this.currentTemplate) return
this.mainLoading = true
const params = {
...this.mainQueryParams,
templateId: this.currentTemplate.templateId
}
if (this.dateRange && this.dateRange.length === 2) {
params.inspectionDateStart = this.dateRange[0]
params.inspectionDateEnd = this.dateRange[1]
}
listInspectionMain(params).then(response => {
this.mainList = (response.rows || []).map(main => {
const itemMap = {}
if (this.checkItems.length > 0) {
this.checkItems.forEach(item => {
itemMap[item.itemName] = {
detailId: undefined,
mainId: main.mainId,
itemName: item.itemName,
itemValue: '',
itemUnit: item.unit,
upperLimit: item.targetUpper,
lowerLimit: item.targetLower,
rangeDesc: ''
}
})
}
return {
...main,
_items: itemMap,
_originalItems: JSON.parse(JSON.stringify(itemMap))
}
})
this.mainTotal = response.total || 0
this.mainLoading = false
this.loadMainDetails()
}).catch(() => {
this.mainLoading = false
})
},
loadMainDetails() {
if (this.mainList.length === 0) return
const promises = this.mainList.map(main => {
return listInspectionDetail({ mainId: main.mainId, pageNum: 1, pageSize: 9999 }).then(response => {
const details = response.rows || []
details.forEach(detail => {
if (main._items[detail.itemName]) {
main._items[detail.itemName] = {
detailId: detail.detailId,
mainId: detail.mainId,
itemName: detail.itemName,
itemValue: detail.itemValue || '',
itemUnit: detail.itemUnit || main._items[detail.itemName].itemUnit,
upperLimit: detail.upperLimit,
lowerLimit: detail.lowerLimit,
rangeDesc: detail.rangeDesc
}
}
})
main._originalItems = JSON.parse(JSON.stringify(main._items))
}).catch(() => {})
})
return Promise.all(promises)
},
handleAddMain() {
this.addMainFormData = {
sampleName: '',
sampleNo: '',
batchNo: '',
inspectionDate: '',
remark: ''
}
this.addMainDialogVisible = true
},
submitAddMain() {
const data = {
...this.addMainFormData,
templateId: this.currentTemplate.templateId
}
addInspectionMain(data).then(() => {
this.$message.success('新增成功')
this.addMainDialogVisible = false
this.getMainList()
}).catch(() => {
this.$message.error('新增失败')
})
},
handleSaveMain(row) {
row._saving = true
updateInspectionMain({
mainId: row.mainId,
sampleName: row.sampleName,
sampleNo: row.sampleNo,
batchNo: row.batchNo,
inspectionDate: row.inspectionDate,
remark: row.remark
}).then(() => {
const items = this.checkItems.map(checkItem => {
const itemData = row._items[checkItem.itemName]
return itemData || { itemName: checkItem.itemName }
})
const promises = items.map(item => {
const data = {
mainId: row.mainId,
itemName: item.itemName,
itemValue: item.itemValue,
itemUnit: item.itemUnit,
upperLimit: item.upperLimit,
lowerLimit: item.lowerLimit
}
if (item.detailId) {
data.detailId = item.detailId
return updateInspectionDetail(data)
} else if (item.itemValue) {
return addInspectionDetail(data)
}
return Promise.resolve()
})
return Promise.all(promises)
}).then(() => {
this.$message.success('保存成功')
return listInspectionDetail({ mainId: row.mainId, pageNum: 1, pageSize: 9999 })
}).then(response => {
const details = response.rows || []
if (this.checkItems.length > 0) {
this.checkItems.forEach(item => {
const found = details.find(d => d.itemName === item.itemName)
if (found) {
row._items[item.itemName] = {
detailId: found.detailId,
mainId: found.mainId,
itemName: found.itemName,
itemValue: found.itemValue || '',
itemUnit: found.itemUnit || item.unit,
upperLimit: found.upperLimit,
lowerLimit: found.lowerLimit,
rangeDesc: found.rangeDesc
}
}
})
}
row._originalItems = JSON.parse(JSON.stringify(row._items))
row._saving = false
}).catch(() => {
this.$message.error('保存失败')
row._saving = false
})
},
handleDeleteMain(row) {
this.$confirm('是否确认删除该检验记录？', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delInspectionMain(row.mainId).then(() => {
this.$message.success('删除成功')
this.getMainList()
}).catch(() => {
this.$message.error('删除失败')
})
})
}
}
}
</script>
<style scoped>
.card-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 15px;
}
.card-header h3 {
margin: 0;
font-size: 16px;
font-weight: 600;
}
.dynamic-table {
width: 100%;
overflow-x: auto;
}
::v-deep .dynamic-table .el-table__header-wrapper {
background-color: #f0f5ff;
}
::v-deep .dynamic-table .el-table__header-wrapper th {
background-color: #f0f5ff;
}
::v-deep .inspect-input .el-input__inner {
border: 1px solid #e4e7ed;
border-radius: 2px;
text-align: center;
background-color: #fff;
padding: 0 4px;
height: 24px;
line-height: 24px;
font-size: 13px;
}
::v-deep .inspect-input.is-focus .el-input__inner {
border-color: #409eff;
}
::v-deep .dynamic-table .el-table__cell {
padding: 2px 0;
}
::v-deep .dynamic-table .el-table__header-wrapper th {
padding: 4px 0;
font-size: 13px;
}
::v-deep .dynamic-table .el-table__body-wrapper {
overflow-x: auto;
}
</style>

1115
klp-ui/src/views/mes/qc/inspectionTensile/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

29
klp-ui/src/views/mes/qc/template/index.vue
View File

@@ -59,9 +59,6 @@
<el-form-item label="方案描述" prop="templateDesc">
<el-input v-model="form.templateDesc" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="待检项" prop="inspectionItem">
<CheckItemTransfer v-model="form.inspectionItem" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
@@ -72,26 +69,6 @@
</div>
</el-dialog>
<!-- 添加现有检查项对话框 -->
<el-dialog title="添加现有检查项" :visible.sync="addItemOpen" width="500px" append-to-body>
<el-form ref="addItemForm" :model="addItemForm" label-width="80px">
<el-form-item label="检查项" prop="itemId">
<el-select v-model="addItemForm.itemId" placeholder="请选择检查项" filterable>
<el-option v-for="item in availableCheckItems" :key="item.itemId" :label="item.itemName" :value="item.itemId">
<span>{{ item.itemName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">
({{ item.qualitativeQuantitative === 0 ? '定性' : '定量' }})
</span>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitAddItem">确 定</el-button>
<el-button @click="addItemOpen = false">取 消</el-button>
</div>
</el-dialog>
<!-- 新建/修改检查项对话框 -->
<el-dialog :title="itemTitle" :visible.sync="itemOpen" width="600px" append-to-body>
<el-form ref="itemForm" :model="itemForm" :rules="itemRules" label-width="100px">
@@ -129,9 +106,9 @@
<el-col :span="16" v-loading="rightLoading">
<el-row :gutter="10" class="mb8" v-if="currentTemplate">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddExistingItem">添加现有检查项</el-button>
<el-button type="success" plain icon="el-icon-plus" size="mini" @click="handleAddNewItem">新建检查项</el-button>
<el-button type="warning" plain icon="el-icon-lightning" size="mini" @click="quickCreateOpen = true">快捷创建检验任务</el-button>
<!-- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddExistingItem">添加现有检查项</el-button> -->
<el-button type="success" plain icon="el-icon-plus" size="mini" @click="handleAddNewItem">添加检查项</el-button>
<!-- <el-button type="warning" plain icon="el-icon-lightning" size="mini" @click="quickCreateOpen = true">快捷创建检验任务</el-button> -->
</el-col>
</el-row>

8
klp-ui/src/views/wms/todo/index.vue
View File

@@ -3,9 +3,9 @@
<el-tab-pane label="待贴标签" name="first">
<TranferCoilTable />
</el-tab-pane>
<el-tab-pane label="检验任务" name="third" v-hasPermi="['qc:inspection:task']">
<!-- <el-tab-pane label="检验任务" name="third" v-hasPermi="['qc:inspection:task']">
<InspectionTask readonly />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="质保书审批" name="fourth" v-hasPermi="['qc:certificate:approve']">
<CertificateBook />
</el-tab-pane>
@@ -20,7 +20,7 @@
<script>
import TranferCoilTable from '@/views/wms/coil/views/base/tranfer.vue'
import InspectionTask from '@/views/mes/qc/inspection/task.vue'
// import InspectionTask from '@/views/mes/qc/inspection/task.vue'
import CertificateBook from '@/views/mes/qc/certificate/book.vue'
import EquipmentInspectionApproval from '@/views/mes/eqp/check/approval.vue'
@@ -28,7 +28,7 @@
name: 'TodoIndex',
components: {
TranferCoilTable,
InspectionTask,
// InspectionTask,
CertificateBook,
EquipmentInspectionApproval,
},