From e9ebe0b65f45b5ecb5729f22bc7e54ce479314d7 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 20 六月 2025 17:12:38 +0800
Subject: [PATCH] 报工以及取消报工联调

---
 pages/product/report/index.vue |   55 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/pages/product/report/index.vue b/pages/product/report/index.vue
index d66fafe..448dd3a 100644
--- a/pages/product/report/index.vue
+++ b/pages/product/report/index.vue
@@ -43,8 +43,8 @@
       <u-form-item label="闆朵欢鎻忚堪" :border-bottom="false" prop="partName">
         <u-input v-model="form.partName" placeholder="" disabled />
       </u-form-item>
-      <u-form-item label="鎵归噺澶у皬" :border-bottom="false" prop="qtyrequired">
-        <u-input v-model="form.qtyrequired" placeholder="" disabled />
+      <u-form-item label="鎵归噺澶у皬" :border-bottom="false" prop="qtyRequired">
+        <u-input v-model="form.qtyRequired" placeholder="" disabled />
       </u-form-item>
       <u-form-item
         label="鍓╀綑鏁伴噺"
@@ -68,19 +68,19 @@
           <u-radio name="part">鏇夸唬闆朵欢</u-radio>
         </u-radio-group>
       </u-form-item>
-      <u-form-item label="鐗╂枡" prop="materialcost">
-        <u-radio-group v-model="form.materialcost" :disabled="true">
+      <u-form-item label="鐗╂枡" prop="materialCost">
+        <u-radio-group v-model="form.materialCost" :disabled="true">
           <u-radio name="鍊掑啿">鍊掑啿</u-radio>
           <u-radio name="鎶曟枡">鎶曟枡</u-radio>
         </u-radio-group>
       </u-form-item>
-      <u-form-item label="宸ュ簭" prop="value1">
+      <u-form-item label="宸ュ簭">
         <u-checkbox-group>
           <u-checkbox
             :name="item.name"
             v-for="(item, index) in checkboxList"
             :key="index"
-            v-model="item.value1"
+            v-model="item.value"
             @change="changeCheckbox"
             :disabled="subdisabled || item.disabled"
           >
@@ -111,7 +111,7 @@
                   <view class="_label-name">鎵瑰彿锛�</view>
                 </view>
                 <view class="_content">
-                  {{ item.productNo }}
+                  {{ item.outBatchNo }}
                 </view>
               </view>
               <view class="row-list">
@@ -187,12 +187,12 @@
         moOn: "",
         partNo: "",
         partName: "",
-        qtyrequired: "",
+        qtyRequired: "",
         Jianqtyfinished: "",
         proposedLocation: "",
         productType: "dep",
         receive: "mo",
-        materialcost: "",
+        materialCost: "",
         autoReport: false,
         simplifyMaterials: false,
       },
@@ -243,6 +243,7 @@
       showSave: false,
       operationTaskId: "",
       subdisabled: false,
+      codeInfoId: "",
     };
   },
   // 鐐瑰嚮鎻愪氦鎸夐挳鐨勪簨浠跺鐞嗗嚱鏁�
@@ -259,6 +260,7 @@
             id: this.form.id,
           })
           .then((res) => {
+            res.data.name = this.form.name
             this.$refs.saveForm.open(res);
             uni.hideLoading();
           });
@@ -278,18 +280,11 @@
       //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠g爜鍦ㄨ繖閲�
       if (data.code) {
         let codeInfo = JSON.parse(data.code);
+        that.codeInfoId = codeInfo.id;
         if (codeInfo.moOn) {
           // 鎵弿鎶ュ伐鍗曚簩缁寸爜
           that.saveForm(codeInfo);
-          that.$u.api.workReporting
-            .getProductMainV1({
-              current: 1,
-              size: -1,
-              id: codeInfo.id,
-            })
-            .then((res) => {
-              that.InventoryReceiptList = res.data.productOutputList;
-            });
+          that.getHandelList();
         }
       }
     });
@@ -297,9 +292,22 @@
   watch: {
     "form.taskNo": function (newVal, oldVal) {
       this.subdisabled = false;
+      this.checkboxList[1].value = false;
+      this.checkboxList[0].value = false;
     },
   },
   methods: {
+    getHandelList() {
+      this.$u.api.workReporting
+        .getProductMainV1({
+          current: 1,
+          size: -1,
+          id: this.codeInfoId,
+        })
+        .then((res) => {
+          this.InventoryReceiptList = res.data.productOutputList;
+        });
+    },
     // 澶氶�夊鐞�
     changeCheckbox(val) {
       if (val.name === "宸ュ簭鐨勮嚜鍔ㄦ姤鍛�") {
@@ -311,6 +319,7 @@
     },
     handleUpdate() {
       this.subdisabled = true;
+      this.getHandelList();
     },
     // 鎵撳紑寮规--鍚庨潰杩橀渶瑕佺洃鍚壂鐮佹灙鎵爜缁撴灉锛岃祴鍊肩粰鎶ュ伐鍗曞彿瀛楁锛岀劧鍚庢墦寮�寮规閫夋嫨璁㈠崟鍙风瓑鎿嶄綔
     open() {
@@ -346,16 +355,18 @@
         moOn: val.moOn,
         partNo: val.partNo,
         partName: val.partName,
-        qtyrequired: val.qtyrequired,
-        Jianqtyfinished: val.qtyrequired - val.qtyfinished,
+        qtyRequired: val.qtyRequired,
+        Jianqtyfinished: val.qtyRequired - val.qtyFinished,
         proposedLocation: val.proposedLocation,
         productType: "dep",
         receive: "mo", // 澶嶉�夋缁勭殑鍊�
-        materialcost: val.materialcost,
+        materialCost: val.materialCost,
         autoReport: false,
         simplifyMaterials: false,
       };
-      if (this.form.materialcost == "鍊掑啿") {
+      this.checkboxList[1].value = false;
+      this.checkboxList[0].value = false;
+      if (this.form.materialCost == "鍊掑啿") {
         this.checkboxList[1].disabled = true;
       }
     },

--
Gitblit v1.9.3