生产工单

src/views/mes/pro/workorder/indexApply.vue

@@ -1020,13 +1020,13 @@ export default {
       // }
       let workorderCode = []
       this.selectedRows.forEach(item => {
-        if (item.status !== 'COMBINED') {
+        if (item.status !== 'COMBINED' || (item.status === 'COMBINED' && (item.dtaAction === '0' || !item.dtaAction))) {
           workorderCode.push(item.workorderCode)
           return
         }
       })
       if (workorderCode.length > 0) {
-        this.$modal.msgWarning(`${workorderCode[0]}只允许操作单据状态为已组合数据！`);
+        this.$modal.msgWarning(`${workorderCode[0]}只允许操作单据状态为已组合数据和单据状态为已排版或单据状态为已组合数据和单据状态为无需排版的数据！`);
         return
       }
       const cparams = []