工序接收、镀前入库、镀前出库页面逻辑调整

pages/plan/operationReceiving.vue

@@ -70,7 +70,7 @@
         <t-td>{{ tableObj.currentWpTitle }}</t-td>
       </t-tr> -->
     </t-table>
-    <view class="buttonBox"
+    <!-- <view class="buttonBox"
       ><button
         class="button"
         type="primary"
@@ -79,7 +79,7 @@
       >
         接收
       </button></view
-    >
+    > -->
   </ifrm>
 </template>
 
@@ -117,6 +117,10 @@ export default {
       this.getData(code);
     },
     confirm(e) {
+      uni.showLoading({
+        title: "接收中...",
+        mask: true,
+      });
       this.getBarCode(e.target.value, true);
     },
     getData(code) {
@@ -128,33 +132,25 @@ export default {
         .then((res) => {
           this.value = "";
           this.tableObj = res.data;
-          uni.showToast({
+          // uni.showToast({
-            title: "数据获取成功",
+          //   title: "数据获取成功",
-          });
+          // });
-          console.log(898989898, res);
+          this.submitClick()
         })
-        .catch((err) => {});
+        .catch((err) => {
+          this.value = "";
+          this.tableObj = {};
+        });
     },
     submitClick() {
       this.$u.api.workPlanReceive({ wpIds: this.tableObj.wpId }).then((res) => {
-        console.log(898989898, res);
         this.tableObj = {};
+        this.hideLoading();
         uni.showToast({
           title: "接收成功",
         });
         this.twoInputFcous = true;
       });
-      //   this.$ajax.request({
-      //     url: "prWorkPlan/workPlanReceive/" + this.tableObj.wpId,
-      //     method: "POST",
-      //     success: (data) => {
-      // this.tableObj = {};
-      // uni.showToast({
-      //   title: "接收成功",
-      // });
-      // this.twoInputFcous = true;
-      //     },
-      //   });
     },
   },
 };

pages/production/warehousing.vue

@@ -65,7 +65,7 @@
         <t-td>{{ prWorkOrder.nextTeamCode }}</t-td>
       </t-tr>
     </t-table>
-    <view class="buttonBox">
+    <!-- <view class="buttonBox">
       <button
         class="button"
         type="primary"
@@ -74,7 +74,7 @@
       >
         入库
       </button>
-    </view>
+    </view> -->
   </ifrm>
 </template>
 
@@ -113,6 +113,10 @@ export default {
       this.getData(code);
     },
     confirm(e) {
+      uni.showLoading({
+        title: "镀前入库中...",
+        mask: true,
+      });
       this.getBarCode(e.target.value, true);
     },
     getData(code) {
@@ -124,38 +128,13 @@ export default {
         this.prWorkPlan = data;
         this.prWorkOrder = data;
         this.quantity = data.inQuantity;
+        this.submitClick()
         
-        // if (!data.oem) {
+      }).catch(err=>{
-        //   this.makeTeam = data.makeTeam;
+        this.value = "";
-        // }
+         this.setData();
-        // if (data.oemCustomer) {
+      })
-        //   this.oemCustomer = data.oemCustomer;
-        // }
       
