66

src/views/productionPlan/components/disassemblePlanPop.vue

@@ -153,8 +153,8 @@
         rules: {},
 
         producedList: [
-          { code: 2, name: '加工' },
-          { code: 3, name: '装配' }
+        { code: 2, name: '加工(MBOM)' },
+        { code: 3, name: '装配(ABOM)' }
         ],
 
         routingList: [],

src/views/productionPlan/components/factoryAdd/index.vue

@@ -326,8 +326,8 @@
         },
 
         producedList: [
-          { code: 2, name: '加工' },
-          { code: 3, name: '装配' }
+          { code: 2, name: '加工(MBOM)' },
+          { code: 3, name: '装配(ABOM)' }
         ]
       };
     },

src/views/saleOrder/index.vue

@@ -8,7 +8,7 @@
         :activeName="activeName"
       >
       </order-search>
-      <el-tabs v-model="activeName" type="card">
+      <el-tabs v-model="activeName" type="card" @tab-click="changeTab">
         <el-tab-pane label="待排产" name="first"></el-tab-pane>
         <el-tab-pane label="未排完" name="three"></el-tab-pane>
         <el-tab-pane label="已排产" name="second"></el-tab-pane>
@@ -64,8 +64,6 @@
           {{ row.contractNum }} {{ row.measuringUnit }}
         </template>
 
-        
-
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <template>
@@ -249,6 +247,16 @@
             align: 'center',
             show: this.clientEnvironmentId == '4'
           },
+
+          {
+            prop: 'planedNum',
+            label: '未排完数量',
+            align: 'center',
+            formatter: (_row, _column, cellValue) => {
+              return _row.contractNum - _row.planedNum;
+            },
+          },
+
           {
             prop: 'blockCount',
             label: '块数',
@@ -350,8 +358,7 @@
       this.requestDict('订单来源');
       this.requestDict('生产状态');
     },
-    methods: {   
-      
+    methods: {
       getFieldModel() {
         fieldModel({ fieldModel: 't_main_category' }).then((res) => {
           const privateColumn = [];
@@ -390,9 +397,7 @@
           where.status = [1];
         } else if (this.activeName == 'three') {
           where.status = [0];
-        }
-        
-        else {
+        } else {
           if (where.proStu) {
             where.status = [where.proStu];
           } else {
@@ -416,6 +421,11 @@
         );
       },
 
+      changeTab(e) {
+        console.log(e);
+        this.$forceUpdate();
+      },
+
       openDetails(row) {
         this.$refs.detailDialog.open(row);
       },

src/views/saleOrder/salesToProduction.vue

@@ -633,8 +633,8 @@ export default {
 
 
       producedList: [
-        { code: 2, name: '加工' }, 
-        { code: 3, name: '装配' }
+      { code: 2, name: '加工(MBOM)' },
+      { code: 3, name: '装配(ABOM)' }
       ],
 
 

src/views/workOrder/index.vue

@@ -77,7 +77,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px" >
         <el-form-item label="指定:" prop="singleType">
           <el-radio-group
-            v-model="form.singleType"
+            v-model="singleType"
             size="mini"
           >
             <el-radio-button :label="1">工位</el-radio-button>
@@ -124,8 +124,9 @@
         visible: false,
         loading: false,
 
+
+        singleType: 1,
         form: {
-          singleType: 1,
           singleReport: 1
         },
         rules: {},
@@ -169,22 +170,26 @@
           {
             prop: 'productionPlanCode',
             label: '计划编号',
-            align: 'center'
+            align: 'center',
+            minWidth: 110,
           },
           {
             prop: 'produceRoutingName',
             label: '工艺路线',
-            align: 'center'
+            align: 'center',
+            minWidth: 110,
           },
           {
             prop: 'productCode',
             label: '产品编码',
-            align: 'center'
+            align: 'center',
+            minWidth: 110,
           },
           {
             prop: 'productName',
             label: '产品名称',
-            align: 'center'
+            align: 'center',
+            minWidth: 110,
           },
           {
             prop: 'brandNo',
@@ -205,6 +210,19 @@
             align: 'center'
           },
 
+          {
+            prop: '',
+            label: '工作中心',
+            align: 'center'
+          },
+
+          {
+            prop: '',
+            label: '首工序',
+            align: 'center'
+          },
+
+
           {
             prop: 'priority',
             label: '优先级',