Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/orderManagement/components/mold/addMoldDailog.vue

@@ -80,14 +80,14 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="quantity" label="数量" align="center">
+        <el-table-column prop="applyNum" label="数量" align="center">
           <template #header>
             <span><i style="color: red">*</i>数量</span>
           </template>
           <template #default="scope">
-            <el-form-item :prop="`moldPlan[${scope.$index}].quantity`" :rules="formRules.quantity">
+            <el-form-item :prop="`moldPlan[${scope.$index}].applyNum`" :rules="formRules.applyNum">
               <el-input-number
-                v-model="scope.row.quantity"
+                v-model="scope.row.applyNum"
                 :min="1"
                 controls-position="right"
                 style="width: 90%"
@@ -239,7 +239,7 @@ export default {
         ],
         partCode: [{ required: true, message: '请选择零件编码', trigger: ['change', 'submit'] }],
         toolCode: [{ required: true, message: '请选择工装号', trigger: ['change', 'submit'] }],
-        quantity: [
+        applyNum: [
           { required: true, message: '请输入数量', trigger: ['change', 'submit'] },
           { type: 'number', min: 1, message: '数量不能小于1', trigger: ['change', 'submit'] },
         ],
@@ -306,7 +306,7 @@ export default {
         partName: '',
         toolCode: '',
         toolName: '',
-        quantity: 1,
+        applyNum: 1,
         mafType: '',
         needDate: '',
         quaLevel: '',

src/views/orderManagement/components/mold/detailsInfoDialog.vue

@@ -8,7 +8,7 @@
     fullscreen
   >
     <el-descriptions class="margin-top" :column="4" border title="需求信息">
-      <el-descriptions-item label="需求编号">{{}}</el-descriptions-item>
+      <el-descriptions-item label="需求编号">{{form.mdCode}}</el-descriptions-item>
       <el-descriptions-item label="工装编号">{{ form.moCode || "-" }}</el-descriptions-item>
       <el-descriptions-item label="工装名称">{{ form.moName || "-" }}</el-descriptions-item>
       <el-descriptions-item label="关联订单数">{{form.linkOrderIds || "-"}}</el-descriptions-item>

src/views/orderManagement/components/mold/moldRecord.vue

@@ -144,12 +144,11 @@ export default {
             sortable: true,
             span: 12,
             headerAlign: 'center',
-            align: 'left',
             width: 140,
           },
           {
             label: '数量',
-            prop: 'quantity',
+            prop: 'applyNum',
             search: false,
             sortable: true,
             span: 12,
@@ -216,7 +215,7 @@ export default {
             span: 12,
             headerAlign: 'center',
             align: 'center',
-            width: 150,
+            width: 180,
           },
           {
             label: '建立人员',

src/views/orderManagement/components/mold/moldRequire.vue

@@ -164,7 +164,7 @@ export default {
         column: [
           {
             label: '需求单号',
-            prop: 'partCode',
+            prop: 'mdCode',
             search: false,
             sortable: true,
             span: 12,
@@ -246,6 +246,21 @@ export default {
             headerAlign: 'center',
             align: 'center',
           },
+          {
+            // STATUS_WAITING("待出库", 10000),
+            // STATUS_OUT_STORE("已出库", 10001),
+            // STATUS_DONE("完成", 10002),
+            // STATUS_CLOSE("关闭", 10003),
+            label:'状态',
+            // type:"select",
+            prop:"statusName",
+            // dicData:[
+            //   {label:'待出库',value:10000},
+            //   {label:'已出库',value:10001},
+            //   {label:'完成',value:10002},
+            //   {label:'关闭',value:10003}
+            // ]
+          }
         ],
       },
 
@@ -265,6 +280,11 @@ export default {
         this.$message.error('请至少选择一条数据!');
         return;
       }
+      let tmp = this.selectionList.map(item => item.statusName != '待出库');
+      if(tmp){
+        this.$message.error("请选择状态为【待出库】的数据")
+        return
+      }
       this.$confirm('确定将选择数据批量关闭?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -273,13 +293,14 @@ export default {
         .then(() => {
           const ids = this.selectionList.map(item => item.id).join(',');
           closeBatchs({ ids }).then(res => {
-            if (res.code === 200) {
+            if (res.data.code === 200) {
               this.$message({
                 type: 'success',
-                message: '操作成功!',
+                message: '关闭成功!',
               });
-            }
               this.onLoad();
+            }
+            
           });
 
           // this.onLoad(this.page);

src/views/productionManagement/components/coatingMater/materialRequirements.vue

@@ -178,7 +178,7 @@ export default {
         },
         {
             label: '物料编号',
-            prop: 'plateGoodsCode',
+            prop: 'goodsCode',
             span: 24,
             width: 150,
             overflow: true,