diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue index 98f1464..ab46e21 100644 --- a/src/views/modules/production/scheduleForSOTask.vue +++ b/src/views/modules/production/scheduleForSOTask.vue @@ -402,6 +402,13 @@ + + + + + + @@ -691,6 +698,7 @@ operatorId:'', efficiency:'', partPlanQty:'', + shiftType: '' }, scheduledModalFlag: false, vpModalFlag: false, @@ -885,6 +893,10 @@ // }) // return false // } + if (this.schedulingModalData.shiftType==null || this.schedulingModalData.shiftType=='') { + this.$message.warning('请选择派工类型!') + return false + } let flag=false; for (let i = 0; i { if (data && data.code === 0) { diff --git a/src/views/modules/production/searchSfdc.vue b/src/views/modules/production/searchSfdc.vue index 8bb273a..467e2da 100644 --- a/src/views/modules/production/searchSfdc.vue +++ b/src/views/modules/production/searchSfdc.vue @@ -241,6 +241,23 @@ serialNumber: null, columnType: null, align: 'right' + },{ + tableId: "sfdcList", + tableName: this.$route.meta.title, + columnProp: "shiftType", + columnLabel: "派工类型", + columnHidden: false, + columnImage: false, + columnSortable: false, + columnWidth: 80, + format: null, + functionId: this.$route.meta.menuId, + sortLv: 0, + status: true, + fixed: '', + serialNumber: null, + columnType: null, + align: 'right' }, { tableId: "sfdcList", diff --git a/src/views/modules/query/liuhuaIssureAndReport.vue b/src/views/modules/query/liuhuaIssureAndReport.vue index 7a8de8d..76b67c8 100644 --- a/src/views/modules/query/liuhuaIssureAndReport.vue +++ b/src/views/modules/query/liuhuaIssureAndReport.vue @@ -132,7 +132,26 @@ status: true, fixed: '', columnWidth: 60 - },{ + }, + { + userId: this.$store.state.user.name, + functionId: 400003, + serialNumber: '400003Table1PartNo', + tableId: "400003Table1", + tableName: "硫化发料产出", + columnProp: "shiftType", + headerAlign: "center", + align: "left", + columnLabel: "派工类型", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, + { userId: this.$store.state.user.name, functionId: 400003, serialNumber: '400003Table1PartNo',