Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
01b69f13 1 parent 7976b2aa

feat: 新增hscode

Inline Side-by-side
Showing 2 changed files with 53 additions and 165 deletions
...@@ -22,3 +22,32 @@ export function getExportArrivalInDetails({ id }) { ...@@ -22,3 +22,32 @@ export function getExportArrivalInDetails({ id }) {
22 method: "get", 22 method: "get",
23 }); 23 });
24 } 24 }
25 +
26 +// /hsCodeMgr/getHsCodeList
27 +export function getHsCodeList(data) {
28 + return request({
29 + url: "/bus-customer/hsCodeMgr/getHsCodeList",
30 + method: "post",
31 + data: data,
32 + });
33 +}
34 +
35 +// GET
36 +// ​/hsCodeMgr​/hsCodeIncr
37 +// 增量数据同步
38 +export function getHsCodeIncr() {
39 + return request({
40 + url: "/bus-customer/hsCodeMgr/hsCodeIncr",
41 + method: "get",
42 + });
43 +}
44 +
45 +// GET
46 +// ​/hsCodeMgr​/singleSync​/{id}
47 +// 单条hsCode同步更新;
48 +export function getHsCodeSingleSync({ id }) {
49 + return request({
50 + url: `/bus-customer/hsCodeMgr/singleSync/${id}`,
51 + method: "get",
52 + });
53 +}
......
...@@ -9,26 +9,26 @@ ...@@ -9,26 +9,26 @@
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 <el-col :span="5"> 11 <el-col :span="5">
12 - <Formitem label="商品编号" prop="billNo"> 12 + <Formitem label="商品编号" prop="skuCode">
13 <el-input 13 <el-input
14 type="text" 14 type="text"
15 class="inputShadow" 15 class="inputShadow"
16 - id="inputInner--billNo" 16 + id="inputInner--skuCode"
17 resize="none" 17 resize="none"
18 - v-model="sreachFormData.billNo" 18 + v-model="sreachFormData.skuCode"
19 clearable 19 clearable
20 placeholder="" 20 placeholder=""
21 ></el-input> 21 ></el-input>
22 </Formitem> 22 </Formitem>
23 </el-col> 23 </el-col>
24 <el-col :span="5"> 24 <el-col :span="5">
25 - <Formitem label="商品名称" prop="operatorCode"> 25 + <Formitem label="商品名称" prop="skuname">
26 <el-input 26 <el-input
27 type="text" 27 type="text"
28 class="inputShadow" 28 class="inputShadow"
29 - id="inputInner--operatorCode" 29 + id="inputInner--skuname"
30 resize="none" 30 resize="none"
31 - v-model="sreachFormData.operatorCode" 31 + v-model="sreachFormData.skuname"
32 clearable 32 clearable
33 placeholder="" 33 placeholder=""
34 ></el-input> 34 ></el-input>
...@@ -112,53 +112,6 @@ ...@@ -112,53 +112,6 @@
112 @tableSelectAll="tableSelectAll" 112 @tableSelectAll="tableSelectAll"
113 :selected="selected" 113 :selected="selected"
114 > 114 >
115 - <template v-slot:billNo="scope">
116 - <el-button type="text" @click.stop="linkChange(scope)">
117 - {{ scope.row.billNo }}
118 - </el-button>
119 - </template>
120 - <!-- <template v-slot:listReceiptStatus="scope">
121 - <TablePopover
122 - ref="listReceiptStatusPopover"
123 - dataKey="listReceiptStatus"
124 - idKey="declareId"
125 - :parentDom="$refs.entryTable"
126 - :receiptDataHead="receiptDataHead"
127 - :rowData="scope.row"
128 - :tableData="tableData"
129 - @popoverChange="popoverChange"
130 - @popoverClose="popoverClose"
131 - >
132 - <div slot="title">
133 - <span style="font-weight: 700; color: #515a6e">订单编号：</span
134 - >{{ scope.row.orderno }}
135 - </div>
136 - <div slot="buttonLabel">
137 - {{ scope.row.listReceiptStatus }}
138 - </div>
139 - </TablePopover>
140 - </template> -->
141 - <!-- <template v-slot:arrivalInReceiptStatus="scope">
142 - <TablePopover
143 - ref="arrivalInReceiptStatusPopover"
144 - dataKey="arrivalInReceiptStatus"
145 - idKey="declareId"
146 - :parentDom="$refs.entryTable"
147 - :receiptDataHead="receiptDataHead"
148 - :rowData="scope.row"
149 - :tableData="tableData"
150 - @popoverChange="popoverChange"
151 - @popoverClose="popoverClose"
152 - >
153 - <div slot="title">
154 - <span style="font-weight: 700; color: #515a6e">提运单号：</span
155 - >{{ scope.row.billNo }}
156 - </div>
157 - <div slot="buttonLabel">
158 - {{ scope.row.arrivalInReceiptStatus }}
159 - </div>
160 - </TablePopover>
161 - </template> -->
162 </Table> 115 </Table>
163 <DialogVue 116 <DialogVue
164 :outerVisible="outerVisible" 117 :outerVisible="outerVisible"
...@@ -169,7 +122,7 @@ ...@@ -169,7 +122,7 @@
169 </template> 122 </template>
170 123
171 <script> 124 <script>
172 -import { getArrivalIneList, arrivalInReceipt } from "@/api/declareData-api.js"; 125 +import { getHsCodeList } from "@/api/arrivalList-api.js";
173 import DialogVue from "./dialog.vue"; 126 import DialogVue from "./dialog.vue";
174 export default { 127 export default {
175 name: "SupervisePlaceManage", 128 name: "SupervisePlaceManage",
...@@ -178,17 +131,10 @@ export default { ...@@ -178,17 +131,10 @@ export default {
178 }, 131 },
179 data() { 132 data() {
180 return { 133 return {
181 - // 控制日志弹窗的显示和隐藏
182 - allLogDataReceiptStatusPopoverType: false,
183 - // 存储选中的日志数据
184 - selectedLogRow: {},
185 selected: [], 134 selected: [],
186 sreachFormData: { 135 sreachFormData: {
187 - billNo: "", 136 + skuCode: "",
188 - operatorCode: "", 137 + skuname: "",
189 - operatorName: "",
190 - receiptStatus: null,
191 - receiptType: null,
192 createTime: [], 138 createTime: [],
193 }, 139 },
194 page: { 140 page: {
...@@ -201,44 +147,43 @@ export default { ...@@ -201,44 +147,43 @@ export default {
201 headerData: [ 147 headerData: [
202 { 148 {
203 name: "序号", 149 name: "序号",
204 - value: "billNo", 150 + value: "gnum",
205 width: "", 151 width: "",
206 align: "left", 152 align: "left",
207 - slot: true,
208 }, 153 },
209 { 154 {
210 name: "商品编号", 155 name: "商品编号",
211 - value: "operatorCode", 156 + value: "skuCode",
212 width: "", 157 width: "",
213 align: "left", 158 align: "left",
214 }, 159 },
215 { 160 {
216 name: "商品名称", 161 name: "商品名称",
217 - value: "operatorName", 162 + value: "skuname",
218 width: "", 163 width: "",
219 align: "left", 164 align: "left",
220 }, 165 },
221 { 166 {
222 name: "申报要素", 167 name: "申报要素",
223 - value: "ecomEntName", 168 + value: "declarationElement",
224 width: "", 169 width: "",
225 align: "left", 170 align: "left",
226 }, 171 },
227 { 172 {
228 name: "第一法定单位", 173 name: "第一法定单位",
229 - value: "createTime", 174 + value: "unitLegalFirst",
230 width: "", 175 width: "",
231 align: "left", 176 align: "left",
232 }, 177 },
233 { 178 {
234 name: "第二法定单位", 179 name: "第二法定单位",
235 - value: "listReceiptStatus", 180 + value: "unitLegalSecond",
236 width: "", 181 width: "",
237 align: "left", 182 align: "left",
238 }, 183 },
239 { 184 {
240 name: "更新时间", 185 name: "更新时间",
241 - value: "arrivalInReceiptStatus", 186 + value: "updateTime",
242 width: "", 187 width: "",
243 align: "left", 188 align: "left",
244 }, 189 },
...@@ -255,11 +200,7 @@ export default { ...@@ -255,11 +200,7 @@ export default {
255 this.search(0); 200 this.search(0);
256 this.calculateTableHeight(); 201 this.calculateTableHeight();
257 }, 202 },
258 - watch: { 203 + watch: {},
259 - $route(val, oldval) {
260 - this.popoverClose();
261 - },
262 - },
263 204
264 mounted() { 205 mounted() {
265 window.addEventListener("resize", this.calculateTableHeight); 206 window.addEventListener("resize", this.calculateTableHeight);
...@@ -268,15 +209,6 @@ export default { ...@@ -268,15 +209,6 @@ export default {
268 window.removeEventListener("resize", this.calculateTableHeight); 209 window.removeEventListener("resize", this.calculateTableHeight);
269 }, 210 },
270 methods: { 211 methods: {
271 - // 运单号跳转
272 - linkChange(record) {
273 - const { billNo } = record.row;
274 - console.log(record);
275 - this.$router.push({
276 - path: "/reportingData",
277 - query: { billNo, search: true },
278 - });
279 - },
280 tableSelect(val) { 212 tableSelect(val) {
281 this.selected = val.selection; 213 this.selected = val.selection;
282 }, 214 },
...@@ -291,85 +223,17 @@ export default { ...@@ -291,85 +223,17 @@ export default {
291 }); 223 });
292 } 224 }
293 }, 225 },
294 - popoverClose(val) { 226 +
295 - this.tableData.forEach((item) => {
296 - item.listReceiptStatusPopoverType = false;
297 - item.arrivalInReceiptStatusPopoverType = false;
298 - item.popoverData = [];
299 - });
300 - this.selectedLogRow.allLogDataReceiptStatusPopoverType = false;
301 - this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
302 - "auto";
303 - },
304 calculateTableHeight() { 227 calculateTableHeight() {
305 this.tableMaxheight = window.innerHeight - 300; 228 this.tableMaxheight = window.innerHeight - 300;
306 }, 229 },
307 - //查询回执
308 - receiptApi(billNo, type) {
309 - return new Promise((resolve, reject) => {
310 - let obj = { billNo };
311 - // if (type == "listReceiptStatus") {
312 - // getListReceipt(obj)
313 - // .then((res) => {
314 - // if (res.code === "200") {
315 - // resolve(res.data);
316 - // } else {
317 - // reject();
318 - // }
319 - // })
320 - // .catch((err) => {
321 - // console.log(err);
322 - // reject();
323 - // });
324 - // } else
325 - if (type == "arrivalInReceiptStatus") {
326 - arrivalInReceipt(obj)
327 - .then((res) => {
328 - if (res.code === "200") {
329 - resolve(res.data);
330 - } else {
331 - reject();
332 - }
333 - })
334 - .catch((err) => {
335 - console.log(err);
336 - reject();
337 - });
338 - }
339 - });
340 - },
341 - popoverChange(val) {
342 - this.tableData = val.tableData;
343 -
344 - console.log(val);
345 -
346 - this.receiptApi(val.data.billNo, val.status)
347 - .then((res) => {
348 - val.tableData.forEach((item) => {
349 - if (item.declareId == val.data.declareId) {
350 - item.popoverData = res;
351 - }
352 - });
353 - this.tableData = val.tableData;
354 - })
355 - .finally(() => {
356 - this.$nextTick(() => {
357 - this.$store.dispatch("setLoadingState", false);
358 - this.$refs.listReceiptStatusPopover.tableLoading = false; // 清单回执
359 - this.$refs.arrivalInReceiptStatusPopover.tableLoading = false; //运抵单回执
360 - });
361 - });
362 - },
363 230
364 clear() { 231 clear() {
365 this.$refs.sreachForm.resetFields(); 232 this.$refs.sreachForm.resetFields();
366 //重置数据 233 //重置数据
367 this.sreachFormData = { 234 this.sreachFormData = {
368 - billNo: "", 235 + skuCode: "",
369 - operatorCode: "", 236 + skuname: "",
370 - operatorName: "",
371 - receiptStatus: null,
372 - receiptType: null,
373 createTime: [], 237 createTime: [],
374 }; 238 };
375 }, 239 },
...@@ -389,22 +253,17 @@ export default { ...@@ -389,22 +253,17 @@ export default {
389 obj.startCreateTime = obj.createTime[0]; 253 obj.startCreateTime = obj.createTime[0];
390 obj.endCreateTime = obj.createTime[1]; 254 obj.endCreateTime = obj.createTime[1];
391 } 255 }
392 - getArrivalIneList({ 256 + getHsCodeList({
393 - // isOnlySearchArrivalIn: true,
394 ...obj, 257 ...obj,
395 }) 258 })
396 .then((res) => { 259 .then((res) => {
397 if (res.code === "200") { 260 if (res.code === "200") {
398 this.tableData = res.data.value; 261 this.tableData = res.data.value;
399 this.page.total = res.data.totalItems; 262 this.page.total = res.data.totalItems;
400 - this.tableData.forEach((item, idx) => { 263 + this.tableData.map((item, index) => {
401 - item.index = idx; 264 + item.gnum = index + 1;
402 - item.listReceiptStatusPopoverType = false; // 清单回执 265 + return item;
403 - item.arrivalInReceiptStatusPopoverType = false; // 运抵单回执
404 - // item.logLoading = false;
405 - item.popoverData = [];
406 }); 266 });
407 - this.selectedLogRow.allLogDataReceiptStatusPopoverType = false;
408 } else { 267 } else {
409 this.alertWarningMsg(res.message); 268 this.alertWarningMsg(res.message);
410 } 269 }
......