55

src/views/productionPlan/index.vue

@@ -38,16 +38,16 @@
         :initLoad="false"
         :columns="newColumns"
         :datasource="datasource"
-        height="calc(100vh - 335px)"
-        row-key="code"
+        row-key="id"
         :selection.sync="selection"
         :cache-key="`${activeName}ProductionPlanTable`"
-        @sort-change="onSortChange"   autoAmendPage
+        @sort-change="onSortChange"
+        autoAmendPage
         :parse-data="parseData"
+        @done="handleDone"
       >
         <template v-slot:batchNo="{ row }">
           <el-link type="primary" :underline="false">
-           
             <el-tag
               type="success"
               size="mini"
@@ -66,7 +66,6 @@
               合</el-tag
             >
             {{ row.batchNo }}
-     
           </el-link>
         </template>
 
@@ -251,7 +250,7 @@
             //   prop: 'deliveryTime',
             //   label: '预测交货日期',
             //   align: 'center',
-            //   showOverflowTooltip: true,
+            //
             //   minWidth: 110
             // }
           ],
@@ -260,35 +259,35 @@
             //   prop: 'formingTime',
             //   label: '实际生产日期',
             //   align: 'center',
-            //   showOverflowTooltip: true,
+            //
             //   minWidth: 110
             // },
             {
               prop: 'releaseTime',
               label: '工单发布日期',
               align: 'center',
-              showOverflowTooltip: true,
+
               minWidth: 110
             },
             {
               prop: 'planFormingTime',
               label: '预测生产日期',
               align: 'center',
-              showOverflowTooltip: true,
+
               minWidth: 110
             },
             {
               prop: 'deliveryTime',
               label: '预测交货日期',
               align: 'center',
-              showOverflowTooltip: true,
+
               minWidth: 110
             },
             {
               prop: 'formingTime',
               label: '实际交货日期',
               align: 'center',
-              showOverflowTooltip: true,
+
               minWidth: 110
             }
           ],
@@ -301,8 +300,7 @@
             type: 'selection',
             columnKey: 'selection',
             align: 'center',
-            reserveSelection: true,
-           
+            reserveSelection: true
           },
           {
             columnKey: 'index',
@@ -316,18 +314,9 @@
           {
             slot: 'batchNo',
             prop: 'batchNo',
-            label: '子批次号',
-            align: 'center',
-            minWidth: 140,
-         
-          },
-
-          {
-            prop: 'joinBatchNo',
             label: '批次号',
             align: 'center',
-            minWidth: 120,
-            showOverflowTooltip: true
+            minWidth: 140
           },
 
           {
@@ -336,7 +325,7 @@
             action: 'code',
             label: '计划编号',
             align: 'center',
-            showOverflowTooltip: true,
+
             minWidth: 160,
             sortable: true
           },
@@ -346,7 +335,7 @@
             action: 'salesCode',
             label: '销售订单号',
             align: 'center',
-            showOverflowTooltip: true,
+
             minWidth: 160
           },
 
@@ -354,14 +343,14 @@
             prop: 'productCode',
             label: '产品编码',
             align: 'center',
-            showOverflowTooltip: true,
+
             minWidth: 140
           },
           {
             prop: 'productName',
             label: '产品名称',
             align: 'center',
-            showOverflowTooltip: true,
+
             minWidth: 140
           },
 
@@ -407,21 +396,21 @@
             prop: 'productNum',
             label: '计划数量',
             align: 'center',
-            showOverflowTooltip: true,
+
             slot: 'productNum'
           },
           {
             prop: 'productWeight',
             label: '计划重量',
             align: 'center',
-            showOverflowTooltip: true,
+
             slot: 'productWeight'
           },
           {
             prop: 'requiredFormingNum',
             label: '要求生产数量',
             align: 'center',
-            showOverflowTooltip: true,
+
             slot: 'requiredFormingNum'
           },
 
@@ -429,7 +418,7 @@
             prop: 'newSumOrderWeight',
             label: '要求生产重量',
             align: 'center',
-            showOverflowTooltip: true,
+
             slot: 'newSumOrderWeight'
           },
 
