Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
47f7adcc 1 parent 9167639a

增加详情接口

Expand all
Inline Side-by-side
Showing 5 changed files with 124 additions and 95 deletions
1 -import request from '@/utils/request' 1 +import request from "@/utils/request";
2 2
3 //获取自定义设置数据 3 //获取自定义设置数据
4 /** 4 /**
...@@ -7,10 +7,14 @@ import request from '@/utils/request' ...@@ -7,10 +7,14 @@ import request from '@/utils/request'
7 */ 7 */
8 export function getCustomData(data) { 8 export function getCustomData(data) {
9 return request({ 9 return request({
10 - url: '/bus-employees/custom/setting/pool/query/' + data.queryType + '/' + data.belongBizType, 10 + url:
11 - method: 'get', 11 + "/bus-employees/custom/setting/pool/query/" +
12 + data.queryType +
13 + "/" +
14 + data.belongBizType,
15 + method: "get",
12 data: data, 16 data: data,
13 - }) 17 + });
14 } 18 }
15 19
16 //保存自定义设置数据 20 //保存自定义设置数据
...@@ -26,10 +30,10 @@ export function getCustomData(data) { ...@@ -26,10 +30,10 @@ export function getCustomData(data) {
26 */ 30 */
27 export function setCustomData(data) { 31 export function setCustomData(data) {
28 return request({ 32 return request({
29 - url: '/bus-employees/custom/setting/pool/merge', 33 + url: "/bus-employees/custom/setting/pool/merge",
30 - method: 'post', 34 + method: "post",
31 data: data, 35 data: data,
32 - }) 36 + });
33 } 37 }
34 38
35 //获取查询条件数据 39 //获取查询条件数据
...@@ -38,10 +42,10 @@ export function setCustomData(data) { ...@@ -38,10 +42,10 @@ export function setCustomData(data) {
38 */ 42 */
39 export function getSreachFormData(data) { 43 export function getSreachFormData(data) {
40 return request({ 44 return request({
41 - url: '/bus-employees/custom/setting/condition/' + data.belongBizType, 45 + url: "/bus-employees/custom/setting/condition/" + data.belongBizType,
42 - method: 'get', 46 + method: "get",
43 data: data, 47 data: data,
44 - }) 48 + });
45 } 49 }
46 50
47 //获取表头数据 51 //获取表头数据
...@@ -50,10 +54,10 @@ export function getSreachFormData(data) { ...@@ -50,10 +54,10 @@ export function getSreachFormData(data) {
50 */ 54 */
51 export function getTableData(data) { 55 export function getTableData(data) {
52 return request({ 56 return request({
53 - url: '/bus-employees/custom/setting/display/' + data.belongBizType, 57 + url: "/bus-employees/custom/setting/display/" + data.belongBizType,
54 - method: 'get', 58 + method: "get",
55 data: data, 59 data: data,
56 - }) 60 + });
57 } 61 }
58 62
59 //自定义查询接口 63 //自定义查询接口
...@@ -73,17 +77,17 @@ export function getTableData(data) { ...@@ -73,17 +77,17 @@ export function getTableData(data) {
73 */ 77 */
74 export function auditionEntrySreachCustomData(data) { 78 export function auditionEntrySreachCustomData(data) {
75 return request({ 79 return request({
76 - url: '/bus-employees' + data.url, 80 + url: "/bus-employees" + data.url,
77 - method: 'post', 81 + method: "post",
78 data: data.data, 82 data: data.data,
79 - }) 83 + });
80 } 84 }
81 85
82 //获取查询导出是否完成 86 //获取查询导出是否完成
83 export function getdownloadExlFileType(data) { 87 export function getdownloadExlFileType(data) {
84 return request({ 88 return request({
85 - url: '/bus-employees/export/custom/exportResult?exportSign=' + data, 89 + url: "/bus-employees/export/custom/exportResult?exportSign=" + data,
86 - method: 'get', 90 + method: "get",
87 data: data, 91 data: data,
88 - }) 92 + });
89 } 93 }
......
1 -import request from '@/utils/request' 1 +import request from "@/utils/request";
2 import axios from "axios"; 2 import axios from "axios";
3 3
4 const baseUrl = process.env.VUE_APP_BASE_API; //接口地址 4 const baseUrl = process.env.VUE_APP_BASE_API; //接口地址
...@@ -16,10 +16,10 @@ const baseUrl = process.env.VUE_APP_BASE_API; //接口地址 ...@@ -16,10 +16,10 @@ const baseUrl = process.env.VUE_APP_BASE_API; //接口地址
16 */ 16 */
17 export function getCustomerList(data) { 17 export function getCustomerList(data) {
18 return request({ 18 return request({
19 - url: '/bus-customer/customers/getCustomerList', 19 + url: "/bus-customer/customers/getCustomerList",
20 - method: 'post', 20 + method: "post",
21 - data: data 21 + data: data,
22 - }) 22 + });
23 } 23 }
24 24
25 // 新增客户数据 25 // 新增客户数据
...@@ -50,69 +50,66 @@ export function addCustomerData(data) { ...@@ -50,69 +50,66 @@ export function addCustomerData(data) {
50 // formData.append("qingdaoUserId", data.qingdaoUserId); 50 // formData.append("qingdaoUserId", data.qingdaoUserId);
51 console.log(data); 51 console.log(data);
52 return request({ 52 return request({
53 - url: '/bus-customer/customers/add', 53 + url: "/bus-customer/customers/add",
54 - method: 'post', 54 + method: "post",
55 - data: data 55 + data: data,
56 - }) 56 + });
57 } 57 }
58 58
59 //上传证书 59 //上传证书
60 export function uploadCertificate(ecomEntCode, certificate) { 60 export function uploadCertificate(ecomEntCode, certificate) {
61 const formData = new FormData(); 61 const formData = new FormData();
62 - formData.append('certificate', certificate); 62 + formData.append("certificate", certificate);
63 - formData.append('ecomEntCode', ecomEntCode); 63 + formData.append("ecomEntCode", ecomEntCode);
64 return request({ 64 return request({
65 - url: '/bus-customer/customers/uploadCertificate', 65 + url: "/bus-customer/customers/uploadCertificate",
66 - method: 'post', 66 + method: "post",
67 data: formData, 67 data: formData,
68 }); 68 });
69 } 69 }
70 //上传青岛证书 70 //上传青岛证书
71 export function uploadQingdaoCertificate(ecomEntCode, certificate) { 71 export function uploadQingdaoCertificate(ecomEntCode, certificate) {
72 const formData = new FormData(); 72 const formData = new FormData();
73 - formData.append('certificate', certificate); 73 + formData.append("certificate", certificate);
74 - formData.append('ecomEntCode', ecomEntCode); 74 + formData.append("ecomEntCode", ecomEntCode);
75 return request({ 75 return request({
76 - url: '/bus-customer/customers/uploadQingDaoCertificate', 76 + url: "/bus-customer/customers/uploadQingDaoCertificate",
77 - method: 'post', 77 + method: "post",
78 data: formData, 78 data: formData,
79 }); 79 });
80 } 80 }
81 81
82 //删除证书 82 //删除证书
83 export function delCertificate(id, certificate) { 83 export function delCertificate(id, certificate) {
84 -
85 return request({ 84 return request({
86 - url: '/bus-customer/customers/deleteCertificate', 85 + url: "/bus-customer/customers/deleteCertificate",
87 - method: 'post', 86 + method: "post",
88 - params: {id:id,certificate:certificate}, 87 + params: { id: id, certificate: certificate },
89 }); 88 });
90 } 89 }
91 //删除青岛证书 90 //删除青岛证书
92 export function delQingdaoCertificate(id, certificate) { 91 export function delQingdaoCertificate(id, certificate) {
93 -
94 return request({ 92 return request({
95 - url: '/bus-customer/customers/deleteQingdaoCertificate', 93 + url: "/bus-customer/customers/deleteQingdaoCertificate",
96 - method: 'post', 94 + method: "post",
97 - params: {id:id,certificatePath:certificate}, 95 + params: { id: id, certificatePath: certificate },
98 }); 96 });
99 } 97 }
100 98
101 //下载证书 99 //下载证书
102 -export function downloadCertificate(id,filename) { 100 +export function downloadCertificate(id, filename) {
103 - 101 + console.log("fileName" + filename);
104 - console.log("fileName"+filename);
105 return new Promise((resolve, reject) => { 102 return new Promise((resolve, reject) => {
106 // axios({ 103 // axios({
107 // method: "get", 104 // method: "get",
108 // url: '/bus-customer/customers/getCertificate/' + id, 105 // url: '/bus-customer/customers/getCertificate/' + id,
109 // responseType: "blob", 106 // responseType: "blob",
110 // }) 107 // })
111 - var url = baseUrl + '/bus-customer/customers/getCertificate/'+id; 108 + var url = baseUrl + "/bus-customer/customers/getCertificate/" + id;
112 request({ 109 request({
113 url: url, 110 url: url,
114 - method: 'get', 111 + method: "get",
115 - responseType: 'blob', // 确保响应类型为 blob 112 + responseType: "blob", // 确保响应类型为 blob
116 params: id, 113 params: id,
117 }) 114 })
118 .then((res) => { 115 .then((res) => {
...@@ -123,7 +120,6 @@ export function downloadCertificate(id,filename) { ...@@ -123,7 +120,6 @@ export function downloadCertificate(id,filename) {
123 aLink.click(); 120 aLink.click();
124 document.body.removeChild(aLink); 121 document.body.removeChild(aLink);
125 resolve(res); 122 resolve(res);
126 -
127 }) 123 })
128 .catch((err) => { 124 .catch((err) => {
129 reject(err); 125 reject(err);
...@@ -131,13 +127,13 @@ export function downloadCertificate(id,filename) { ...@@ -131,13 +127,13 @@ export function downloadCertificate(id,filename) {
131 }); 127 });
132 } 128 }
133 //下载青岛证书 129 //下载青岛证书
134 -export function downloadQingdaoCertificate(id,filename) { 130 +export function downloadQingdaoCertificate(id, filename) {
135 return new Promise((resolve, reject) => { 131 return new Promise((resolve, reject) => {
136 - var url = baseUrl + '/bus-customer/customers/getQingDaoCertificate/'+id; 132 + var url = baseUrl + "/bus-customer/customers/getQingDaoCertificate/" + id;
137 request({ 133 request({
138 url: url, 134 url: url,
139 - method: 'get', 135 + method: "get",
140 - responseType: 'blob', // 确保响应类型为 blob 136 + responseType: "blob", // 确保响应类型为 blob
141 params: id, 137 params: id,
142 }) 138 })
143 .then((res) => { 139 .then((res) => {
...@@ -148,7 +144,6 @@ export function downloadQingdaoCertificate(id,filename) { ...@@ -148,7 +144,6 @@ export function downloadQingdaoCertificate(id,filename) {
148 aLink.click(); 144 aLink.click();
149 document.body.removeChild(aLink); 145 document.body.removeChild(aLink);
150 resolve(res); 146 resolve(res);
151 -
152 }) 147 })
153 .catch((err) => { 148 .catch((err) => {
154 reject(err); 149 reject(err);
...@@ -185,8 +180,26 @@ export function updateCustomerData(data) { ...@@ -185,8 +180,26 @@ export function updateCustomerData(data) {
185 // formData.append("qingdaoUserDxpid", data.qingdaoUserDxpid); 180 // formData.append("qingdaoUserDxpid", data.qingdaoUserDxpid);
186 // formData.append("qingdaoUserId", data.qingdaoUserId); 181 // formData.append("qingdaoUserId", data.qingdaoUserId);
187 return request({ 182 return request({
188 - url: '/bus-customer/customers/update', 183 + url: "/bus-customer/customers/update",
189 - method: 'put', 184 + method: "put",
190 - data: data 185 + data: data,
191 - }) 186 + });
187 +}
188 +// /portInfo
189 +export function getPortInfo(data) {
190 + return request({
191 + url: "/bus-customer/portInfo",
192 + method: "get",
193 + data: data,
194 + });
195 +}
196 +
197 +// GET
198 +// ​/customers​/customerDetails​/{id}
199 +// 获取客户详情
200 +export function getCustomerDetails(data) {
201 + return request({
202 + url: "/bus-customer/customers/customerDetails/" + data.id,
203 + method: "get",
204 + });
192 } 205 }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 title="运抵单申报" 4 title="运抵单申报"
5 :visible.sync="outerVisible" 5 :visible.sync="outerVisible"
6 :show-close="false" 6 :show-close="false"
7 - width="40%" 7 + width="720px"
8 :close-on-click-modal="false" 8 :close-on-click-modal="false"
9 :destroy-on-close="true" 9 :destroy-on-close="true"
10 v-loading="loadings.dialogLoading" 10 v-loading="loadings.dialogLoading"
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
31 > 31 >
32 <el-option 32 <el-option
33 v-for="item in operatorCode" 33 v-for="item in operatorCode"
34 - :key="item" 34 + :key="item.operatorCode"
35 - :label="item" 35 + :label="item.operatorName"
36 - :value="item" 36 + :value="item.operatorCode"
37 ></el-option> 37 ></el-option>
38 </el-select> 38 </el-select>
39 </Formitem> 39 </Formitem>
......
This diff is collapsed. Click to expand it.
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 <!-- Client ID --> 11 <!-- Client ID -->
12 - <el-col :span="5"> 12 + <!-- <el-col :span="5">
13 <Formitem label="Client ID" prop="clientId"> 13 <Formitem label="Client ID" prop="clientId">
14 <el-input 14 <el-input
15 type="text" 15 type="text"
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
21 placeholder="" 21 placeholder=""
22 ></el-input> 22 ></el-input>
23 </Formitem> 23 </Formitem>
24 - </el-col> 24 + </el-col> -->
25 <!-- 电商企业名称 --> 25 <!-- 电商企业名称 -->
26 <el-col :span="5"> 26 <el-col :span="5">
27 <Formitem label="电商企业名称" prop="ecomEntName"> 27 <Formitem label="电商企业名称" prop="ecomEntName">
28 <el-input 28 <el-input
29 type="text" 29 type="text"
30 class="inputShadow" 30 class="inputShadow"
31 - id="inputInner--ecomEntName" 31 + id="inputInner-edit-ecomEntName"
32 resize="none" 32 resize="none"
33 v-model="sreachFormData.ecomEntName" 33 v-model="sreachFormData.ecomEntName"
34 clearable 34 clearable
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 <el-input 42 <el-input
43 type="text" 43 type="text"
44 class="inputShadow" 44 class="inputShadow"
45 - id="inputInner--ecomEntCode" 45 + id="inputInner-edit-ecomEntCode"
46 resize="none" 46 resize="none"
47 v-model="sreachFormData.ecomEntCode" 47 v-model="sreachFormData.ecomEntCode"
48 clearable 48 clearable
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 <Formitem label="创建日期" prop="creationTime" :activeType="true"> 55 <Formitem label="创建日期" prop="creationTime" :activeType="true">
56 <el-date-picker 56 <el-date-picker
57 class="inputInner--creationTime" 57 class="inputInner--creationTime"
58 - id="inputInner--creationTime" 58 + id="inputInner-edit-creationTime"
59 v-model="sreachFormData.creationTime" 59 v-model="sreachFormData.creationTime"
60 type="daterange" 60 type="daterange"
61 format="yyyy-MM-dd" 61 format="yyyy-MM-dd"
...@@ -66,6 +66,19 @@ ...@@ -66,6 +66,19 @@
66 /> 66 />
67 </Formitem> 67 </Formitem>
68 </el-col> 68 </el-col>
69 + <el-col :span="5">
70 + <Formitem label="电商企业邮箱" prop="ecomEntEmail">
71 + <el-input
72 + type="text"
73 + class="inputShadow"
74 + id="inputInner-edit-ecomEntEmail"
75 + resize="none"
76 + v-model="sreachFormData.ecomEntEmail"
77 + clearable
78 + placeholder=""
79 + ></el-input>
80 + </Formitem>
81 + </el-col>
69 <el-col :span="2"> 82 <el-col :span="2">
70 <el-form-item class="textCenter"> 83 <el-form-item class="textCenter">
71 <el-button 84 <el-button
...@@ -91,22 +104,6 @@ ...@@ -91,22 +104,6 @@
91 </el-form-item> 104 </el-form-item>
92 </el-col> 105 </el-col>
93 </el-row> 106 </el-row>
94 - <el-row>
95 - <!-- 电商企业邮箱 -->
96 - <el-col :span="5">
97 - <Formitem label="电商企业邮箱" prop="ecomEntEmail">
98 - <el-input
99 - type="text"
100 - class="inputShadow"
101 - id="inputInner--ecomEntEmail"
102 - resize="none"
103 - v-model="sreachFormData.ecomEntEmail"
104 - clearable
105 - placeholder=""
106 - ></el-input>
107 - </Formitem>
108 - </el-col>
109 - </el-row>
110 </el-form> 107 </el-form>
111 <div class="optionButton"> 108 <div class="optionButton">
112 <div> 109 <div>
...@@ -162,7 +159,7 @@ ...@@ -162,7 +159,7 @@
162 :title="dialogTitle" 159 :title="dialogTitle"
163 :type="editType" 160 :type="editType"
164 :active="activeData" 161 :active="activeData"
165 - :portCodeList="dict.port" 162 + :portCodeList="portList"
166 @close="dialogClose" 163 @close="dialogClose"
167 /> 164 />
168 </div> 165 </div>
...@@ -173,8 +170,10 @@ import { ...@@ -173,8 +170,10 @@ import {
173 getCustomerList, 170 getCustomerList,
174 downloadCertificate, 171 downloadCertificate,
175 downloadQingdaoCertificate, 172 downloadQingdaoCertificate,
173 + getPortInfo,
176 } from "@/api/system/customer-ai.js"; 174 } from "@/api/system/customer-ai.js";
177 -import { getPortList } from "@/api/system/user.js"; 175 +import { getDictData } from "@/api/system/dict-api.js";
176 +
178 import DialogVue from "./dialog.vue"; 177 import DialogVue from "./dialog.vue";
179 export default { 178 export default {
180 name: "PortConfig", 179 name: "PortConfig",
...@@ -198,12 +197,12 @@ export default { ...@@ -198,12 +197,12 @@ export default {
198 activeData: null, 197 activeData: null,
199 tableData: [], 198 tableData: [],
200 headerData: [ 199 headerData: [
201 - { 200 + // {
202 - name: "Client ID", 201 + // name: "Client ID",
203 - value: "clientId", 202 + // value: "clientId",
204 - width: "", 203 + // width: "",
205 - align: "left", 204 + // align: "left",
206 - }, 205 + // },
207 { 206 {
208 name: "电商企业代码", 207 name: "电商企业代码",
209 value: "ecomEntCode", 208 value: "ecomEntCode",
...@@ -262,6 +261,7 @@ export default { ...@@ -262,6 +261,7 @@ export default {
262 dict: { 261 dict: {
263 port: [], 262 port: [],
264 }, 263 },
264 + portList: [],
265 // dict: { 265 // dict: {
266 // orderRequester: [ 266 // orderRequester: [
267 // { name: "企业", code: "ENTERPRISE_DECLARATION", value: "1" }, 267 // { name: "企业", code: "ENTERPRISE_DECLARATION", value: "1" },
...@@ -275,6 +275,8 @@ export default { ...@@ -275,6 +275,8 @@ export default {
275 outerVisible: false, 275 outerVisible: false,
276 dialogTitle: "", 276 dialogTitle: "",
277 editType: "", 277 editType: "",
278 + // 加密方式list
279 + encryptionTypeList: [],
278 }; 280 };
279 }, 281 },
280 created() { 282 created() {
...@@ -327,15 +329,25 @@ export default { ...@@ -327,15 +329,25 @@ export default {
327 }, 329 },
328 //获取口岸子字典 330 //获取口岸子字典
329 searchPortDictData() { 331 searchPortDictData() {
330 - getPortList() 332 + getPortInfo()
331 .then((res) => { 333 .then((res) => {
334 + console.log(res);
332 if (res.code === "200") { 335 if (res.code === "200") {
333 - this.dict.port = res.data; 336 + this.portList = res.data;
334 } 337 }
335 }) 338 })
336 .catch((err) => { 339 .catch((err) => {
337 console.log(err); 340 console.log(err);
338 }); 341 });
342 + getDictData({ doctCode: "METHOD_OF_SIGNATURE" })
343 + .then((res) => {
344 + if (res.code == "200") {
345 + this.encryptionTypeList = res.data;
346 + }
347 + })
348 + .catch((err) => {
349 + console.error(err);
350 + });
339 }, 351 },
340 clear() { 352 clear() {
341 this.$refs.sreachForm.resetFields(); 353 this.$refs.sreachForm.resetFields();
......