Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zihan.wu
2e0d4783 1 parent 331ce247

feat(views): 添加物流运单编号查询功能 

- 在 exportBillQuery、exportListQuery、listBranchQuery 和 logisticsExitQuery 页面中添加物流运单编号查询字段
- 实现物流运单编号的多行输入和查询功能
-优化查询条件处理逻辑，支持空值和非空值的正确处理
Inline Side-by-side
Showing 4 changed files with 67 additions and 32 deletions
...@@ -8,6 +8,16 @@ ...@@ -8,6 +8,16 @@
8 size="small" 8 size="small"
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 + <!-- 运单编号 -->
12 + <el-col :span="5">
13 + <Formitem label="物流运单编号" prop="logisticsNo">
14 + <FormTextareaInput
15 + :formData="sreachFormData"
16 + dataKey="logisticsNo"
17 + @formChange="formChange"
18 + />
19 + </Formitem>
20 + </el-col>
11 <!-- 订单编号 --> 21 <!-- 订单编号 -->
12 <el-col :span="5"> 22 <el-col :span="5">
13 <Formitem label="订单编号" prop="orderNo"> 23 <Formitem label="订单编号" prop="orderNo">
...@@ -170,6 +180,7 @@ export default { ...@@ -170,6 +180,7 @@ export default {
170 ebccode: "", 180 ebccode: "",
171 returnStatus: "", 181 returnStatus: "",
172 createTime: [], 182 createTime: [],
183 + logisticsNo: "",
173 }, 184 },
174 page: { 185 page: {
175 pageIndex: 1, 186 pageIndex: 1,
...@@ -302,6 +313,11 @@ export default { ...@@ -302,6 +313,11 @@ export default {
302 obj.createTimeStart = obj.createTime[0]; 313 obj.createTimeStart = obj.createTime[0];
303 obj.createTimeEnd = obj.createTime[1]; 314 obj.createTimeEnd = obj.createTime[1];
304 } 315 }
316 + if (obj.logisticsNo != null && obj.logisticsNo != "") {
317 + obj.logisticsNo = obj.logisticsNo.split("\n");
318 + } else {
319 + obj.logisticsNo = [];
320 + }
305 getAllExportingBills(obj) 321 getAllExportingBills(obj)
306 .then((res) => { 322 .then((res) => {
307 323
...@@ -386,6 +402,9 @@ export default { ...@@ -386,6 +402,9 @@ export default {
386 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY = 402 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
387 "auto"; 403 "auto";
388 }, 404 },
405 + formChange(val) {
406 + this.sreachFormData = val;
407 + },
389 //分页 408 //分页
390 currentChange(val) { 409 currentChange(val) {
391 this.page.pageIndex = val.page; 410 this.page.pageIndex = val.page;
......
...@@ -8,6 +8,28 @@ ...@@ -8,6 +8,28 @@
8 size="small" 8 size="small"
9 > 9 >
10 <el-row> 10 <el-row>
11 + <!-- 物流运单编号 -->
12 + <el-col :span="5">
13 + <Formitem label="物流运单编号" prop="logisticsNo">
14 + <!-- <el-input
15 + type="text"
16 + class="inputShadow"
17 + id="inputInner--logisticsNo"
18 + resize="none"
19 + v-model="sreachFormData.logisticsNo"
20 + clearable
21 + placeholder=""
22 + ></el-input> -->
23 +
24 + <FormTextareaInput
25 + :formData="sreachFormData"
26 + dataKey="logisticsNo"
27 + @formChange="formChange"
28 + />
29 +
30 +
31 + </Formitem>
32 + </el-col>
11 <!-- 提运单号 --> 33 <!-- 提运单号 -->
12 <el-col :span="5"> 34 <el-col :span="5">
13 <Formitem label="提运单号" prop="billNo"> 35 <Formitem label="提运单号" prop="billNo">
...@@ -41,28 +63,6 @@ ...@@ -41,28 +63,6 @@
41 ></el-input> 63 ></el-input>
42 </Formitem> 64 </Formitem>
43 </el-col> 65 </el-col>
44 - <!-- 物流运单编号 -->
45 - <el-col :span="5">
46 - <Formitem label="物流运单编号" prop="logisticsNo">
47 - <!-- <el-input
48 - type="text"
49 - class="inputShadow"
50 - id="inputInner--logisticsNo"
51 - resize="none"
52 - v-model="sreachFormData.logisticsNo"
53 - clearable
54 - placeholder=""
55 - ></el-input> -->
56 -
57 - <FormTextareaInput
58 - :formData="sreachFormData"
59 - dataKey="logisticsNo"
60 - @formChange="formChange"
61 - />
62 -
63 -
64 - </Formitem>
65 - </el-col>
66 <!-- 创建时间 --> 66 <!-- 创建时间 -->
67 <el-col :span="5"> 67 <el-col :span="5">
68 <Formitem label="创建时间" prop="createTime" :activeType="true"> 68 <Formitem label="创建时间" prop="createTime" :activeType="true">
......
...@@ -8,6 +8,16 @@ ...@@ -8,6 +8,16 @@
8 size="small" 8 size="small"
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 + <!-- 运单编号 -->
12 + <el-col :span="5">
13 + <Formitem label="物流运单编号" prop="logisticsNo">
14 + <FormTextareaInput
15 + :formData="sreachFormData"
16 + dataKey="logisticsNo"
17 + @formChange="formChange"
18 + />
19 + </Formitem>
20 + </el-col>
11 <!-- 提运单号 --> 21 <!-- 提运单号 -->
12 <el-col :span="5"> 22 <el-col :span="5">
13 <Formitem label="提运单号" prop="billNo"> 23 <Formitem label="提运单号" prop="billNo">
...@@ -159,6 +169,7 @@ export default { ...@@ -159,6 +169,7 @@ export default {
159 billNo: "", 169 billNo: "",
160 returnStatus: "", 170 returnStatus: "",
161 createTime: [], 171 createTime: [],
172 + logisticsNo: [],
162 }, 173 },
163 page: { 174 page: {
164 pageIndex: 1, 175 pageIndex: 1,
...@@ -292,6 +303,11 @@ export default { ...@@ -292,6 +303,11 @@ export default {
292 // } else { 303 // } else {
293 // obj.billNo = []; 304 // obj.billNo = [];
294 // } 305 // }
306 + if (obj.logisticsNo != null && obj.logisticsNo != "") {
307 + obj.logisticsNo = obj.logisticsNo.split("\n");
308 + } else {
309 + obj.logisticsNo = [];
310 + }
295 getAllTotalScoreList(obj) 311 getAllTotalScoreList(obj)
296 .then((res) => { 312 .then((res) => {
297 if (res.code === "200") { 313 if (res.code === "200") {
......
...@@ -8,6 +8,16 @@ ...@@ -8,6 +8,16 @@
8 size="small" 8 size="small"
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 + <!-- 运单号 -->
12 + <el-col :span="5">
13 + <Formitem label="物流运单编号" prop="logisticsWaybillNumber">
14 + <FormTextareaInput
15 + :formData="sreachFormData"
16 + dataKey="logisticsWaybillNumber"
17 + @formChange="formChange"
18 + />
19 + </Formitem>
20 + </el-col>
11 <!-- 提运单号 --> 21 <!-- 提运单号 -->
12 <el-col :span="5"> 22 <el-col :span="5">
13 <Formitem label="提运单号" prop="billNo"> 23 <Formitem label="提运单号" prop="billNo">
...@@ -46,16 +56,6 @@ ...@@ -46,16 +56,6 @@
46 </el-select> 56 </el-select>
47 </Formitem> 57 </Formitem>
48 </el-col> 58 </el-col>
49 - <!-- 运单号 -->
50 - <el-col :span="5">
51 - <Formitem label="物流运单编号" prop="logisticsWaybillNumber">
52 - <FormTextareaInput
53 - :formData="sreachFormData"
54 - dataKey="logisticsWaybillNumber"
55 - @formChange="formChange"
56 - />
57 - </Formitem>
58 - </el-col>
59 <!-- 创建时间 --> 59 <!-- 创建时间 -->
60 <el-col :span="5"> 60 <el-col :span="5">
61 <Formitem label="创建时间" prop="createTime" :activeType="true"> 61 <Formitem label="创建时间" prop="createTime" :activeType="true">
......