Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
32c89bdc 1 parent 23a939a1

字典增加，字段修改

Inline Side-by-side
Showing 22 changed files with 479 additions and 193 deletions
...@@ -7,7 +7,7 @@ import request from '@/utils/request' ...@@ -7,7 +7,7 @@ import request from '@/utils/request'
7 * @param ecomEntEmail 电商企业邮箱 7 * @param ecomEntEmail 电商企业邮箱
8 * @param ecomEntName 电商企业名称 8 * @param ecomEntName 电商企业名称
9 * @param endCreationTime 结束创建时间 9 * @param endCreationTime 结束创建时间
10 - * @param startCreationTime开始创建时间 10 + * @param startCreationTime 开始创建时间
11 * @param pageIndex * 11 * @param pageIndex *
12 * @param pageSize * 12 * @param pageSize *
13 */ 13 */
...@@ -18,3 +18,71 @@ export function getCustomerList(data) { ...@@ -18,3 +18,71 @@ export function getCustomerList(data) {
18 data: data 18 data: data
19 }) 19 })
20 } 20 }
21 +
22 +// 新增客户数据
23 +/**
24 + * @param beijingDxpid 北京DXPID
25 + * @param certificare 证书
26 + * @param clientId 客户ID
27 + * @param ecomEntCode * 电商企业代码
28 + * @param ecomEntEmail 电商企业邮箱
29 + * @param ecomEntName * 电商企业名称
30 + * @param orderRequester 订单申报方
31 + * @param qingdaoDanyiUserDxpid 青岛单一用户DXPID
32 + * @param qingdaoKey 青岛密钥
33 + * @param qingdaoUserDxpid 青岛用户DXPID
34 + * @param qingdaoUserId 青岛用户ID
35 + */
36 +export function addCustomerData(data) {
37 + let formData = new FormData
38 + formData.append("beijingDxpid", data.beijingDxpid);
39 + formData.append("certificare", data.certificare);
40 + formData.append("clientId", data.clientId);
41 + formData.append("ecomEntCode", data.ecomEntCode);
42 + formData.append("ecomEntEmail", data.ecomEntEmail);
43 + formData.append("orderRequester", data.orderRequester);
44 + formData.append("qingdaoDanyiUserDxpid", data.qingdaoDanyiUserDxpid);
45 + formData.append("qingdaoKey", data.qingdaoKey);
46 + formData.append("qingdaoUserDxpid", data.qingdaoUserDxpid);
47 + formData.append("qingdaoUserId", data.qingdaoUserId);
48 + return request({
49 + url: '/bus-customer/customers/add',
50 + method: 'post',
51 + data: formData
52 + })
53 +}
54 +
55 +// 修改客户数据
56 +/**
57 + * @param id *
58 + * @param beijingDxpid 北京DXPID
59 + * @param certificare 证书
60 + * @param clientId * 客户ID
61 + * @param ecomEntCode * 电商企业代码
62 + * @param ecomEntEmail 电商企业邮箱
63 + * @param ecomEntName * 电商企业名称
64 + * @param orderRequester 订单申报方
65 + * @param qingdaoDanyiUserDxpid 青岛单一用户DXPID
66 + * @param qingdaoKey 青岛密钥
67 + * @param qingdaoUserDxpid 青岛用户DXPID
68 + * @param qingdaoUserId 青岛用户ID
69 + */
70 +export function updateCustomerData(data) {
71 + let formData = new FormData
72 + formData.append("id", data.id);
73 + formData.append("beijingDxpid", data.beijingDxpid);
74 + formData.append("certificare", data.certificare);
75 + formData.append("clientId", data.clientId);
76 + formData.append("ecomEntCode", data.ecomEntCode);
77 + formData.append("ecomEntEmail", data.ecomEntEmail);
78 + formData.append("orderRequester", data.orderRequester);
79 + formData.append("qingdaoDanyiUserDxpid", data.qingdaoDanyiUserDxpid);
80 + formData.append("qingdaoKey", data.qingdaoKey);
81 + formData.append("qingdaoUserDxpid", data.qingdaoUserDxpid);
82 + formData.append("qingdaoUserId", data.qingdaoUserId);
83 + return request({
84 + url: '/bus-customer/customers/update',
85 + method: 'put',
86 + data: formData
87 + })
88 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,18 @@ import request from '@/utils/request' ...@@ -2,6 +2,18 @@ import request from '@/utils/request'
2 2
3 //获取物流企业代码 3 //获取物流企业代码
4 /** 4 /**
5 + * @param doctCode
6 + */
7 +export function getDictData(data) {
8 + return request({
9 + url: '/bus-customer/SysDictItem/getDictItemByDictCode',
10 + method: 'get',
11 + params: data
12 + })
13 +}
14 +
15 +//获取物流企业代码
16 +/**
5 * @param 17 * @param
6 */ 18 */
7 export function getLogisticsCodeList(data) { 19 export function getLogisticsCodeList(data) {
......
...@@ -203,6 +203,10 @@ ...@@ -203,6 +203,10 @@
203 203
204 span { 204 span {
205 color: $fedexButton!important ; 205 color: $fedexButton!important ;
206 +
207 + svg {
208 + color: $fedexButton!important ;
209 + }
206 } 210 }
207 } 211 }
208 212
......
...@@ -23,7 +23,7 @@ router.beforeEach((to, from, next) => { ...@@ -23,7 +23,7 @@ router.beforeEach((to, from, next) => {
23 store.dispatch('GetInfo').then((res) => { 23 store.dispatch('GetInfo').then((res) => {
24 // if (res.success) { 24 // if (res.success) {
25 store.dispatch('GenerateRoutes').then(accessRoutes => { 25 store.dispatch('GenerateRoutes').then(accessRoutes => {
26 - store.dispatch("GetDict"); 26 + store.dispatch("GetDict", ['DECLARE_F_FLAG', 'MEASUREMENT_UNIT', 'RECEIPT_STATUS', 'DECLARE_APPTYPE', 'CURRENCY', 'DECLARE_STATISTICS_FLAG', 'ORDER_DECLARATION_PARTY']);
27 // 根据roles权限生成可访问的路由表 27 // 根据roles权限生成可访问的路由表
28 router.addRoutes(accessRoutes) // 动态添加可访问路由表 28 router.addRoutes(accessRoutes) // 动态添加可访问路由表
29 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 29 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
......
1 import { login, logout } from '@/api/login' 1 import { login, logout } from '@/api/login'
2 -import { getLogisticsCodeList } from '@/api/system/dict-api.js' 2 +import { getLogisticsCodeLis, getDictData } from '@/api/system/dict-api.js'
3 import { getToken, setToken, removeToken, removeUserId, removeTime } from '@/utils/auth' 3 import { getToken, setToken, removeToken, removeUserId, removeTime } from '@/utils/auth'
4 import { alertWarningMsg } from '@/utils/index.js' 4 import { alertWarningMsg } from '@/utils/index.js'
5 5
...@@ -19,7 +19,9 @@ const user = { ...@@ -19,7 +19,9 @@ const user = {
19 id: null, 19 id: null,
20 status: 0, 20 status: 0,
21 }, 21 },
22 - dict: {}, 22 + dict: {
23 + DECLARE_TRAFMODE: [{ itemCode: 'DECLARE_TRAFMODE_AVIATION', itemChineseName: '航空运输', itemValue: '5' }]
24 + },
23 dictWit: ['H2000Account'], 25 dictWit: ['H2000Account'],
24 loading: { 26 loading: {
25 type: false, 27 type: false,
...@@ -126,16 +128,29 @@ const user = { ...@@ -126,16 +128,29 @@ const user = {
126 }, 128 },
127 129
128 //获取字典数据 130 //获取字典数据
129 - async GetDict({ commit, state }) { 131 + async GetDict({ commit, state }, codeList) {
130 let obj = state.dict 132 let obj = state.dict
131 - new Promise((resolve, reject) => { 133 + codeList.forEach((item, idx) => {
132 - getLogisticsCode().then(res => { 134 + if (obj[item] == undefined || obj[item].length == 0) {
133 - obj.LogisticsCode = res 135 + obj[item] = []
136 + getDictData({ doctCode: item }).then(res => {
137 + if (res.code === '200') {
138 + obj[item] = res.data
139 + }
140 + }).catch(err => {
141 + console.log(err);
134 }).finally(() => { 142 }).finally(() => {
135 - resolve() 143 + if (idx == codeList.length - 1) {
144 + console.log(obj);
145 + commit('SET_DICT', obj)
146 + }
136 }) 147 })
137 - }).then(() => { 148 + } else {
149 + if (idx == codeList.length - 1) {
150 + console.log(obj);
138 commit('SET_DICT', obj) 151 commit('SET_DICT', obj)
152 + }
153 + }
139 }) 154 })
140 }, 155 },
141 156
......
...@@ -19,11 +19,13 @@ ...@@ -19,11 +19,13 @@
19 :expandRowKeys="expandRowKeys" 19 :expandRowKeys="expandRowKeys"
20 > 20 >
21 <template v-slot:unit="scope"> 21 <template v-slot:unit="scope">
22 - <span>{{ selectDictLabel(scope.row.unit, "unit", "code") }}</span> 22 + <span>{{
23 + selectDictLabel(scope.row.unit, "MEASUREMENT_UNIT", "itemCode")
24 + }}</span>
23 </template> 25 </template>
24 <template v-slot:currency="scope"> 26 <template v-slot:currency="scope">
25 <span>{{ 27 <span>{{
26 - selectDictLabel(scope.row.currency, "currency", "value") 28 + selectDictLabel(scope.row.currency, "CURRENCY", "itemValue")
27 }}</span> 29 }}</span>
28 </template> 30 </template>
29 <!-- <template slot="optionColumn"> 31 <!-- <template slot="optionColumn">
...@@ -87,7 +89,7 @@ export default { ...@@ -87,7 +89,7 @@ export default {
87 }, 89 },
88 selectDictLabel(value, dictkey, key) { 90 selectDictLabel(value, dictkey, key) {
89 let str = value; 91 let str = value;
90 - this.dictData[dictkey].forEach((item) => { 92 + this.$store.getters.dict[dictkey].forEach((item) => {
91 if (value == item[key]) { 93 if (value == item[key]) {
92 str = item.name; 94 str = item.name;
93 } 95 }
......
...@@ -68,18 +68,18 @@ ...@@ -68,18 +68,18 @@
68 <el-row :gutter="5"> 68 <el-row :gutter="5">
69 <!-- 订单申报方 --> 69 <!-- 订单申报方 -->
70 <el-col :span="8"> 70 <el-col :span="8">
71 - <Formitem label="订单申报方" prop="declarationUnit10" type="edit"> 71 + <Formitem label="订单申报方" prop="orderRequester" type="edit">
72 <el-select 72 <el-select
73 type="text" 73 type="text"
74 - id="inputInner--portCode" 74 + id="inputInner--orderRequester"
75 - v-model="sreachFormData.portCode" 75 + v-model="formData.orderRequester"
76 clearable 76 clearable
77 placeholder="" 77 placeholder=""
78 > 78 >
79 <el-option 79 <el-option
80 - v-for="(item, index) in dict.port" 80 + v-for="(item, index) in dict.orderRequester"
81 :key="index" 81 :key="index"
82 - :label="item" 82 + :label="item.name"
83 :value="item" 83 :value="item"
84 ></el-option> 84 ></el-option>
85 </el-select> 85 </el-select>
...@@ -87,11 +87,7 @@ ...@@ -87,11 +87,7 @@
87 </el-col> 87 </el-col>
88 <!-- DXPID --> 88 <!-- DXPID -->
89 <el-col :span="8"> 89 <el-col :span="8">
90 - <Formitem 90 + <Formitem label="DXPID" prop="qingdaoDanyiUserDxpid" type="edit">
91 - label="DXPID"
92 - prop="qingdaoDanyiUserDxpid"
93 - type="edit"
94 - >
95 <el-input 91 <el-input
96 type="text" 92 type="text"
97 class="inputShadow" 93 class="inputShadow"
...@@ -104,7 +100,9 @@ ...@@ -104,7 +100,9 @@
104 </Formitem> 100 </Formitem>
105 </el-col> 101 </el-col>
106 </el-row> 102 </el-row>
107 - <div>青岛</div> 103 + <div class="checkTitle">
104 + <el-checkbox v-model="formData.qdCheck"></el-checkbox>青岛
105 + </div>
108 <el-row :gutter="5"> 106 <el-row :gutter="5">
109 <!-- User ID --> 107 <!-- User ID -->
110 <el-col :span="8"> 108 <el-col :span="8">
...@@ -149,7 +147,9 @@ ...@@ -149,7 +147,9 @@
149 </Formitem> 147 </Formitem>
150 </el-col> 148 </el-col>
151 </el-row> 149 </el-row>
152 - <div>北京</div> 150 + <div class="checkTitle">
151 + <el-checkbox v-model="formData.bjCheck"></el-checkbox>北京
152 + </div>
153 <el-row :gutter="5"> 153 <el-row :gutter="5">
154 <!-- DXPID --> 154 <!-- DXPID -->
155 <el-col :span="8"> 155 <el-col :span="8">
...@@ -183,7 +183,6 @@ ...@@ -183,7 +183,6 @@
183 :auto-upload="true" 183 :auto-upload="true"
184 :show-file-list="false" 184 :show-file-list="false"
185 :data="{}" 185 :data="{}"
186 - accept=".xlsx"
187 :before-upload="beforeUpload" 186 :before-upload="beforeUpload"
188 :on-remove="handleRemove" 187 :on-remove="handleRemove"
189 :on-success="handleSuccess" 188 :on-success="handleSuccess"
...@@ -239,7 +238,10 @@ ...@@ -239,7 +238,10 @@
239 </template> 238 </template>
240 239
241 <script> 240 <script>
242 -import { addPortData, updatePortData } from "@/api/system/port-api.js"; 241 +import {
242 + addCustomerData,
243 + updateCustomerData,
244 +} from "@/api/system/customer-ai.js";
243 export default { 245 export default {
244 props: { 246 props: {
245 outerVisible: { 247 outerVisible: {
...@@ -248,7 +250,7 @@ export default { ...@@ -248,7 +250,7 @@ export default {
248 }, 250 },
249 title: { 251 title: {
250 type: String, 252 type: String,
251 - default: "新增口岸", 253 + default: "新增客户",
252 }, 254 },
253 type: { 255 type: {
254 type: String, 256 type: String,
...@@ -258,17 +260,33 @@ export default { ...@@ -258,17 +260,33 @@ export default {
258 type: Object, 260 type: Object,
259 default: null, 261 default: null,
260 }, 262 },
263 + dict: {
264 + type: Array,
265 + default() {
266 + return {
267 + orderRequester:[]
268 + };
269 + },
270 + },
261 }, 271 },
262 data() { 272 data() {
263 return { 273 return {
264 formData: { 274 formData: {
265 - declarationPortCode: "", 275 + id: null,
266 - declarationUnit10: "", 276 + beijingDxpid: "",
267 - declarationUnit10Inspection: "", 277 + certificare: "",
268 - declarationUnit18: "", 278 + clientId: "",
269 - declarationUnitCompanyName: "", 279 + ecomEntCode: "",
270 - dxpid: "", 280 + ecomEntEmail: "",
271 - portCode: "", 281 + ecomEntName: "",
282 + orderRequester: "",
283 + qingdaoDanyiUserDxpid: "",
284 + qingdaoKey: "",
285 + qingdaoUserDxpid: "",
286 + qingdaoUserId: "",
287 + qdCheck: false,
288 + bjCheck: false,
289 + file: null,
272 }, 290 },
273 rules: { 291 rules: {
274 portCode: [ 292 portCode: [
...@@ -343,6 +361,7 @@ export default { ...@@ -343,6 +361,7 @@ export default {
343 submitLoading: false, 361 submitLoading: false,
344 }, 362 },
345 loadingText: "", 363 loadingText: "",
364 + fileList: [],
346 }; 365 };
347 }, 366 },
348 watch: { 367 watch: {
...@@ -356,6 +375,42 @@ export default { ...@@ -356,6 +375,42 @@ export default {
356 }, 375 },
357 }, 376 },
358 methods: { 377 methods: {
378 + uploadFile() {
379 + this.$refs.uploadFile.$refs["upload-inner"].handleClick();
380 + },
381 + //文件校验
382 + beforeUpload(val) {
383 + // if (
384 + // val.type !=
385 + // "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
386 + // ) {
387 + // this.alertWarningMsg("请上传Excel文件！");
388 + // return false;
389 + // } else {
390 + return true;
391 + // }
392 + },
393 + fileUpload(val) {
394 + const reader = new FileReader();
395 + reader.readAsDataURL(val.file);
396 + reader.onload = (e) => {
397 + let obj = {
398 + file: e.target.result,
399 + name: val.file.name,
400 + };
401 + this.formData.file = obj;
402 + };
403 + },
404 + fileChange(val) {},
405 + handleSuccess() {},
406 + clearFile() {},
407 + handleRemove() {
408 + this.fileList = [];
409 + },
410 + //删除文件
411 + delTypeDFile() {
412 + this.formData.file = null;
413 + },
359 //查询用户信息详情 414 //查询用户信息详情
360 searchUserData(id) { 415 searchUserData(id) {
361 this.loadings.dialogLoading = true; 416 this.loadings.dialogLoading = true;
...@@ -433,14 +488,23 @@ export default { ...@@ -433,14 +488,23 @@ export default {
433 }, 488 },
434 close() { 489 close() {
435 this.formData = { 490 this.formData = {
436 - declarationPortCode: "", 491 + id: null,
437 - declarationUnit10: "", 492 + beijingDxpid: "",
438 - declarationUnit10Inspection: "", 493 + certificare: "",
439 - declarationUnit18: "", 494 + clientId: "",
440 - declarationUnitCompanyName: "", 495 + ecomEntCode: "",
441 - dxpid: "", 496 + ecomEntEmail: "",
442 - portCode: "", 497 + ecomEntName: "",
498 + orderRequester: "",
499 + qingdaoDanyiUserDxpid: "",
500 + qingdaoKey: "",
501 + qingdaoUserDxpid: "",
502 + qingdaoUserId: "",
503 + qdCheck: false,
504 + bjCheck: false,
505 + file: null,
443 }; 506 };
507 + this.handleRemove();
444 this.$emit("close"); 508 this.$emit("close");
445 }, 509 },
446 }, 510 },
...@@ -449,4 +513,76 @@ export default { ...@@ -449,4 +513,76 @@ export default {
449 513
450 <style lang="scss" scoped> 514 <style lang="scss" scoped>
451 @import "@/assets/styles/variables.scss"; 515 @import "@/assets/styles/variables.scss";
516 +.uploadItem {
517 + margin-bottom: 5px;
518 +
519 + .uploadbox {
520 + width: 100%;
521 + height: 40px;
522 + line-height: 20px;
523 + background-color: $formItemBackgroundColor;
524 + padding: 4px 8px;
525 + margin-top: 5px;
526 + display: flex;
527 + justify-content: space-between;
528 +
529 + .el-button {
530 + font-weight: 400 !important;
531 + }
532 + }
533 +}
534 +
535 +.fileList {
536 + width: 100%;
537 +
538 + .fileList-item {
539 + display: flex;
540 + justify-content: space-between;
541 + padding: 5px 15px 5px 5px;
542 + background-color: $formItemBackgroundColor;
543 + font-size: 14px;
544 +
545 + .uploadbox-fileName {
546 + display: flex;
547 + align-items: center;
548 + }
549 +
550 + .uploadbox-option {
551 + .fileSize {
552 + display: inline-block;
553 + color: #8e8e8e;
554 + font-size: 12px;
555 + }
556 + }
557 +
558 + .svg-icon {
559 + display: inline-block;
560 + color: $fedexError;
561 + }
562 +
563 + .text-tooltip {
564 + max-width: 500px;
565 + display: inline-block;
566 + margin-left: 10px;
567 + }
568 +
569 + .fileList-item-empty {
570 + display: inline-block;
571 + margin: 5px;
572 + height: max-content;
573 + color: #8e8e8e;
574 + }
575 + }
576 +}
577 +
578 +.checkTitle {
579 + font-weight: 600;
580 + font-size: 14px;
581 + color: #333 !important;
582 + margin: 5px;
583 + .el-checkbox {
584 + display: inline-block;
585 + margin-right: 10px;
586 + }
587 +}
452 </style> 588 </style>
......
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
157 :title="dialogTitle" 157 :title="dialogTitle"
158 :type="editType" 158 :type="editType"
159 :active="activeData" 159 :active="activeData"
160 + :dict="dict"
160 @close="dialogClose" 161 @close="dialogClose"
161 /> 162 />
162 </div> 163 </div>
...@@ -244,7 +245,10 @@ export default { ...@@ -244,7 +245,10 @@ export default {
244 }, 245 },
245 ], 246 ],
246 dict: { 247 dict: {
247 - port: [], 248 + orderRequester: [
249 + { name: "企业", code: "ENTERPRISE_DECLARATION", value: "1" },
250 + { name: "FEDEX", code: "FEDEX_DECLARATION", value: "2" },
251 + ],
248 }, 252 },
249 loadings: { 253 loadings: {
250 searchLoading: false, 254 searchLoading: false,
...@@ -319,12 +323,12 @@ export default { ...@@ -319,12 +323,12 @@ export default {
319 addCustomer() { 323 addCustomer() {
320 this.dialogTitle = "新增客户"; 324 this.dialogTitle = "新增客户";
321 this.editType = "add"; 325 this.editType = "add";
322 - // this.outerVisible = true; 326 + this.outerVisible = true;
323 }, 327 },
324 update(val) { 328 update(val) {
325 this.dialogTitle = "修改客户"; 329 this.dialogTitle = "修改客户";
326 this.editType = "update"; 330 this.editType = "update";
327 - // this.outerVisible = true; 331 + this.outerVisible = true;
328 this.activeData = val; 332 this.activeData = val;
329 }, 333 },
330 dialogClose() { 334 dialogClose() {
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
15 size="small" 15 size="small"
16 > 16 >
17 <el-row :gutter="5"> 17 <el-row :gutter="5">
18 + <!-- 订单编号 -->
18 <el-col :span="3"> 19 <el-col :span="3">
19 <Formitem label="订单编号" prop="orderNo"> 20 <Formitem label="订单编号" prop="orderNo">
20 <el-input 21 <el-input
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
28 ></el-input> 29 ></el-input>
29 </Formitem> 30 </Formitem>
30 </el-col> 31 </el-col>
32 + <!-- 订单类型 -->
31 <el-col :span="3"> 33 <el-col :span="3">
32 <Formitem label="订单类型" prop="orderType"> 34 <Formitem label="订单类型" prop="orderType">
33 <el-input 35 <el-input
...@@ -41,6 +43,7 @@ ...@@ -41,6 +43,7 @@
41 ></el-input> 43 ></el-input>
42 </Formitem> 44 </Formitem>
43 </el-col> 45 </el-col>
46 + <!-- 电商平台代码 -->
44 <el-col :span="3"> 47 <el-col :span="3">
45 <Formitem label="电商平台代码" prop="ebpcode"> 48 <Formitem label="电商平台代码" prop="ebpcode">
46 <el-input 49 <el-input
...@@ -54,6 +57,7 @@ ...@@ -54,6 +57,7 @@
54 ></el-input> 57 ></el-input>
55 </Formitem> 58 </Formitem>
56 </el-col> 59 </el-col>
60 + <!-- 电商平台名称 -->
57 <el-col :span="6"> 61 <el-col :span="6">
58 <Formitem label="电商平台名称" prop="ebpname"> 62 <Formitem label="电商平台名称" prop="ebpname">
59 <el-input 63 <el-input
...@@ -67,6 +71,7 @@ ...@@ -67,6 +71,7 @@
67 ></el-input> 71 ></el-input>
68 </Formitem> 72 </Formitem>
69 </el-col> 73 </el-col>
74 + <!-- 电商企业代码 -->
70 <el-col :span="3"> 75 <el-col :span="3">
71 <Formitem label="电商企业代码" prop="ebccode"> 76 <Formitem label="电商企业代码" prop="ebccode">
72 <el-input 77 <el-input
...@@ -80,6 +85,7 @@ ...@@ -80,6 +85,7 @@
80 ></el-input> 85 ></el-input>
81 </Formitem> 86 </Formitem>
82 </el-col> 87 </el-col>
88 + <!-- 电商企业 -->
83 <el-col :span="3"> 89 <el-col :span="3">
84 <Formitem label="电商企业" prop="ebcname"> 90 <Formitem label="电商企业" prop="ebcname">
85 <el-input 91 <el-input
...@@ -93,6 +99,7 @@ ...@@ -93,6 +99,7 @@
93 ></el-input> 99 ></el-input>
94 </Formitem> 100 </Formitem>
95 </el-col> 101 </el-col>
102 + <!-- 货款金额 -->
96 <el-col :span="3"> 103 <el-col :span="3">
97 <Formitem label="货款金额" prop="goodsValue"> 104 <Formitem label="货款金额" prop="goodsValue">
98 <el-input 105 <el-input
...@@ -108,6 +115,7 @@ ...@@ -108,6 +115,7 @@
108 </el-col> 115 </el-col>
109 </el-row> 116 </el-row>
110 <el-row :gutter="5"> 117 <el-row :gutter="5">
118 + <!-- 运杂费 -->
111 <el-col :span="3"> 119 <el-col :span="3">
112 <Formitem label="运杂费" prop="freight"> 120 <Formitem label="运杂费" prop="freight">
113 <el-input 121 <el-input
...@@ -121,6 +129,7 @@ ...@@ -121,6 +129,7 @@
121 ></el-input> 129 ></el-input>
122 </Formitem> 130 </Formitem>
123 </el-col> 131 </el-col>
132 + <!-- 币制 -->
124 <el-col :span="3"> 133 <el-col :span="3">
125 <Formitem label="币制" prop="currency"> 134 <Formitem label="币制" prop="currency">
126 <el-select 135 <el-select
...@@ -131,27 +140,15 @@ ...@@ -131,27 +140,15 @@
131 placeholder="" 140 placeholder=""
132 > 141 >
133 <el-option 142 <el-option
134 - v-for="(item, index) in dictData.currency" 143 + v-for="(item, index) in $store.getters.dict.CURRENCY"
135 :key="index" 144 :key="index"
136 - :label="item.name" 145 + :label="item.itemChineseName"
137 - :value="item.value" 146 + :value="item.itemValue"
138 ></el-option> 147 ></el-option>
139 </el-select> 148 </el-select>
140 </Formitem> 149 </Formitem>
141 </el-col> 150 </el-col>
142 - <!-- <el-col :span="3"> 151 + <!-- 申报类型 -->
143 - <Formitem label="回执状态" prop="returnStatus">
144 - <el-input
145 - type="text"
146 - class="inputShadow"
147 - id="inputInner--returnStatus"
148 - resize="none"
149 - v-model="formData.returnStatus"
150 - clearable
151 - placeholder=""
152 - ></el-input>
153 - </Formitem>
154 - </el-col> -->
155 <el-col :span="3"> 152 <el-col :span="3">
156 <Formitem label="申报类型" prop="appType"> 153 <Formitem label="申报类型" prop="appType">
157 <el-select 154 <el-select
...@@ -162,14 +159,16 @@ ...@@ -162,14 +159,16 @@
162 placeholder="" 159 placeholder=""
163 > 160 >
164 <el-option 161 <el-option
165 - v-for="(item, index) in dictData.appType" 162 + v-for="(item, index) in $store.getters.dict
163 + .DECLARE_STATISTICS_FLAG"
166 :key="index" 164 :key="index"
167 - :label="item.name" 165 + :label="item.itemChineseName"
168 - :value="item.value" 166 + :value="item.itemValue"
169 ></el-option> 167 ></el-option>
170 </el-select> 168 </el-select>
171 </Formitem> 169 </Formitem>
172 </el-col> 170 </el-col>
171 + <!-- 申报日期 -->
173 <el-col :span="3"> 172 <el-col :span="3">
174 <Formitem label="申报日期" prop="appTime"> 173 <Formitem label="申报日期" prop="appTime">
175 <el-input 174 <el-input
...@@ -183,6 +182,7 @@ ...@@ -183,6 +182,7 @@
183 ></el-input> 182 ></el-input>
184 </Formitem> 183 </Formitem>
185 </el-col> 184 </el-col>
185 + <!-- 备注 -->
186 <el-col :span="12"> 186 <el-col :span="12">
187 <Formitem label="备注" prop="note"> 187 <Formitem label="备注" prop="note">
188 <el-input 188 <el-input
......
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
43 placeholder="" 43 placeholder=""
44 > 44 >
45 <el-option 45 <el-option
46 - v-for="(item, index) in dictData.returnStatus" 46 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
47 :key="index" 47 :key="index"
48 - :label="item.name" 48 + :label="item.itemChineseName"
49 - :value="item.code" 49 + :value="item.itemCode"
50 ></el-option> 50 ></el-option>
51 </el-select> 51 </el-select>
52 </Formitem> 52 </Formitem>
...@@ -234,19 +234,19 @@ export default { ...@@ -234,19 +234,19 @@ export default {
234 receiptDataHead: [ 234 receiptDataHead: [
235 { 235 {
236 name: "回执状态", 236 name: "回执状态",
237 - value: "receiptStatus", 237 + value: "returnStatus",
238 - width: "", 238 + width: "120",
239 align: "left", 239 align: "left",
240 }, 240 },
241 { 241 {
242 name: "状态时间", 242 name: "状态时间",
243 - value: "statusTime", 243 + value: "returnTime",
244 width: "", 244 width: "",
245 align: "left", 245 align: "left",
246 }, 246 },
247 { 247 {
248 name: "回执描述", 248 name: "回执描述",
249 - value: "receiptDescription", 249 + value: "returnInfo",
250 width: "", 250 width: "",
251 align: "left", 251 align: "left",
252 }, 252 },
...@@ -333,7 +333,7 @@ export default { ...@@ -333,7 +333,7 @@ export default {
333 popoverChange(val) { 333 popoverChange(val) {
334 console.log(val); 334 console.log(val);
335 this.tableData = val.tableData; 335 this.tableData = val.tableData;
336 - this.receiptApi(val.data.declareId, val.status) 336 + this.receiptApi(val.data.id, val.status)
337 .then((res) => { 337 .then((res) => {
338 val.tableData.forEach((item) => { 338 val.tableData.forEach((item) => {
339 if (item.declareId == val.data.declareId) { 339 if (item.declareId == val.data.declareId) {
......
...@@ -167,12 +167,13 @@ ...@@ -167,12 +167,13 @@
167 clearable 167 clearable
168 placeholder="" 168 placeholder=""
169 > 169 >
170 - <!-- <el-option 170 + <el-option
171 - v-for="(item, index) in dictData.currency" 171 + v-for="(item, index) in $store.getters.dict
172 + .DECLARE_STATISTICS_FLAG"
172 :key="index" 173 :key="index"
173 - :label="item.name" 174 + :label="item.itemChineseName"
174 - :value="item.value" 175 + :value="item.itemValue"
175 - ></el-option> --> 176 + ></el-option>
176 </el-select> 177 </el-select>
177 </Formitem> 178 </Formitem>
178 </el-col> 179 </el-col>
...@@ -333,12 +334,12 @@ ...@@ -333,12 +334,12 @@
333 clearable 334 clearable
334 placeholder="" 335 placeholder=""
335 > 336 >
336 - <!-- <el-option 337 + <el-option
337 - v-for="(item, index) in dictData.currency" 338 + v-for="(item, index) in $store.getters.dict.DECLARE_TRAFMODE"
338 :key="index" 339 :key="index"
339 - :label="item.name" 340 + :label="item.itemChineseName"
340 - :value="item.value" 341 + :value="item.itemValue"
341 - ></el-option> --> 342 + ></el-option>
342 </el-select> 343 </el-select>
343 </Formitem> 344 </Formitem>
344 </el-col> 345 </el-col>
...@@ -455,15 +456,20 @@ ...@@ -455,15 +456,20 @@
455 <!-- 运费币制 --> 456 <!-- 运费币制 -->
456 <el-col :span="3"> 457 <el-col :span="3">
457 <Formitem label="运费币制" prop="fcurrency"> 458 <Formitem label="运费币制" prop="fcurrency">
458 - <el-input 459 + <el-select
459 type="text" 460 type="text"
460 - class="inputShadow"
461 id="inputInner--fcurrency" 461 id="inputInner--fcurrency"
462 - resize="none"
463 v-model="formData.fcurrency" 462 v-model="formData.fcurrency"
464 clearable 463 clearable
465 placeholder="" 464 placeholder=""
466 - ></el-input> 465 + >
466 + <el-option
467 + v-for="(item, index) in $store.getters.dict.CURRENCY"
468 + :key="index"
469 + :label="item.itemChineseName"
470 + :value="item.itemValue"
471 + ></el-option>
472 + </el-select>
467 </Formitem> 473 </Formitem>
468 </el-col> 474 </el-col>
469 </el-row> 475 </el-row>
...@@ -471,15 +477,20 @@ ...@@ -471,15 +477,20 @@
471 <!-- 运费标志 --> 477 <!-- 运费标志 -->
472 <el-col :span="3"> 478 <el-col :span="3">
473 <Formitem label="运费标志" prop="fflag"> 479 <Formitem label="运费标志" prop="fflag">
474 - <el-input 480 + <el-select
475 type="text" 481 type="text"
476 - class="inputShadow"
477 id="inputInner--fflag" 482 id="inputInner--fflag"
478 - resize="none"
479 v-model="formData.fflag" 483 v-model="formData.fflag"
480 clearable 484 clearable
481 placeholder="" 485 placeholder=""
482 - ></el-input> 486 + >
487 + <el-option
488 + v-for="(item, index) in $store.getters.dict.DECLARE_F_FLAG"
489 + :key="index"
490 + :label="item.itemChineseName"
491 + :value="item.itemValue"
492 + ></el-option>
493 + </el-select>
483 </Formitem> 494 </Formitem>
484 </el-col> 495 </el-col>
485 <!-- 保费 --> 496 <!-- 保费 -->
...@@ -499,29 +510,39 @@ ...@@ -499,29 +510,39 @@
499 <!-- 保费币制 --> 510 <!-- 保费币制 -->
500 <el-col :span="3"> 511 <el-col :span="3">
501 <Formitem label="保费币制" prop="icurrency"> 512 <Formitem label="保费币制" prop="icurrency">
502 - <el-input 513 + <el-select
503 type="text" 514 type="text"
504 - class="inputShadow"
505 id="inputInner--icurrency" 515 id="inputInner--icurrency"
506 - resize="none"
507 v-model="formData.icurrency" 516 v-model="formData.icurrency"
508 - clearable 517 + clearableF
509 placeholder="" 518 placeholder=""
510 - ></el-input> 519 + >
520 + <el-option
521 + v-for="(item, index) in $store.getters.dict.CURRENCY"
522 + :key="index"
523 + :label="item.itemChineseName"
524 + :value="item.itemValue"
525 + ></el-option>
526 + </el-select>
511 </Formitem> 527 </Formitem>
512 </el-col> 528 </el-col>
513 <!-- 保费标志 --> 529 <!-- 保费标志 -->
514 <el-col :span="3"> 530 <el-col :span="3">
515 <Formitem label="保费标志" prop="iflag"> 531 <Formitem label="保费标志" prop="iflag">
516 - <el-input 532 + <el-select
517 type="text" 533 type="text"
518 - class="inputShadow"
519 id="inputInner--iflag" 534 id="inputInner--iflag"
520 - resize="none"
521 v-model="formData.iflag" 535 v-model="formData.iflag"
522 clearable 536 clearable
523 placeholder="" 537 placeholder=""
524 - ></el-input> 538 + >
539 + <el-option
540 + v-for="(item, index) in $store.getters.dict.DECLARE_F_FLAG"
541 + :key="index"
542 + :label="item.itemChineseName"
543 + :value="item.itemValue"
544 + ></el-option>
545 + </el-select>
525 </Formitem> 546 </Formitem>
526 </el-col> 547 </el-col>
527 <!-- 件数/包裹件数 --> 548 <!-- 件数/包裹件数 -->
...@@ -585,29 +606,39 @@ ...@@ -585,29 +606,39 @@
585 <!-- 业务状态 --> 606 <!-- 业务状态 -->
586 <el-col :span="3"> 607 <el-col :span="3">
587 <Formitem label="回执状态" prop="returnStatus"> 608 <Formitem label="回执状态" prop="returnStatus">
588 - <el-input 609 + <el-select
589 type="text" 610 type="text"
590 - class="inputShadow"
591 id="inputInner--returnStatus" 611 id="inputInner--returnStatus"
592 - resize="none"
593 v-model="formData.returnStatus" 612 v-model="formData.returnStatus"
594 clearable 613 clearable
595 placeholder="" 614 placeholder=""
596 - ></el-input> 615 + >
616 + <el-option
617 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
618 + :key="index"
619 + :label="item.itemChineseName"
620 + :value="item.itemValue"
621 + ></el-option>
622 + </el-select>
597 </Formitem> 623 </Formitem>
598 </el-col> 624 </el-col>
599 <!-- 申报类型 --> 625 <!-- 申报类型 -->
600 <el-col :span="3"> 626 <el-col :span="3">
601 <Formitem label="申报类型" prop="appType"> 627 <Formitem label="申报类型" prop="appType">
602 - <el-input 628 + <el-select
603 type="text" 629 type="text"
604 - class="inputShadow"
605 id="inputInner--appType" 630 id="inputInner--appType"
606 - resize="none"
607 v-model="formData.appType" 631 v-model="formData.appType"
608 clearable 632 clearable
609 placeholder="" 633 placeholder=""
610 - ></el-input> 634 + >
635 + <el-option
636 + v-for="(item, index) in $store.getters.dict.DECLARE_STATISTICS_FLAGF"
637 + :key="index"
638 + :label="item.itemChineseName"
639 + :value="item.itemValue"
640 + ></el-option>
641 + </el-select>
611 </Formitem> 642 </Formitem>
612 </el-col> 643 </el-col>
613 <!-- 申报时间 --> 644 <!-- 申报时间 -->
...@@ -714,13 +745,13 @@ export default { ...@@ -714,13 +745,13 @@ export default {
714 }, 745 },
715 { 746 {
716 name: "商品编码", 747 name: "商品编码",
717 - value: "itemNo", 748 + value: "gcode",
718 width: "", 749 width: "",
719 align: "left", 750 align: "left",
720 }, 751 },
721 { 752 {
722 name: "商品规格型号", 753 name: "商品规格型号",
723 - value: "", 754 + value: "gmodel",
724 width: "", 755 width: "",
725 align: "left", 756 align: "left",
726 }, 757 },
......
...@@ -122,10 +122,10 @@ ...@@ -122,10 +122,10 @@
122 placeholder="" 122 placeholder=""
123 > 123 >
124 <el-option 124 <el-option
125 - v-for="(item, index) in dictData.returnStatus" 125 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
126 :key="index" 126 :key="index"
127 - :label="item.name" 127 + :label="item.itemChineseName"
128 - :value="item.code" 128 + :value="item.itemCode"
129 ></el-option> 129 ></el-option>
130 </el-select> 130 </el-select>
131 </Formitem> 131 </Formitem>
...@@ -291,19 +291,19 @@ export default { ...@@ -291,19 +291,19 @@ export default {
291 receiptDataHead: [ 291 receiptDataHead: [
292 { 292 {
293 name: "回执状态", 293 name: "回执状态",
294 - value: "receiptStatus", 294 + value: "returnStatus",
295 - width: "", 295 + width: "120",
296 align: "left", 296 align: "left",
297 }, 297 },
298 { 298 {
299 name: "状态时间", 299 name: "状态时间",
300 - value: "statusTime", 300 + value: "returnTime",
301 width: "", 301 width: "",
302 align: "left", 302 align: "left",
303 }, 303 },
304 { 304 {
305 name: "回执描述", 305 name: "回执描述",
306 - value: "receiptDescription", 306 + value: "returnInfo",
307 width: "", 307 width: "",
308 align: "left", 308 align: "left",
309 }, 309 },
...@@ -390,7 +390,7 @@ export default { ...@@ -390,7 +390,7 @@ export default {
390 popoverChange(val) { 390 popoverChange(val) {
391 console.log(val); 391 console.log(val);
392 this.tableData = val.tableData; 392 this.tableData = val.tableData;
393 - this.receiptApi(val.data.copNo, val.status) 393 + this.receiptApi(val.data.id, val.status)
394 .then((res) => { 394 .then((res) => {
395 val.tableData.forEach((item) => { 395 val.tableData.forEach((item) => {
396 if (item.declareId == val.data.declareId) { 396 if (item.declareId == val.data.declareId) {
......
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
38 placeholder="" 38 placeholder=""
39 > 39 >
40 <el-option 40 <el-option
41 - v-for="(item, index) in dictData.returnStatus" 41 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
42 :key="index" 42 :key="index"
43 - :label="item.name" 43 + :label="item.itemChineseName"
44 - :value="item.code" 44 + :value="item.itemCode"
45 ></el-option> 45 ></el-option>
46 </el-select> 46 </el-select>
47 </Formitem> 47 </Formitem>
......
...@@ -48,10 +48,10 @@ ...@@ -48,10 +48,10 @@
48 placeholder="" 48 placeholder=""
49 > 49 >
50 <el-option 50 <el-option
51 - v-for="(item, index) in dictData.returnStatus" 51 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
52 :key="index" 52 :key="index"
53 - :label="item.name" 53 + :label="item.itemChineseName"
54 - :value="item.code" 54 + :value="item.itemCode"
55 ></el-option> 55 ></el-option>
56 </el-select> 56 </el-select>
57 </Formitem> 57 </Formitem>
...@@ -232,19 +232,19 @@ export default { ...@@ -232,19 +232,19 @@ export default {
232 receiptDataHead: [ 232 receiptDataHead: [
233 { 233 {
234 name: "回执状态", 234 name: "回执状态",
235 - value: "receiptStatus", 235 + value: "returnStatus",
236 - width: "", 236 + width: "120",
237 align: "left", 237 align: "left",
238 }, 238 },
239 { 239 {
240 name: "状态时间", 240 name: "状态时间",
241 - value: "statusTime", 241 + value: "returnTime",
242 width: "", 242 width: "",
243 align: "left", 243 align: "left",
244 }, 244 },
245 { 245 {
246 name: "回执描述", 246 name: "回执描述",
247 - value: "receiptDescription", 247 + value: "returnInfo",
248 width: "", 248 width: "",
249 align: "left", 249 align: "left",
250 }, 250 },
...@@ -331,7 +331,7 @@ export default { ...@@ -331,7 +331,7 @@ export default {
331 popoverChange(val) { 331 popoverChange(val) {
332 console.log(val); 332 console.log(val);
333 this.tableData = val.tableData; 333 this.tableData = val.tableData;
334 - this.receiptApi(val.data.declareId, val.status) 334 + this.receiptApi(val.data.id, val.status)
335 .then((res) => { 335 .then((res) => {
336 val.tableData.forEach((item) => { 336 val.tableData.forEach((item) => {
337 if (item.declareId == val.data.declareId) { 337 if (item.declareId == val.data.declareId) {
......
...@@ -140,10 +140,10 @@ ...@@ -140,10 +140,10 @@
140 placeholder="" 140 placeholder=""
141 > 141 >
142 <el-option 142 <el-option
143 - v-for="(item, index) in dictData.currency" 143 + v-for="(item, index) in $store.getters.dict.CURRENCY"
144 :key="index" 144 :key="index"
145 - :label="item.name" 145 + :label="item.itemChineseName"
146 - :value="item.value" 146 + :value="item.itemValue"
147 ></el-option> 147 ></el-option>
148 </el-select> 148 </el-select>
149 </Formitem> 149 </Formitem>
...@@ -201,10 +201,10 @@ ...@@ -201,10 +201,10 @@
201 placeholder="" 201 placeholder=""
202 > 202 >
203 <el-option 203 <el-option
204 - v-for="(item, index) in dictData.returnStatus" 204 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
205 :key="index" 205 :key="index"
206 - :label="item.name" 206 + :label="item.itemChineseName"
207 - :value="item.code" 207 + :value="item.itemValue"
208 ></el-option> 208 ></el-option>
209 </el-select> 209 </el-select>
210 </Formitem> 210 </Formitem>
......
...@@ -102,15 +102,20 @@ ...@@ -102,15 +102,20 @@
102 <!-- 运输方式 --> 102 <!-- 运输方式 -->
103 <el-col :span="3"> 103 <el-col :span="3">
104 <Formitem label="运输方式" prop="trafMode"> 104 <Formitem label="运输方式" prop="trafMode">
105 - <el-input 105 + <el-select
106 type="text" 106 type="text"
107 - class="inputShadow"
108 id="inputInner--trafMode" 107 id="inputInner--trafMode"
109 - resize="none"
110 v-model="formData.trafMode" 108 v-model="formData.trafMode"
111 clearable 109 clearable
112 placeholder="" 110 placeholder=""
113 - ></el-input> 111 + >
112 + <el-option
113 + v-for="(item, index) in $store.getters.dict.DECLARE_TRAFMODE"
114 + :key="index"
115 + :label="item.itemChineseName"
116 + :value="item.itemValue"
117 + ></el-option>
118 + </el-select>
114 </Formitem> 119 </Formitem>
115 </el-col> 120 </el-col>
116 </el-row> 121 </el-row>
...@@ -232,15 +237,20 @@ ...@@ -232,15 +237,20 @@
232 <!-- 业务状态 --> 237 <!-- 业务状态 -->
233 <el-col :span="3"> 238 <el-col :span="3">
234 <Formitem label="业务状态" prop="returnStatus"> 239 <Formitem label="业务状态" prop="returnStatus">
235 - <el-input 240 + <el-select
236 type="text" 241 type="text"
237 - class="inputShadow"
238 id="inputInner--returnStatus" 242 id="inputInner--returnStatus"
239 - resize="none"
240 v-model="formData.returnStatus" 243 v-model="formData.returnStatus"
241 clearable 244 clearable
242 placeholder="" 245 placeholder=""
243 - ></el-input> 246 + >
247 + <el-option
248 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
249 + :key="index"
250 + :label="item.itemChineseName"
251 + :value="item.itemValue"
252 + ></el-option>
253 + </el-select>
244 </Formitem> 254 </Formitem>
245 </el-col> 255 </el-col>
246 <!-- 申报类型 --> 256 <!-- 申报类型 -->
......
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
38 placeholder="" 38 placeholder=""
39 > 39 >
40 <el-option 40 <el-option
41 - v-for="(item, index) in dictData.returnStatus" 41 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
42 :key="index" 42 :key="index"
43 - :label="item.name" 43 + :label="item.itemChineseName"
44 - :value="item.code" 44 + :value="item.itemCode"
45 ></el-option> 45 ></el-option>
46 </el-select> 46 </el-select>
47 </Formitem> 47 </Formitem>
...@@ -221,19 +221,19 @@ export default { ...@@ -221,19 +221,19 @@ export default {
221 receiptDataHead: [ 221 receiptDataHead: [
222 { 222 {
223 name: "回执状态", 223 name: "回执状态",
224 - value: "receiptStatus", 224 + value: "returnStatus",
225 - width: "", 225 + width: "120",
226 align: "left", 226 align: "left",
227 }, 227 },
228 { 228 {
229 name: "状态时间", 229 name: "状态时间",
230 - value: "statusTime", 230 + value: "returnTime",
231 width: "", 231 width: "",
232 align: "left", 232 align: "left",
233 }, 233 },
234 { 234 {
235 name: "回执描述", 235 name: "回执描述",
236 - value: "receiptDescription", 236 + value: "returnInfo",
237 width: "", 237 width: "",
238 align: "left", 238 align: "left",
239 }, 239 },
......
...@@ -46,15 +46,20 @@ ...@@ -46,15 +46,20 @@
46 <!-- 业务状态 --> 46 <!-- 业务状态 -->
47 <el-col :span="3"> 47 <el-col :span="3">
48 <Formitem label="业务状态" prop="returnStatus"> 48 <Formitem label="业务状态" prop="returnStatus">
49 - <el-input 49 + <el-select
50 type="text" 50 type="text"
51 - class="inputShadow"
52 id="inputInner--returnStatus" 51 id="inputInner--returnStatus"
53 - resize="none"
54 v-model="formData.returnStatus" 52 v-model="formData.returnStatus"
55 clearable 53 clearable
56 placeholder="" 54 placeholder=""
57 - ></el-input> 55 + >
56 + <el-option
57 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
58 + :key="index"
59 + :label="item.itemChineseName"
60 + :value="item.itemValue"
61 + ></el-option>
62 + </el-select>
58 </Formitem> 63 </Formitem>
59 </el-col> 64 </el-col>
60 <!-- 报送时间 --> 65 <!-- 报送时间 -->
...@@ -116,15 +121,20 @@ ...@@ -116,15 +121,20 @@
116 <!-- 运输方式 --> 121 <!-- 运输方式 -->
117 <el-col :span="3"> 122 <el-col :span="3">
118 <Formitem label="运输方式" prop="trafMode"> 123 <Formitem label="运输方式" prop="trafMode">
119 - <el-input 124 + <el-select
120 type="text" 125 type="text"
121 - class="inputShadow"
122 id="inputInner--trafMode" 126 id="inputInner--trafMode"
123 - resize="none"
124 v-model="formData.trafMode" 127 v-model="formData.trafMode"
125 clearable 128 clearable
126 placeholder="" 129 placeholder=""
127 - ></el-input> 130 + >
131 + <el-option
132 + v-for="(item, index) in $store.getters.dict.DECLARE_TRAFMODE"
133 + :key="index"
134 + :label="item.itemChineseName"
135 + :value="item.itemValue"
136 + ></el-option>
137 + </el-select>
128 </Formitem> 138 </Formitem>
129 </el-col> 139 </el-col>
130 </el-row> 140 </el-row>
......
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
38 placeholder="" 38 placeholder=""
39 > 39 >
40 <el-option 40 <el-option
41 - v-for="(item, index) in dictData.returnStatus" 41 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
42 :key="index" 42 :key="index"
43 - :label="item.name" 43 + :label="item.itemChineseName"
44 - :value="item.code" 44 + :value="item.itemCode"
45 ></el-option> 45 ></el-option>
46 </el-select> 46 </el-select>
47 </Formitem> 47 </Formitem>
...@@ -253,19 +253,19 @@ export default { ...@@ -253,19 +253,19 @@ export default {
253 receiptDataHead: [ 253 receiptDataHead: [
254 { 254 {
255 name: "回执状态", 255 name: "回执状态",
256 - value: "receiptStatus", 256 + value: "returnStatus",
257 - width: "", 257 + width: "120",
258 align: "left", 258 align: "left",
259 }, 259 },
260 { 260 {
261 name: "状态时间", 261 name: "状态时间",
262 - value: "statusTime", 262 + value: "returnTime",
263 width: "", 263 width: "",
264 align: "left", 264 align: "left",
265 }, 265 },
266 { 266 {
267 name: "回执描述", 267 name: "回执描述",
268 - value: "receiptDescription", 268 + value: "returnInfo",
269 width: "", 269 width: "",
270 align: "left", 270 align: "left",
271 }, 271 },
......
...@@ -41,7 +41,6 @@ export default { ...@@ -41,7 +41,6 @@ export default {
41 // }) 41 // })
42 // ); 42 // );
43 // } 43 // }
44 - this.$store.dispatch("GetDict");
45 location.replace(process.env.VUE_APP_BASE_ROUTE); 44 location.replace(process.env.VUE_APP_BASE_ROUTE);
46 } else { 45 } else {
47 this.$router.push({ path: "/login" }); 46 this.$router.push({ path: "/login" });
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
9 size="small" 9 size="small"
10 > 10 >
11 <el-row class="row-border"> 11 <el-row class="row-border">
12 - <el-col :span="5">
13 <!-- 提运单号 --> 12 <!-- 提运单号 -->
13 + <el-col :span="5">
14 <Formitem label="提运单号" prop="billNo"> 14 <Formitem label="提运单号" prop="billNo">
15 <el-input 15 <el-input
16 type="text" 16 type="text"
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
23 ></el-input> 23 ></el-input>
24 </Formitem> 24 </Formitem>
25 </el-col> 25 </el-col>
26 - <el-col :span="5">
27 <!-- 订单编号 --> 26 <!-- 订单编号 -->
27 + <el-col :span="5">
28 <Formitem label="订单编号" prop="orderNo"> 28 <Formitem label="订单编号" prop="orderNo">
29 <el-input 29 <el-input
30 type="text" 30 type="text"
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
37 ></el-input> 37 ></el-input>
38 </Formitem> 38 </Formitem>
39 </el-col> 39 </el-col>
40 - <el-col :span="5">
41 <!-- 运单编号 --> 40 <!-- 运单编号 -->
41 + <el-col :span="5">
42 <Formitem label="运单编号" prop="logisticsNo"> 42 <Formitem label="运单编号" prop="logisticsNo">
43 <FormTextareaInput 43 <FormTextareaInput
44 :formData="sreachFormData" 44 :formData="sreachFormData"
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
47 /> 47 />
48 </Formitem> 48 </Formitem>
49 </el-col> 49 </el-col>
50 - <el-col :span="5">
51 <!-- 创建时间 --> 50 <!-- 创建时间 -->
51 + <el-col :span="5">
52 <Formitem label="创建时间" prop="createTime" :activeType="true"> 52 <Formitem label="创建时间" prop="createTime" :activeType="true">
53 <el-date-picker 53 <el-date-picker
54 class="inputInner--createTime" 54 class="inputInner--createTime"
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
75 </el-form-item> 75 </el-form-item>
76 </el-col> 76 </el-col>
77 <el-col :span="2"> 77 <el-col :span="2">
78 - <!-- 清空查询条件-->
79 <el-form-item class="textLeft textCenter"> 78 <el-form-item class="textLeft textCenter">
80 <el-button 79 <el-button
81 type="text" 80 type="text"
...@@ -89,27 +88,8 @@ ...@@ -89,27 +88,8 @@
89 </el-col> 88 </el-col>
90 </el-row> 89 </el-row>
91 <el-row class="backgroundRow"> 90 <el-row class="backgroundRow">
92 - <!-- <el-col :span="5"> -->
93 - <!-- 回执类型 -->
94 - <!-- <Formitem label="回执类型" prop="receiptType">
95 - <el-select
96 - type="text"
97 - id="inputInner--receiptType"
98 - v-model="sreachFormData.receiptType"
99 - clearable
100 - placeholder=""
101 - >
102 - <el-option
103 - v-for="(item, index) in dictData.returnStatus"
104 - :key="index"
105 - :label="item.name"
106 - :value="item.code"
107 - ></el-option>
108 - </el-select>
109 - </Formitem> -->
110 - <!-- </el-col> -->
111 - <el-col :span="5">
112 <!-- 回执状态 --> 91 <!-- 回执状态 -->
92 + <el-col :span="5">
113 <Formitem label="回执状态" prop="receiptStatus"> 93 <Formitem label="回执状态" prop="receiptStatus">
114 <el-select 94 <el-select
115 type="text" 95 type="text"
...@@ -119,10 +99,10 @@ ...@@ -119,10 +99,10 @@
119 placeholder="" 99 placeholder=""
120 > 100 >
121 <el-option 101 <el-option
122 - v-for="(item, index) in dictData.returnStatus" 102 + v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
123 :key="index" 103 :key="index"
124 - :label="item.name" 104 + :label="item.itemChineseName"
125 - :value="item.code" 105 + :value="item.itemCode"
126 ></el-option> 106 ></el-option>
127 </el-select> 107 </el-select>
128 </Formitem> 108 </Formitem>
......
1 +<template>
2 + <div></div>
3 +</template>
4 +
5 +<script>
6 +export default {
7 + name: "",
8 + data() {
9 + return {};
10 + },
11 + methods: {},
12 +};
13 +</script>
14 +
15 +<style lang="scss" scoped></style>
......