From d1cf689a1fa2c443e225292fb4fd7cae232a6fca Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 26 Jun 2026 14:51:59 +0800 Subject: [PATCH] =?UTF-8?q?2026-06-26=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unqualifiedInspectionReasons.vue | 115 ++++++++++++++++-- .../modules/yieldReport/com_produce_down.vue | 1 - 2 files changed, 104 insertions(+), 12 deletions(-) diff --git a/src/views/modules/qualityAssurance/unqualifiedInspectionReasons.vue b/src/views/modules/qualityAssurance/unqualifiedInspectionReasons.vue index f6117f3..12362d4 100644 --- a/src/views/modules/qualityAssurance/unqualifiedInspectionReasons.vue +++ b/src/views/modules/qualityAssurance/unqualifiedInspectionReasons.vue @@ -46,7 +46,8 @@ :min-width="item.columnWidth" :label="item.columnLabel"> @@ -77,6 +78,16 @@ + + + + + + {{buttons.save}} @@ -102,6 +113,7 @@ saveUnqualifiedInspectionReasonsData, deleteUnqualifiedInspectionReasonsData } from "@/api/qualityAssurance/unqualifiedInspectionReasons.js" + import { getWorkCenterList } from "@/api/orderIssure/soIssueNotify.js" import { searchFunctionButtonList, @@ -147,6 +159,7 @@ site:'', inspectionType:'', inspectionTypeDb:'', + workCenterNo:'', defectCode:'', defectDesc:'', active:'', @@ -154,6 +167,7 @@ }, dataList:[], dataListLoading: false, + workCenterList: [], columnList: [ { userId: this.$store.state.user.name, @@ -209,6 +223,24 @@ fixed: '', columnWidth: 300 }, + { + userId: this.$store.state.user.name, + functionId: 101001, + serialNumber: '101001TableWorkCenterNo', + tableId: "101001Table", + tableName: "检验不合格原因表", + columnProp: "workCenterNo", + headerAlign: "center", + align: "left", + columnLabel: "加工中心", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 35, + status: true, + fixed: '', + columnWidth: 120 + }, { userId: this.$store.state.user.name, functionId: 101001, @@ -260,6 +292,7 @@ active:'在用:', defectCode:'原因代码:', defectDesc:'原因描述', + workCenterNo:'加工中心:', inspectionBuy:'采购进料检验', inspectionProduct:'生产过程检验', }, @@ -290,7 +323,9 @@ modelData: { deep: true, handler: function (newV, oldV) { - this.modelData.defectCode = this.modelData.defectCode.toUpperCase() + if (this.modelData.defectCode) { + this.modelData.defectCode = this.modelData.defectCode.toUpperCase() + } } } }, @@ -308,17 +343,42 @@ this.dataList = data.rows }) }, + loadWorkCenterList() { + const inData = { + username: this.$store.state.user.name + } + getWorkCenterList(inData).then(({data}) => { + if (data && data.code === 0) { + this.workCenterList = data.rows || [] + } + }) + }, + getWorkCenterDesc(workCenterNo) { + if (!workCenterNo) { + return '' + } + const target = this.workCenterList.find(item => item.workCenterNo === workCenterNo) + return target ? target.workCenterDesc : workCenterNo + }, addModal(){ - this.modelData={}; - this.modelData.site=this.$store.state.user.site; - this.modelData.add=0; + this.modelData = { + add: 0, + site: this.$store.state.user.site, + inspectionType: '', + inspectionTypeDb: '', + workCenterNo: '', + defectCode: '', + defectDesc: '', + active: 'Y', + user: '' + }; this.modelInputFlag=false; - this.modelData.active='Y'; this.modelFlag=true; }, editModel(row){ this.modelData=JSON.parse(JSON.stringify(row)); this.modelData.add=1; + this.modelData.workCenterNo = this.modelData.workCenterNo || ''; this.modelInputFlag=true; this.modelFlag=true; }, @@ -341,6 +401,12 @@ }) return false; } + if(this.modelData.workCenterNo==''||this.modelData.workCenterNo==null){ + this.$alert("请选择加工中心！",'错误',{ + confirmButtonText:'确定' + }) + return false; + } if(this.modelData.active==''||this.modelData.active==null){ this.$alert("请选择是否在用！",'错误',{ confirmButtonText:'确定' @@ -383,7 +449,8 @@ }).then(() => { let inData = { defectCode: row.defectCode, - site:row.site + site:row.site, + workCenterNo: row.workCenterNo } deleteUnqualifiedInspectionReasonsData(inData).then(({data}) => { if (data && data.code == 200) { @@ -449,7 +516,7 @@ //首先查询当前按钮的多语言 searchFunctionButtonList(this.queryButton).then(({data}) => { if (data.code == 0) { - this.buttons = data.data + this.buttons = Object.assign({}, this.buttons, data.data) } else { // saveButtonList(this.buttonList).then(({data}) => { // }) @@ -458,7 +525,7 @@ //其次查询当前标签的多语言 searchFunctionButtonList(this.queryLabel).then(({data}) => { if (data.code == 0) { - this.labels = data.data + this.labels = Object.assign({}, this.labels, data.data) } else { // saveButtonList(this.buttonList).then(({data}) => { // }) @@ -484,7 +551,7 @@ getTableUserListLanguage(this.queryTableUser).then(({data}) => { if (data.rows.length > 0) { //this.columnList = [] - this.columnList = data.rows + this.columnList = this.ensureWorkCenterColumn(data.rows) } else { this.getColumnList() } @@ -495,16 +562,42 @@ getTableDefaultListLanguage(this.queryTable).then(({data}) => { if (!data.rows.length == 0) { // this.showDefault = false - this.columnList = data.rows + this.columnList = this.ensureWorkCenterColumn(data.rows) } else { // this.showDefault = true } }) }, + ensureWorkCenterColumn(columnList = []) { + const hasWorkCenter = columnList.some(item => item.columnProp === 'workCenterNo') + if (hasWorkCenter) { + return columnList + } + const workCenterColumn = { + userId: this.$store.state.user.name, + functionId: 101001, + serialNumber: '101001TableWorkCenterNo', + tableId: "101001Table", + tableName: "检验不合格原因表", + columnProp: "workCenterNo", + headerAlign: "center", + align: "left", + columnLabel: "加工中心", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 35, + status: true, + fixed: '', + columnWidth: 120 + } + return [...columnList, workCenterColumn] + }, }, created() { this.getMultiLanguageList()//刷新按钮 this.getData(); + this.loadWorkCenterList(); //获取按钮的权限 this.getButtonAuthData(); this.getTableUserColumn() diff --git a/src/views/modules/yieldReport/com_produce_down.vue b/src/views/modules/yieldReport/com_produce_down.vue index 5217045..0846ad3 100644 --- a/src/views/modules/yieldReport/com_produce_down.vue +++ b/src/views/modules/yieldReport/com_produce_down.vue @@ -251,7 +251,6 @@ export default { //初始化组件的参数 init(scheduleData, operatorData) { - console.log(scheduleData) //初始化参数 this.scheduleData = scheduleData; //初始化操作员对象