diff --git a/src/views/modules/toolMan/quarantineLibrary.vue b/src/views/modules/toolMan/quarantineLibrary.vue index 951267b1..6865e06b 100644 --- a/src/views/modules/toolMan/quarantineLibrary.vue +++ b/src/views/modules/toolMan/quarantineLibrary.vue @@ -80,6 +80,17 @@ + + + + + + + @@ -144,9 +155,21 @@ import { }, modelInput : { label1 : '报废信息', - label2 : '报废原因', + label2 : '原因', + label3 : '责任类型', }, }, + selectList: { + select1: [{ + value: '内部责任', + label: '内部责任' + }, { + value: '供应商责任', + label: '供应商责任' + }], + }, + //责任类型 + defectCode : '', remark : '', site : this.$store.state.user.site, userName : this.$store.state.user.name, @@ -590,9 +613,11 @@ import { if(passFlag == 'Y'){ status = '合格' }else if(passFlag == 'W') { + this.inputLabel.modelInput.label1 = '维修信息' status = '待维修' }else if(passFlag == 'B') { status = '待报废' + this.inputLabel.modelInput.label1 = '报废信息' } this.$confirm(`确定该工具` + status + '?', '操作提示', { confirmButtonText: '确定', @@ -602,7 +627,8 @@ import { this.currentData = row this.flag = passFlag this.remark = '' - if(passFlag == 'B'){ + this.defectCode = '' + if(passFlag == 'B' || passFlag == 'W'){ this.setUp.modelFlag = true }else { this.saveToolInspection(row ,passFlag) @@ -612,7 +638,17 @@ import { modelVerification(){ this.saveModelFlag = true if(this.remark == ''){ - this.$alert('请输入报废原因!', '操作提示', { + this.$alert('请输入原因!', '操作提示', { + confirmButtonText: '确定', + type :"warning", + callback: action => { + this.saveModelFlag = false + } + }); + return false + } + if(this.defectCode == ''){ + this.$alert('请选择责任类型!', '操作提示', { confirmButtonText: '确定', type :"warning", callback: action => { @@ -645,6 +681,7 @@ import { passFlag : passFlag, status : status, remark : this.remark, + defectCode : this.defectCode, } updateToolDetailStatus3(saveData).then(({data}) =>{ if(data.code == 0){ diff --git a/src/views/modules/toolMan/toolResume.vue b/src/views/modules/toolMan/toolResume.vue index 4476ab0b..216ca4d1 100644 --- a/src/views/modules/toolMan/toolResume.vue +++ b/src/views/modules/toolMan/toolResume.vue @@ -624,6 +624,23 @@ import { fixed: false, columnWidth : 135, }, + { + userId: this.$store.state.user.name, + functionId: 1101, + tableId: "toolTrans1101DefectCode", + tableName: "toolTransTable", + columnProp: "defectCode", + headerAlign: "center", + align: "center", + columnLabel: "责任类型", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth : 90, + }, { userId: this.$store.state.user.name, functionId: 1101,