From 548c8932d9d9283ebab1a65154c908c664967cad Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 11 Oct 2024 17:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=97=E6=8E=A7=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/checkType.js | 43 +++ src/layout/components/Navbar.vue | 4 +- src/views/quality/checkType/confFile.vue | 277 ++++++++++++++++++++ src/views/quality/checkType/index.vue | 92 +++---- src/views/quality/inventoryReport/index.vue | 4 + src/views/quality/produceReport/index.vue | 12 +- src/views/quality/qcInventory/index.vue | 16 ++ 7 files changed, 399 insertions(+), 49 deletions(-) create mode 100644 src/views/quality/checkType/confFile.vue diff --git a/src/api/quality/checkType.js b/src/api/quality/checkType.js index 72bb291..d227eac 100644 --- a/src/api/quality/checkType.js +++ b/src/api/quality/checkType.js @@ -42,3 +42,46 @@ export function delCheckType(id) { method: 'delete' }); } + +/**查询检验节点受控文件列表**/ +// 查询受控文件列表 +export function listFile(query) { + return request({ + url: '/quality/checkTypeFile/list', + method: 'get', + params: query + }); +} +// 查询检验节点维护详细 +export function getFile(id) { + return request({ + url: '/quality/checkTypeFile/' + id, + method: 'get' + }); +} + +// 新增检验节点维护 +export function addFile(data) { + return request({ + url: '/quality/checkTypeFile', + method: 'post', + data: data + }); +} + +// 修改检验节点维护 +export function updateFile(data) { + return request({ + url: '/quality/checkTypeFile', + method: 'put', + data: data + }); +} + +// 删除检验节点维护 +export function delFile(id) { + return request({ + url: '/quality/checkTypeFile/' + id, + method: 'delete' + }); +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index bfaf9f2..30c2056 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -313,14 +313,14 @@ export default { setInterval(() => this.getAlarmData(), 1000 * 60); this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); - + /** //先执行一次 this.getUnReadList(); // 实现轮询 this.timer = setInterval(() => { setTimeout(this.getUnReadList(), 30000); }, 30000); - + **/ }, components: { diff --git a/src/views/quality/checkType/confFile.vue b/src/views/quality/checkType/confFile.vue new file mode 100644 index 0000000..b7fdec6 --- /dev/null +++ b/src/views/quality/checkType/confFile.vue @@ -0,0 +1,277 @@ + + + diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue index eb36a0f..79be36b 100644 --- a/src/views/quality/checkType/index.vue +++ b/src/views/quality/checkType/index.vue @@ -95,13 +95,13 @@ icon="el-icon-connection" @click="handleBind(scope.row)" >分配检验员 - + >受控文件 @@ -185,12 +185,10 @@ 关 闭 - - + + + + @@ -198,17 +196,16 @@ import { listCheckType, getCheckType, delCheckType, addCheckType, updateCheckType } from "@/api/quality/checkType"; import{ getSelectedUsers, addUserBind, deleteByMaterialCode} from "@/api/quality/userbind"; import ItemSelectUser from "./selectUser.vue"; +import ItemConfFile from "./confFile.vue"; export default { name: "CheckType", dicts: ["check_type","order_type_ll"], - components: { - ItemSelectUser - }, + components: {ItemSelectUser,ItemConfFile}, data() { return { // 遮罩层 loading: true, - userloading: true, + userloading: true, // 选中数组 ids: [], // 非单个禁用 @@ -414,48 +411,55 @@ export default { }, //人员选择确认 onSelectUser(obj) { - let data = { - materialCode: this.materialCode, - materialName: this.materialName, - attr1List: [], - userCodes: [], - userNames: [], - } + let data = { + materialCode: this.materialCode, + materialName: this.materialName, + attr1List: [], + userCodes: [], + userNames: [], + } obj.forEach((item, index) => { - data.userCodes.push(item.userCode); - data.userNames.push(item.userName); - data.attr1List.push(item.attr1); - }); - addUserBind(data).then(response => { - if(response.code === 200) { - this.$modal.msgSuccess("人员绑定成功"); - }else{ - this.$modal.msgError(response.msg); - } - this.getSelectUserList(); - }); + data.userCodes.push(item.userCode); + data.userNames.push(item.userName); + data.attr1List.push(item.attr1); + }); + addUserBind(data).then(response => { + if(response.code === 200) { + this.$modal.msgSuccess("人员绑定成功"); + }else{ + this.$modal.msgError(response.msg); + } + this.getSelectUserList(); + }); }, - deleteUser(row) { + deleteUser(row) { const userCode = row.userCode; - const userName = row.userName; - const data = { - materialCode: this.materialCode, - userCode: userCode, - userName: userName, - } + const userName = row.userName; + const data = { + materialCode: this.materialCode, + userCode: userCode, + userName: userName, + } this.$modal.confirm('是否确认删除用户名为"' + userName + '"的数据项？').then(function() { return deleteByMaterialCode(data); }).then(response => { - if(response.code === 200) { - this.$modal.msgSuccess("删除成功"); - }else{ - this.$modal.msgError(response.msg); - } + if(response.code === 200) { + this.$modal.msgSuccess("删除成功"); + }else{ + this.$modal.msgError(response.msg); + } this.getSelectUserList(); }).catch(() => {}); }, + //受控文件弹窗 + handleFile(row) { + this.checkType = row.orderCode; + this.$refs.itemConfFile.initFunc(this.checkType); + this.$refs.itemConfFile.showFlag = true; + this.$refs.itemConfFile.getList(); + }, } }; diff --git a/src/views/quality/inventoryReport/index.vue b/src/views/quality/inventoryReport/index.vue index 6bf2ed9..36acd18 100644 --- a/src/views/quality/inventoryReport/index.vue +++ b/src/views/quality/inventoryReport/index.vue @@ -208,8 +208,12 @@ + + + diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 91f64cc..44f597f 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -167,6 +167,9 @@ 产品巡检记录表 + + 检验依据：{{form.standardNo}} + @@ -581,9 +584,12 @@ - - {{ this.standardNo }} + + {{ form.standardNo }} + @@ -1049,7 +1055,7 @@ export default { this.checkProjectList = response.rows; this.total = response.total; this.loading = false; - this.standardNo = this.checkProjectList[0].standardNo; + //this.standardNo = this.checkProjectList[0].standardNo; this.rowspan() }); }, diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue index ee0aebe..2f55de9 100644 --- a/src/views/quality/qcInventory/index.vue +++ b/src/views/quality/qcInventory/index.vue @@ -20,6 +20,22 @@ end-placeholder="结束日期"> + + + + + + 搜索 重置