From c0b5b977f6c65324140959ce63b7af166b3b4651 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 22 Aug 2023 16:00:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E6=B4=97=E4=B8=8B=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js                       |  6 +-----
 src/pages/modules/clean/cleaning-cutting.vue | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 042cfd0..42580c4 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -343,11 +343,7 @@ export const washWashVechileInfo = (area) => post('api/pda/wash/washVechileInfo'
   product_area: area
 })
 // 1.2确认下料
-export const washWashFinish = (id, wegiht, code) => post('api/pda/wash/washFinish', {
-  task_id: id,
-  wegiht: wegiht,
-  vechile_code: code
-})
+export const washWashFinish = (obj) => post('api/pda/wash/washFinish', obj)
 // 1.3强制完成
 export const washWashTaskFinish = (id) => post('api/pda/wash/washTaskFinish', {
   task_id: id
diff --git a/src/pages/modules/clean/cleaning-cutting.vue b/src/pages/modules/clean/cleaning-cutting.vue
index 6671d6b..0604cd2 100644
--- a/src/pages/modules/clean/cleaning-cutting.vue
+++ b/src/pages/modules/clean/cleaning-cutting.vue
@@ -47,6 +47,7 @@
                         <th>物料编号</th>
                         <th>物料规格</th>
                         <th>上料重量(kg)</th>
+                        <td>物料单重(g)</td>
                         <th>物料名称</th>
                     </tr>
                 </thead>
@@ -58,6 +59,7 @@
                         <td>{{e.material_code}}</td>
                         <td>{{e.material_spec}}</td>
                         <td>{{e.material_qty | unitskg}}</td>
+                        <td><input type="number" class="input" v-model="e.net_weight" @input="handleInput(e)"></td>
                         <td>{{ e.material_name }}</td>
                     </tr>
                 </tbody>
@@ -119,6 +121,9 @@ export default {
       if (res.code === 200) {
         this.pkId = ''
         this.pkObj = {}
+        res.content.map(el => {
+          this.$set(el, 'net_weight', '')
+        })
         this.dataList = [...res.content]
         if (this.dataList.length > 0) {
           this.sep_on = this.dataList[0].sep_on
@@ -165,7 +170,11 @@ export default {
     },
     async __washWashFinish () {
       try {
-        let res = await washWashFinish(this.pkId, this.weight, this.vechile_code)
+        let obj = {}
+        obj = this.pkObj
+        this.$set(obj, 'wegiht', this.weight)
+        this.$set(obj, 'vechile_code', this.vechile_code)
+        let res = await washWashFinish(obj)
         if (res.code === 200) {
           this.toast(res.msg)
           this._washWashTasks()
@@ -258,6 +267,9 @@ export default {
       } catch (e) {
         this.disabled5 = false
       }
+    },
+    handleInput (e) {
+      e.net_weight = e.net_weight.indexOf('.') > -1 ? e.net_weight.slice(0, e.net_weight.indexOf('.') + 4) : e.net_weight
     }
   }
 }