src/views/order/base/orderManage/components/addWorkOrder.vue

@@ -92,8 +92,8 @@
       <el-col :span='12'>
         <el-form-item label="物料计算方式" prop="materialMethod">
           <el-radio-group v-model="form.materialMethod" disabled>
-            <el-radio :label="1">产品基础</el-radio>
+            <el-radio :label="1">产品基础BOM</el-radio>
-            <el-radio :label="2">工艺扩展</el-radio>
+            <el-radio :label="2">工艺扩展BOM</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>

src/views/order/base/orderManage/components/orderAdd.vue

@@ -24,7 +24,7 @@
             <el-option
               v-for="item in productList"
               :key="item.id"
-              :label="item.name+' | '+item.specifications"
+              :label="item.name+' | '+(item.specifications || '')"
               :value="item.id">
               <span style="float: left">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
@@ -41,7 +41,7 @@
       </el-col>
       <el-col :span='12'>
         <el-form-item label="客户" prop="customerId">
-          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable>
             <el-option
               v-for="item in customerList"
               :key="item.id"
@@ -55,7 +55,7 @@
     <el-row>
       <el-col :span='12'>
         <el-form-item label="优先级" prop="priority">
-          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" clearable>
             <el-option
               v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
               :key="item.value"
@@ -67,7 +67,7 @@
       </el-col>
       <el-col :span='12'>
         <el-form-item label="包装规格" prop="packSpec">
-          <el-select v-model="form.packSpec" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.packSpec" placeholder="请选择" style="width: 100%;" clearable>
             <el-option
               v-for="item in getDictDatas(DICT_TYPE.PACK_SPEC)"
               :key="item.value"
@@ -86,7 +86,7 @@
       </el-col>
       <el-col :span='12'>
         <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable @change="processFlowIdChange">
             <el-option
               v-for="item in processFlowList"
               :key="item.id"
@@ -100,9 +100,9 @@
     <el-row>
       <el-col :span='12'>
         <el-form-item label="物料计算方式" prop="materialMethod">
-          <el-radio-group v-model="form.materialMethod">
+          <el-radio-group v-model="form.materialMethod" @change='materialMethodChange'>
-            <el-radio :label="1">产品基础</el-radio>
+            <el-radio :label="1">产品基础BOM</el-radio>
-            <el-radio :label="2">工艺扩展</el-radio>
+            <el-radio :label="2">工艺扩展BOM</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
@@ -240,6 +240,20 @@ export default {
         }
       }
     },
+    // 工艺变更
+    materialMethodChange(val) {
+      if (val === 2 && !this.form.processFlowId) {
+        this.form.materialMethod = 1
+        this.$modal.msgError("请先选择关联工艺");
+      }
+    },
+    // 工艺变更
+    processFlowIdChange(val) {
+      console.log(val)
+      if (!val) {
+        this.form.materialMethod = 1
+      }
+    },
     submitForm() {
       this.$refs['orderAddForm'].validate((valid) => {
         if (valid) {

src/views/order/base/orderManage/index.vue

@@ -194,12 +194,22 @@ export default {
               type: 'add',
               btnName: '新增工单',
               showParam: {
-                type: '&',
+                type: '|',
                 data: [
                   {
                     type: 'equal',
                     name: 'status',
                     value: 1
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 2
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
                   }
                 ]
               }
@@ -210,12 +220,22 @@ export default {
               type: 'bind',
               btnName: '绑定工单',
               showParam: {
-                type: '&',
+                type: '|',
                 data: [
                   {
                     type: 'equal',
                     name: 'status',
                     value: 1
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 2
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
                   }
                 ]
               }
@@ -224,14 +244,19 @@ export default {
       this.$auth.hasPermi('base:order-manage:bindWorkOrder')
           ? {
               type: 'complete',
-              btnName: '完成工单',
+              btnName: '完成订单',
               showParam: {
-                type: '&',
+                type: '|',
                 data: [
                   {
                     type: 'equal',
                     name: 'status',
                     value: 2
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
                   }
                 ]
               }