Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/byProduct/components/addByProduct.vue

@@ -68,8 +68,10 @@
               <div class="col">
                 <div class="name">数量</div>
                 <div class="content content_num">
-                  <el-input v-model="productWeight"></el-input>
-                  <div style="margin-left: 8px"> {{ item.measuringUnit }}</div>
+                  <el-input v-model="productWeight">
+                    <template slot="append">{{ item.measuringUnit }}</template>
+                  </el-input>
+                  <!-- <div style="margin-left: 8px"> {{ item.measuringUnit }}</div> -->
                 </div>
               </div>
             </div>
@@ -100,7 +102,8 @@
 
               <el-table-column label="编码" prop="categoryCode">
               </el-table-column>
-              <el-table-column label="工单编码" prop="code"> </el-table-column>
+              <el-table-column label="工单编码" prop="workOrderCode">
+              </el-table-column>
               <el-table-column label="名称" prop="categoryName">
               </el-table-column>
               <el-table-column label="型号" prop="modelType"> </el-table-column>
@@ -302,10 +305,10 @@
     }
 
     .col {
-      width: 16.666%;
+      width: calc(100% / 5) !important;
       display: flex;
       align-items: center;
-      min-width: 200px;
+      // min-width: 200px;
       min-height: 32px;
       border-bottom: 1px solid #e3e5e5;
       border-right: 1px solid #e3e5e5;
@@ -318,7 +321,7 @@
         display: flex;
         align-items: center;
         padding: 4px;
-        width: 80px;
+        width: 60px;
         height: 100%;
         background-color: #ededed;
         color: #000;

src/views/pick/pickApply/components/addPick.vue

@@ -450,7 +450,7 @@
       width: calc(100% / 5);
       display: flex;
       align-items: center;
-      min-width: 200px;
+      // min-width: 200px;
       min-height: 32px;
       border-bottom: 1px solid #e3e5e5;
       border-right: 1px solid #e3e5e5;
@@ -463,7 +463,7 @@
         display: flex;
         align-items: center;
         padding: 4px;
-        width: 80px;
+        width: 60px;
         height: 100%;
         background-color: #d0e4d5;
         color: #000;

src/views/pick/pickApply/components/selfDetailed.vue

@@ -352,7 +352,7 @@
       width: calc(100% / 5);
       display: flex;
       align-items: center;
-      min-width: 200px;
+      // min-width: 200px;
       min-height: 32px;
       border-bottom: 1px solid #e3e5e5;
       border-right: 1px solid #e3e5e5;
@@ -365,7 +365,7 @@
         display: flex;
         align-items: center;
         padding: 4px;
-        width: 80px;
+        width: 60px;
         height: 100%;
         background-color: #d0e4d5;
         color: #000;

src/views/produce/components/feeding/components/batchProductsBom.vue

@@ -40,10 +40,19 @@
       </template>
 
       <template v-slot:newWeight="{ row, $index }">
-        <span v-if="row.extInfo.newWeight">
+        <el-input
+          size="mini"
+          class="content_num"
+          v-model="row.extInfo.newWeight"
+          placeholder="重量"
+          :disabled="isEdit"
+        >
+          <template slot="append">{{ row.extInfo.weightUnit }}</template>
+        </el-input>
+        <!-- <span>
           {{ row.extInfo.newWeight || 0 }}
           {{ row.extInfo.weightUnit }}
-        </span>
+        </span> -->
       </template>
       <!--
       <template v-slot:feedQuantity="{ row, $index }">
@@ -242,7 +251,7 @@
           //   showOverflowTooltip: true
           // },
           {
-            minWidth: 120,
+            minWidth: 140,
             prop: 'newWeight',
             slot: 'newWeight',
             label: '重量',

src/views/produce/components/jobBooking/components/detailPackagingGrouping.vue

@@ -214,7 +214,7 @@
           <div class="item">
             <div class="lable rx-cc">总数 </div>
             <div class="content content_num">
-              <span>{{ item.formedNumLast }}</span>
+              <span>{{ totalNumber }}</span>
               <div class="unit">{{ item.packageUnit }}</div>
             </div>
           </div>
@@ -711,7 +711,11 @@
       console.log(this.objData, 'objDataobjDataobjData');
       if (this.objData.packInfo && !this.storeType) {
         this.warehouseId = this.objData.packInfo.tier;
-        if (this.objData.packInfo.isUnpack == '1') {
+        if (
+          this.objData.packInfo.isUnpack == '1' &&
+          this.objData.packInfo.isNewUnpack != 1
+        ) {
+          console.log('42424');
           this.DispositionList.push({
             titel: '最小包装',
             splitList: this.objData.packInfo.minimumPackage,

src/views/produce/components/outsourcing/outsourceList.vue

@@ -906,6 +906,8 @@
           }
         }
 
+        this.outObj.formedNumLast = this.outsourceData.formedNumLast;
+
         let param = {
           ...this.outObj,
           isRelease: isRelease,

src/views/produce/components/workPlan/components/baseInfo.vue

@@ -772,6 +772,8 @@
         } else {
           this.form.qualityName = '';
         }
+
+        this.$forceUpdate();
         // this.$set(this.form, 'qualityIdList', val);
         // this.$forceUpdate();
         // if (val) {

src/views/produceWord/index.vue

@@ -166,15 +166,14 @@ r++<template>
             showOverflowTooltip: true
           },
           {
-            prop: 'productionCodes',
-            label: '生产编号',
+            prop: 'productCode',
+            label: '编码',
             align: 'center',
-            minWidth: 150,
             showOverflowTooltip: true
           },
           {
-            prop: 'productCode',
-            label: '编码',
+            prop: 'productionCodes',
+            label: '生产编号',
             align: 'center',
             showOverflowTooltip: true
           },