diff --git a/src/views/modules/base/shutDownReason.vue b/src/views/modules/base/shutDownReason.vue index c57eec2..43cc04c 100644 --- a/src/views/modules/base/shutDownReason.vue +++ b/src/views/modules/base/shutDownReason.vue @@ -30,8 +30,8 @@ width="150" label="操作"> @@ -69,6 +70,16 @@ + + + + + + @@ -97,6 +108,7 @@ saveShutDownReasonData, deleteShutDownReasonData } from "@/api/base/site.js" + import { getWorkCenterList } from "@/api/orderIssure/soIssueNotify.js" import { searchFunctionButtonList, @@ -126,6 +138,7 @@ area:'区域:', shutDownReason:'停机原因', site:'工厂编码:', + workCenterNo:'加工中心:', reasonCode:'原因代码:', reasonDescription:'原因描述:', active:'在用:', @@ -138,6 +151,7 @@ inArea:'请输入区域!', inReasonCode:'请输入原因代码!', inReasonDescription:'请输入原因描述!', + inWorkCenterNo:'请选择加工中心!', inActive:'请选择是否在用!', deleteAsk:'是否删除此条停机原因?', }, @@ -176,6 +190,7 @@ add:'', site:'', area:'', + workCenterNo:'', reasonCode:'', reasonDescription:'', active:'', @@ -183,6 +198,7 @@ }, dataList:[], dataListLoading: false, + workCenterList: [], columnList: [ { userId: this.$store.state.user.name, @@ -256,6 +272,24 @@ fixed: '', columnWidth: 200 }, + { + userId: this.$store.state.user.name, + functionId: 103003, + serialNumber: '103003TableWorkCenterNo', + tableId: "103003Table", + tableName: "停机原因表", + columnProp: "workCenterNo", + headerAlign: "center", + align: "left", + columnLabel: "加工中心", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, { userId: this.$store.state.user.name, functionId: 103003, @@ -295,11 +329,29 @@ 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={ add:'', site:this.$store.state.user.site, area:'', + workCenterNo:'', reasonCode:'', reasonDescription:'', active:'', @@ -313,6 +365,7 @@ 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 +394,12 @@ }) return false; } + if(this.modelData.workCenterNo==''||this.modelData.workCenterNo==null){ + this.$alert(this.labels.inWorkCenterNo,this.labels.error,{ + confirmButtonText:this.labels.true + }) + return false; + } if(this.modelData.active==''||this.modelData.active==null){ this.$alert(this.labels.inActive,this.labels.error,{ confirmButtonText:this.labels.true @@ -371,7 +430,8 @@ }).then(() => { let inData = { reasonCode: row.reasonCode, - site:row.site + site:row.site, + workCenterNo: row.workCenterNo } deleteShutDownReasonData(inData).then(({data}) => { if (data && data.code == 200) { @@ -436,12 +496,15 @@ modelData: { deep: true, handler: function (newV, oldV) { - this.modelData.reasonCode = this.modelData.reasonCode.toUpperCase() + if (this.modelData.reasonCode) { + this.modelData.reasonCode = this.modelData.reasonCode.toUpperCase() + } } } }, created() { this.getData(); + this.loadWorkCenterList(); //获取按钮的权限 this.getButtonAuthData();