jiaxing.zhou

fix(exportBillQuery, listBranchQuery): 修复物流单号换行查询问题

- 在两个组件中添加 originalLogisticsNo 字段,用于保存原始的物流单号字符串
- 修改查询逻辑,使用保存的原始物流单号进行查询
- 通过对象展开运算符复制 sreachFormData,避免直接修改原始对象
...@@ -182,6 +182,7 @@ export default { ...@@ -182,6 +182,7 @@ export default {
182 createTime: [], 182 createTime: [],
183 logisticsNo: "", 183 logisticsNo: "",
184 }, 184 },
185 + originalLogisticsNo: "", // 用于保存原始的 logisticsNo 字符串
185 page: { 186 page: {
186 pageIndex: 1, 187 pageIndex: 1,
187 pageSize: 20, 188 pageSize: 20,
...@@ -304,7 +305,8 @@ export default { ...@@ -304,7 +305,8 @@ export default {
304 if (val == 0) { 305 if (val == 0) {
305 this.page.pageIndex = 1; 306 this.page.pageIndex = 1;
306 } 307 }
307 - let obj = this.sreachFormData; 308 + let obj = { ...this.sreachFormData }; // 使用对象展开运算符复制 sreachFormData
309 + //let obj = this.sreachFormData;
308 obj.pageIndex = this.page.pageIndex; 310 obj.pageIndex = this.page.pageIndex;
309 obj.pageSize = this.page.pageSize; 311 obj.pageSize = this.page.pageSize;
310 obj.createTimeStart = ""; 312 obj.createTimeStart = "";
...@@ -313,6 +315,8 @@ export default { ...@@ -313,6 +315,8 @@ export default {
313 obj.createTimeStart = obj.createTime[0]; 315 obj.createTimeStart = obj.createTime[0];
314 obj.createTimeEnd = obj.createTime[1]; 316 obj.createTimeEnd = obj.createTime[1];
315 } 317 }
318 + // 使用保存的原始 logisticsNo 字符串
319 + obj.logisticsNo = this.originalLogisticsNo;
316 if (obj.logisticsNo != null && obj.logisticsNo != "") { 320 if (obj.logisticsNo != null && obj.logisticsNo != "") {
317 obj.logisticsNo = obj.logisticsNo.split("\n"); 321 obj.logisticsNo = obj.logisticsNo.split("\n");
318 } else { 322 } else {
...@@ -404,6 +408,7 @@ export default { ...@@ -404,6 +408,7 @@ export default {
404 }, 408 },
405 formChange(val) { 409 formChange(val) {
406 this.sreachFormData = val; 410 this.sreachFormData = val;
411 + this.originalLogisticsNo = val.logisticsNo; // 保存原始的 logisticsNo 字符串
407 }, 412 },
408 //分页 413 //分页
409 currentChange(val) { 414 currentChange(val) {
......
...@@ -171,6 +171,7 @@ export default { ...@@ -171,6 +171,7 @@ export default {
171 createTime: [], 171 createTime: [],
172 logisticsNo: [], 172 logisticsNo: [],
173 }, 173 },
174 + originalLogisticsNo: "", // 用于保存原始的 logisticsNo 字符串
174 page: { 175 page: {
175 pageIndex: 1, 176 pageIndex: 1,
176 pageSize: 20, 177 pageSize: 20,
...@@ -289,7 +290,9 @@ export default { ...@@ -289,7 +290,9 @@ export default {
289 if (val == 0) { 290 if (val == 0) {
290 this.page.pageIndex = 1; 291 this.page.pageIndex = 1;
291 } 292 }
292 - let obj = this.sreachFormData; 293 + let obj = { ...this.sreachFormData }; // 使用对象展开运算符复制 sreachFormData
294 +
295 + //let obj = this.sreachFormData;
293 obj.pageIndex = this.page.pageIndex; 296 obj.pageIndex = this.page.pageIndex;
294 obj.pageSize = this.page.pageSize; 297 obj.pageSize = this.page.pageSize;
295 obj.createTimeStart = ""; 298 obj.createTimeStart = "";
...@@ -303,6 +306,8 @@ export default { ...@@ -303,6 +306,8 @@ export default {
303 // } else { 306 // } else {
304 // obj.billNo = []; 307 // obj.billNo = [];
305 // } 308 // }
309 + // 使用保存的原始 logisticsNo 字符串
310 + obj.logisticsNo = this.originalLogisticsNo;
306 if (obj.logisticsNo != null && obj.logisticsNo != "") { 311 if (obj.logisticsNo != null && obj.logisticsNo != "") {
307 obj.logisticsNo = obj.logisticsNo.split("\n"); 312 obj.logisticsNo = obj.logisticsNo.split("\n");
308 } else { 313 } else {
...@@ -402,6 +407,7 @@ export default { ...@@ -402,6 +407,7 @@ export default {
402 }, 407 },
403 formChange(val) { 408 formChange(val) {
404 this.sreachFormData = val; 409 this.sreachFormData = val;
410 + this.originalLogisticsNo = val.logisticsNo; // 保存原始的 logisticsNo 字符串
405 }, 411 },
406 input() { 412 input() {
407 this.$forceUpdate(); 413 this.$forceUpdate();
......