Merge branch 'xf_dev' of http://139.155.176.112:8091/project-all/mes-admin-temp into xf_dev

src/views/plan/prepare/index.vue

@@ -97,17 +97,17 @@
       <el-form ref="dataFormRef" :model="form" label-width="90px">
         <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="工单编码" prop="materialCode">
+            <el-form-item label="工单编码" prop="workOrderCode">
               <el-input v-model="form.workOrderCode" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="订单编码" prop="materialName">
+            <el-form-item label="订单编码" prop="orderCode">
               <el-input v-model="form.orderCode" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="订单名称" prop="materialModel">
+            <el-form-item label="订单名称" prop="orderName">
               <el-input v-model="form.orderName" disabled />
             </el-form-item>
           </el-col>
@@ -131,7 +131,7 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="24">
-            <el-form-item label="工单数量" prop="materialModel">
+            <el-form-item label="工单数量" prop="workOrderNum">
               <el-input v-model="form.workOrderNum" disabled />
             </el-form-item>
           </el-col>
@@ -210,17 +210,17 @@
       <el-form ref="formRef" :model="form" label-width="90px">
         <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="工单编码" prop="materialCode">
+            <el-form-item label="工单编码" prop="workOrderCode">
               <el-input v-model="form.workOrderCode" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="订单编码" prop="materialName">
+            <el-form-item label="订单编码" prop="orderCode">
               <el-input v-model="form.orderCode" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="订单名称" prop="materialModel">
+            <el-form-item label="订单名称" prop="orderName">
               <el-input v-model="form.orderName" disabled />
             </el-form-item>
           </el-col>
@@ -244,7 +244,7 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="24">
-            <el-form-item label="工单数量" prop="materialModel">
+            <el-form-item label="工单数量" prop="workOrderNum">
               <el-input v-model="form.workOrderNum" disabled />
             </el-form-item>
           </el-col>
@@ -502,7 +502,7 @@ option.value = Object.assign(option.value, {
           message: "工单号不能为空",
           trigger: "trigger",
         },
-      ],
+      ]/*,
       click: ({ value, column }) => {
         if (column.boxType) {
           dialog.visible = true;
@@ -512,8 +512,9 @@ option.value = Object.assign(option.value, {
         if (value) {
           checkInfo(value);
         }
-      },
+      },*/
     },
+
     {
       label: "物料编码",
       prop: "materialCode",

src/views/plan/requisition/index.vue

@@ -439,13 +439,12 @@
                         tag="p"
                         v-if="
                           dialogType === 1 ||
-                          form.state === '6' ||
-                          form.state === '7'
+                          form.state > 5
                         "
                         >{{
                           form.state === "5"
                             ? "待审批"
-                            : form.state === "6"
+                            : form.state > 5
                               ? "通过"
                               : "未通过"
                         }}</el-text

src/views/plan/workOrder/index.vue

@@ -771,6 +771,7 @@ option.value = Object.assign(option.value, {
       label: "自动拆单",
       hide: true,
       type: "switch",
+      display: false,
       dicData: [
         {
           label: "否",

src/views/storage/stock/index.vue

@@ -172,6 +172,7 @@ option.value = Object.assign(option.value, {
       label: "物料名称",
       prop: "materialName",
       width: 130,
+      readonly: true,
       overHidden: true,
       click: ({ value, column }) => {
         if(column.boxType){