@@ -437,7 +426,7 @@
             prop: 'scheduleStatusName',
             label: '进度状态',
             align: 'center',
-            showOverflowTooltip: true,
+
             minWidth: 100
           },
 
@@ -486,7 +475,7 @@
             prop: 'noWordCount',
             label: '未排程块数',
             align: 'center',
-            showOverflowTooltip: true,
+
             show: this.clientEnvironmentId == '4',
             minWidth: 110
           },
@@ -494,7 +483,7 @@
             prop: 'reqMoldTime',
             label: '计划完成日期',
             align: 'center',
-            showOverflowTooltip: true,
+
             minWidth: 110
           },
 
@@ -504,7 +493,7 @@
             prop: 'orderType',
             label: '计划类型',
             align: 'center',
-            showOverflowTooltip: true,
+
             formatter: (row) => {
               const obj = this.planType.find((i) => i.value == row.planType);
               return obj && obj.label;
@@ -514,14 +503,14 @@
             prop: 'version',
             label: '版本',
             align: 'center',
-            showOverflowTooltip: true,
+
             minWidth: 80
           },
           {
             prop: 'createTime',
             label: '创建时间',
             align: 'center',
-            showOverflowTooltip: true,
+
             minWidth: 110
           },
           {
@@ -614,6 +603,11 @@
         });
       },
 
+      handleDone() {
+        this.$nextTick(() => {
+          this.$refs.table.setSelectedRowKeys(['1867146702592253954']);
+        });
+      },
       getFieldModel() {
         fieldModel({ fieldModel: 't_main_category' }).then((res) => {
           const privateColumn = [];
@@ -686,6 +680,8 @@
       },
       // 合并
       handleMerge() {
+        this.$forceUpdate();
+
         if (this.selection.length <= 1) {
           return this.$message.warning('请先勾选二个或多个计划！');
         }

src/views/saleOrder/components/create-order.vue

@@ -201,7 +201,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="交付重量" align="center" prop="productWeight">
+        <el-table-column label="订单重量" align="center" prop="productWeight">
           <template slot-scope="{ row }">
             <span>{{ row.productWeight ? row.productWeight : '-' }}</span>
           </template>

src/views/saleOrder/components/order-detail.vue

@@ -19,8 +19,8 @@
           {{ form.salesOrderBasicInfo.releaseTime }}
         </el-descriptions-item>
         <el-descriptions-item>
-          <template slot="label"> 合同数量(方)</template>
-          {{ form.salesOrderBasicInfo.contractNum }}
+          <template slot="label"> 数量</template>
+          {{ form.salesOrderBasicInfo.contractNum }}  {{  form.salesOrderBasicInfo.measuringUnit }}
         </el-descriptions-item>
        <el-descriptions-item>
           <template slot="label"> 模数 </template>
@@ -43,8 +43,8 @@
           {{ form.salesOrderBasicInfo.deliveryTime }}
         </el-descriptions-item>
         <el-descriptions-item>
-          <template slot="label"> 合同重量 </template>
-          {{ form.salesOrderBasicInfo.sumOrderWeight }}
+          <template slot="label"> 订单重量 </template>
+          {{ form.salesOrderBasicInfo.productSumWeight }}   {{  form.salesOrderBasicInfo.weightUnit }}
         </el-descriptions-item>
 <!--        <el-descriptions-item>
           <template slot="label"> 已交货重量 </template>
@@ -227,7 +227,7 @@
         </el-table-column>
         <el-table-column label="型号" align="center" prop="model" width="160">
         </el-table-column>
-        <el-table-column label="合同数量" align="center" prop="contractNum">
+        <el-table-column label="订单数量" align="center" prop="contractNum">
         </el-table-column>
         <el-table-column
           label="计划单号"

src/views/saleOrder/index.vue

@@ -25,7 +25,7 @@
         @sort-change="onSortChange"
       >
         <template v-slot:code="{ row }">
-          <el-link :underline="false" @click="openDetails(row)">
+          <el-link :underline="false" type="primary" @click="openDetails(row)">
             {{ row.code }}
           </el-link>
         </template>