Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/pro/workorder/components/WorkOrderSale.vue

@@ -322,6 +322,40 @@
         prop="salesVoucherItem"
         width="120"
       />
+      <el-table-column
+        label="包装数量"
+        align="center"
+        prop="packNum"
+        width="120"
+      />
+      <el-table-column
+        label="包装类型"
+        align="center"
+        prop="packType"
+        width="120"
+      />
+      <el-table-column
+        label="包装单位"
+        align="center"
+        prop="packUnit"
+        width="120"
+      />
+      <el-table-column
+        label="LOSS数是否单独包装"
+        align="center"
+        prop="lossPack"
+        width="150"
+      >
+        <template slot-scope="scope">
+         {{ scope.row.lossPack === 'Y'? '是': '否' }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="数量"
+        align="center"
+        prop="quantity"
+        width="120"
+      />
       <el-table-column
         label="客户编号"
         align="center"
@@ -340,12 +374,12 @@
         prop="clientSizeUnit"
         width="120"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="指令号"
         align="center"
         prop="clientCmd"
         width="120"
-      />
+      /> -->
       <el-table-column
         label="型体号"
         align="center"
@@ -408,12 +442,12 @@
         prop="signer"
         width="120"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="SHIP TO ID"
         align="center"
         prop="shipToId"
         width="120"
-      />
+      /> -->
       <el-table-column
         label="产品规格"
         align="center"

src/views/mes/pro/workorder/components/WorkOrderSize.vue

@@ -410,7 +410,7 @@ export default {
         { prop: "salesId", label: "销售订单号" },
         { prop: "salesItem", label: "销售订单行项目" },
         { prop: "clientCmd", label: "销售订单指令号" },
-        { prop: "dispatchMultiple", label: "派工数" },
+        { prop: "quantity", label: "派工数" },
         { prop: "lossNum", label: "Loss数" },
         { prop: "brandCode", label: "品牌" },
         { prop: "salePath", label: "销线" },

src/views/mes/pro/workorder/indexApply.vue

@@ -229,8 +229,7 @@
           @click="handleMake"
           v-hasPermi="['mes:pro:workorder:make']"
         >生产补单
-        </el-button
-        >
+        </el-button>
       </el-col>
 
       <el-col :span="1.5">
@@ -474,7 +473,7 @@
 
       <el-table-column
         label="操作"
-        width="150px"
+        width="220px"
         align="center"
         fixed="right"
         class-name="small-padding fixed-width"

src/views/mes/pro/workorder/proofingInfo.vue

@@ -216,7 +216,7 @@
               <el-input v-model="form.thickness" :disabled="mode == 'make'" placeholder="请输入厚度(丝)" />
             </el-form-item>
           </el-col>
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+          <!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="包装数量" prop="packNum">
               <el-input v-model="form.packNum" :disabled="mode == 'make'" placeholder="请输入包装数量" />
             </el-form-item>
@@ -232,8 +232,8 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+          </el-col> -->
+          <!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="包装单位" prop="packUnitOfMeasure">
               <el-input
                 v-model="form.packUnitOfMeasure"
@@ -260,7 +260,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -397,7 +397,7 @@ export default {
         packUnitOfMeasure: null,
         lossIndividuallyWrap: null,
         packNum: null,
-        productionSolutionId: null, 
+        productionSolutionId: null,
         productionSolutionCode: null,
         productionSolutionName: null,
       },
@@ -626,11 +626,14 @@ export default {
     //   }
     // },
     //物料选择弹出框
-  
+
     onRoutesProcessSelect(row) {
+      console.log(row, 'rows444')
       if (row != undefined && row != null) {
         this.form.productionSolutionId = row.productionSolutionId;
         this.form.productionSolutionCode = row.productionSolutionCode;
+        this.form.productCode = row.itemCode;
+        this.form.productName = row.itemName;
         const params = {
           pageNum: 1,
           pageSize: 1000,