修改江南的mesbug

src/enum/dict.js

@@ -23,6 +23,7 @@ export default {
   异常类型: 'Exception_type',
   请托类型: 'entrust_type',
   退料场景: 'returnScenario',
+  精度等级: 'accuracy_level',
   质检计划类型: 'inspection_plan_type',
   处置状态: 'dispose_status'
 };

src/views/produce/components/device/components/link-msg.vue

@@ -189,8 +189,8 @@
     },
     methods: {
       async getData() {
-        const data = await getBomRoutingList(this.id);
-
+        // const data = await getBomRoutingList(this.id);
+        const data = [];
         this.bomData = data?.bomList || [];
         this.pathData = data?.routingList || [];
       },

src/views/produce/components/footBtn.vue

@@ -96,7 +96,7 @@
           {
             name: '周转车',
             type: 'turnover',
-            bjColor: '#409EFF'
+            bjColor: '#660066'
           }
           // {
           //   type: 'turnover',

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

@@ -24,6 +24,14 @@
         "
         >否</span
       >
+
+      <!-- <el-button
+        type="primary"
+        size="mini"
+        style="margin-left: 40px"
+        @click="checkUnpack"
+        >拆包</el-button
+      > -->
     </div>
     <div v-if="objData.isUnpack == '1'">
       <div class="col userInp" style="display: flex; align-items: center">
@@ -198,6 +206,71 @@
         </div>
       </div>
     </div>
+
+    <div v-if="isNewUnpack">
+      <div class="col userInp" style="display: flex; align-items: center">
+        <div class="label lable150 rx-cc" style="width: 100px !important"
+          >规格选择：</div
+        >
+        <el-select
+          v-model="Usertype"
+          placeholder="请选择"
+          @change="changeUserType"
+        >
+          <el-option
+            v-for="item in localdataList"
+            :key="item.value"
+            :label="item.text"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+
+      <!-- <div class="material">
+        <div class="content_table">
+          <div class="item">
+            <div class="lable rx-cc">包装总数 </div>
+            <div class="content content_num">
+              <el-input
+                class="uni-el-input"
+                v-model="formedNumLast"
+                type="number"
+                v-if="i == 0"
+                @input="changeinput"
+                disabled
+                style="width: 200px"
+              ></el-input>
+              <el-input
+                class="uni-el-input"
+                v-model="item.formedNumLast"
+                type="number"
+                v-else
+                disabled
+                style="width: 200px"
+              ></el-input>
+              <div class="unit">{{ item.packageUnit }}</div>
+            </div>
+          </div>
+
+          <div class="item rx-sc">
+            <div class="rx ww55">
+              <div class="lable lable200 rx-cc">{{ item.titel }}单元</div>
+              <div class="content content_num">
+                <el-input
+                  class="uni-el-input"
+                  v-model="item.packageCell"
+                  disabled
+                  style="width: 200px"
+                ></el-input>
+                <div class="unit">{{ item.packageUnit }}</div
+                >/<div class="unit">{{ item.conversionUnit }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div> -->
+    </div>
   </div>
 </template>
 
@@ -299,7 +372,8 @@
             textValue: ''
           }
         ],
-        cacheKeyUrlMin: 'cacheKeyUrlMin'
+        cacheKeyUrlMin: 'cacheKeyUrlMin',
+        isNewUnpack: false
         // clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,
       };
     },
@@ -595,7 +669,6 @@
       },
 
       async packageDispositionFn() {
-        console.log();
         if (!this.newCategoryId) return;
 
         let that = this;
@@ -638,41 +711,14 @@
 
           this.warehouseSpecTypeList.forEach((item) => {
             if (item.value == 2) {
-              // const num = res[0].packageCell ? res[0].packageCell : '';
-              // const packageUnit = res[0].packageUnit ? res[0].packageUnit : '';
-              // const conversionUnit = res[0].conversionUnit
-              //   ? res[0].conversionUnit
-              //   : '';
-              // let packInfo = '';
-              // if (num) {
-              //   packInfo = num + '/' + packageUnit + '/' + conversionUnit;
-              // }
               item.textValue = item.text + `(${this.selectPackInfo(res[0])})`;
             }
 
             if (item.value == 3) {
-              // const num = res[1].packageCell ? res[1].packageCell : '';
-              // const packageUnit = res[1].packageUnit ? res[1].packageUnit : '';
-              // const conversionUnit = res[1].conversionUnit
-              //   ? res[1].conversionUnit
-              //   : '';
-              // let packInfo = '';
-              // if (num) {
-              //   packInfo = num + '/' + packageUnit + '/' + conversionUnit;
-              // }
               item.textValue = item.text + `(${this.selectPackInfo(res[1])})`;
             }
 
             if (item.value == 4) {
-              // const num = res[2].packageCell ? res[2].packageCell : '';
-              // const packageUnit = res[2].packageUnit ? res[2].packageUnit : '';
-              // const conversionUnit = res[2].conversionUnit
-              //   ? res[2].conversionUnit
-              //   : '';
-              // let packInfo = '';
-              // if (num) {
-              //   packInfo = num + '/' + packageUnit + '/' + conversionUnit;
-              // }
               item.textValue = item.text + `(${this.selectPackInfo(res[2])})`;
             }
           });
@@ -717,6 +763,9 @@
         } = res;
         let textList = [];
         let arr = [];
