Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
15849199 2 parents 95029386 d97ac45d

feat: 合并代码

Expand all
Inline Side-by-side
Showing 10 changed files with 314 additions and 221 deletions
...@@ -174,6 +174,18 @@ export function getCustomerList(data) { ...@@ -174,6 +174,18 @@ export function getCustomerList(data) {
174 }, 174 },
175 }); 175 });
176 } 176 }
177 +// /exportSummary/exportSummaryList
178 +export function getNewCustomerList(data) {
179 + return request({
180 + url: "/bus-customer/exportSummary/get/customers",
181 + method: "post",
182 + data: {
183 + pageIndex: 1,
184 + pageSize: 1000,
185 + ...data,
186 + },
187 + });
188 +}
177 189
178 //获取口岸表数据 190 //获取口岸表数据
179 export function getPortList(data) { 191 export function getPortList(data) {
......
1 -import request from '@/utils/request' 1 +import request from "@/utils/request";
2 2
3 /** 3 /**
4 * 汇总申请单查询 4 * 汇总申请单查询
...@@ -14,46 +14,56 @@ import request from '@/utils/request' ...@@ -14,46 +14,56 @@ import request from '@/utils/request'
14 * @param data.pageIndex 当前页码 14 * @param data.pageIndex 当前页码
15 * @param data.pageSize 分页最大数据量 15 * @param data.pageSize 分页最大数据量
16 */ 16 */
17 -export function searchExportSummaryList(data){ 17 +export function searchExportSummaryList(data) {
18 return request({ 18 return request({
19 - url: '/bus-customer/exportSummary/exportSummaryList', 19 + url: "/bus-customer/exportSummary/exportSummaryList",
20 - method: 'post', 20 + method: "post",
21 data: data, 21 data: data,
22 - }) 22 + });
23 } 23 }
24 24
25 /** 25 /**
26 * 查询汇总回执 26 * 查询汇总回执
27 * @param data.copNo 企业唯一编号 27 * @param data.copNo 企业唯一编号
28 */ 28 */
29 -export function getExportSummaryReceiptData(data){ 29 +export function getExportSummaryReceiptData(data) {
30 return request({ 30 return request({
31 - url: '/bus-customer/exportSummary/receipt/' + data.copNo, 31 + url: "/bus-customer/exportSummary/receipt/" + data.copNo,
32 - method: 'get', 32 + method: "get",
33 - }) 33 + });
34 } 34 }
35 35
36 /** 36 /**
37 * 获取汇总申请单详情 37 * 获取汇总申请单详情
38 * @param data.id 汇总申请单id 38 * @param data.id 汇总申请单id
39 */ 39 */
40 -export function getExportSummaryDetail(data){ 40 +export function getExportSummaryDetail(data) {
41 return request({ 41 return request({
42 - url: '/bus-customer/exportSummary/exportSummaryDetail/' + data.id, 42 + url: "/bus-customer/exportSummary/exportSummaryDetail/" + data.id,
43 - method: 'get', 43 + method: "get",
44 - }) 44 + });
45 } 45 }
46 46
47 -
48 /** 47 /**
49 * 汇总申报 48 * 汇总申报
50 * @param data 49 * @param data
51 * @returns {*} 50 * @returns {*}
52 */ 51 */
53 -export function declareSummaryApplication(data){ 52 +export function declareSummaryApplication(data) {
53 + return request({
54 + url: "/bus-customer/exportSummary/declare",
55 + method: "post",
56 + data: data,
57 + });
58 +}
59 +
60 +// POST
61 +// ​/exportSummary​/get​/customers
62 +// 根据条件获取可以汇总申报的企业
63 +export function getCustomers(data) {
54 return request({ 64 return request({
55 - url:'/bus-customer/exportSummary/declare', 65 + url: "/bus-customer/exportSummary/get/customers",
56 - method:'post', 66 + method: "post",
57 - data:data 67 + data: data,
58 - }) 68 + });
59 } 69 }
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
39 ? '数据加载中' 39 ? '数据加载中'
40 : $t('portEntry.emptyText') 40 : $t('portEntry.emptyText')
41 " 41 "
42 - height="350px" 42 + :height="tableHeight + 'px'"
43 - maxHeight="500px" 43 + :maxHeight="tableHeight + 'px'"
44 rowKey="id" 44 rowKey="id"
45 > 45 >
46 </Table> 46 </Table>
...@@ -90,6 +90,7 @@ export default { ...@@ -90,6 +90,7 @@ export default {
90 data() { 90 data() {
91 return { 91 return {
92 tableLoading: false, 92 tableLoading: false,
93 + tableHeight: 350,
93 }; 94 };
94 }, 95 },
95 computed: { 96 computed: {
...@@ -97,7 +98,17 @@ export default { ...@@ -97,7 +98,17 @@ export default {
97 return this.$store.state.viewOption.loadingDatas; 98 return this.$store.state.viewOption.loadingDatas;
98 }, 99 },
99 }, 100 },
101 + mounted() {
102 + this.calculateTableHeight();
103 + window.addEventListener("resize", this.calculateTableHeight);
104 + },
105 + beforeDestroy() {
106 + window.removeEventListener("resize", this.calculateTableHeight);
107 + },
100 methods: { 108 methods: {
109 + calculateTableHeight() {
110 + this.tableHeight = window.innerHeight - 300;
111 + },
101 //弹框关闭 112 //弹框关闭
102 popoverClose() { 113 popoverClose() {
103 this.$emit("popoverClose"); 114 this.$emit("popoverClose");
......
This diff is collapsed. Click to expand it.
...@@ -127,6 +127,25 @@ ...@@ -127,6 +127,25 @@
127 </Formitem> 127 </Formitem>
128 </el-col> 128 </el-col>
129 </el-row> 129 </el-row>
130 + <el-row :gutter="5">
131 + <el-col :span="8">
132 + <Formitem
133 + label="汇总申报地海关代码"
134 + prop="exportPortCode"
135 + type="edit"
136 + >
137 + <el-input
138 + type="text"
139 + class="inputShadow"
140 + id="inputInner-edit-exportPortCode"
141 + resize="none"
142 + v-model="formData.exportPortCode"
143 + clearable
144 + placeholder=""
145 + ></el-input>
146 + </Formitem>
147 + </el-col>
148 + </el-row>
130 </el-form> 149 </el-form>
131 </div> 150 </div>
132 <div class="dialogOption entrySave"> 151 <div class="dialogOption entrySave">
...@@ -177,6 +196,7 @@ export default { ...@@ -177,6 +196,7 @@ export default {
177 declarationUnitCompanyName: "", 196 declarationUnitCompanyName: "",
178 dxpid: "", 197 dxpid: "",
179 portCode: "", 198 portCode: "",
199 + exportPortCode: "",
180 }, 200 },
181 rules: { 201 rules: {
182 portCode: [ 202 portCode: [
...@@ -244,6 +264,13 @@ export default { ...@@ -244,6 +264,13 @@ export default {
244 message: "申报单位 (企业名称)不能为空！", 264 message: "申报单位 (企业名称)不能为空！",
245 }, 265 },
246 ], 266 ],
267 + exportPortCode: [
268 + {
269 + required: true,
270 + trigger: "blur",
271 + message: "汇总申报地海关代码不能为空！",
272 + },
273 + ],
247 }, 274 },
248 loadings: { 275 loadings: {
249 dialogLoading: false, 276 dialogLoading: false,
...@@ -348,6 +375,7 @@ export default { ...@@ -348,6 +375,7 @@ export default {
348 declarationUnitCompanyName: "", 375 declarationUnitCompanyName: "",
349 dxpid: "", 376 dxpid: "",
350 portCode: "", 377 portCode: "",
378 + exportPortCode: "",
351 }; 379 };
352 this.$emit("close"); 380 this.$emit("close");
353 }, 381 },
......
...@@ -255,7 +255,8 @@ ...@@ -255,7 +255,8 @@
255 ref="entryTable" 255 ref="entryTable"
256 :data="tableData" 256 :data="tableData"
257 :headerData="headerData" 257 :headerData="headerData"
258 - :height="tableMaxheight" 258 + :height="tableMaxheight + 'px'"
259 + :maxHeight="tableMaxheight + 'px'"
259 :border="true" 260 :border="true"
260 :pagination="true" 261 :pagination="true"
261 :order="false" 262 :order="false"
...@@ -633,7 +634,7 @@ export default { ...@@ -633,7 +634,7 @@ export default {
633 departureLoading: false, // 离境单申报加载状态 634 departureLoading: false, // 离境单申报加载状态
634 }, 635 },
635 textareaVisible: {}, 636 textareaVisible: {},
636 - tableMaxheight: null, 637 + tableMaxheight: 500,
637 outerVisible: false, 638 outerVisible: false,
638 dropdownName: "一键申报", 639 dropdownName: "一键申报",
639 dropdownCode: "full", 640 dropdownCode: "full",
...@@ -645,17 +646,13 @@ export default { ...@@ -645,17 +646,13 @@ export default {
645 }, 646 },
646 created() { 647 created() {
647 this.search(0); 648 this.search(0);
648 - // this.getCancellationReasons() 649 + this.calculateTableHeight();
649 }, 650 },
650 mounted() { 651 mounted() {
651 - this.tableMaxheight = window.innerHeight - 280; 652 + window.addEventListener("resize", this.calculateTableHeight);
652 - window.addEventListener(
653 - "resize",
654 - () => {
655 - this.tableMaxheight = window.innerHeight - 280;
656 }, 653 },
657 - false 654 + beforeDestroy() {
658 - ); 655 + window.removeEventListener("resize", this.calculateTableHeight);
659 }, 656 },
660 watch: { 657 watch: {
661 $route(val, oldval) { 658 $route(val, oldval) {
...@@ -673,6 +670,9 @@ export default { ...@@ -673,6 +670,9 @@ export default {
673 }); 670 });
674 }, 671 },
675 methods: { 672 methods: {
673 + calculateTableHeight() {
674 + this.tableMaxheight = window.innerHeight - 300;
675 + },
676 //查询申报数据 676 //查询申报数据
677 search(val) { 677 search(val) {
678 this.loadings.sreachLoading = true; 678 this.loadings.sreachLoading = true;
...@@ -886,7 +886,7 @@ export default { ...@@ -886,7 +886,7 @@ export default {
886 // } 886 // }
887 this.search(1); 887 this.search(1);
888 this.outerVisible = false; 888 this.outerVisible = false;
889 - this.tableMaxheight = window.innerHeight - 280; 889 + this.tableMaxheight = window.innerHeight - 300;
890 this.$forceUpdate(); 890 this.$forceUpdate();
891 }, 891 },
892 popoverChange(val) { 892 popoverChange(val) {
......
...@@ -9,24 +9,24 @@ ...@@ -9,24 +9,24 @@
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 <!-- 提运单号 --> 11 <!-- 提运单号 -->
12 -<!-- <el-col :span="5">--> 12 + <!-- <el-col :span="5">-->
13 -<!-- <Formitem label="提运单号" prop="billNo">--> 13 + <!-- <Formitem label="提运单号" prop="billNo">-->
14 -<!-- <el-input--> 14 + <!-- <el-input-->
15 -<!-- type="text"--> 15 + <!-- type="text"-->
16 -<!-- class="inputShadow"--> 16 + <!-- class="inputShadow"-->
17 -<!-- id="inputInner&#45;&#45;billNo"--> 17 + <!-- id="inputInner&#45;&#45;billNo"-->
18 -<!-- resize="none"--> 18 + <!-- resize="none"-->
19 -<!-- v-model="sreachFormData.billNo"--> 19 + <!-- v-model="sreachFormData.billNo"-->
20 -<!-- clearable--> 20 + <!-- clearable-->
21 -<!-- placeholder=""--> 21 + <!-- placeholder=""-->
22 -<!-- ></el-input>--> 22 + <!-- ></el-input>-->
23 -<!--&lt;!&ndash; <FormTextareaInput&ndash;&gt;--> 23 + <!--&lt;!&ndash; <FormTextareaInput&ndash;&gt;-->
24 -<!--&lt;!&ndash; :formData="sreachFormData"&ndash;&gt;--> 24 + <!--&lt;!&ndash; :formData="sreachFormData"&ndash;&gt;-->
25 -<!--&lt;!&ndash; dataKey="billNo"&ndash;&gt;--> 25 + <!--&lt;!&ndash; dataKey="billNo"&ndash;&gt;-->
26 -<!--&lt;!&ndash; @formChange="formChange"&ndash;&gt;--> 26 + <!--&lt;!&ndash; @formChange="formChange"&ndash;&gt;-->
27 -<!--&lt;!&ndash; />&ndash;&gt;--> 27 + <!--&lt;!&ndash; />&ndash;&gt;-->
28 -<!-- </Formitem>--> 28 + <!-- </Formitem>-->
29 -<!-- </el-col>--> 29 + <!-- </el-col>-->
30 <!-- 预录入编号 --> 30 <!-- 预录入编号 -->
31 <el-col :span="5"> 31 <el-col :span="5">
32 <Formitem label="预录入编号" prop="preNo"> 32 <Formitem label="预录入编号" prop="preNo">
...@@ -135,7 +135,11 @@ ...@@ -135,7 +135,11 @@
135 placeholder="" 135 placeholder=""
136 > 136 >
137 <el-option 137 <el-option
138 - v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS.filter(fItem => fItem.itemChineseName !== '已提交')" 138 + v-for="(
139 + item, index
140 + ) in $store.getters.dict.RECEIPT_STATUS.filter(
141 + (fItem) => fItem.itemChineseName !== '已提交'
142 + )"
139 :key="index" 143 :key="index"
140 :label="item.itemChineseName" 144 :label="item.itemChineseName"
141 :value="item.itemValue" 145 :value="item.itemValue"
...@@ -144,47 +148,47 @@ ...@@ -144,47 +148,47 @@
144 </Formitem> 148 </Formitem>
145 </el-col> 149 </el-col>
146 <!-- 入库时间 --> 150 <!-- 入库时间 -->
147 -<!-- <el-col :span="5">--> 151 + <!-- <el-col :span="5">-->
148 -<!-- <Formitem label="入库时间" prop="startTime" :activeType="true">--> 152 + <!-- <Formitem label="入库时间" prop="startTime" :activeType="true">-->
149 -<!-- <el-date-picker--> 153 + <!-- <el-date-picker-->
150 -<!-- class="inputInner&#45;&#45;startTime"--> 154 + <!-- class="inputInner&#45;&#45;startTime"-->
151 -<!-- id="inputInner&#45;&#45;startTime"--> 155 + <!-- id="inputInner&#45;&#45;startTime"-->
152 -<!-- v-model="sreachFormData.startTime"--> 156 + <!-- v-model="sreachFormData.startTime"-->
153 -<!-- type="daterange"--> 157 + <!-- type="daterange"-->
154 -<!-- format="yyyy-MM-dd"--> 158 + <!-- format="yyyy-MM-dd"-->
155 -<!-- prefix-icon="none"--> 159 + <!-- prefix-icon="none"-->
156 -<!-- value-format="yyyy-MM-dd"--> 160 + <!-- value-format="yyyy-MM-dd"-->
157 -<!-- range-separator="至"--> 161 + <!-- range-separator="至"-->
158 -<!-- @change="dateChange"--> 162 + <!-- @change="dateChange"-->
159 -<!-- />--> 163 + <!-- />-->
160 -<!-- </Formitem>--> 164 + <!-- </Formitem>-->
161 -<!-- </el-col>--> 165 + <!-- </el-col>-->
162 <!-- 报文序号 --> 166 <!-- 报文序号 -->
163 -<!-- <el-col :span="5">--> 167 + <!-- <el-col :span="5">-->
164 -<!-- <Formitem label="报文序号" prop="msgSeqNo">--> 168 + <!-- <Formitem label="报文序号" prop="msgSeqNo">-->
165 -<!-- <el-input--> 169 + <!-- <el-input-->
166 -<!-- type="text"--> 170 + <!-- type="text"-->
167 -<!-- class="inputShadow"--> 171 + <!-- class="inputShadow"-->
168 -<!-- id="inputInner&#45;&#45;msgSeqNo"--> 172 + <!-- id="inputInner&#45;&#45;msgSeqNo"-->
169 -<!-- resize="none"--> 173 + <!-- resize="none"-->
170 -<!-- v-model="sreachFormData.msgSeqNo"--> 174 + <!-- v-model="sreachFormData.msgSeqNo"-->
171 -<!-- clearable--> 175 + <!-- clearable-->
172 -<!-- placeholder=""--> 176 + <!-- placeholder=""-->
173 -<!-- ></el-input>--> 177 + <!-- ></el-input>-->
174 -<!-- </Formitem>--> 178 + <!-- </Formitem>-->
175 -<!-- </el-col>--> 179 + <!-- </el-col>-->
176 </el-row> 180 </el-row>
177 </el-form> 181 </el-form>
178 -<!-- <div class="optionButton">--> 182 + <!-- <div class="optionButton">-->
179 -<!-- <el-button--> 183 + <!-- <el-button-->
180 -<!-- class="entrySaveButton"--> 184 + <!-- class="entrySaveButton"-->
181 -<!-- size="small"--> 185 + <!-- size="small"-->
182 -<!-- icon="el-icon-download"--> 186 + <!-- icon="el-icon-download"-->
183 -<!-- @click="downloadData"--> 187 + <!-- @click="downloadData"-->
184 -<!-- >--> 188 + <!-- >-->
185 -<!-- 导出--> 189 + <!-- 导出-->
186 -<!-- </el-button>--> 190 + <!-- </el-button>-->
187 -<!-- </div>--> 191 + <!-- </div>-->
188 <Table 192 <Table
189 class="fedexDetialTable fedexSreachTable" 193 class="fedexDetialTable fedexSreachTable"
190 ref="entryTable" 194 ref="entryTable"
...@@ -220,7 +224,8 @@ ...@@ -220,7 +224,8 @@
220 @popoverClose="popoverClose" 224 @popoverClose="popoverClose"
221 > 225 >
222 <div slot="title"> 226 <div slot="title">
223 - <span style="font-weight: 700; color: #515a6e">汇总申请单编号：</span 227 + <span style="font-weight: 700; color: #515a6e"
228 + >汇总申请单编号：</span
224 >{{ scope.row.sumNo }} 229 >{{ scope.row.sumNo }}
225 </div> 230 </div>
226 <div slot="buttonLabel"> 231 <div slot="buttonLabel">
...@@ -242,7 +247,7 @@ ...@@ -242,7 +247,7 @@
242 <script> 247 <script>
243 import { 248 import {
244 searchExportSummaryList, 249 searchExportSummaryList,
245 - getExportSummaryReceiptData 250 + getExportSummaryReceiptData,
246 } from "@/api/exportSummary-api"; 251 } from "@/api/exportSummary-api";
247 export default { 252 export default {
248 name: "ExportBillQuery", 253 name: "ExportBillQuery",
...@@ -325,7 +330,13 @@ export default { ...@@ -325,7 +330,13 @@ export default {
325 }, 330 },
326 { 331 {
327 name: "收发货人汇总标志", 332 name: "收发货人汇总标志",
328 - value:"summaryFlag", 333 + value: "summaryFlag",
334 + width: "",
335 + align: "left",
336 + },
337 + {
338 + name: "申报时间",
339 + value: "createTime",
329 width: "", 340 width: "",
330 align: "left", 341 align: "left",
331 }, 342 },
...@@ -443,7 +454,7 @@ export default { ...@@ -443,7 +454,7 @@ export default {
443 }) 454 })
444 .finally(() => { 455 .finally(() => {
445 this.$nextTick(() => { 456 this.$nextTick(() => {
446 - this.$store.dispatch('setLoadingState', false) 457 + this.$store.dispatch("setLoadingState", false);
447 this.$refs.returnStatusPopover.tableLoading = false; 458 this.$refs.returnStatusPopover.tableLoading = false;
448 }); 459 });
449 }); 460 });
......
...@@ -16,21 +16,21 @@ ...@@ -16,21 +16,21 @@
16 > 16 >
17 <el-row :gutter="5"> 17 <el-row :gutter="5">
18 <!-- 提运单号 --> 18 <!-- 提运单号 -->
19 -<!-- <el-col :span="3">--> 19 + <!-- <el-col :span="3">-->
20 -<!-- <Formitem label="提运单号" prop="billNo">--> 20 + <!-- <Formitem label="提运单号" prop="billNo">-->
21 -<!-- <el-input--> 21 + <!-- <el-input-->
22 -<!-- type="text"--> 22 + <!-- type="text"-->
23 -<!-- class="inputShadow"--> 23 + <!-- class="inputShadow"-->
24 -<!-- id="inputInner&#45;&#45;billNo"--> 24 + <!-- id="inputInner&#45;&#45;billNo"-->
25 -<!-- resize="none"--> 25 + <!-- resize="none"-->
26 -<!-- v-model="formData.billNo"--> 26 + <!-- v-model="formData.billNo"-->
27 -<!-- clearable--> 27 + <!-- clearable-->
28 -<!-- placeholder=""--> 28 + <!-- placeholder=""-->
29 -<!-- ></el-input>--> 29 + <!-- ></el-input>-->
30 -<!-- </Formitem>--> 30 + <!-- </Formitem>-->
31 -<!-- </el-col>--> 31 + <!-- </el-col>-->
32 <!-- 电子口岸编号 --> 32 <!-- 电子口岸编号 -->
33 - <el-col :span="3"> 33 + <el-col :span="6">
34 <Formitem label="电子口岸编号" prop="preNo"> 34 <Formitem label="电子口岸编号" prop="preNo">
35 <el-input 35 <el-input
36 type="text" 36 type="text"
...@@ -62,21 +62,21 @@ ...@@ -62,21 +62,21 @@
62 </el-select> 62 </el-select>
63 </Formitem> 63 </Formitem>
64 </el-col> 64 </el-col>
65 -<!-- <el-col :span="3">--> 65 + <!-- <el-col :span="3">-->
66 -<!-- <Formitem label="业务状态" prop="">--> 66 + <!-- <Formitem label="业务状态" prop="">-->
67 -<!-- <el-select--> 67 + <!-- <el-select-->
68 -<!-- type="text"--> 68 + <!-- type="text"-->
69 -<!-- id="inputInner&#45;&#45;appType"--> 69 + <!-- id="inputInner&#45;&#45;appType"-->
70 -<!-- v-model="formData.businessStatus"--> 70 + <!-- v-model="formData.businessStatus"-->
71 -<!-- clearable--> 71 + <!-- clearable-->
72 -<!-- placeholder=""--> 72 + <!-- placeholder=""-->
73 -<!-- >--> 73 + <!-- >-->
74 74
75 -<!-- </el-select>--> 75 + <!-- </el-select>-->
76 -<!-- </Formitem>--> 76 + <!-- </Formitem>-->
77 -<!-- </el-col>--> 77 + <!-- </el-col>-->
78 <!-- 汇总申请编号 --> 78 <!-- 汇总申请编号 -->
79 - <el-col :span="3"> 79 + <el-col :span="6">
80 <Formitem label="汇总申请编号" prop="sumNo"> 80 <Formitem label="汇总申请编号" prop="sumNo">
81 <el-input 81 <el-input
82 type="text" 82 type="text"
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
104 </Formitem> 104 </Formitem>
105 </el-col> 105 </el-col>
106 <!-- 报关单位名称 --> 106 <!-- 报关单位名称 -->
107 - <el-col :span="12"> 107 + <el-col :span="6">
108 <Formitem label="报关单位名称" prop="declAgentName"> 108 <Formitem label="报关单位名称" prop="declAgentName">
109 <el-input 109 <el-input
110 type="text" 110 type="text"
...@@ -289,9 +289,9 @@ ...@@ -289,9 +289,9 @@
289 ></el-input> 289 ></el-input>
290 </Formitem> 290 </Formitem>
291 </el-col> 291 </el-col>
292 - <!-- 入库时间 --> 292 + <!-- 入库时间=>申报时间 -->
293 <el-col :span="3"> 293 <el-col :span="3">
294 - <Formitem label="入库时间" prop="createTime"> 294 + <Formitem label="申报时间" prop="createTime">
295 <el-input 295 <el-input
296 type="text" 296 type="text"
297 class="inputShadow" 297 class="inputShadow"
......
1 <template> 1 <template>
2 - <div style="background-color: #FFFFFF;height: 100%"> 2 + <div style="background-color: #ffffff; height: 100%">
3 <div class="title"> 3 <div class="title">
4 - <div> 4 + <div></div>
5 - </div> 5 + <div>汇总申报信息</div>
6 - <div>
7 - 汇总申报信息
8 - </div>
9 </div> 6 </div>
10 <div class="content"> 7 <div class="content">
11 <el-form 8 <el-form
...@@ -26,6 +23,7 @@ ...@@ -26,6 +23,7 @@
26 clearable 23 clearable
27 filterable 24 filterable
28 placeholder="" 25 placeholder=""
26 + @change="searchUserData"
29 > 27 >
30 <el-option 28 <el-option
31 v-for="(item, index) in portInfo" 29 v-for="(item, index) in portInfo"
...@@ -37,7 +35,7 @@ ...@@ -37,7 +35,7 @@
37 </Formitem> 35 </Formitem>
38 </el-col> 36 </el-col>
39 <el-col :span="10"> 37 <el-col :span="10">
40 - <Formitem label="申报地海关" prop="customsCode"> 38 + <Formitem label="清单申报地海关" prop="customsCode">
41 <el-select 39 <el-select
42 type="text" 40 type="text"
43 id="inputInner--customsCode" 41 id="inputInner--customsCode"
...@@ -57,25 +55,6 @@ ...@@ -57,25 +55,6 @@
57 </el-row> 55 </el-row>
58 <el-row :gutter="5" type="flex" justify="center"> 56 <el-row :gutter="5" type="flex" justify="center">
59 <el-col :span="10"> 57 <el-col :span="10">
60 - <Formitem label="电商企业名称" prop="ebpcode">
61 - <el-select
62 - type="text"
63 - id="inputInner--ebpcode"
64 - v-model="formData.ebpcode"
65 - clearable
66 - filterable
67 - placeholder=""
68 - >
69 - <el-option
70 - v-for="(item, index) in ebcDataList"
71 - :key="index"
72 - :label="item.ecomEntName"
73 - :value="item.ecomEntCode"
74 - ></el-option>
75 - </el-select>
76 - </Formitem>
77 - </el-col>
78 - <el-col :span="10">
79 <Formitem label="申报方式" prop="declareType"> 58 <Formitem label="申报方式" prop="declareType">
80 <el-select 59 <el-select
81 type="text" 60 type="text"
...@@ -93,10 +72,8 @@ ...@@ -93,10 +72,8 @@
93 </el-select> 72 </el-select>
94 </Formitem> 73 </Formitem>
95 </el-col> 74 </el-col>
96 - </el-row>
97 - <el-row :gutter="5" type="flex" justify="center">
98 <el-col :span="10"> 75 <el-col :span="10">
99 - <Formitem label="创建时间" prop="time" :activeType="true"> 76 + <Formitem label="创建时间" prop="time">
100 <el-date-picker 77 <el-date-picker
101 class="inputInner--time" 78 class="inputInner--time"
102 id="inputInner--time" 79 id="inputInner--time"
...@@ -107,10 +84,32 @@ ...@@ -107,10 +84,32 @@
107 value-format="yyyy-MM-dd" 84 value-format="yyyy-MM-dd"
108 range-separator="至" 85 range-separator="至"
109 @change="dateChange" 86 @change="dateChange"
110 - style="background-color: #f2f2f2;" 87 + style="background-color: #f2f2f2"
111 /> 88 />
112 </Formitem> 89 </Formitem>
113 </el-col> 90 </el-col>
91 + </el-row>
92 + <el-row :gutter="5" type="flex" justify="center">
93 + <el-col :span="10">
94 + <Formitem label="电商企业名称" prop="ebpcode">
95 + <el-select
96 + type="text"
97 + id="inputInner--ebpcode"
98 + v-model="formData.ebpcode"
99 + clearable
100 + filterable
101 + placeholder=""
102 + @focus.stop="getCustomerList"
103 + >
104 + <el-option
105 + v-for="(item, index) in ebcDataList"
106 + :key="index"
107 + :label="item.ecomEntName"
108 + :value="item.ecomEntCode"
109 + ></el-option>
110 + </el-select>
111 + </Formitem>
112 + </el-col>
114 <el-col :span="5"> 113 <el-col :span="5">
115 <Formitem label="发货人汇总" prop="summaryFlag"> 114 <Formitem label="发货人汇总" prop="summaryFlag">
116 <el-select 115 <el-select
...@@ -151,75 +150,81 @@ ...@@ -151,75 +150,81 @@
151 </el-form> 150 </el-form>
152 </div> 151 </div>
153 <div class="entrySave"> 152 <div class="entrySave">
154 - <el-button 153 + <el-button class="entrySaveButton" @click="submit">提交</el-button>
155 - class="entrySaveButton" 154 + <el-button class="entrySaveButton" @click="cancel">取消</el-button>
156 - @click="submit"
157 - >提交</el-button
158 - >
159 - <el-button
160 - class="entrySaveButton"
161 - @click="cancel"
162 - >取消</el-button
163 - >
164 </div> 155 </div>
165 </div> 156 </div>
166 </template> 157 </template>
167 158
168 <script> 159 <script>
169 import { getCurrUserPortInfo } from "@/api/system/user.js"; 160 import { getCurrUserPortInfo } from "@/api/system/user.js";
170 -import { getCustomerList} from "@/api/declareData-api.js"; 161 +import { getNewCustomerList } from "@/api/declareData-api.js";
171 -import { getDictData } from '@/api/system/dict-api.js' 162 +import { getDictData } from "@/api/system/dict-api.js";
172 import { declareSummaryApplication } from "@/api/exportSummary-api.js"; 163 import { declareSummaryApplication } from "@/api/exportSummary-api.js";
173 export default { 164 export default {
174 name: "", 165 name: "",
175 data() { 166 data() {
176 return { 167 return {
177 - formRules:{ 168 + formRules: {
178 - portCode:[ 169 + portCode: [
179 - { required: true, message: '请选择出口口岸', trigger: 'change' }, 170 + { required: true, message: "请选择出口口岸", trigger: "change" },
180 ], 171 ],
181 - customsCode:[ 172 + customsCode: [
182 - { required: true, message: '请选择申报地海关', trigger: 'change' }, 173 + { required: true, message: "请选择申报地海关", trigger: "change" },
183 ], 174 ],
184 ebpcode: [ 175 ebpcode: [
185 - { required: true, message: '请选择电商企业', trigger: 'change' }, 176 + { required: true, message: "请选择电商企业", trigger: "change" },
186 ], 177 ],
187 declareType: [ 178 declareType: [
188 - { required: true, message: '请选择申报方式', trigger: 'change' }, 179 + { required: true, message: "请选择申报方式", trigger: "change" },
189 ], 180 ],
190 time: [ 181 time: [
191 { 182 {
192 - type: 'array', 183 + type: "array",
193 required: true, 184 required: true,
194 - message: '请选择完整的日期区间', 185 + message: "请选择完整的日期区间",
195 - trigger: 'change' 186 + trigger: "change",
196 - } 187 + },
197 ], 188 ],
198 summaryFlag: [ 189 summaryFlag: [
199 - { required: true, message: '请选择发货人汇总', trigger: 'change' }, 190 + { required: true, message: "请选择发货人汇总", trigger: "change" },
200 ], 191 ],
201 itemNameFlag: [ 192 itemNameFlag: [
202 - { required: true, message: '请选择商品名汇总', trigger: 'change' }, 193 + { required: true, message: "请选择商品名汇总", trigger: "change" },
203 ], 194 ],
204 }, 195 },
205 - formData:{}, 196 + formData: {
206 - portInfo:[], 197 + portCode: "",
207 - ebcDataList:[], 198 + customsCode: "",
208 - summaryFlag:[], 199 + ebpcode: "",
209 - itemNameFlag:[], 200 + declareType: "",
210 - declareType:[] 201 + time: [],
202 + summaryFlag: "",
203 + itemNameFlag: "",
204 + },
205 + portInfo: [],
206 + ebcDataList: [],
207 + summaryFlag: [],
208 + itemNameFlag: [],
209 + declareType: [],
211 }; 210 };
212 }, 211 },
213 created() { 212 created() {
214 - this.getCurrUserPortInfo() 213 + this.getCurrUserPortInfo();
215 - this.getCustomerList() 214 + this.getCustomerList();
216 - this.getSummaryFlag() 215 + this.getSummaryFlag();
217 - this.getItemNameFlag() 216 + this.getItemNameFlag();
218 - this.getDeclareType() 217 + },
218 + mounted() {
219 + this.getDeclareType();
219 }, 220 },
220 methods: { 221 methods: {
222 + searchUserData(val) {
223 + this.formData.customsCode = val;
224 + this.formData.ebpcode = "";
225 + },
221 //获取当前用户的口岸信息 226 //获取当前用户的口岸信息
222 - getCurrUserPortInfo(){ 227 + getCurrUserPortInfo() {
223 getCurrUserPortInfo() 228 getCurrUserPortInfo()
224 .then((res) => { 229 .then((res) => {
225 if (res.code === "200") { 230 if (res.code === "200") {
...@@ -231,23 +236,27 @@ export default { ...@@ -231,23 +236,27 @@ export default {
231 }); 236 });
232 }, 237 },
233 //获取客户下拉列表数据 238 //获取客户下拉列表数据
234 - getCustomerList(){ 239 + getCustomerList() {
235 - getCustomerList().then(res =>{ 240 + let params = {
241 + ...this.formData,
242 + };
243 + getNewCustomerList(params)
244 + .then((res) => {
236 if (res.code == 200) { 245 if (res.code == 200) {
237 - this.ebcDataList = res.data.value 246 + this.ebcDataList = res.data;
238 } else { 247 } else {
239 - this.ebcDataList = [] 248 + this.ebcDataList = [];
240 } 249 }
241 -
242 - }).catch(err =>{
243 - console.log(err)
244 }) 250 })
251 + .catch((err) => {
252 + console.log(err);
253 + });
245 }, 254 },
246 //获取发货人下拉数据 255 //获取发货人下拉数据
247 - getSummaryFlag(){ 256 + getSummaryFlag() {
248 getDictData({ 257 getDictData({
249 - doctCode: "SUMMARY_FLAG" 258 + doctCode: "SUMMARY_FLAG",
250 - }).then(res => { 259 + }).then((res) => {
251 if (res.code == 200) { 260 if (res.code == 200) {
252 this.summaryFlag = res.data; 261 this.summaryFlag = res.data;
253 } else { 262 } else {
...@@ -256,10 +265,10 @@ export default { ...@@ -256,10 +265,10 @@ export default {
256 }); 265 });
257 }, 266 },
258 //获取发货人下拉数据 267 //获取发货人下拉数据
259 - getItemNameFlag(){ 268 + getItemNameFlag() {
260 getDictData({ 269 getDictData({
261 - doctCode: "ITEM_NAME_FLAG" 270 + doctCode: "ITEM_NAME_FLAG",
262 - }).then(res => { 271 + }).then((res) => {
263 if (res.code == 200) { 272 if (res.code == 200) {
264 this.itemNameFlag = res.data; 273 this.itemNameFlag = res.data;
265 } else { 274 } else {
...@@ -267,39 +276,51 @@ export default { ...@@ -267,39 +276,51 @@ export default {
267 } 276 }
268 }); 277 });
269 }, 278 },
270 - cancel(){ 279 + cancel() {
271 - this.$router.push("summaryDataSearch") 280 + this.$router.push("summaryDataSearch");
272 }, 281 },
273 - submit(){ 282 + submit() {
274 this.$refs.editForm.validate((valid) => { 283 this.$refs.editForm.validate((valid) => {
275 if (!valid) { 284 if (!valid) {
276 return; 285 return;
277 } 286 }
278 - declareSummaryApplication(this.formData).then(response => { 287 + declareSummaryApplication(this.formData).then((response) => {
279 - if(response.data){ 288 + if (response.data) {
280 this.msgSuccess("汇总申报成功"); 289 this.msgSuccess("汇总申报成功");
281 - this.$router.push("summaryDataSearch") 290 + this.$router.push("summaryDataSearch");
282 - }else { 291 + } else {
283 - this.msgError(response.message) 292 + this.msgError(response.message);
284 } 293 }
285 - }) 294 + });
286 - }) 295 + });
287 }, 296 },
288 - dateChange(val){ 297 + dateChange(val) {
289 - this.formData.startTime = val[0] + ' 00:00:00' 298 + if (val) {
290 - this.formData.endTime = val[1] + ' 23:59:59' 299 + this.formData.startTime = val[0] + " 00:00:00";
300 + this.formData.endTime = val[1] + " 23:59:59";
301 + } else {
302 + this.formData.startTime = "";
303 + this.formData.endTime = "";
304 + this.formData.time = [];
305 + }
306 + this.formData.ebpcode = "";
291 }, 307 },
292 - getDeclareType(){ 308 + getDeclareType() {
293 getDictData({ 309 getDictData({
294 - doctCode: "DECLARE_TYPE" 310 + doctCode: "DECLARE_TYPE",
295 - }).then(res => { 311 + }).then((res) => {
296 if (res.code == 200) { 312 if (res.code == 200) {
297 this.declareType = res.data; 313 this.declareType = res.data;
314 + console.log(res.data);
315 + this.formData.declareType = this.declareType[0].itemValue;
316 + this.$nextTick(() => {
317 + this.$refs.editForm.clearValidate(["declareType"]);
318 + });
298 } else { 319 } else {
299 this.declareType = []; 320 this.declareType = [];
300 } 321 }
301 }); 322 });
302 - } 323 + },
303 }, 324 },
304 }; 325 };
305 </script> 326 </script>
...@@ -308,7 +329,7 @@ export default { ...@@ -308,7 +329,7 @@ export default {
308 .content { 329 .content {
309 margin-top: 50px; 330 margin-top: 50px;
310 } 331 }
311 -.title{ 332 +.title {
312 font-size: 23px; 333 font-size: 23px;
313 margin-left: 8%; 334 margin-left: 8%;
314 padding-top: 2%; 335 padding-top: 2%;
......