Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
37684659 1 parent 76217385

feat: 修改字段和优化BUG

Inline Side-by-side
Showing 4 changed files with 69 additions and 62 deletions
...@@ -9,20 +9,6 @@ ...@@ -9,20 +9,6 @@
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 <!-- 提运单号、监管场经营人代码、监管场所经营人名称、创建时间、回执状态 --> 11 <!-- 提运单号、监管场经营人代码、监管场所经营人名称、创建时间、回执状态 -->
12 - <!-- 提运单号 -->
13 - <el-col :span="5">
14 - <Formitem label="提运单号" prop="billNo">
15 - <el-input
16 - type="text"
17 - class="inputShadow"
18 - id="inputInner--billNo"
19 - resize="none"
20 - v-model="sreachFormData.billNo"
21 - clearable
22 - placeholder=""
23 - ></el-input>
24 - </Formitem>
25 - </el-col>
26 <!-- 选择口岸 --> 12 <!-- 选择口岸 -->
27 <el-col :span="5"> 13 <el-col :span="5">
28 <Formitem label="口岸" prop="dataSource" :activeType="activePortType"> 14 <Formitem label="口岸" prop="dataSource" :activeType="activePortType">
...@@ -46,6 +32,21 @@ ...@@ -46,6 +32,21 @@
46 </el-select> 32 </el-select>
47 </Formitem> 33 </Formitem>
48 </el-col> 34 </el-col>
35 + <!-- 提运单号 -->
36 + <el-col :span="5">
37 + <Formitem label="提运单号" prop="billNo">
38 + <el-input
39 + type="text"
40 + class="inputShadow"
41 + id="inputInner--billNo"
42 + resize="none"
43 + v-model="sreachFormData.billNo"
44 + clearable
45 + placeholder=""
46 + ></el-input>
47 + </Formitem>
48 + </el-col>
49 +
49 <!-- 回执状态 --> 50 <!-- 回执状态 -->
50 <el-col :span="5"> 51 <el-col :span="5">
51 <Formitem label="回执状态" prop="receiptStatus"> 52 <Formitem label="回执状态" prop="receiptStatus">
......
...@@ -90,13 +90,13 @@ ...@@ -90,13 +90,13 @@
90 <el-row> 90 <el-row>
91 <!-- 电商企业代码 --> 91 <!-- 电商企业代码 -->
92 <el-col :span="5"> 92 <el-col :span="5">
93 - <Formitem label="电商平台代码" prop="ebpcode"> 93 + <Formitem label="电商企业名称" prop="ebcName">
94 <el-input 94 <el-input
95 type="text" 95 type="text"
96 class="inputShadow" 96 class="inputShadow"
97 - id="inputInner--ebpcode" 97 + id="inputInner--ebcName"
98 resize="none" 98 resize="none"
99 - v-model="sreachFormData.ebpcode" 99 + v-model="sreachFormData.ebcName"
100 clearable 100 clearable
101 placeholder="" 101 placeholder=""
102 ></el-input> 102 ></el-input>
...@@ -252,7 +252,7 @@ export default { ...@@ -252,7 +252,7 @@ export default {
252 customDialogShow: false, 252 customDialogShow: false,
253 sreachFormData: { 253 sreachFormData: {
254 billNo: "", 254 billNo: "",
255 - ebpcode: "", 255 + ebcName: "",
256 invtNo: "", 256 invtNo: "",
257 logisticsNo: [], 257 logisticsNo: [],
258 orderNo: "", 258 orderNo: "",
...@@ -300,14 +300,14 @@ export default { ...@@ -300,14 +300,14 @@ export default {
300 align: "left", 300 align: "left",
301 }, 301 },
302 { 302 {
303 - name: "电商平台代码", 303 + name: "电商企业代码",
304 - value: "ebpcode", 304 + value: "ebccode",
305 width: "", 305 width: "",
306 align: "left", 306 align: "left",
307 }, 307 },
308 { 308 {
309 - name: "电商平台名称", 309 + name: "电商企业名称",
310 - value: "ebpname", 310 + value: "ebcname",
311 width: "", 311 width: "",
312 align: "left", 312 align: "left",
313 }, 313 },
...@@ -428,6 +428,7 @@ export default { ...@@ -428,6 +428,7 @@ export default {
428 ebccode: "", 428 ebccode: "",
429 returnStatus: "", 429 returnStatus: "",
430 createTime: [], 430 createTime: [],
431 + ebcName: "",
431 }; 432 };
432 }, 433 },
433 //导出 434 //导出
......
...@@ -9,6 +9,33 @@ ...@@ -9,6 +9,33 @@
9 size="small" 9 size="small"
10 > 10 >
11 <el-row class="row-border"> 11 <el-row class="row-border">
12 + <!-- 选择口岸 -->
13 + <el-col :span="5">
14 + <Formitem
15 + label="口岸"
16 + prop="dataSource"
17 + :activeType="activePortType"
18 + >
19 + <el-select
20 + type="text"
21 + id="inputInner--dataSource"
22 + v-model="sreachFormData.dataSource"
23 + clearable
24 + multiple
25 + placeholder=""
26 + @visible-change="portChange"
27 + @remove-tag="removePort"
28 + @clear="clearPort"
29 + >
30 + <el-option
31 + v-for="(item, index) in portList"
32 + :key="index"
33 + :label="item.portName"
34 + :value="item.portCode"
35 + ></el-option>
36 + </el-select>
37 + </Formitem>
38 + </el-col>
12 <!-- 提运单号 --> 39 <!-- 提运单号 -->
13 <el-col :span="5"> 40 <el-col :span="5">
14 <Formitem label="提运单号" prop="billNo"> 41 <Formitem label="提运单号" prop="billNo">
...@@ -48,22 +75,6 @@ ...@@ -48,22 +75,6 @@
48 </Formitem> 75 </Formitem>
49 </el-col> 76 </el-col>
50 77
51 - <!-- 创建时间 -->
52 - <el-col :span="5">
53 - <Formitem label="创建时间" prop="createTime" :activeType="true">
54 - <el-date-picker
55 - class="inputInner--createTime"
56 - id="inputInner--createTime"
57 - v-model="sreachFormData.createTime"
58 - type="daterange"
59 - format="yyyy-MM-dd"
60 - prefix-icon="none"
61 - value-format="yyyy-MM-dd"
62 - range-separator="至"
63 - @change="dateChange"
64 - />
65 - </Formitem>
66 - </el-col>
67 <el-col :span="2"> 78 <el-col :span="2">
68 <el-form-item class="textCenter"> 79 <el-form-item class="textCenter">
69 <el-button 80 <el-button
...@@ -89,31 +100,20 @@ ...@@ -89,31 +100,20 @@
89 </el-col> 100 </el-col>
90 </el-row> 101 </el-row>
91 <el-row class="backgroundRow"> 102 <el-row class="backgroundRow">
92 - <!-- 选择口岸 --> 103 + <!-- 创建时间 -->
93 <el-col :span="5"> 104 <el-col :span="5">
94 - <Formitem 105 + <Formitem label="创建时间" prop="createTime" :activeType="true">
95 - label="口岸" 106 + <el-date-picker
96 - prop="dataSource" 107 + class="inputInner--createTime"
97 - :activeType="activePortType" 108 + id="inputInner--createTime"
98 - > 109 + v-model="sreachFormData.createTime"
99 - <el-select 110 + type="daterange"
100 - type="text" 111 + format="yyyy-MM-dd"
101 - id="inputInner--dataSource" 112 + prefix-icon="none"
102 - v-model="sreachFormData.dataSource" 113 + value-format="yyyy-MM-dd"
103 - clearable 114 + range-separator="至"
104 - multiple 115 + @change="dateChange"
105 - placeholder="" 116 + />
106 - @visible-change="portChange"
107 - @remove-tag="removePort"
108 - @clear="clearPort"
109 - >
110 - <el-option
111 - v-for="(item, index) in portList"
112 - :key="index"
113 - :label="item.portName"
114 - :value="item.portCode"
115 - ></el-option>
116 - </el-select>
117 </Formitem> 117 </Formitem>
118 </el-col> 118 </el-col>
119 <el-col :span="5"> 119 <el-col :span="5">
......
...@@ -167,6 +167,11 @@ export default { ...@@ -167,6 +167,11 @@ export default {
167 }, 167 },
168 //数据保存 168 //数据保存
169 submit() { 169 submit() {
170 + if (this.tableSelected.length < 1) {
171 + this.msgError("请选择数据");
172 + return;
173 + }
174 +
170 declareSummaryApplication({ 175 declareSummaryApplication({
171 ...this.selected, 176 ...this.selected,
172 logisticsNos: this.tableSelected.map((item) => item.logisticsNo), 177 logisticsNos: this.tableSelected.map((item) => item.logisticsNo),
......