diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index 570325c..3b77e16 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -533,7 +533,13 @@ - + + + + + + + @@ -1431,6 +1437,7 @@ export default { laborSetupTime: '', crewSize: '', setupCrewSize: '', + parallelOperation: 'Not parallel', outsideOpItem: '', machineNo: '', workCenterNo: '', @@ -2108,6 +2115,24 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + functionId: 104003, + serialNumber: '104003Table2ParallelOperation', + tableId: '104003Table2', + tableName: 'Routing工序表', + columnProp: 'parallelOperation', + headerAlign: 'center', + align: 'center', + columnLabel: '并行操作', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, { userId: this.$store.state.user.name, functionId: 104003, @@ -2928,6 +2953,19 @@ export default { fixed: '', columnWidth: 100 }, + { + columnProp: 'parallelOperation', + headerAlign: 'center', + align: 'center', + columnLabel: '并行操作', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, { columnProp: 'outsideOpItem', headerAlign: 'center', @@ -3131,6 +3169,13 @@ export default { trigger: ['blur', 'change'] } ], + parallelOperation: [ + { + required: true, + message: ' ', + trigger: ['blur', 'change'] + } + ], machRunFactor: [ { required: true, @@ -3856,6 +3901,7 @@ export default { laborSetupTime: '', crewSize: 1, setupCrewSize: 1, + parallelOperation: 'Not parallel', outsideOpItem: '', machineNo: '', workCenterNo: '', @@ -3909,6 +3955,7 @@ export default { laborSetupTime: row.laborSetupTime, crewSize: row.crewSize, setupCrewSize: row.setupCrewSize, + parallelOperation: row.parallelOperation || 'Not parallel', outsideOpItem: row.outsideOpItem, machineNo: row.machineNo, workCenterNo: row.workCenterNo, @@ -4546,6 +4593,10 @@ export default { this.$message.warning('请填写调机过程中人数!') return } + if (this.componentData.parallelOperation === '' || this.componentData.parallelOperation == null) { + this.$message.warning('请选择并行操作!') + return + } if (this.componentData.machRunFactor === '' || this.componentData.machRunFactor == null) { this.$message.warning('请填写机器单位产出!') return diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue index a832a27..3e95192 100644 --- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue +++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue @@ -71,7 +71,7 @@ - + @@ -1075,7 +1075,7 @@ } const missing = [] if (this.dataForm.projectAmount === null || this.dataForm.projectAmount === undefined || String(this.dataForm.projectAmount).trim() === '') { - missing.push('项目年销售额') + missing.push('项目年销售额CNY(K)') } if (!this.dataForm.finalCustomerId || String(this.dataForm.finalCustomerId).trim() === '') { missing.push('直接客户') diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index c041a56..8657cf2 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -84,7 +84,7 @@ label="操作"> @@ -148,7 +148,7 @@
- +
@@ -2293,7 +2293,7 @@ } const missing = [] if (source.projectAmount === null || source.projectAmount === undefined || String(source.projectAmount).trim() === '') { - missing.push('项目年销售额') + missing.push('项目年销售额CNY(K)') } if (!source.finalCustomerId || String(source.finalCustomerId).trim() === '') { missing.push('直接客户')