Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
94560c58 1 parent 1bfa754a

回执功能增加，详情增加

Expand all
Inline Side-by-side
Showing 24 changed files with 251 additions and 71 deletions
...@@ -65,7 +65,7 @@ export function getOrderReceipt(data) { ...@@ -65,7 +65,7 @@ export function getOrderReceipt(data) {
65 */ 65 */
66 export function getLogisticsReceipt(data) { 66 export function getLogisticsReceipt(data) {
67 return request({ 67 return request({
68 - url: '/bus-customer/declareData/logisticsReceipt', 68 + url: '/bus-customer/declareData/wayBillReceipt',
69 method: 'get', 69 method: 'get',
70 params: data, 70 params: data,
71 }) 71 })
...@@ -78,7 +78,7 @@ export function getLogisticsReceipt(data) { ...@@ -78,7 +78,7 @@ export function getLogisticsReceipt(data) {
78 */ 78 */
79 export function getListReceipt(data) { 79 export function getListReceipt(data) {
80 return request({ 80 return request({
81 - url: '/bus-customer/declareData/logisticsReceipt', 81 + url: '/bus-customer/declareData/listReceipt',
82 method: 'get', 82 method: 'get',
83 params: data, 83 params: data,
84 }) 84 })
......
...@@ -2,6 +2,7 @@ import request from '@/utils/request' ...@@ -2,6 +2,7 @@ import request from '@/utils/request'
2 2
3 //订单详情 3 //订单详情
4 /** 4 /**
5 + * @param orderId * 订单id
5 */ 6 */
6 export function getOrderDetailData(data) { 7 export function getOrderDetailData(data) {
7 return request({ 8 return request({
...@@ -11,23 +12,47 @@ export function getOrderDetailData(data) { ...@@ -11,23 +12,47 @@ export function getOrderDetailData(data) {
11 }) 12 })
12 } 13 }
13 14
14 -//订单详情
15 /** 15 /**
16 + * 出口运单详情
17 + * @param logisticsId * 运单id
16 */ 18 */
17 -export function getOrderLogata(data) { 19 +export function getTransportDetail(data) {
18 return request({ 20 return request({
19 - url: '/bus-customer/exportOrder/receipt/' + data.orderNo, 21 + url: '/bus-customer/exportWaybill/info/' + data.logisticsId,
20 - method: 'get', 22 + method: 'get'
21 - data: data
22 }) 23 })
23 } 24 }
24 25
25 /** 26 /**
26 - * 出口运单详情 27 + * 出口清单详情
28 + * @param listId * 清单id
29 + */
30 +export function getListDetail(data) {
31 + return request({
32 + url: '/bus-customer/exportList/info/' + data.listId,
33 + method: 'get'
34 + })
35 +}
36 +
37 +
38 +/**
39 + * 清单总分单详情
40 + * @param totalScoreId * 总分单id
41 + */
42 +export function getListBranchDetail(data) {
43 + return request({
44 + url: '/bus-customer/exportTotalScore/info/' + data.totalScoreId,
45 + method: 'get'
46 + })
47 +}
48 +
49 +/**
50 + * 物流离境单详情
51 + * @param logisticsDepartureId * 物流离境单id
27 */ 52 */
28 -export function getTransportDetail(id) { 53 +export function getLogisticsExitDetail(data) {
29 return request({ 54 return request({
30 - url: '/bus-customer/exportWaybill/info/' + id, 55 + url: '/bus-customer/exportLogisticsDeparture/info/' + data.logisticsDepartureId,
31 method: 'get' 56 method: 'get'
32 }) 57 })
33 } 58 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -20,3 +20,15 @@ export function getAllexportList(data) { ...@@ -20,3 +20,15 @@ export function getAllexportList(data) {
20 data: data, 20 data: data,
21 }) 21 })
22 } 22 }
23 +
24 +
25 +//清单回执
26 +/**
27 + * @param copNo * 运单id
28 + */
29 +export function getListReceiptData(data) {
30 + return request({
31 + url: '/bus-customer/exportList/receipt/' + data.copNo,
32 + method: 'get',
33 + })
34 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -35,3 +35,25 @@ export function getAllExportingTransportBills(data) { ...@@ -35,3 +35,25 @@ export function getAllExportingTransportBills(data) {
35 data: data, 35 data: data,
36 }) 36 })
37 } 37 }
38 +
39 +//订单回执
40 +/**
41 + * @param orderId * 订单id
42 + */
43 +export function getOrderReceiptData(data) {
44 + return request({
45 + url: '/bus-customer/exportOrder/receipt/' + data.orderId,
46 + method: 'get',
47 + })
48 +}
49 +
50 +//运单回执
51 +/**
52 + * @param logisticsId * 运单id
53 + */
54 +export function getWaybillReceiptData(data) {
55 + return request({
56 + url: '/bus-customer/exportWaybill/receipt/' + data.logisticsId,
57 + method: 'get',
58 + })
59 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -16,3 +16,14 @@ export function getAllTotalScoreList(data) { ...@@ -16,3 +16,14 @@ export function getAllTotalScoreList(data) {
16 data: data, 16 data: data,
17 }) 17 })
18 } 18 }
19 +
20 +//清单总分单回执
21 +/**
22 + * @param copNo * 清单总分单号
23 + */
24 +export function getTotalScoreReceiptData(data) {
25 + return request({
26 + url: '/bus-customer/exportTotalScore/receipt/' + data.copNo,
27 + method: 'get',
28 + })
29 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -17,3 +17,14 @@ export function getAllLogisticsDepartureList(data) { ...@@ -17,3 +17,14 @@ export function getAllLogisticsDepartureList(data) {
17 data: data, 17 data: data,
18 }) 18 })
19 } 19 }
20 +
21 +//物流离境单回执
22 +/**
23 + * @param copNo * 清单总分单号
24 + */
25 +export function getLogisticsDepartureReceiptData(data) {
26 + return request({
27 + url: '/bus-customer/exportLogisticsDeparture/receipt/' + data.copNo,
28 + method: 'get',
29 + })
30 +}
...\ No newline at end of file ...\ No newline at end of file
......
1 +import request from '@/utils/request'
2 +
3 +//获取物流企业代码
4 +/**
5 + * @param
6 + */
7 +export function getLogisticsCodeList(data) {
8 + return request({
9 + url: '/bus-customer/exportWaybill/getLogisticsCodeList',
10 + method: 'get',
11 + params: data
12 + })
13 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -97,7 +97,7 @@ export default { ...@@ -97,7 +97,7 @@ export default {
97 let arr = JSON.parse(JSON.stringify(this.tableData)); 97 let arr = JSON.parse(JSON.stringify(this.tableData));
98 arr.forEach((item) => { 98 arr.forEach((item) => {
99 item.popoverData = []; 99 item.popoverData = [];
100 - if (data[idKey] != item[idKey]) { 100 + if (data[this.idKey] != item[this.idKey]) {
101 // item[`${type}PopoverLoading`] = false; 101 // item[`${type}PopoverLoading`] = false;
102 item[`${type}PopoverType`] = false; 102 item[`${type}PopoverType`] = false;
103 } else { 103 } else {
...@@ -131,13 +131,13 @@ export default { ...@@ -131,13 +131,13 @@ export default {
131 }); 131 });
132 let interval = setInterval(() => { 132 let interval = setInterval(() => {
133 if ( 133 if (
134 - document.getElementsByClassName(`popper${type}${data[idKey]}`) 134 + document.getElementsByClassName(`popper${type}${data[this.idKey]}`)
135 .length == 1 135 .length == 1
136 ) { 136 ) {
137 clearInterval(interval); 137 clearInterval(interval);
138 } 138 }
139 document 139 document
140 - .getElementsByClassName(`popper${type}${data[idKey]}`) 140 + .getElementsByClassName(`popper${type}${data[this.idKey]}`)
141 .forEach((dom, index) => { 141 .forEach((dom, index) => {
142 if (index > 0) { 142 if (index > 0) {
143 dom.style.display = "none"; 143 dom.style.display = "none";
......
...@@ -23,14 +23,10 @@ router.beforeEach((to, from, next) => { ...@@ -23,14 +23,10 @@ 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 // 根据roles权限生成可访问的路由表 27 // 根据roles权限生成可访问的路由表
27 router.addRoutes(accessRoutes) // 动态添加可访问路由表 28 router.addRoutes(accessRoutes) // 动态添加可访问路由表
28 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 29 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
29 - // if (getLoginType()) {
30 - // next({ name: 'Entry', params: JSON.parse(getLoginType()) })
31 - // } else {
32 - // next()
33 - // }
34 }) 30 })
35 // } 31 // }
36 }).catch(err => { 32 }).catch(err => {
...@@ -39,11 +35,6 @@ router.beforeEach((to, from, next) => { ...@@ -39,11 +35,6 @@ router.beforeEach((to, from, next) => {
39 } 35 }
40 }) 36 })
41 } else { 37 } else {
42 - // if (store.getters.entryEdit.submitType && to.path != '/finish') {
43 - // alertWarningMsg('单据提交进行中，请等待提交完成后再进行操作！', '警告！').then(() => {
44 - // next(false)
45 - // })
46 - // }
47 next() 38 next()
48 } 39 }
49 } 40 }
......
1 -import { login, logout, getLinkURL } from '@/api/login' 1 +import { login, logout } from '@/api/login'
2 -import { getInfo, initOwnerNameChange, getUserPortData, checkRdeUser } from '@/api/system/user.js' 2 +import { getLogisticsCodeList } from '@/api/system/dict-api.js'
3 -import { getToken, setToken, removeToken, getUserId, setUserId, 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 -import { encrypt } from '@/utils/jsencrypt'
6 -import { unEntryLock } from "@/api/entry-api.js";
7 5
8 const user = { 6 const user = {
9 state: { 7 state: {
...@@ -127,6 +125,20 @@ const user = { ...@@ -127,6 +125,20 @@ const user = {
127 }) 125 })
128 }, 126 },
129 127
128 + //获取字典数据
129 + async GetDict({ commit, state }) {
130 + let obj = state.dict
131 + new Promise((resolve, reject) => {
132 + getLogisticsCode().then(res => {
133 + obj.LogisticsCode = res
134 + }).finally(() => {
135 + resolve()
136 + })
137 + }).then(() => {
138 + commit('SET_DICT', obj)
139 + })
140 + },
141 +
130 //退出系统 142 //退出系统
131 LogOut({ commit, state }) { 143 LogOut({ commit, state }) {
132 return new Promise((resolve, reject) => { 144 return new Promise((resolve, reject) => {
...@@ -161,6 +173,21 @@ const user = { ...@@ -161,6 +173,21 @@ const user = {
161 } 173 }
162 } 174 }
163 175
176 +function getLogisticsCode() {
177 + return new Promise((resolve, reject) => {
178 + getLogisticsCodeList().then(res => {
179 + if (res.code === '200') {
180 + resolve(res.data)
181 + } else {
182 + reject()
183 + }
184 + }).catch(err => {
185 + console.log(err);
186 + reject()
187 + })
188 + })
189 +}
190 +
164 191
165 export default user 192 export default user
166 193
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 class="fedexDetialTable fedexTableBlack tableHeightAuto bodyTable" 3 class="fedexDetialTable fedexTableBlack tableHeightAuto bodyTable"
4 :data="tableData" 4 :data="tableData"
5 :headerData="bodyHeader" 5 :headerData="bodyHeader"
6 - :order="true" 6 + :order="false"
7 :border="false" 7 :border="false"
8 :pagination="false" 8 :pagination="false"
9 :pageSizes="[20, 30, 50, 100]" 9 :pageSizes="[20, 30, 50, 100]"
......
...@@ -229,7 +229,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; ...@@ -229,7 +229,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
229 import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 229 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
230 import { getOrderDetailData } from "@/api/exportDetail-api.js"; 230 import { getOrderDetailData } from "@/api/exportDetail-api.js";
231 export default { 231 export default {
232 - name: "index.vue", 232 + name: "",
233 components: { ProductDetailTable, ReceiptInfoTable }, 233 components: { ProductDetailTable, ReceiptInfoTable },
234 data() { 234 data() {
235 return { 235 return {
...@@ -259,6 +259,12 @@ export default { ...@@ -259,6 +259,12 @@ export default {
259 detailData: [], 259 detailData: [],
260 detialHeaderData: [ 260 detialHeaderData: [
261 { 261 {
262 + name: "序号",
263 + value: "gnum",
264 + width: "",
265 + align: "left",
266 + },
267 + {
262 name: "企业商品货号", 268 name: "企业商品货号",
263 value: "itemNo", 269 value: "itemNo",
264 width: "", 270 width: "",
......
...@@ -152,7 +152,10 @@ ...@@ -152,7 +152,10 @@
152 </template> 152 </template>
153 153
154 <script> 154 <script>
155 -import { getAllExportingBills } from "@/api/exportQuery.js"; 155 +import {
156 + getAllExportingBills,
157 + getOrderReceiptData,
158 +} from "@/api/exportQuery.js";
156 159
157 export default { 160 export default {
158 name: "ExportBillQuery", 161 name: "ExportBillQuery",
...@@ -346,10 +349,21 @@ export default { ...@@ -346,10 +349,21 @@ export default {
346 }); 349 });
347 }, 350 },
348 //查询回执 351 //查询回执
349 - receiptApi(id, type) { 352 + receiptApi(id) {
350 return new Promise((resolve, reject) => { 353 return new Promise((resolve, reject) => {
351 - let obj = { declareId: id }; 354 + let obj = { orderId: id };
352 - resolve(); 355 + getOrderReceiptData(obj)
356 + .then((res) => {
357 + if (res.code === "200") {
358 + resolve(res.data);
359 + } else {
360 + reject();
361 + }
362 + })
363 + .catch((err) => {
364 + console.log(err);
365 + reject();
366 + });
353 }); 367 });
354 }, 368 },
355 popoverClose(val) { 369 popoverClose(val) {
......
This diff is collapsed. Click to expand it.
...@@ -148,13 +148,13 @@ ...@@ -148,13 +148,13 @@
148 </el-form> 148 </el-form>
149 <div class="optionButton"> 149 <div class="optionButton">
150 <div> 150 <div>
151 - <el-button class="entrySaveButton" size="small" @click="downloadData"> 151 + <!-- <el-button class="entrySaveButton" size="small" @click="downloadData">
152 <svg-icon 152 <svg-icon
153 class="el-icon-user-solid" 153 class="el-icon-user-solid"
154 icon-class="customCodeConfig" 154 icon-class="customCodeConfig"
155 ></svg-icon> 155 ></svg-icon>
156 汇总申请单 156 汇总申请单
157 - </el-button> 157 + </el-button> -->
158 </div> 158 </div>
159 <div> 159 <div>
160 <el-button 160 <el-button
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
183 @sizeChange="sizeChange" 183 @sizeChange="sizeChange"
184 @currentChange="currentChange" 184 @currentChange="currentChange"
185 @cellClick="cellClick" 185 @cellClick="cellClick"
186 - :selection="true" 186 + :selection="false"
187 :selectFixed="false" 187 :selectFixed="false"
188 :rowSelectDataType="false" 188 :rowSelectDataType="false"
189 @tableSelect="tableSelect" 189 @tableSelect="tableSelect"
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
220 </template> 220 </template>
221 221
222 <script> 222 <script>
223 -import { getAllexportList } from "@/api/exportList-api.js"; 223 +import { getAllexportList, getListReceiptData } from "@/api/exportList-api.js";
224 224
225 export default { 225 export default {
226 name: "ExportBillQuery", 226 name: "ExportBillQuery",
...@@ -383,14 +383,14 @@ export default { ...@@ -383,14 +383,14 @@ export default {
383 //查询详情 383 //查询详情
384 view(val) { 384 view(val) {
385 this.$router.push({ 385 this.$router.push({
386 - name: "ExportBillDetail", 386 + name: "ExportListDetail",
387 params: { data: val }, 387 params: { data: val },
388 }); 388 });
389 }, 389 },
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.declareId, val.status) 393 + this.receiptApi(val.data.copNo, 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) {
...@@ -406,10 +406,21 @@ export default { ...@@ -406,10 +406,21 @@ export default {
406 }); 406 });
407 }, 407 },
408 //查询回执 408 //查询回执
409 - receiptApi(id, type) { 409 + receiptApi(id) {
410 return new Promise((resolve, reject) => { 410 return new Promise((resolve, reject) => {
411 - let obj = { declareId: id }; 411 + let obj = { copNo: id };
412 - resolve(); 412 + getListReceiptData(obj)
413 + .then((res) => {
414 + if (res.code === "200") {
415 + resolve(res.data);
416 + } else {
417 + reject();
418 + }
419 + })
420 + .catch((err) => {
421 + console.log(err);
422 + reject();
423 + });
413 }); 424 });
414 }, 425 },
415 popoverClose(val) { 426 popoverClose(val) {
......
...@@ -21,16 +21,7 @@ ...@@ -21,16 +21,7 @@
21 <!-- 物流企业代码 --> 21 <!-- 物流企业代码 -->
22 <el-col :span="5"> 22 <el-col :span="5">
23 <Formitem label="物流企业代码" prop="logisticsCode"> 23 <Formitem label="物流企业代码" prop="logisticsCode">
24 - <el-input 24 + <el-select
25 - type="text"
26 - class="inputShadow"
27 - id="inputInner--logisticsCode"
28 - resize="none"
29 - v-model="sreachFormData.logisticsCode"
30 - clearable
31 - placeholder=""
32 - ></el-input>
33 - <!-- <el-select
34 type="text" 25 type="text"
35 id="inputInner--logisticsCode" 26 id="inputInner--logisticsCode"
36 v-model="sreachFormData.logisticsCode" 27 v-model="sreachFormData.logisticsCode"
...@@ -38,12 +29,12 @@ ...@@ -38,12 +29,12 @@
38 placeholder="" 29 placeholder=""
39 > 30 >
40 <el-option 31 <el-option
41 - v-for="(item, index) in dictData.logisticsCode" 32 + v-for="(item, index) in $store.getters.dict.logisticsCode"
42 :key="index" 33 :key="index"
43 :label="item.name" 34 :label="item.name"
44 :value="item.code" 35 :value="item.code"
45 ></el-option> 36 ></el-option>
46 - </el-select> --> 37 + </el-select>
47 </Formitem> 38 </Formitem>
48 </el-col> 39 </el-col>
49 <!-- 回执状态 --> 40 <!-- 回执状态 -->
...@@ -165,7 +156,10 @@ ...@@ -165,7 +156,10 @@
165 </template> 156 </template>
166 157
167 <script> 158 <script>
168 -import { getAllExportingTransportBills } from "@/api/exportQuery.js"; 159 +import {
160 + getAllExportingTransportBills,
161 + getWaybillReceiptData,
162 +} from "@/api/exportQuery.js";
169 163
170 export default { 164 export default {
171 name: "ExportTransportBillQuery", 165 name: "ExportTransportBillQuery",
...@@ -353,10 +347,21 @@ export default { ...@@ -353,10 +347,21 @@ export default {
353 }); 347 });
354 }, 348 },
355 //查询回执 349 //查询回执
356 - receiptApi(id, type) { 350 + receiptApi(id) {
357 return new Promise((resolve, reject) => { 351 return new Promise((resolve, reject) => {
358 - let obj = { declareId: id }; 352 + let obj = { logisticsId: id };
359 - resolve(); 353 + getWaybillReceiptData(obj)
354 + .then((res) => {
355 + if (res.code === "200") {
356 + resolve(res.data);
357 + } else {
358 + reject();
359 + }
360 + })
361 + .catch((err) => {
362 + console.log(err);
363 + reject();
364 + });
360 }); 365 });
361 }, 366 },
362 popoverClose(val) { 367 popoverClose(val) {
......
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
...@@ -146,7 +146,10 @@ ...@@ -146,7 +146,10 @@
146 </template> 146 </template>
147 147
148 <script> 148 <script>
149 -import { getAllTotalScoreList } from "@/api/listBranch-api.js"; 149 +import {
150 + getAllTotalScoreList,
151 + getTotalScoreReceiptData,
152 +} from "@/api/listBranch-api.js";
150 153
151 export default { 154 export default {
152 name: "ListBranchQuery", 155 name: "ListBranchQuery",
...@@ -259,7 +262,7 @@ export default { ...@@ -259,7 +262,7 @@ export default {
259 //查询详情 262 //查询详情
260 view(val) { 263 view(val) {
261 this.$router.push({ 264 this.$router.push({
262 - name: "ExportTransportDetail", 265 + name: "ListBranchDetail",
263 params: { data: val }, 266 params: { data: val },
264 }); 267 });
265 }, 268 },
...@@ -317,7 +320,7 @@ export default { ...@@ -317,7 +320,7 @@ export default {
317 popoverChange(val) { 320 popoverChange(val) {
318 console.log(val); 321 console.log(val);
319 this.tableData = val.tableData; 322 this.tableData = val.tableData;
320 - this.receiptApi(val.data.declareId, val.status) 323 + this.receiptApi(val.data.copNo, val.status)
321 .then((res) => { 324 .then((res) => {
322 val.tableData.forEach((item) => { 325 val.tableData.forEach((item) => {
323 if (item.declareId == val.data.declareId) { 326 if (item.declareId == val.data.declareId) {
...@@ -333,10 +336,21 @@ export default { ...@@ -333,10 +336,21 @@ export default {
333 }); 336 });
334 }, 337 },
335 //查询回执 338 //查询回执
336 - receiptApi(id, type) { 339 + receiptApi(id) {
337 return new Promise((resolve, reject) => { 340 return new Promise((resolve, reject) => {
338 - let obj = { declareId: id }; 341 + let obj = { copNo: id };
339 - resolve(); 342 + getTotalScoreReceiptData(obj)
343 + .then((res) => {
344 + if (res.code === "200") {
345 + resolve(res.data);
346 + } else {
347 + reject();
348 + }
349 + })
350 + .catch((err) => {
351 + console.log(err);
352 + reject();
353 + });
340 }); 354 });
341 }, 355 },
342 popoverClose(val) { 356 popoverClose(val) {
......
This diff is collapsed. Click to expand it.
...@@ -165,7 +165,10 @@ ...@@ -165,7 +165,10 @@
165 </template> 165 </template>
166 166
167 <script> 167 <script>
168 -import { getAllLogisticsDepartureList } from "@/api/logisticsExit-api.js"; 168 +import {
169 + getAllLogisticsDepartureList,
170 + getLogisticsDepartureReceiptData,
171 +} from "@/api/logisticsExit-api.js";
169 172
170 export default { 173 export default {
171 name: "LogisticsExitQuery", 174 name: "LogisticsExitQuery",
...@@ -291,7 +294,7 @@ export default { ...@@ -291,7 +294,7 @@ export default {
291 //查询详情 294 //查询详情
292 view(val) { 295 view(val) {
293 this.$router.push({ 296 this.$router.push({
294 - name: "ExportTransportDetail", 297 + name: "LogisticsExitDetail",
295 params: { data: val }, 298 params: { data: val },
296 }); 299 });
297 }, 300 },
...@@ -349,7 +352,7 @@ export default { ...@@ -349,7 +352,7 @@ export default {
349 popoverChange(val) { 352 popoverChange(val) {
350 console.log(val); 353 console.log(val);
351 this.tableData = val.tableData; 354 this.tableData = val.tableData;
352 - this.receiptApi(val.data.declareId, val.status) 355 + this.receiptApi(val.data.copNo, val.status)
353 .then((res) => { 356 .then((res) => {
354 val.tableData.forEach((item) => { 357 val.tableData.forEach((item) => {
355 if (item.declareId == val.data.declareId) { 358 if (item.declareId == val.data.declareId) {
...@@ -365,10 +368,21 @@ export default { ...@@ -365,10 +368,21 @@ export default {
365 }); 368 });
366 }, 369 },
367 //查询回执 370 //查询回执
368 - receiptApi(id, type) { 371 + receiptApi(id) {
369 return new Promise((resolve, reject) => { 372 return new Promise((resolve, reject) => {
370 - let obj = { declareId: id }; 373 + let obj = { copNo: id };
371 - resolve(); 374 + getLogisticsDepartureReceiptData(obj)
375 + .then((res) => {
376 + if (res.code === "200") {
377 + resolve(res.data);
378 + } else {
379 + reject();
380 + }
381 + })
382 + .catch((err) => {
383 + console.log(err);
384 + reject();
385 + });
372 }); 386 });
373 }, 387 },
374 popoverClose(val) { 388 popoverClose(val) {
......
...@@ -41,6 +41,7 @@ export default { ...@@ -41,6 +41,7 @@ export default {
41 // }) 41 // })
42 // ); 42 // );
43 // } 43 // }
44 + this.$store.dispatch("GetDict");
44 location.replace(process.env.VUE_APP_BASE_ROUTE); 45 location.replace(process.env.VUE_APP_BASE_ROUTE);
45 } else { 46 } else {
46 this.$router.push({ path: "/login" }); 47 this.$router.push({ path: "/login" });
......
...@@ -334,6 +334,7 @@ export default { ...@@ -334,6 +334,7 @@ export default {
334 } 334 }
335 335
336 .errorMessage { 336 .errorMessage {
337 + width: 100%;
337 color: $fedexError; 338 color: $fedexError;
338 } 339 }
339 </style> 340 </style>
......
...@@ -487,6 +487,7 @@ export default { ...@@ -487,6 +487,7 @@ export default {
487 item.orderReceiptStatusPopoverType = false; 487 item.orderReceiptStatusPopoverType = false;
488 item.listReceiptStatusPopoverType = false; 488 item.listReceiptStatusPopoverType = false;
489 item.logisticsReceiptStatusPopoverType = false; 489 item.logisticsReceiptStatusPopoverType = false;
490 + item.totalSplitOrderStatusPopoverType = false;
490 item.popoverData = []; 491 item.popoverData = [];
491 }); 492 });
492 } else { 493 } else {
...@@ -655,6 +656,7 @@ export default { ...@@ -655,6 +656,7 @@ export default {
655 item.orderReceiptStatusPopoverType = false; 656 item.orderReceiptStatusPopoverType = false;
656 item.listReceiptStatusPopoverType = false; 657 item.listReceiptStatusPopoverType = false;
657 item.logisticsReceiptStatusPopoverType = false; 658 item.logisticsReceiptStatusPopoverType = false;
659 + item.totalSplitOrderStatusPopoverType = false;
658 item.popoverData = []; 660 item.popoverData = [];
659 }); 661 });
660 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY = 662 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
......