From dbd697822e7ef54bd40914820fc9848eec74bec4 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 5 Nov 2024 15:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/collectPoint/timerSetting.vue | 20 +++++++++-
 .../basic/workplace/cargowWorkplaceManage.vue |  8 ++--
 src/views/collect/DealOrder.vue               | 37 ++++++++++++-------
 3 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/views/basic/collectPoint/timerSetting.vue b/src/views/basic/collectPoint/timerSetting.vue
index 5e0828e8..f35013ea 100644
--- a/src/views/basic/collectPoint/timerSetting.vue
+++ b/src/views/basic/collectPoint/timerSetting.vue
@@ -105,6 +105,21 @@
               </el-col>
             </el-row>
           </el-collapse-item>
+          <el-collapse-item name="3">
+            <template slot="title">
+              <p class="form-title">拆零设置</p>
+            </template>
+            <el-row :gutter="20">
+              <el-col :span="8" class="el-col">
+                <el-form-item label="是否最后追溯码拆零:" prop="lastCodeSplit" style="margin-bottom: 0">
+                  <el-radio-group v-model="formData.lastCodeSplit">
+                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="false">否</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
         </el-collapse>
 
 
@@ -122,9 +137,10 @@ export default {
 
   data() {
     return {
-      activeNames: ['0','1','2','3'],
+      activeNames: ['0', '1', '2', '3'],
       formData: {
-        startDownloadTime: null
+        startDownloadTime: null,
+        lastCodeSplit: true
       },
       systemParam: null,
 
diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue
index eddd8583..7c8b3c8d 100644
--- a/src/views/basic/workplace/cargowWorkplaceManage.vue
+++ b/src/views/basic/workplace/cargowWorkplaceManage.vue
@@ -933,7 +933,7 @@ export default {
         keyWords: null,
         workPlaceCode: null
       }
-      this.getCargowBindCollectList()
+        this.getCargowBindCollectList()
     },
     onQueueList() {
       if (this.rowData.workplaceId == null) {
@@ -1059,7 +1059,7 @@ export default {
         chargeUser: null,
         constituencies: '1001',
         invRemindNumber: 0,
-        queueStatus: 0,
+        queueStatus:0,
         remake: null
       }
       if (this.groupData != null) {
@@ -1205,7 +1205,7 @@ export default {
     },
     edit(row) {
       this.formData = row
-      this.formData.queueStatus = Number(row.queueStatus)
+      this.formData.queueStatus =  Number(row.queueStatus)
       // this.formData.invCode = String(row.invCode)
       if (row.chargeUser == 0) {
         this.formData.chargeUser = null
@@ -1261,7 +1261,7 @@ export default {
     },
     printQueue(row) {
       row.labelId = 8
-      printQueueLabel(row).then(res => {
+      printQueueLabel(row).then(res  => {
         const binaryData = []
         binaryData.push(res)
         let url = window.URL.createObjectURL(
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 88bda9df..0acca53e 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -408,7 +408,14 @@ import {
   vailOrderFinish
 } from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
-import {getCurOrder, getNextOrder, findByBill, findFromCorp, orderDetail,removeByScanCode} from "@/api/collect/collectOrder";
+import {
+  getCurOrder,
+  getNextOrder,
+  findByBill,
+  findFromCorp,
+  orderDetail,
+  removeByScanCode
+} from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -1147,6 +1154,7 @@ export default {
         this.loading = false
         if (res.code == 20000) {
           this.formData = res.data;
+
           this.startDeal();
         } else {
           this.$message.error(res.message)
@@ -1233,6 +1241,7 @@ export default {
     },
     //开始拆零
     dealSplitOrder() {
+      this.formData.workPlaceCode = this.workplaceId;
       startSplit(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
@@ -1375,7 +1384,7 @@ export default {
       this.$refs.inputRef.focus();
       this.$refs.inputRef.select();
     },
-    reset(){
+    reset() {
       this.formData = {
         tagStatus: -1,
         workPlaceCode: this.formData.workPlaceCode,
@@ -1484,18 +1493,18 @@ export default {
 
     },
     removeCodesTemp(query) {
-      removeByScanCode(query).then(res =>{
-        if (res.code == 20000){
-              this.$message.success('剔除成功')
-              this.scanCode = ''
-              this.panelALive = false
-              this.$nextTick(() => {
-                this.panelALive = true
-              })
-              this.result = ''
-        }else if (res.code == 501){
+      removeByScanCode(query).then(res => {
+        if (res.code == 20000) {
+          this.$message.success('剔除成功')
+          this.scanCode = ''
+          this.panelALive = false
+          this.$nextTick(() => {
+            this.panelALive = true
+          })
+          this.result = ''
+        } else if (res.code == 501) {
 
-        }else {
+        } else {
           this.result = ''
           this.scanCode = ''
           this.$message.error(res.message)
@@ -1626,7 +1635,7 @@ export default {
       this.placeholder = "请点击输入框进行扫码剔除"
       this.scanStatus = 1
       this.scanCode = ''
-      if (!isBlank(this.warnResult)){
+      if (!isBlank(this.warnResult)) {
         this.warnResult = ""
       }
     },