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

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

@@ -31,8 +31,8 @@
       <el-table-column prop="ypQty" label="零件数量" align="center"> </el-table-column>
       <el-table-column prop="demandDate" label="需求交期" align="center"> </el-table-column>
       <el-table-column prop="toolsDemand" label="工装需求数量" align="center"> </el-table-column>
-      <el-table-column prop="shuliang" label="已交付数量" align="center"> </el-table-column>
-      <el-table-column prop="shuliang" label="未交付数量" align="center"> </el-table-column>
+      <!-- <el-table-column prop="shuliang" label="已交付数量" align="center"> </el-table-column>
+      <el-table-column prop="shuliang" label="未交付数量" align="center"> </el-table-column> -->
       <el-table-column prop="releaseDate" label="计划下达时间" align="center"> </el-table-column>
     </el-table>
     <el-descriptions

src/views/orderManagement/exceptionOrder.vue

@@ -3,8 +3,8 @@
         <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
             <el-tab-pane label="数据缺失" name="1"></el-tab-pane>
             <el-tab-pane label="工艺缺失" name="2"></el-tab-pane>
-            <el-tab-pane label="资源缺失" name="3"></el-tab-pane>
-            <el-tab-pane label="交期冲突" name="4"></el-tab-pane>
+            <el-tab-pane label="分派异常" name="3"></el-tab-pane>
+            <!-- <el-tab-pane label="交期冲突" name="4"></el-tab-pane> -->
         </el-tabs>
         <dataMissing v-if="activeName=='1'"></dataMissing>
         <processMissing v-if="activeName=='2'"></processMissing>

src/views/orderManagement/planYieIdOrder.vue

@@ -246,6 +246,24 @@ export default {
               },
             ],
           },
+          {
+            label: '零件名称',
+            prop: 'partName',
+            search: false,
+            sortable: true,
+            disabled: true,
+            span: 12,
+            width: 150,
+            headerAlign: 'center',
+            align: 'left',
+            rules: [
+              {
+                required: false,
+                message: '请输入零件名称',
+                trigger: 'blur',
+              },
+            ],
+          },
           {
             label: '批次号',
             prop: 'batchNo',
@@ -281,24 +299,6 @@ export default {
               },
             ],
           },
-          {
-            label: '产品名称',
-            prop: 'partName',
-            search: false,
-            sortable: true,
-            disabled: true,
-            span: 12,
-            width: 150,
-            headerAlign: 'center',
-            align: 'left',
-            rules: [
-              {
-                required: false,
-                message: '请输入产品名称',
-                trigger: 'blur',
-              },
-            ],
-          },
           {
             label: '流程卡号',
             prop: 'cardNo',
@@ -503,13 +503,15 @@ export default {
           {
             label: '需求交期',
             prop: 'demandDate',
+            type:'date',
             search: false,
             sortable: true,
             width: 180,
             span: 12,
             headerAlign: 'center',
             align: 'center',
-
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
             rules: [
               {
                 required: true,

src/views/orderManagement/plannedOrder.vue

@@ -233,37 +233,37 @@ export default {
             ],
           },
           {
-            label: '产品型号',
-            prop: 'productType',
+            label: '零件名称',
+            prop: 'partName',
             search: false,
             sortable: true,
             disabled: true,
-            width: 120,
             span: 12,
+            width: 150,
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             rules: [
               {
                 required: false,
-                message: '请输入产品型号',
+                message: '请输入零件名称',
                 trigger: 'blur',
               },
             ],
           },
           {
-            label: '产品名称',
-            prop: 'partName',
+            label: '产品型号',
+            prop: 'productType',
             search: false,
             sortable: true,
             disabled: true,
+            width: 120,
             span: 12,
-            width: 150,
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
             rules: [
               {
                 required: false,
-                message: '请输入产品名称',
+                message: '请输入产品型号',
                 trigger: 'blur',
               },
             ],