From db42e2a2995d6e1413fecef85c6bcdf273411dbf Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 4 Aug 2023 08:57:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=85=A5=E5=BA=93=E3=80=81?=
 =?UTF-8?q?=E5=88=BB=E5=AD=97=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js                        |  6 +++++
 src/pages/modules/finished/batch-instore.vue  | 10 ++++----
 .../modules/lettering/lettering-process.vue   | 18 +++++++++++++--
 .../modules/lettering/lettering-task-list.vue | 23 +++++++++++++++++--
 4 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 5e39e5b..042cfd0 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -377,6 +377,8 @@ export const bypda = (page, size) => post('api/bcp/bypda', {
 //   }
 //   return res
 // }
+// 空框送回
+export const kzsendVechile = () => post('api/pda/kz/sendVechile', {})
 // 1.2刻字机选择
 export const kzDeviceList = () => post('api/produceWorkorder', {
   product_area: 'A1',
@@ -443,6 +445,10 @@ export const operation = (id, method) => post('api/task/operation', {
   task_id: id,
   method_name: method
 })
+// 重新下发
+export const kzresend = (id) => post('api/pda/kz/resend', {
+  task_id: id
+})
 
 /**
  * 批量入库
diff --git a/src/pages/modules/finished/batch-instore.vue b/src/pages/modules/finished/batch-instore.vue
index 171fac5..d00a810 100644
--- a/src/pages/modules/finished/batch-instore.vue
+++ b/src/pages/modules/finished/batch-instore.vue
@@ -56,7 +56,7 @@
                 <div class="search-item_3">
                     <button class="button button--primary" @click="_finishproductBucket">查询</button>
                     <button class="button button--primary" :class="{'button--defalut': checkArr.length === 0}" @click="setPoint">设置站点</button>
-                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': dataList.length === 0}" @click="_finishproductBatchin">确认入库</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': checkArr.length === 0}" @click="_finishproductBatchin">确认入库</button>
                     <button class="button button--primary" :class="{'button--defalut': checkArr.length !== 1}" @click="toJump">托盘明细</button>
                     <button class="button button--primary" :class="{'button--defalut': checkArr.length !== 1}" @click="toDelect">删除一行</button>
                 </div>
@@ -72,7 +72,6 @@
                         <th>组盘日期</th>
                         <th>订单号</th>
                         <th>订单行号</th>
-                        <th>规格</th>
                         <th>数量</th>
                         <th>明细数</th>
                         <th>入库点</th>
@@ -88,7 +87,6 @@
                         <td>{{ e.create_time }}</td>
                         <td>{{e.sale_code}}</td>
                         <td>{{e.sale_seq_no}}</td>
-                        <td>{{ e.material_spec }}</td>
                         <td>{{ e.storage_qty }}</td>
                         <td>{{ e.count }}</td>
                         <td>{{ e.point_code }}</td>
@@ -197,15 +195,15 @@ export default {
     // 确认入库
     async _finishproductBatchin () {
       this.disabled1 = true
-      if (this.dataList.length === 0) {
+      if (this.checkArr.length === 0) {
         this.disabled1 = false
         return
       }
       try {
-        this.dataList.map(el => {
+        this.checkArr.map(el => {
           this.$set(el, 'bill_code', this.value3)
         })
-        let res = await finishproductBatchin(this.dataList)
+        let res = await finishproductBatchin(this.checkArr)
         if (res.code === 200) {
           this.toast(res.msg)
           this._finishproductBucket()
diff --git a/src/pages/modules/lettering/lettering-process.vue b/src/pages/modules/lettering/lettering-process.vue
index 715b5d5..9ebbd29 100644
--- a/src/pages/modules/lettering/lettering-process.vue
+++ b/src/pages/modules/lettering/lettering-process.vue
@@ -5,6 +5,7 @@
               <div class="search-item_3">
                   <button class="button button--primary" @click="_bypda">查询</button>
                   <button class="button button--primary" :class="{'button--defalut': pkId === ''}" @click="toSure">确认上料</button>
+                  <button class="button button--primary" :disabled="disabled1" @click="_kzsendVechile">空框送回</button>
               </div>
           </div>
         </div>
@@ -43,7 +44,7 @@
 </template>
 
 <script>
-import { bypda } from '@config/getData2.js'
+import { bypda, kzsendVechile } from '@config/getData2.js'
 export default {
   name: 'letteringprocess',
   data () {
@@ -54,7 +55,8 @@ export default {
       page: 1,
       size: '99',
       busy: false,
-      desc: ''
+      desc: '',
+      disabled1: false
     }
   },
   created () {
@@ -110,6 +112,18 @@ export default {
           spec: this.pkObj.material_spec
         }
       })
+    },
+    async _kzsendVechile () {
+      this.disabled1 = true
+      try {
+        let res = await kzsendVechile()
+        if (res.code === 200) {
+          this.toast(res.msg)
+        }
+        this.disabled1 = false
+      } catch (e) {
+        this.disabled1 = false
+      }
     }
   }
 }
diff --git a/src/pages/modules/lettering/lettering-task-list.vue b/src/pages/modules/lettering/lettering-task-list.vue
index 84f37da..5134de8 100644
--- a/src/pages/modules/lettering/lettering-task-list.vue
+++ b/src/pages/modules/lettering/lettering-task-list.vue
@@ -19,6 +19,7 @@
                     <button class="button button--primary" @click="_KzTasks">查询</button>
                     <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': pkId === ''}" @click="toSure1">强制完成</button>
                     <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': pkId === ''}" @click="toSure2">强制取消</button>
+                    <button class="button button--primary" :disabled="disabled3" :class="{'button--defalut': pkId === ''}" @click="_kzresend">重新下发</button>
                 </div>
             </div>
         </div>
@@ -60,7 +61,7 @@
 </template>
 
 <script>
-import {dictAll, KzTasks, operation} from '@config/getData2.js'
+import {dictAll, KzTasks, operation, kzresend} from '@config/getData2.js'
 export default {
   data () {
     return {
@@ -70,7 +71,8 @@ export default {
       pkId: '',
       pkObj: {},
       disabled1: false,
-      disabled2: false
+      disabled2: false,
+      disabled3: false
     }
   },
   created () {
@@ -128,6 +130,23 @@ export default {
         this.disabled1 = false
         this.disabled2 = false
       }
+    },
+    // 重新下发
+    async _kzresend () {
+      if (this.pkId === '') {
+        this.disabled3 = false
+        return
+      }
+      try {
+        let res = await kzresend(this.pkId)
+        if (res.code === 200) {
+          this.toast(res.msg)
+          this._KzTasks()
+        }
+        this.disabled3 = false
+      } catch (e) {
+        this.disabled3 = false
+      }
     }
   }
 }