+        if (!this.isNewUnpack) {
+        }
+
         if (this.warehouseId == 2) {
           textList.push('最小包装');
           arr.push({ list: minimumPackage });
@@ -808,6 +857,79 @@
         });
       },
 
+      // checkUnpack() {
+      //   this.$confirm('此操作将进行拆包, 是否继续?', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   })
+      //     .then(() => {
+      //       this.checkUnpackProduction();
+      //     })
+      //     .catch(() => {});
+      // },
+
+      // checkUnpackProduction() {
+      //   this.isNewUnpack = true;
+      //   this.getPackingData();
+      // },
+
+      // async getPackingData() {
+      //   if (!this.newCategoryId) return;
+
+      //   let that = this;
+      //   const res = await packageDisposition(this.newCategoryId);
+
+      //   if (res.length) {
+      //     res.shift();
+      //     let data = JSON.parse(JSON.stringify(res));
+      //     let list = this.groupBy(data, 'code');
+      //     this.localdataList = [];
+      //     Object.entries(list).forEach(([key, value]) => {
+      //       let obj = {
+      //         text: value[0].name,
+      //         arr: value,
+      //         value: key
+      //       };
+      //       this.localdataList.push(obj);
+      //     });
+
+      //     this.Usertype = this.localdataList[0].value;
+      //     this.text = this.localdataList[0].text;
+      //     this.value = this.localdataList[0].value;
+      //     res.map((v) => {
+      //       v.splitList = [];
+      //     });
+
+      //     this.newDispositionList = res;
+      //     // if (this.warehouseId == 2) {
+      //     //   this.newDispositionList = [res[0]];
+      //     // } else if (this.warehouseId == 3) {
+      //     //   this.newDispositionList = [res[1]];
+      //     // } else if (this.warehouseId == 4) {
+      //     //   this.newDispositionList = [res[2]];
+      //     // }
+      //     this.selectList = res;
+      //     this.initData(this.localdataList[0].arr);
+
+      //     console.log(this.newDispositionList, 'this.newDispositionList');
+      //     // this.initFn(this.localdataList[0].arr);
+      //   }
+      // },
+
+      // initData(v) {
+      //   if (v.length) {
+      //     this.withinQuantity = v[1].packageCell; //内包装数量
+      //     this.withinUnit = v[1].conversionUnit; //内包装单位
+      //     this.outsideQuantity = v[2].packageCell; //外包装数量
+      //     this.outsideUnit = v[2].conversionUnit; //外包装单位
+      //     this.minimumUnit = v[0].conversionUnit;
+      //   }
+
+      //   console.log(v[0], 'v[0]');
+      //   // this.handleSplit(v[0]);
+      // },
+
       // 第一次调用
       handleSplit(v) {
         console.log(v, 99655);

src/views/produce/components/taskDialog/index.vue

@@ -97,7 +97,7 @@
         </el-popconfirm> -->
         <el-popconfirm title="确认本次报工？" @confirm="saveData(row)">
           <template v-slot:reference>
-            <el-link  :underline="false" type="primary">报工 </el-link>
+            <el-link :underline="false" type="primary">报工 </el-link>
           </template>
         </el-popconfirm>
 
@@ -216,14 +216,14 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          {
-            slot: 'qualifiedWeight',
-            label: '合格重量',
-            prop: 'qualifiedWeight',
-            width: 160,
-            align: 'center',
-            showOverflowTooltip: true
-          },
+          // {
+          //   slot: 'qualifiedWeight',
+          //   label: '合格重量',
+          //   prop: 'qualifiedWeight',
+          //   width: 160,
+          //   align: 'center',
+          //   showOverflowTooltip: true
+          // },
           {
             slot: 'unqualifiedQuantity',
             label: '不合格数量',
@@ -232,14 +232,14 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          {
-            slot: 'unqualifiedWeight',
-            label: '不合格重量',
-            prop: 'unqualifiedWeight',
-            width: 160,
-            align: 'center',
-            showOverflowTooltip: true
-          },
+          // {
+          //   slot: 'unqualifiedWeight',
+          //   label: '不合格重量',
+          //   prop: 'unqualifiedWeight',
+          //   width: 160,
+          //   align: 'center',
+          //   showOverflowTooltip: true
+          // },
           {
             slot: 'assigneeRemark',
             label: '备注',
@@ -288,9 +288,9 @@
           remark: row.assigneeRemark,
           apsAssigneeId: row.id
         };
-        batchUpdateRealTimeConfirm(params).then((res)=>{
-          console.log(res,'res 1111')
-        })
+        batchUpdateRealTimeConfirm(params).then((res) => {
+          console.log(res, 'res 1111');
+        });
       },
       getData() {
         this.workList = [];

src/views/produce/components/turnover/components/detail.vue

@@ -199,7 +199,7 @@
       flex-direction: row;
       flex-wrap: wrap;
       color: #333;
-      font-size: 1.2rem;
+      font-size: 1.1rem;
       overflow: auto;
 
       .detail-sigle-box {

src/views/taskList/components/Ddtails.vue

@@ -337,7 +337,7 @@
         }
         // 更新绑定值
         this.form[type] = value;
-        this.calculateWeight(type);
+        // this.calculateWeight(type);
       },
       //计算重量
       calculateWeight(type) {