-        uni.showToast({
-          title: "数据获取成功",
-        });
-      });
-      //   this.$ajax.request({
-      //     url: "pdaLoad/loadPlateFe/" + code,
-      //     method: "GET",
-      //     success: (data) => {
-      //   this.value = "";
-      //   this.prWorkPlan = data;
-      //   this.prWorkOrder = data.prWorkOrder;
-      //   console.log(data.prWorkOrder);
-      //   this.quantity = data.prWorkOrder.makeQty;
-      //   if (!data.oem) {
-      //     this.makeTeam = data.makeTeam;
-      //   }
-      //   if (data.oemCustomer) {
-      //     this.oemCustomer = data.oemCustomer;
-      //   }
-      //   uni.showToast({
-      //     title: "数据获取成功",
-      //   });
-      //     },
-      //   });
     },
     submitClick() {
       let query = [];
@@ -169,6 +148,7 @@ export default {
       console.log(query,'query');
 
       this.$u.api.savePlateFrontEnter(query).then((res) => {
+         uni.hideLoading()
         uni.showToast({
           title: "入库成功",
         });
@@ -176,22 +156,7 @@ export default {
         this.setData();
       });
 
-      //   this.$ajax.request({
+     
-      //     url: "pdaSave/savePlateFe",
-      //     method: "POST",
-      //     data: {
-      //       prWorkPlan: this.prWorkPlan,
-      //       quantity: this.quantity,
-      //       makeTeam: this.makeTeam,
-      //     },
-      //     success: (data) => {
-      //   uni.showToast({
-      //     title: "入库成功",
-      //   });
-      //   this.value = "";
-      //   this.setData();
-      //     },
-      //   });
     },
     setData() {
       this.prWorkPlan = {};

pages/production/warehousingIssue.vue

@@ -44,9 +44,7 @@
       </t-tr>
       <t-tr>
         <t-td>上序班组/供应商</t-td>
-        <t-td>{{
+        <t-td>{{ prWorkOrder.nextTeamCode || prWorkOrder.ocName }}</t-td>
-          prWorkOrder.nextTeamCode || prWorkOrder.ocName
-        }}</t-td>
       </t-tr>
       <t-tr>
         <t-td>工序号</t-td>
@@ -65,7 +63,7 @@
         <t-td>{{ prWorkOrder.inQuantity }}</t-td>
       </t-tr>
     </t-table>
-    <view class="buttonBox"
+    <!-- <view class="buttonBox"
       ><button
         class="button"
         type="primary"
@@ -74,7 +72,7 @@
       >
         出库
       </button>
-    </view>
+    </view> -->
   </ifrm>
 </template>
 
@@ -114,49 +112,31 @@ export default {
       this.getData(code);
     },
     confirm(e) {
+      uni.showLoading({
+        title: "镀前出库中...",
+        mask: true,
+      });
       this.getBarCode(e.target.value, true);
     },
     getData(code) {
       if (!code) return;
       this.value = code;
-      this.$u.api.getBeforePlatOutCardNo({ cardNo: code }).then((res) => {
+      this.$u.api
-        let data = res.data;
+        .getBeforePlatOutCardNo({ cardNo: code })
-        console.log(data,'8787878878');
+        .then((res) => {
-        this.value = "";
+          let data = res.data;
-        this.prPlateAround = data;
+          this.value = "";
-        this.prWorkPlan = data;
+          this.prPlateAround = data;
-        this.prWorkOrder = data;
+          this.prWorkPlan = data;
-        this.quantity = data.inQuantity;
+          this.prWorkOrder = data;
-        // if (!data.prWorkPlan.oem) {
+          this.quantity = data.inQuantity;
-        //   this.makeTeam = data.prWorkPlan.makeTeam;
+
-        // }
+          this.submitClick();
-        // if (data.oemCustomer) {
+        })
-        //   this.oemCustomer = data.prWorkPlan.oemCustomer;
+        .catch((err) => {
-        // }
+          this.value = "";
-        uni.showToast({
+          this.setData();
-          title: "数据获取成功",
         });
-      });
-      //   this.$ajax.request({
-      //     url: "pdaLoad/loadPlateFi/" + code,
-      //     method: "GET",
-      //     success: (data) => {
-      //   this.value = "";
-      //   this.prPlateAround = data;
-      //   this.prWorkPlan = data.prWorkPlan;
-      //   this.prWorkOrder = data.prWorkPlan.prWorkOrder;
-      //   this.quantity = data.prWorkPlan.quantity;
-      //   if (!data.prWorkPlan.oem) {
-      //     this.makeTeam = data.prWorkPlan.makeTeam;
-      //   }
-      //   if (data.oemCustomer) {
-      //     this.oemCustomer = data.prWorkPlan.oemCustomer;
-      //   }
-      //   uni.showToast({
-      //     title: "数据获取成功",
-      //   });
-      //     },
-      //   });
     },
     submitClick() {
       let query = [];
@@ -167,28 +147,14 @@ export default {
         id: this.prWorkPlan.id,
         quantity: this.prWorkPlan.inQuantity,
       });
-      console.log(query,'query');
       this.$u.api.savePlateFrontEnterIssue(query).then((res) => {
+        uni.hideLoading();
         uni.showToast({
           title: "出库成功",
         });
         this.value = "";
         this.setData();
       });
-
-
-      // this.$ajax.request({
-      //     url: 'pdaSave/savePlateFi',
-      //     method: 'POST',
-      //     data: this.prPlateAround,
-      //     success: data => {
-      // uni.showToast({
-      //     title: '出库成功'
-      // });
-      // this.value = '';
-      // this.setData();
-      //     }
-      // });
     },
     setData() {
       this.prWorkPlan = {