From a706f724a11194eea83142e383a2321ca68ce479 Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Wed, 25 Sep 2024 19:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E9=80=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue          |  1 +
 src/views/collect/IoSplitOperateCode.vue     | 20 ++++++++++----------
 src/views/collect/chooseDraftOrderDialog.vue |  2 ++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 6cea02fe..0b2f2c3b 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -1169,6 +1169,7 @@ export default {
       );
       tQuery.code = this.codeFormData.code;
       tQuery.orderType = this.viewType;
+      tQuery.splitType = this.splitType;
       this.addCodeSubmit(tQuery);
       this.$refs.inputRef.select();
     },
diff --git a/src/views/collect/IoSplitOperateCode.vue b/src/views/collect/IoSplitOperateCode.vue
index ae411116..cb84922a 100644
--- a/src/views/collect/IoSplitOperateCode.vue
+++ b/src/views/collect/IoSplitOperateCode.vue
@@ -488,11 +488,11 @@
       <!--单据扫码明细-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
-        <el-form v-if="queryList4 && queryList4.length > 0" :inline="true" :model="resultQuery" class="query-form"
+        <el-form v-if="queryList4 && queryList4.length > 0" :inline="true" :model="codeQuery" class="query-form"
                  size="mini">
           <!--          <el-form-item class="query-form-item" label="UDI码:">-->
           <!--            <el-input-->
-          <!--              v-model="resultQuery.code"-->
+          <!--              v-model="codeQuery.code"-->
           <!--              placeholder="请输入UDI码"-->
           <!--              clearable-->
           <!--            >-->
@@ -503,7 +503,7 @@
               <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
                             :label="item.columnDesc+`:`" :key="item.id">
                 <el-input
-                  v-model="resultQuery[item.columnName]"
+                  v-model="codeQuery[item.columnName]"
                   :placeholder="item.columnDesc"
                   :disabled="executeEval(null,item.disabledFuc,false)"
                   @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
@@ -512,7 +512,7 @@
               </el-form-item>
               <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
                             :label="item.columnDesc+`:`">
-                <el-select v-model="resultQuery[item.columnName]"
+                <el-select v-model="codeQuery[item.columnName]"
                            :placeholder="item.columnDesc"
                            :disabled="executeEval(null,item.disabledFuc,false)"
                            clearable>
@@ -527,7 +527,7 @@
               <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
                             :label="item.columnDesc+`:`">
                 <el-select
-                  v-model="resultQuery[item.columnName]"
+                  v-model="codeQuery[item.columnName]"
                   :placeholder="item.columnDesc"
                   @change="executeFuc($event,'5',item.checkRules)"
                   :disabled="executeEval(null,item.disabledFuc,false)"
@@ -559,7 +559,7 @@
               <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
                             :label="item.columnDesc+`:`">
                 <el-date-picker
-                  v-model="resultQuery[item.columnName]"
+                  v-model="codeQuery[item.columnName]"
                   :style="`width:${item.width+'px'}`"
                   value-format="yyyy-MM-dd"
                   :disabled="executeEval(null,item.disabledFuc,false)"
@@ -573,10 +573,10 @@
                 <el-button
                   type="primary"
                   icon="el-icon-refresh"
-                  @click="onResultReset"
+                  @click="onCodeReset"
                 >重置
                 </el-button>
-                <el-button type="primary" @click="onResultSubmit"
+                <el-button type="primary" @click="onCodeSubmit"
                            icon="el-icon-search"
                 >查询
                 </el-button
@@ -1248,9 +1248,9 @@ export default {
         return;
       }
 
-      this.resultQuery.orderId = this.currentRow.billNo;
+      this.codeQuery.orderId = this.currentRow.billNo;
       this.resultDetailLoading = true;
-      errorCodeList(this.resultQuery).then((res) => {
+      errorCodeList(this.codeQuery).then((res) => {
         this.resultDetailLoading = false;
         if (res.code === 20000) {
           this.resultDetailList = res.data.list || [];
diff --git a/src/views/collect/chooseDraftOrderDialog.vue b/src/views/collect/chooseDraftOrderDialog.vue
index 8fa5f973..322c356c 100644
--- a/src/views/collect/chooseDraftOrderDialog.vue
+++ b/src/views/collect/chooseDraftOrderDialog.vue
@@ -909,6 +909,8 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        keyWords: null
+
       };
       this.actDateRange = [];
       this.getList();