修改索尔报工

pages/pda/jobBooking/components/batchJobBom.vue

@@ -848,6 +848,7 @@ export default {
   padding: 0 20rpx;
   line-height: 48rpx;
   color: #fff;
+  font-size: 12px;
 }
 
 .content_num {

pages/pda/jobBooking/components/singleJobBom.vue

@@ -672,6 +672,7 @@ export default {
   padding: 0 20rpx;
   line-height: 48rpx;
   color: #fff;
+  font-size: 12px;
 }
 
 .content_num {

pages/pda/jobBooking/index/index.vue

@@ -221,7 +221,7 @@
 
           <!-- 通用包装 -->
 
-          <view v-if="clientEnvironmentId != 2 && clientEnvironmentId != 3">
+          <view v-if="clientEnvironmentId != 3">
             <packingBom
               :taskId="taskId"
               :workOrderId="id"
@@ -720,8 +720,7 @@ export default {
           if (
             (this.taskType == 6 || this.taskType == 4) &&
             this.objData.singleReport == 1 &&
-            this.clientEnvironmentId != 3 &&
-            this.clientEnvironmentId != 2
+            this.clientEnvironmentId != 3
           ) {
             if (
               this.objData.pickOutInList &&
@@ -735,8 +734,7 @@ export default {
           if (
             (this.taskType == 6 || this.taskType == 4) &&
             this.objData.singleReport == 0 &&
-            this.clientEnvironmentId != 3 &&
-            this.clientEnvironmentId != 2
+            this.clientEnvironmentId != 3
           ) {
             if (
               this.objData.pickOutInList &&
@@ -1075,11 +1073,7 @@ export default {
         }
       }
 
-      if (
-        this.taskType == 4 &&
-        this.clientEnvironmentId != 3 &&
-        this.clientEnvironmentId != 2
-      ) {
+      if (this.taskType == 4 && this.clientEnvironmentId != 3) {
         const isPack = await this.checkPack();
 
         if (!isPack) {

pages/pda/warehousing/index.vue

@@ -21,7 +21,7 @@
             @handleScan="handleScan"
           ></workOrderBom>
 
-          <jobBom
+          <!-- <jobBom
             v-if="clientEnvironmentId == 2"
             :item="objData"
             ref="jobRef"
@@ -29,7 +29,7 @@
             pType="job"
             @penalize="penalize"
             @modeNum="modeNum"
-          ></jobBom>
+          ></jobBom> -->
 
           <view class="select_box">
             <zxz-uni-data-select
@@ -316,7 +316,7 @@ export default {
 
       let storageInfo = {
         inWarehouseSpecType:
-          this.clientEnvironmentId !== 3 || this.clientEnvironmentId !== 2
+          this.clientEnvironmentId !== 3
             ? Number(this.inWarehouseSpecType)
             : "",
         warehouseId: this.warehouseId,
@@ -325,29 +325,40 @@ export default {
           this.clientEnvironmentId == 3 ? this.tgList : this.List,
       };
 
-      if (this.clientEnvironmentId == 2) {
-        let num = "";
-        if (
-          this.objData.workReportInfo &&
-          this.objData.workReportInfo?.formedNum
-        ) {
-          num = this.objData.workReportInfo.formedNum;
-        }
-
-        storageInfo.packingReportList = [
-          {
-            code: this.objData.productCode,
-            categoryId: categoryId,
-            workOrderId: this.objData.workOrderId,
-            rootCategoryLevelId: rootCategoryLevelId,
-            totalQuantity: num,
-            quantity: num,
-            unit: this.objData.unit,
-            packingNum: 1,
-            taskId: -1,
-          },
-        ];
-      }
+      // let storageInfo = {
+      //   inWarehouseSpecType:
+      //     this.clientEnvironmentId !== 3 || this.clientEnvironmentId !== 2
+      //       ? Number(this.inWarehouseSpecType)
+      //       : "",
+      //   warehouseId: this.warehouseId,
+      //   inWarehouseType: this.inWarehouseType,
+      //   toWarehouseList:
+      //     this.clientEnvironmentId == 3 ? this.tgList : this.List,
+      // };
+
+      // if (this.clientEnvironmentId == 2) {
+      //   let num = "";
+      //   if (
+      //     this.objData.workReportInfo &&
+      //     this.objData.workReportInfo?.formedNum
+      //   ) {
+      //     num = this.objData.workReportInfo.formedNum;
+      //   }
+
+      //   storageInfo.packingReportList = [
+      //     {
+      //       code: this.objData.productCode,
+      //       categoryId: categoryId,
+      //       workOrderId: this.objData.workOrderId,
+      //       rootCategoryLevelId: rootCategoryLevelId,
+      //       totalQuantity: num,
+      //       quantity: num,
+      //       unit: this.objData.unit,
+      //       packingNum: 1,
+      //       taskId: -1,
+      //     },
+      //   ];
+      // }
 
       this.objData["storageInfo"] = storageInfo;