修改报工bug

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "v1.0.3.5",
+    "versionName" : "v1.0.3.6",
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {

pages/pda/feeding/components/instanceBom.vue

@@ -91,10 +91,12 @@
                   {{ mate.extInfo.weight || 0
                   }}{{ mate.extInfo.weightUnit }}</view
                 >
-                <view v-else>
-                  <input class="uni-input" v-model="mate.extInfo.weight" />{{
-                    mate.extInfo.weightUnit
-                  }}
+                <view v-else style="display: flex; flex-direction: row">
+                  <input
+                    class="uni-input"
+                    v-model="mate.extInfo.weight"
+                    style="width: 80px"
+                  />{{ mate.extInfo.weightUnit }}
                 </view>
               </view>
               <view class="content" v-if="currentTaskDiagram.isFirstTask == 0">
@@ -102,10 +104,12 @@
                   {{ mate.extInfo.weight || 0
                   }}{{ mate.extInfo.weightUnit }}</view
                 >
-                <view v-else>
-                  <input class="uni-input" v-model="mate.extInfo.weight" />{{
-                    mate.extInfo.weightUnit
-                  }}
+                <view v-else style="display: flex; flex-direction: row">
+                  <input
+                    class="uni-input"
+                    v-model="mate.extInfo.weight"
+                    style="width: 80px"
+                  />{{ mate.extInfo.weightUnit }}
                 </view>
               </view>
             </view>

pages/pda/feeding/components/workOrderBom.vue

@@ -126,23 +126,23 @@ export default {
       currentExecutorTime: "",
     };
   },
-  watch: {
-    item: {
-      immediate: true,
-      deep: true,
-      handler(newVal) {
-        // this.deviceList = newVal
-        //设备下拉框数据来源
-        this.getByCode();
-        // this.$set(this.item, "executorTime", this.currentExecutorTime);
-        // this.$set(
-        //   this.item.workReportInfo,
-        //   "executorTime",
-        //   this.currentExecutorTime
-        // );
-      },
-    },
-  },
+  // watch: {
+  //   item: {
+  //     immediate: true,
+  //     deep: true,
+  //     handler(newVal) {
+  //       // this.deviceList = newVal
+  //       //设备下拉框数据来源
+  //       this.getByCode();
+  //       // this.$set(this.item, "executorTime", this.currentExecutorTime);
+  //       // this.$set(
+  //       //   this.item.workReportInfo,
+  //       //   "executorTime",
+  //       //   this.currentExecutorTime
+  //       // );
+  //     },
+  //   },
+  // },
 
   created() {
     console.log("item", this.item);

pages/pda/feeding/details.vue

@@ -343,7 +343,6 @@ export default {
               title: `请先去领料`,
               icon: "none",
             });
-            console.log("1234");
             return false;
           }
         }

pages/pda/jobBooking/components/batchJobBom.vue

@@ -18,7 +18,7 @@
 
 				</view> -->
 
-        <view class="item rx-sc">
+        <!-- <view class="item rx-sc">
           <view class="rx ww55">
             <view class="lable lable150 rx-cc">要求生产数量</view>
             <view class="content rx-sc">
@@ -34,7 +34,7 @@
               <view class="unit">{{ item.weightUnit }}</view>
             </view>
           </view>
-        </view>
+        </view> -->
 
         <view class="item rx-sc">
           <view class="rx ww55">

pages/pda/jobBooking/components/singleJobBom.vue

@@ -16,7 +16,7 @@
           </view>
         </view> -->
 
-        <view class="item rx-sc">
+        <!-- <view class="item rx-sc">
           <view class="rx ww55">
             <view class="lable lable150 rx-cc">要求生产数量</view>
             <view class="content rx-sc">
@@ -32,7 +32,7 @@
               <view class="unit">{{ item.weightUnit }}</view>
             </view>
           </view>
-        </view>
+        </view> -->
 
         <view class="item rx-sc">
           <view class="rx ww55">
@@ -198,15 +198,14 @@
           :item="item"
           :list="item.semiProductList"
           :equipmentList="item.equipmentList"
-          v-if="clientEnvironmentId != 3"
         ></singleProductJobBom>
 
-        <singleProductJobBom
+        <!-- <singleProductJobBom
           :item="item"
           :list="item.semiProductList"
           :equipmentList="item.equipmentList"
           v-if="clientEnvironmentId == 3 && item.currentTaskDiagram.type != 6"
-        ></singleProductJobBom>
+        ></singleProductJobBom> -->
       </view>
     </view>
   </view>
@@ -336,6 +335,8 @@ export default {
       console.log(adultCount, noAdultCount);
       this.$set(this.item.workReportInfo, "formedNum", adultCount);
       this.$set(this.item.workReportInfo, "notFormedNum", noAdultCount);
+
+      this.$forceUpdate();
     },
 
     getByCode() {

pages/pda/jobBooking/components/singleProductJobBom.vue

@@ -580,11 +580,11 @@ export default {
 
       isQualifiedList: [
         {
-          code: "1",
+          code: 1,
           name: "合格",
         },
         {
-          code: "2",
+          code: 2,
           name: "不合格",
         },
       ],

pages/pda/jobBooking/index/index.vue

@@ -20,7 +20,7 @@
 
           <workOrderBom
             :item="objData"
-            v-if="objData"
+            v-if="Object.keys(objData.workReportInfo).length != 0"
             pType="job"
             :taskType="taskType"
             @handleScan="handleScan"
@@ -163,7 +163,7 @@
           >
           </semiProductJobBomPL>
 
-          <oneJobQualityBom
+          <!-- <oneJobQualityBom
             v-if="
               objData.semiProductList &&
               objData.semiProductList.length != 0 &&
@@ -174,7 +174,7 @@
             :item="objData"
             :list="objData.semiProductList"
             @weightEmit="weightEmit"
-          ></oneJobQualityBom>
+          ></oneJobQualityBom> -->
 
           <oneJobQualityBomPL
             v-if="

pages/pda/sample/components/inspectionBom.vue

@@ -236,11 +236,11 @@
 
 
 				isQualifiedList: [{
-						code: '1',
+						code: 1,
 						name: '合格'
 					},
 					{
-						code: '2',
+						code: 2,
 						name: '不合格'
 					}
 				],

pages/pda/warehousing/components/batchProductJobBom.vue

@@ -503,11 +503,11 @@ export default {
 
       isQualifiedList: [
         {
-          code: "1",
+          code: 1,
           name: "合格",
         },
         {
-          code: "2",
+          code: 2,
           name: "不合格",
         },
       ],