jinhui.wang

回执功能增加,详情增加

...@@ -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) {
......
1 <template> 1 <template>
2 - <div class="export-bill-detail"> 2 + <div class="entry" v-loading="loadings.entryLoading">
3 - <h5 class="first-header"> 3 + <div class="entryTitle">
4 - 出口清单详情 4 + <div>出口清单详情</div>
5 - <div class="returnButton" @click="$router.back()">返回</div> 5 + <div>
6 - </h5> 6 + <el-button class="entrySaveButton" @click="back">返 回</el-button>
7 + </div>
8 + </div>
7 <el-form 9 <el-form
8 - class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder" 10 + class="fedexFormStyle"
9 ref="sreachForm" 11 ref="sreachForm"
10 - :model="searchForm" 12 + :model="formData"
11 label-position="top" 13 label-position="top"
12 disabled 14 disabled
13 size="small" 15 size="small"
14 > 16 >
15 - <el-row class="row-border"> 17 + <el-row :gutter="5">
16 - <el-col :span="5"> 18 + <!-- 提运单号 -->
17 - <Formitem label="提运单号" prop="consignmentCode"> 19 + <el-col :span="3">
18 - <el-popover 20 + <Formitem label="提运单号" prop="billNo">
19 - placement="bottom"
20 - width="320"
21 - trigger="manual"
22 - popper-class="popoverconsignmentCode"
23 - v-model="textareaVisible.formItemconsignmentCode"
24 - >
25 <el-input 21 <el-input
26 - name="consignmentCode-textarea" 22 + type="text"
27 - type="textarea"
28 - :rows="5"
29 - id="popoverInputconsignmentCode"
30 - class="inputShadow textareaPopover"
31 - v-model="searchForm.consignmentCode"
32 - resize="none"
33 - maxlength="13000"
34 - placeholder=""
35 - @blur="textareaBlur"
36 - ></el-input>
37 - <el-input
38 - slot="reference"
39 - name="consignmentCode"
40 - type="textarea"
41 - :rows="1"
42 class="inputShadow" 23 class="inputShadow"
43 - id="inputInner--consignmentCode" 24 + id="inputInner--billNo"
44 - v-model="searchForm.consignmentCode"
45 resize="none" 25 resize="none"
26 + v-model="formData.billNo"
27 + clearable
46 placeholder="" 28 placeholder=""
47 - @focus="textareaFocus"
48 ></el-input> 29 ></el-input>
49 - </el-popover>
50 </Formitem> 30 </Formitem>
51 </el-col> 31 </el-col>
52 - <el-col :span="4"> 32 + <!-- 订单编号 -->
53 - <Formitem label="订单编号" prop="factoryCode"> 33 + <el-col :span="3">
54 - <el-select 34 + <Formitem label="订单编号" prop="orderNo">
35 + <el-input
55 type="text" 36 type="text"
56 - id="inputInner--declaredPort" 37 + class="inputShadow"
57 - v-model="searchForm.declaredPort" 38 + id="inputInner--orderNo"
39 + resize="none"
40 + v-model="formData.orderNo"
58 clearable 41 clearable
59 placeholder="" 42 placeholder=""
60 - > 43 + ></el-input>
61 - <el-option
62 - v-for="(item, index) in dictData.userport"
63 - :key="index"
64 - :label="item.name"
65 - :value="item.name"
66 - ></el-option>
67 - </el-select>
68 </Formitem> 44 </Formitem>
69 </el-col> 45 </el-col>
70 - <el-col :span="5"> 46 + <!-- 电商平台代码 -->
71 - <Formitem label="电商平台代码" prop="consignmentCode"> 47 + <el-col :span="3">
72 - <el-popover 48 + <Formitem label="电商平台代码" prop="ebpcode">
73 - placement="bottom"
74 - width="320"
75 - trigger="manual"
76 - popper-class="popoverconsignmentCode"
77 - v-model="textareaVisible.formItemconsignmentCode"
78 - >
79 <el-input 49 <el-input
80 - name="consignmentCode-textarea" 50 + type="text"
81 - type="textarea"
82 - :rows="5"
83 - id="popoverInputconsignmentCode"
84 - class="inputShadow textareaPopover"
85 - v-model="searchForm.consignmentCode"
86 - resize="none"
87 - maxlength="13000"
88 - placeholder=""
89 - @blur="textareaBlur"
90 - ></el-input>
91 - <el-input
92 - slot="reference"
93 - name="consignmentCode"
94 - type="textarea"
95 - :rows="1"
96 class="inputShadow" 51 class="inputShadow"
97 - id="inputInner--consignmentCode" 52 + id="inputInner--ebpcode"
98 - v-model="searchForm.consignmentCode"
99 resize="none" 53 resize="none"
54 + v-model="formData.ebpcode"
55 + clearable
100 placeholder="" 56 placeholder=""
101 - @focus="textareaFocus"
102 ></el-input> 57 ></el-input>
103 - </el-popover>
104 </Formitem> 58 </Formitem>
105 </el-col> 59 </el-col>
106 - <el-col :span="5"> 60 + <!-- 申报地海关 -->
107 - <Formitem label="申报地海关" prop="consignmentCode"> 61 + <el-col :span="3">
108 - <el-popover 62 + <Formitem label="申报地海关" prop="customsCode">
109 - placement="bottom"
110 - width="320"
111 - trigger="manual"
112 - popper-class="popoverconsignmentCode"
113 - v-model="textareaVisible.formItemconsignmentCode"
114 - >
115 <el-input 63 <el-input
116 - name="consignmentCode-textarea" 64 + type="text"
117 - type="textarea"
118 - :rows="5"
119 - id="popoverInputconsignmentCode"
120 - class="inputShadow textareaPopover"
121 - v-model="searchForm.consignmentCode"
122 - resize="none"
123 - maxlength="13000"
124 - placeholder=""
125 - @blur="textareaBlur"
126 - ></el-input>
127 - <el-input
128 - slot="reference"
129 - name="consignmentCode"
130 - type="textarea"
131 - :rows="1"
132 class="inputShadow" 65 class="inputShadow"
133 - id="inputInner--consignmentCode" 66 + id="inputInner--customsCode"
134 - v-model="searchForm.consignmentCode"
135 resize="none" 67 resize="none"
68 + v-model="formData.customsCode"
69 + clearable
136 placeholder="" 70 placeholder=""
137 - @focus="textareaFocus"
138 ></el-input> 71 ></el-input>
139 - </el-popover>
140 </Formitem> 72 </Formitem>
141 </el-col> 73 </el-col>
142 - <el-col :span="5"> 74 + <!-- 物流企业代码 -->
143 - <Formitem label="物流企业代码" prop="consignmentCode"> 75 + <el-col :span="3">
144 - <el-popover 76 + <Formitem label="物流企业代码" prop="logisticsCode">
145 - placement="bottom"
146 - width="320"
147 - trigger="manual"
148 - popper-class="popoverconsignmentCode"
149 - v-model="textareaVisible.formItemconsignmentCode"
150 - >
151 - <el-input
152 - name="consignmentCode-textarea"
153 - type="textarea"
154 - :rows="5"
155 - id="popoverInputconsignmentCode"
156 - class="inputShadow textareaPopover"
157 - v-model="searchForm.consignmentCode"
158 - resize="none"
159 - maxlength="13000"
160 - placeholder=""
161 - @blur="textareaBlur"
162 - ></el-input>
163 <el-input 77 <el-input
164 - slot="reference" 78 + type="text"
165 - name="consignmentCode"
166 - type="textarea"
167 - :rows="1"
168 class="inputShadow" 79 class="inputShadow"
169 - id="inputInner--consignmentCode" 80 + id="inputInner--logisticsCode"
170 - v-model="searchForm.consignmentCode"
171 resize="none" 81 resize="none"
82 + v-model="formData.logisticsCode"
83 + clearable
172 placeholder="" 84 placeholder=""
173 - @focus="textareaFocus"
174 ></el-input> 85 ></el-input>
175 - </el-popover>
176 </Formitem> 86 </Formitem>
177 </el-col> 87 </el-col>
178 - </el-row> 88 + <!-- 物流企业名称 -->
179 - <el-row> 89 + <el-col :span="6">
180 - <el-col :span="5"> 90 + <Formitem label="物流企业名称" prop="logisticsName">
181 - <Formitem label="物流企业名称" prop="consignmentCode">
182 - <el-popover
183 - placement="bottom"
184 - width="320"
185 - trigger="manual"
186 - popper-class="popoverconsignmentCode"
187 - v-model="textareaVisible.formItemconsignmentCode"
188 - >
189 <el-input 91 <el-input
190 - name="consignmentCode-textarea" 92 + type="text"
191 - type="textarea"
192 - :rows="5"
193 - id="popoverInputconsignmentCode"
194 - class="inputShadow textareaPopover"
195 - v-model="searchForm.consignmentCode"
196 - resize="none"
197 - maxlength="13000"
198 - placeholder=""
199 - @blur="textareaBlur"
200 - ></el-input>
201 - <el-input
202 - slot="reference"
203 - name="consignmentCode"
204 - type="textarea"
205 - :rows="1"
206 class="inputShadow" 93 class="inputShadow"
207 - id="inputInner--consignmentCode" 94 + id="inputInner--logisticsName"
208 - v-model="searchForm.consignmentCode"
209 resize="none" 95 resize="none"
96 + v-model="formData.logisticsName"
97 + clearable
210 placeholder="" 98 placeholder=""
211 - @focus="textareaFocus"
212 ></el-input> 99 ></el-input>
213 - </el-popover>
214 </Formitem> 100 </Formitem>
215 </el-col> 101 </el-col>
216 - 102 + <!-- 物流运单编号 -->
217 - <el-col :span="5"> 103 + <el-col :span="3">
218 - <Formitem label="物流运单编号" prop="consignmentCode"> 104 + <Formitem label="物流运单编号" prop="logisticsNo">
219 - <el-popover
220 - placement="bottom"
221 - width="320"
222 - trigger="manual"
223 - popper-class="popoverconsignmentCode"
224 - v-model="textareaVisible.formItemconsignmentCode"
225 - >
226 <el-input 105 <el-input
227 - name="consignmentCode-textarea" 106 + type="text"
228 - type="textarea"
229 - :rows="5"
230 - id="popoverInputconsignmentCode"
231 - class="inputShadow textareaPopover"
232 - v-model="searchForm.consignmentCode"
233 - resize="none"
234 - maxlength="13000"
235 - placeholder=""
236 - @blur="textareaBlur"
237 - ></el-input>
238 - <el-input
239 - slot="reference"
240 - name="consignmentCode"
241 - type="textarea"
242 - :rows="1"
243 class="inputShadow" 107 class="inputShadow"
244 - id="inputInner--consignmentCode" 108 + id="inputInner--logisticsNo"
245 - v-model="searchForm.consignmentCode"
246 resize="none" 109 resize="none"
110 + v-model="formData.logisticsNo"
111 + clearable
247 placeholder="" 112 placeholder=""
248 - @focus="textareaFocus"
249 ></el-input> 113 ></el-input>
250 - </el-popover>
251 </Formitem> 114 </Formitem>
252 </el-col> 115 </el-col>
253 - 116 + </el-row>
254 - <el-col :span="5"> 117 + <el-row :gutter="5">
255 - <Formitem label="进出口标记" prop="consignmentCode"> 118 + <!-- 进出口标记 -->
256 - <el-popover 119 + <el-col :span="3">
257 - placement="bottom" 120 + <Formitem label="进出口标记" prop="ieFlag">
258 - width="320"
259 - trigger="manual"
260 - popper-class="popoverconsignmentCode"
261 - v-model="textareaVisible.formItemconsignmentCode"
262 - >
263 - <el-input
264 - name="consignmentCode-textarea"
265 - type="textarea"
266 - :rows="5"
267 - id="popoverInputconsignmentCode"
268 - class="inputShadow textareaPopover"
269 - v-model="searchForm.consignmentCode"
270 - resize="none"
271 - maxlength="13000"
272 - placeholder=""
273 - @blur="textareaBlur"
274 - ></el-input>
275 <el-input 121 <el-input
276 - slot="reference" 122 + type="text"
277 - name="consignmentCode"
278 - type="textarea"
279 - :rows="1"
280 class="inputShadow" 123 class="inputShadow"
281 - id="inputInner--consignmentCode" 124 + id="inputInner--ieFlag"
282 - v-model="searchForm.consignmentCode"
283 resize="none" 125 resize="none"
126 + v-model="formData.ieFlag"
127 + clearable
284 placeholder="" 128 placeholder=""
285 - @focus="textareaFocus"
286 ></el-input> 129 ></el-input>
287 - </el-popover>
288 </Formitem> 130 </Formitem>
289 </el-col> 131 </el-col>
290 - 132 + <!-- 出口口岸 -->
291 - <el-col :span="4"> 133 + <el-col :span="3">
292 - <Formitem label="出口口岸" prop="factoryCode"> 134 + <Formitem label="出口口岸" prop="portCode">
293 - <el-select 135 + <el-input
294 type="text" 136 type="text"
295 - id="inputInner--declaredPort" 137 + class="inputShadow"
296 - v-model="searchForm.declaredPort" 138 + id="inputInner--portCode"
139 + resize="none"
140 + v-model="formData.portCode"
297 clearable 141 clearable
298 placeholder="" 142 placeholder=""
299 - > 143 + ></el-input>
300 - <el-option
301 - v-for="(item, index) in dictData.userport"
302 - :key="index"
303 - :label="item.name"
304 - :value="item.name"
305 - ></el-option>
306 - </el-select>
307 </Formitem> 144 </Formitem>
308 </el-col> 145 </el-col>
309 - 146 + <!-- 出口日期 -->
310 - <el-col :span="5"> 147 + <el-col :span="3">
311 - <Formitem label="出口日期" prop="consignmentCode"> 148 + <Formitem label="出口日期" prop="ieDate">
312 - <el-popover
313 - placement="bottom"
314 - width="320"
315 - trigger="manual"
316 - popper-class="popoverconsignmentCode"
317 - v-model="textareaVisible.formItemconsignmentCode"
318 - >
319 - <el-input
320 - name="consignmentCode-textarea"
321 - type="textarea"
322 - :rows="5"
323 - id="popoverInputconsignmentCode"
324 - class="inputShadow textareaPopover"
325 - v-model="searchForm.consignmentCode"
326 - resize="none"
327 - maxlength="13000"
328 - placeholder=""
329 - @blur="textareaBlur"
330 - ></el-input>
331 <el-input 149 <el-input
332 - slot="reference" 150 + type="text"
333 - name="consignmentCode"
334 - type="textarea"
335 - :rows="1"
336 class="inputShadow" 151 class="inputShadow"
337 - id="inputInner--consignmentCode" 152 + id="inputInner--ieDate"
338 - v-model="searchForm.consignmentCode"
339 resize="none" 153 resize="none"
154 + v-model="formData.ieDate"
155 + clearable
340 placeholder="" 156 placeholder=""
341 - @focus="textareaFocus"
342 ></el-input> 157 ></el-input>
343 - </el-popover>
344 </Formitem> 158 </Formitem>
345 </el-col> 159 </el-col>
346 - </el-row> 160 + <!-- 申报业务类型 -->
347 - <el-row> 161 + <el-col :span="3">
348 - <el-col :span="4"> 162 + <Formitem label="申报业务类型" prop="statisticsFlag">
349 - <Formitem label="申报业务类型" prop="factoryCode">
350 <el-select 163 <el-select
351 type="text" 164 type="text"
352 - id="inputInner--declaredPort" 165 + id="inputInner--statisticsFlag"
353 - v-model="searchForm.declaredPort" 166 + v-model="formData.statisticsFlag"
354 clearable 167 clearable
355 placeholder="" 168 placeholder=""
356 > 169 >
357 - <el-option 170 + <!-- <el-option
358 - v-for="(item, index) in dictData.userport" 171 + v-for="(item, index) in dictData.currency"
359 :key="index" 172 :key="index"
360 :label="item.name" 173 :label="item.name"
361 - :value="item.name" 174 + :value="item.value"
362 - ></el-option> 175 + ></el-option> -->
363 </el-select> 176 </el-select>
364 </Formitem> 177 </Formitem>
365 </el-col> 178 </el-col>
366 - <el-col :span="4"> 179 + <!-- 申报企业代码 -->
367 - <Formitem label="申报企业代码" prop="factoryCode"> 180 + <el-col :span="3">
368 - <el-popover 181 + <Formitem label="申报企业代码" prop="agentCode">
369 - placement="bottom"
370 - width="320"
371 - trigger="manual"
372 - popper-class="popoverconsignmentCode"
373 - v-model="textareaVisible.formItemconsignmentCode"
374 - >
375 - <el-input
376 - name="consignmentCode-textarea"
377 - type="textarea"
378 - :rows="5"
379 - id="popoverInputconsignmentCode"
380 - class="inputShadow textareaPopover"
381 - v-model="searchForm.consignmentCode"
382 - resize="none"
383 - maxlength="13000"
384 - placeholder=""
385 - @blur="textareaBlur"
386 - ></el-input>
387 <el-input 182 <el-input
388 - slot="reference" 183 + type="text"
389 - name="consignmentCode"
390 - type="textarea"
391 - :rows="1"
392 class="inputShadow" 184 class="inputShadow"
393 - id="inputInner--consignmentCode" 185 + id="inputInner--agentCode"
394 - v-model="searchForm.consignmentCode"
395 resize="none" 186 resize="none"
187 + v-model="formData.agentCode"
188 + clearable
396 placeholder="" 189 placeholder=""
397 - @focus="textareaFocus"
398 ></el-input> 190 ></el-input>
399 - </el-popover>
400 </Formitem> 191 </Formitem>
401 </el-col> 192 </el-col>
402 - <el-col :span="5"> 193 + <!-- 申报企业名称 -->
403 - <Formitem label="申报企业名称" prop="consignmentCode"> 194 + <el-col :span="6">
404 - <el-popover 195 + <Formitem label="申报企业名称" prop="agentName">
405 - placement="bottom"
406 - width="320"
407 - trigger="manual"
408 - popper-class="popoverconsignmentCode"
409 - v-model="textareaVisible.formItemconsignmentCode"
410 - >
411 <el-input 196 <el-input
412 - name="consignmentCode-textarea" 197 + type="text"
413 - type="textarea"
414 - :rows="5"
415 - id="popoverInputconsignmentCode"
416 - class="inputShadow textareaPopover"
417 - v-model="searchForm.consignmentCode"
418 - resize="none"
419 - maxlength="13000"
420 - placeholder=""
421 - @blur="textareaBlur"
422 - ></el-input>
423 - <el-input
424 - slot="reference"
425 - name="consignmentCode"
426 - type="textarea"
427 - :rows="1"
428 class="inputShadow" 198 class="inputShadow"
429 - id="inputInner--consignmentCode" 199 + id="inputInner--agentName"
430 - v-model="searchForm.consignmentCode"
431 resize="none" 200 resize="none"
201 + v-model="formData.agentName"
202 + clearable
432 placeholder="" 203 placeholder=""
433 - @focus="textareaFocus"
434 ></el-input> 204 ></el-input>
435 - </el-popover>
436 </Formitem> 205 </Formitem>
437 </el-col> 206 </el-col>
438 - <el-col :span="5"> 207 + <!-- 收发货人代码 -->
439 - <Formitem label="收发货人代码" prop="consignmentCode"> 208 + <el-col :span="3">
440 - <el-popover 209 + <Formitem label="收发货人代码" prop="ebccode">
441 - placement="bottom"
442 - width="320"
443 - trigger="manual"
444 - popper-class="popoverconsignmentCode"
445 - v-model="textareaVisible.formItemconsignmentCode"
446 - >
447 <el-input 210 <el-input
448 - name="consignmentCode-textarea" 211 + type="text"
449 - type="textarea"
450 - :rows="5"
451 - id="popoverInputconsignmentCode"
452 - class="inputShadow textareaPopover"
453 - v-model="searchForm.consignmentCode"
454 - resize="none"
455 - maxlength="13000"
456 - placeholder=""
457 - @blur="textareaBlur"
458 - ></el-input>
459 - <el-input
460 - slot="reference"
461 - name="consignmentCode"
462 - type="textarea"
463 - :rows="1"
464 class="inputShadow" 212 class="inputShadow"
465 - id="inputInner--consignmentCode" 213 + id="inputInner--ebccode"
466 - v-model="searchForm.consignmentCode"
467 resize="none" 214 resize="none"
215 + v-model="formData.ebccode"
216 + clearable
468 placeholder="" 217 placeholder=""
469 - @focus="textareaFocus"
470 ></el-input> 218 ></el-input>
471 - </el-popover>
472 </Formitem> 219 </Formitem>
473 </el-col> 220 </el-col>
474 - <el-col :span="5"> 221 + </el-row>
475 - <Formitem label="收发货人名称" prop="consignmentCode"> 222 + <el-row :gutter="5">
476 - <el-popover 223 + <!-- 收发货人名称 -->
477 - placement="bottom" 224 + <el-col :span="3">
478 - width="320" 225 + <Formitem label="收发货人名称" prop="ebcname">
479 - trigger="manual"
480 - popper-class="popoverconsignmentCode"
481 - v-model="textareaVisible.formItemconsignmentCode"
482 - >
483 - <el-input
484 - name="consignmentCode-textarea"
485 - type="textarea"
486 - :rows="5"
487 - id="popoverInputconsignmentCode"
488 - class="inputShadow textareaPopover"
489 - v-model="searchForm.consignmentCode"
490 - resize="none"
491 - maxlength="13000"
492 - placeholder=""
493 - @blur="textareaBlur"
494 - ></el-input>
495 <el-input 226 <el-input
496 - slot="reference" 227 + type="text"
497 - name="consignmentCode"
498 - type="textarea"
499 - :rows="1"
500 class="inputShadow" 228 class="inputShadow"
501 - id="inputInner--consignmentCode" 229 + id="inputInner--ebcname"
502 - v-model="searchForm.consignmentCode"
503 resize="none" 230 resize="none"
231 + v-model="formData.ebcname"
232 + clearable
504 placeholder="" 233 placeholder=""
505 - @focus="textareaFocus"
506 ></el-input> 234 ></el-input>
507 - </el-popover>
508 </Formitem> 235 </Formitem>
509 </el-col> 236 </el-col>
510 - <el-col :span="5"> 237 + <!-- 生产销售企业代码 -->
511 - <Formitem label="生产销售企业代码" prop="consignmentCode"> 238 + <el-col :span="3">
512 - <el-popover 239 + <Formitem label="生产销售企业代码" prop="ownerCode">
513 - placement="bottom"
514 - width="320"
515 - trigger="manual"
516 - popper-class="popoverconsignmentCode"
517 - v-model="textareaVisible.formItemconsignmentCode"
518 - >
519 <el-input 240 <el-input
520 - name="consignmentCode-textarea" 241 + type="text"
521 - type="textarea"
522 - :rows="5"
523 - id="popoverInputconsignmentCode"
524 - class="inputShadow textareaPopover"
525 - v-model="searchForm.consignmentCode"
526 - resize="none"
527 - maxlength="13000"
528 - placeholder=""
529 - @blur="textareaBlur"
530 - ></el-input>
531 - <el-input
532 - slot="reference"
533 - name="consignmentCode"
534 - type="textarea"
535 - :rows="1"
536 class="inputShadow" 242 class="inputShadow"
537 - id="inputInner--consignmentCode" 243 + id="inputInner--ownerCode"
538 - v-model="searchForm.consignmentCode"
539 resize="none" 244 resize="none"
245 + v-model="formData.ownerCode"
246 + clearable
540 placeholder="" 247 placeholder=""
541 - @focus="textareaFocus"
542 ></el-input> 248 ></el-input>
543 - </el-popover>
544 </Formitem> 249 </Formitem>
545 </el-col> 250 </el-col>
546 - <el-col :span="5"> 251 + <!-- 生产销售企业名称 -->
547 - <Formitem label="生产销售企业名称" prop="consignmentCode"> 252 + <el-col :span="3">
548 - <el-popover 253 + <Formitem label="生产销售企业名称" prop="ownerName">
549 - placement="bottom"
550 - width="320"
551 - trigger="manual"
552 - popper-class="popoverconsignmentCode"
553 - v-model="textareaVisible.formItemconsignmentCode"
554 - >
555 - <el-input
556 - name="consignmentCode-textarea"
557 - type="textarea"
558 - :rows="5"
559 - id="popoverInputconsignmentCode"
560 - class="inputShadow textareaPopover"
561 - v-model="searchForm.consignmentCode"
562 - resize="none"
563 - maxlength="13000"
564 - placeholder=""
565 - @blur="textareaBlur"
566 - ></el-input>
567 <el-input 254 <el-input
568 - slot="reference" 255 + type="text"
569 - name="consignmentCode"
570 - type="textarea"
571 - :rows="1"
572 class="inputShadow" 256 class="inputShadow"
573 - id="inputInner--consignmentCode" 257 + id="inputInner--ownerName"
574 - v-model="searchForm.consignmentCode"
575 resize="none" 258 resize="none"
259 + v-model="formData.ownerName"
260 + clearable
576 placeholder="" 261 placeholder=""
577 - @focus="textareaFocus"
578 ></el-input> 262 ></el-input>
579 - </el-popover>
580 </Formitem> 263 </Formitem>
581 </el-col> 264 </el-col>
582 - <el-col :span="5"> 265 + <!-- 区内企业代码 -->
583 - <Formitem label="区内企业代码" prop="consignmentCode"> 266 + <el-col :span="3">
584 - <el-popover 267 + <Formitem label="区内企业代码" prop="iacCode">
585 - placement="bottom"
586 - width="320"
587 - trigger="manual"
588 - popper-class="popoverconsignmentCode"
589 - v-model="textareaVisible.formItemconsignmentCode"
590 - >
591 <el-input 268 <el-input
592 - name="consignmentCode-textarea" 269 + type="text"
593 - type="textarea"
594 - :rows="5"
595 - id="popoverInputconsignmentCode"
596 - class="inputShadow textareaPopover"
597 - v-model="searchForm.consignmentCode"
598 - resize="none"
599 - maxlength="13000"
600 - placeholder=""
601 - @blur="textareaBlur"
602 - ></el-input>
603 - <el-input
604 - slot="reference"
605 - name="consignmentCode"
606 - type="textarea"
607 - :rows="1"
608 class="inputShadow" 270 class="inputShadow"
609 - id="inputInner--consignmentCode" 271 + id="inputInner--iacCode"
610 - v-model="searchForm.consignmentCode"
611 resize="none" 272 resize="none"
273 + v-model="formData.iacCode"
274 + clearable
612 placeholder="" 275 placeholder=""
613 - @focus="textareaFocus"
614 ></el-input> 276 ></el-input>
615 - </el-popover>
616 </Formitem> 277 </Formitem>
617 </el-col> 278 </el-col>
618 - <el-col :span="5"> 279 + <!-- 区内企业名称 -->
619 - <Formitem label="区内企业名称" prop="consignmentCode"> 280 + <el-col :span="3">
620 - <el-popover 281 + <Formitem label="区内企业名称" prop="iacName">
621 - placement="bottom"
622 - width="320"
623 - trigger="manual"
624 - popper-class="popoverconsignmentCode"
625 - v-model="textareaVisible.formItemconsignmentCode"
626 - >
627 <el-input 282 <el-input
628 - name="consignmentCode-textarea" 283 + type="text"
629 - type="textarea"
630 - :rows="5"
631 - id="popoverInputconsignmentCode"
632 - class="inputShadow textareaPopover"
633 - v-model="searchForm.consignmentCode"
634 - resize="none"
635 - maxlength="13000"
636 - placeholder=""
637 - @blur="textareaBlur"
638 - ></el-input>
639 - <el-input
640 - slot="reference"
641 - name="consignmentCode"
642 - type="textarea"
643 - :rows="1"
644 class="inputShadow" 284 class="inputShadow"
645 - id="inputInner--consignmentCode" 285 + id="inputInner--iacName"
646 - v-model="searchForm.consignmentCode"
647 resize="none" 286 resize="none"
287 + v-model="formData.iacName"
288 + clearable
648 placeholder="" 289 placeholder=""
649 - @focus="textareaFocus"
650 ></el-input> 290 ></el-input>
651 - </el-popover>
652 </Formitem> 291 </Formitem>
653 </el-col> 292 </el-col>
654 - <el-col :span="5"> 293 + <!-- 账册编号 -->
655 - <Formitem label="账册编号" prop="consignmentCode"> 294 + <el-col :span="3">
656 - <el-popover 295 + <Formitem label="账册编号" prop="emsNo">
657 - placement="bottom"
658 - width="320"
659 - trigger="manual"
660 - popper-class="popoverconsignmentCode"
661 - v-model="textareaVisible.formItemconsignmentCode"
662 - >
663 <el-input 296 <el-input
664 - name="consignmentCode-textarea" 297 + type="text"
665 - type="textarea"
666 - :rows="5"
667 - id="popoverInputconsignmentCode"
668 - class="inputShadow textareaPopover"
669 - v-model="searchForm.consignmentCode"
670 - resize="none"
671 - maxlength="13000"
672 - placeholder=""
673 - @blur="textareaBlur"
674 - ></el-input>
675 - <el-input
676 - slot="reference"
677 - name="consignmentCode"
678 - type="textarea"
679 - :rows="1"
680 class="inputShadow" 298 class="inputShadow"
681 - id="inputInner--consignmentCode" 299 + id="inputInner--emsNo"
682 - v-model="searchForm.consignmentCode"
683 resize="none" 300 resize="none"
301 + v-model="formData.emsNo"
302 + clearable
684 placeholder="" 303 placeholder=""
685 - @focus="textareaFocus"
686 ></el-input> 304 ></el-input>
687 - </el-popover>
688 </Formitem> 305 </Formitem>
689 </el-col> 306 </el-col>
690 - <el-col :span="4"> 307 + <!-- 贸易方式 -->
691 - <Formitem label="贸易方式" prop="factoryCode"> 308 + <el-col :span="3">
309 + <Formitem label="贸易方式" prop="tradeMode">
692 <el-select 310 <el-select
693 type="text" 311 type="text"
694 - id="inputInner--declaredPort" 312 + id="inputInner--tradeMode"
695 - v-model="searchForm.declaredPort" 313 + v-model="formData.tradeMode"
696 clearable 314 clearable
697 placeholder="" 315 placeholder=""
698 > 316 >
699 - <el-option 317 + <!-- <el-option
700 - v-for="(item, index) in dictData.userport" 318 + v-for="(item, index) in dictData.currency"
701 :key="index" 319 :key="index"
702 :label="item.name" 320 :label="item.name"
703 - :value="item.name" 321 + :value="item.value"
704 - ></el-option> 322 + ></el-option> -->
705 </el-select> 323 </el-select>
706 </Formitem> 324 </Formitem>
707 </el-col> 325 </el-col>
708 - <el-col :span="4"> 326 + <!-- 运输方式 -->
709 - <Formitem label="运输方式" prop="factoryCode"> 327 + <el-col :span="3">
328 + <Formitem label="运输方式" prop="trafMode">
710 <el-select 329 <el-select
711 type="text" 330 type="text"
712 - id="inputInner--declaredPort" 331 + id="inputInner--trafMode"
713 - v-model="searchForm.declaredPort" 332 + v-model="formData.trafMode"
714 clearable 333 clearable
715 placeholder="" 334 placeholder=""
716 > 335 >
717 - <el-option 336 + <!-- <el-option
718 - v-for="(item, index) in dictData.userport" 337 + v-for="(item, index) in dictData.currency"
719 :key="index" 338 :key="index"
720 :label="item.name" 339 :label="item.name"
721 - :value="item.name" 340 + :value="item.value"
722 - ></el-option> 341 + ></el-option> -->
723 </el-select> 342 </el-select>
724 </Formitem> 343 </Formitem>
725 </el-col> 344 </el-col>
726 - 345 + </el-row>
727 - <el-col :span="5"> 346 + <el-row :gutter="5">
728 - <Formitem label="运输工具名称" prop="consignmentCode"> 347 + <!-- 运输工具名称 -->
729 - <el-popover 348 + <el-col :span="3">
730 - placement="bottom" 349 + <Formitem label="运输工具名称" prop="trafName">
731 - width="320"
732 - trigger="manual"
733 - popper-class="popoverconsignmentCode"
734 - v-model="textareaVisible.formItemconsignmentCode"
735 - >
736 - <el-input
737 - name="consignmentCode-textarea"
738 - type="textarea"
739 - :rows="5"
740 - id="popoverInputconsignmentCode"
741 - class="inputShadow textareaPopover"
742 - v-model="searchForm.consignmentCode"
743 - resize="none"
744 - maxlength="13000"
745 - placeholder=""
746 - @blur="textareaBlur"
747 - ></el-input>
748 <el-input 350 <el-input
749 - slot="reference" 351 + type="text"
750 - name="consignmentCode"
751 - type="textarea"
752 - :rows="1"
753 class="inputShadow" 352 class="inputShadow"
754 - id="inputInner--consignmentCode" 353 + id="inputInner--trafName"
755 - v-model="searchForm.consignmentCode"
756 resize="none" 354 resize="none"
355 + v-model="formData.trafName"
356 + clearable
757 placeholder="" 357 placeholder=""
758 - @focus="textareaFocus"
759 ></el-input> 358 ></el-input>
760 - </el-popover>
761 </Formitem> 359 </Formitem>
762 </el-col> 360 </el-col>
763 - <el-col :span="5"> 361 + <!-- 航班航次号 -->
764 - <Formitem label="航班航次号" prop="consignmentCode"> 362 + <el-col :span="3">
765 - <el-popover 363 + <Formitem label="航班航次号" prop="voyageNo">
766 - placement="bottom"
767 - width="320"
768 - trigger="manual"
769 - popper-class="popoverconsignmentCode"
770 - v-model="textareaVisible.formItemconsignmentCode"
771 - >
772 - <el-input
773 - name="consignmentCode-textarea"
774 - type="textarea"
775 - :rows="5"
776 - id="popoverInputconsignmentCode"
777 - class="inputShadow textareaPopover"
778 - v-model="searchForm.consignmentCode"
779 - resize="none"
780 - maxlength="13000"
781 - placeholder=""
782 - @blur="textareaBlur"
783 - ></el-input>
784 <el-input 364 <el-input
785 - slot="reference" 365 + type="text"
786 - name="consignmentCode"
787 - type="textarea"
788 - :rows="1"
789 class="inputShadow" 366 class="inputShadow"
790 - id="inputInner--consignmentCode" 367 + id="inputInner--voyageNo"
791 - v-model="searchForm.consignmentCode"
792 resize="none" 368 resize="none"
369 + v-model="formData.voyageNo"
370 + clearable
793 placeholder="" 371 placeholder=""
794 - @focus="textareaFocus"
795 ></el-input> 372 ></el-input>
796 - </el-popover>
797 </Formitem> 373 </Formitem>
798 </el-col> 374 </el-col>
799 - <el-col :span="5"> 375 + <!-- 总包号 -->
800 - <Formitem label="总包号" prop="consignmentCode"> 376 + <el-col :span="3">
801 - <el-popover 377 + <Formitem label="总包号" prop="totalPackageNo">
802 - placement="bottom"
803 - width="320"
804 - trigger="manual"
805 - popper-class="popoverconsignmentCode"
806 - v-model="textareaVisible.formItemconsignmentCode"
807 - >
808 <el-input 378 <el-input
809 - name="consignmentCode-textarea" 379 + type="text"
810 - type="textarea"
811 - :rows="5"
812 - id="popoverInputconsignmentCode"
813 - class="inputShadow textareaPopover"
814 - v-model="searchForm.consignmentCode"
815 - resize="none"
816 - maxlength="13000"
817 - placeholder=""
818 - @blur="textareaBlur"
819 - ></el-input>
820 - <el-input
821 - slot="reference"
822 - name="consignmentCode"
823 - type="textarea"
824 - :rows="1"
825 class="inputShadow" 380 class="inputShadow"
826 - id="inputInner--consignmentCode" 381 + id="inputInner--totalPackageNo"
827 - v-model="searchForm.consignmentCode"
828 resize="none" 382 resize="none"
383 + v-model="formData.totalPackageNo"
384 + clearable
829 placeholder="" 385 placeholder=""
830 - @focus="textareaFocus"
831 ></el-input> 386 ></el-input>
832 - </el-popover>
833 </Formitem> 387 </Formitem>
834 </el-col> 388 </el-col>
835 - <el-col :span="5"> 389 + <!-- 监管场所代码 -->
836 - <Formitem label="监管场所代码" prop="consignmentCode"> 390 + <el-col :span="3">
837 - <el-popover 391 + <Formitem label="监管场所代码" prop="loctNo">
838 - placement="bottom"
839 - width="320"
840 - trigger="manual"
841 - popper-class="popoverconsignmentCode"
842 - v-model="textareaVisible.formItemconsignmentCode"
843 - >
844 - <el-input
845 - name="consignmentCode-textarea"
846 - type="textarea"
847 - :rows="5"
848 - id="popoverInputconsignmentCode"
849 - class="inputShadow textareaPopover"
850 - v-model="searchForm.consignmentCode"
851 - resize="none"
852 - maxlength="13000"
853 - placeholder=""
854 - @blur="textareaBlur"
855 - ></el-input>
856 <el-input 392 <el-input
857 - slot="reference" 393 + type="text"
858 - name="consignmentCode"
859 - type="textarea"
860 - :rows="1"
861 class="inputShadow" 394 class="inputShadow"
862 - id="inputInner--consignmentCode" 395 + id="inputInner--loctNo"
863 - v-model="searchForm.consignmentCode"
864 resize="none" 396 resize="none"
397 + v-model="formData.loctNo"
398 + clearable
865 placeholder="" 399 placeholder=""
866 - @focus="textareaFocus"
867 ></el-input> 400 ></el-input>
868 - </el-popover>
869 </Formitem> 401 </Formitem>
870 </el-col> 402 </el-col>
871 - <el-col :span="4"> 403 + <!-- 运抵国(地区) -->
872 - <Formitem label="运抵国(地区)" prop="factoryCode"> 404 + <el-col :span="3">
405 + <Formitem label="运抵国(地区)" prop="country">
873 <el-select 406 <el-select
874 type="text" 407 type="text"
875 - id="inputInner--declaredPort" 408 + id="inputInner--country"
876 - v-model="searchForm.declaredPort" 409 + v-model="formData.country"
877 clearable 410 clearable
878 placeholder="" 411 placeholder=""
879 > 412 >
880 - <el-option 413 + <!-- <el-option
881 - v-for="(item, index) in dictData.userport" 414 + v-for="(item, index) in dictData.currency"
882 :key="index" 415 :key="index"
883 :label="item.name" 416 :label="item.name"
884 - :value="item.name" 417 + :value="item.value"
885 - ></el-option> 418 + ></el-option> -->
886 </el-select> 419 </el-select>
887 </Formitem> 420 </Formitem>
888 </el-col> 421 </el-col>
889 - <el-col :span="4"> 422 + <!-- 指运港 -->
890 - <Formitem label="指运港" prop="factoryCode"> 423 + <el-col :span="3">
424 + <Formitem label="指运港" prop="pod">
891 <el-select 425 <el-select
892 type="text" 426 type="text"
893 - id="inputInner--declaredPort" 427 + id="inputInner--pod"
894 - v-model="searchForm.declaredPort" 428 + v-model="formData.pod"
895 clearable 429 clearable
896 placeholder="" 430 placeholder=""
897 > 431 >
898 - <el-option 432 + <!-- <el-option
899 - v-for="(item, index) in dictData.userport" 433 + v-for="(item, index) in dictData.currency"
900 :key="index" 434 :key="index"
901 :label="item.name" 435 :label="item.name"
902 - :value="item.name" 436 + :value="item.value"
903 - ></el-option> 437 + ></el-option> -->
904 </el-select> 438 </el-select>
905 </Formitem> 439 </Formitem>
906 </el-col> 440 </el-col>
907 - <el-col :span="5"> 441 + <!-- 运费 -->
908 - <Formitem label="运费" prop="consignmentCode"> 442 + <el-col :span="3">
909 - <el-popover 443 + <Formitem label="运费" prop="freight">
910 - placement="bottom"
911 - width="320"
912 - trigger="manual"
913 - popper-class="popoverconsignmentCode"
914 - v-model="textareaVisible.formItemconsignmentCode"
915 - >
916 - <el-input
917 - name="consignmentCode-textarea"
918 - type="textarea"
919 - :rows="5"
920 - id="popoverInputconsignmentCode"
921 - class="inputShadow textareaPopover"
922 - v-model="searchForm.consignmentCode"
923 - resize="none"
924 - maxlength="13000"
925 - placeholder=""
926 - @blur="textareaBlur"
927 - ></el-input>
928 <el-input 444 <el-input
929 - slot="reference" 445 + type="text"
930 - name="consignmentCode"
931 - type="textarea"
932 - :rows="1"
933 class="inputShadow" 446 class="inputShadow"
934 - id="inputInner--consignmentCode" 447 + id="inputInner--freight"
935 - v-model="searchForm.consignmentCode"
936 resize="none" 448 resize="none"
449 + v-model="formData.freight"
450 + clearable
937 placeholder="" 451 placeholder=""
938 - @focus="textareaFocus"
939 ></el-input> 452 ></el-input>
940 - </el-popover>
941 </Formitem> 453 </Formitem>
942 </el-col> 454 </el-col>
943 - <el-col :span="5"> 455 + <!-- 运费币制 -->
944 - <Formitem label="运费币制" prop="consignmentCode"> 456 + <el-col :span="3">
945 - <el-popover 457 + <Formitem label="运费币制" prop="fcurrency">
946 - placement="bottom"
947 - width="320"
948 - trigger="manual"
949 - popper-class="popoverconsignmentCode"
950 - v-model="textareaVisible.formItemconsignmentCode"
951 - >
952 <el-input 458 <el-input
953 - name="consignmentCode-textarea" 459 + type="text"
954 - type="textarea"
955 - :rows="5"
956 - id="popoverInputconsignmentCode"
957 - class="inputShadow textareaPopover"
958 - v-model="searchForm.consignmentCode"
959 - resize="none"
960 - maxlength="13000"
961 - placeholder=""
962 - @blur="textareaBlur"
963 - ></el-input>
964 - <el-input
965 - slot="reference"
966 - name="consignmentCode"
967 - type="textarea"
968 - :rows="1"
969 class="inputShadow" 460 class="inputShadow"
970 - id="inputInner--consignmentCode" 461 + id="inputInner--fcurrency"
971 - v-model="searchForm.consignmentCode"
972 resize="none" 462 resize="none"
463 + v-model="formData.fcurrency"
464 + clearable
973 placeholder="" 465 placeholder=""
974 - @focus="textareaFocus"
975 ></el-input> 466 ></el-input>
976 - </el-popover>
977 </Formitem> 467 </Formitem>
978 </el-col> 468 </el-col>
979 - <el-col :span="4"> 469 + </el-row>
980 - <Formitem label="运费标志" prop="factoryCode"> 470 + <el-row :gutter="5">
981 - <el-select 471 + <!-- 运费标志 -->
472 + <el-col :span="3">
473 + <Formitem label="运费标志" prop="fflag">
474 + <el-input
982 type="text" 475 type="text"
983 - id="inputInner--declaredPort" 476 + class="inputShadow"
984 - v-model="searchForm.declaredPort" 477 + id="inputInner--fflag"
478 + resize="none"
479 + v-model="formData.fflag"
985 clearable 480 clearable
986 placeholder="" 481 placeholder=""
987 - > 482 + ></el-input>
988 - <el-option
989 - v-for="(item, index) in dictData.userport"
990 - :key="index"
991 - :label="item.name"
992 - :value="item.name"
993 - ></el-option>
994 - </el-select>
995 </Formitem> 483 </Formitem>
996 </el-col> 484 </el-col>
997 - <el-col :span="5"> 485 + <!-- 保费 -->
998 - <Formitem label="保费" prop="consignmentCode"> 486 + <el-col :span="3">
999 - <el-popover 487 + <Formitem label="保费" prop="insuredfee">
1000 - placement="bottom"
1001 - width="320"
1002 - trigger="manual"
1003 - popper-class="popoverconsignmentCode"
1004 - v-model="textareaVisible.formItemconsignmentCode"
1005 - >
1006 - <el-input
1007 - name="consignmentCode-textarea"
1008 - type="textarea"
1009 - :rows="5"
1010 - id="popoverInputconsignmentCode"
1011 - class="inputShadow textareaPopover"
1012 - v-model="searchForm.consignmentCode"
1013 - resize="none"
1014 - maxlength="13000"
1015 - placeholder=""
1016 - @blur="textareaBlur"
1017 - ></el-input>
1018 <el-input 488 <el-input
1019 - slot="reference" 489 + type="text"
1020 - name="consignmentCode"
1021 - type="textarea"
1022 - :rows="1"
1023 class="inputShadow" 490 class="inputShadow"
1024 - id="inputInner--consignmentCode" 491 + id="inputInner--insuredfee"
1025 - v-model="searchForm.consignmentCode"
1026 resize="none" 492 resize="none"
493 + v-model="formData.insuredfee"
494 + clearable
1027 placeholder="" 495 placeholder=""
1028 - @focus="textareaFocus"
1029 ></el-input> 496 ></el-input>
1030 - </el-popover>
1031 </Formitem> 497 </Formitem>
1032 </el-col> 498 </el-col>
1033 - <el-col :span="4"> 499 + <!-- 保费币制 -->
1034 - <Formitem label="保费币制" prop="factoryCode"> 500 + <el-col :span="3">
1035 - <el-select 501 + <Formitem label="保费币制" prop="icurrency">
502 + <el-input
1036 type="text" 503 type="text"
1037 - id="inputInner--declaredPort" 504 + class="inputShadow"
1038 - v-model="searchForm.declaredPort" 505 + id="inputInner--icurrency"
506 + resize="none"
507 + v-model="formData.icurrency"
1039 clearable 508 clearable
1040 placeholder="" 509 placeholder=""
1041 - > 510 + ></el-input>
1042 - <el-option
1043 - v-for="(item, index) in dictData.userport"
1044 - :key="index"
1045 - :label="item.name"
1046 - :value="item.name"
1047 - ></el-option>
1048 - </el-select>
1049 </Formitem> 511 </Formitem>
1050 </el-col> 512 </el-col>
1051 - <el-col :span="4"> 513 + <!-- 保费标志 -->
1052 - <Formitem label="保费标志" prop="factoryCode"> 514 + <el-col :span="3">
1053 - <el-select 515 + <Formitem label="保费标志" prop="iflag">
516 + <el-input
1054 type="text" 517 type="text"
1055 - id="inputInner--declaredPort" 518 + class="inputShadow"
1056 - v-model="searchForm.declaredPort" 519 + id="inputInner--iflag"
520 + resize="none"
521 + v-model="formData.iflag"
1057 clearable 522 clearable
1058 placeholder="" 523 placeholder=""
1059 - > 524 + ></el-input>
1060 - <el-option
1061 - v-for="(item, index) in dictData.userport"
1062 - :key="index"
1063 - :label="item.name"
1064 - :value="item.name"
1065 - ></el-option>
1066 - </el-select>
1067 </Formitem> 525 </Formitem>
1068 </el-col> 526 </el-col>
1069 - <el-col :span="5"> 527 + <!-- 件数/包裹件数 -->
1070 - <Formitem label="件数/包裹件数" prop="consignmentCode"> 528 + <el-col :span="3">
1071 - <el-popover 529 + <Formitem label="件数/包裹件数" prop="packNo">
1072 - placement="bottom"
1073 - width="320"
1074 - trigger="manual"
1075 - popper-class="popoverconsignmentCode"
1076 - v-model="textareaVisible.formItemconsignmentCode"
1077 - >
1078 - <el-input
1079 - name="consignmentCode-textarea"
1080 - type="textarea"
1081 - :rows="5"
1082 - id="popoverInputconsignmentCode"
1083 - class="inputShadow textareaPopover"
1084 - v-model="searchForm.consignmentCode"
1085 - resize="none"
1086 - maxlength="13000"
1087 - placeholder=""
1088 - @blur="textareaBlur"
1089 - ></el-input>
1090 <el-input 530 <el-input
1091 - slot="reference" 531 + type="text"
1092 - name="consignmentCode"
1093 - type="textarea"
1094 - :rows="1"
1095 class="inputShadow" 532 class="inputShadow"
1096 - id="inputInner--consignmentCode" 533 + id="inputInner--packNo"
1097 - v-model="searchForm.consignmentCode"
1098 resize="none" 534 resize="none"
535 + v-model="formData.packNo"
536 + clearable
1099 placeholder="" 537 placeholder=""
1100 - @focus="textareaFocus"
1101 ></el-input> 538 ></el-input>
1102 - </el-popover>
1103 </Formitem> 539 </Formitem>
1104 </el-col> 540 </el-col>
1105 - <el-col :span="5"> 541 + <!-- 毛重(公斤) -->
1106 - <Formitem label="毛重(公斤)" prop="consignmentCode"> 542 + <el-col :span="3">
1107 - <el-popover 543 + <Formitem label="毛重(公斤)" prop="grossWeight">
1108 - placement="bottom"
1109 - width="320"
1110 - trigger="manual"
1111 - popper-class="popoverconsignmentCode"
1112 - v-model="textareaVisible.formItemconsignmentCode"
1113 - >
1114 - <el-input
1115 - name="consignmentCode-textarea"
1116 - type="textarea"
1117 - :rows="5"
1118 - id="popoverInputconsignmentCode"
1119 - class="inputShadow textareaPopover"
1120 - v-model="searchForm.consignmentCode"
1121 - resize="none"
1122 - maxlength="13000"
1123 - placeholder=""
1124 - @blur="textareaBlur"
1125 - ></el-input>
1126 <el-input 544 <el-input
1127 - slot="reference" 545 + type="text"
1128 - name="consignmentCode"
1129 - type="textarea"
1130 - :rows="1"
1131 class="inputShadow" 546 class="inputShadow"
1132 - id="inputInner--consignmentCode" 547 + id="inputInner--grossWeight"
1133 - v-model="searchForm.consignmentCode"
1134 resize="none" 548 resize="none"
549 + v-model="formData.grossWeight"
550 + clearable
1135 placeholder="" 551 placeholder=""
1136 - @focus="textareaFocus"
1137 ></el-input> 552 ></el-input>
1138 - </el-popover>
1139 </Formitem> 553 </Formitem>
1140 </el-col> 554 </el-col>
1141 - <el-col :span="5"> 555 + <!-- 净重(公斤) -->
1142 - <Formitem label="净重(公斤)" prop="consignmentCode"> 556 + <el-col :span="3">
1143 - <el-popover 557 + <Formitem label="净重(公斤)" prop="netWeight">
1144 - placement="bottom"
1145 - width="320"
1146 - trigger="manual"
1147 - popper-class="popoverconsignmentCode"
1148 - v-model="textareaVisible.formItemconsignmentCode"
1149 - >
1150 <el-input 558 <el-input
1151 - name="consignmentCode-textarea" 559 + type="text"
1152 - type="textarea"
1153 - :rows="5"
1154 - id="popoverInputconsignmentCode"
1155 - class="inputShadow textareaPopover"
1156 - v-model="searchForm.consignmentCode"
1157 - resize="none"
1158 - maxlength="13000"
1159 - placeholder=""
1160 - @blur="textareaBlur"
1161 - ></el-input>
1162 - <el-input
1163 - slot="reference"
1164 - name="consignmentCode"
1165 - type="textarea"
1166 - :rows="1"
1167 class="inputShadow" 560 class="inputShadow"
1168 - id="inputInner--consignmentCode" 561 + id="inputInner--netWeight"
1169 - v-model="searchForm.consignmentCode"
1170 resize="none" 562 resize="none"
563 + v-model="formData.netWeight"
564 + clearable
1171 placeholder="" 565 placeholder=""
1172 - @focus="textareaFocus"
1173 ></el-input> 566 ></el-input>
1174 - </el-popover>
1175 </Formitem> 567 </Formitem>
1176 </el-col> 568 </el-col>
1177 - <el-col :span="5"> 569 + <!-- 包装种类代码 -->
1178 - <Formitem label="包装种类代码" prop="consignmentCode"> 570 + <el-col :span="3">
1179 - <el-popover 571 + <Formitem label="包装种类代码" prop="wrapType">
1180 - placement="bottom"
1181 - width="320"
1182 - trigger="manual"
1183 - popper-class="popoverconsignmentCode"
1184 - v-model="textareaVisible.formItemconsignmentCode"
1185 - >
1186 - <el-input
1187 - name="consignmentCode-textarea"
1188 - type="textarea"
1189 - :rows="5"
1190 - id="popoverInputconsignmentCode"
1191 - class="inputShadow textareaPopover"
1192 - v-model="searchForm.consignmentCode"
1193 - resize="none"
1194 - maxlength="13000"
1195 - placeholder=""
1196 - @blur="textareaBlur"
1197 - ></el-input>
1198 <el-input 572 <el-input
1199 - slot="reference" 573 + type="text"
1200 - name="consignmentCode"
1201 - type="textarea"
1202 - :rows="1"
1203 class="inputShadow" 574 class="inputShadow"
1204 - id="inputInner--consignmentCode" 575 + id="inputInner--wrapType"
1205 - v-model="searchForm.consignmentCode"
1206 resize="none" 576 resize="none"
577 + v-model="formData.wrapType"
578 + clearable
1207 placeholder="" 579 placeholder=""
1208 - @focus="textareaFocus"
1209 ></el-input> 580 ></el-input>
1210 - </el-popover>
1211 </Formitem> 581 </Formitem>
1212 </el-col> 582 </el-col>
1213 - <el-col :span="4"> 583 + </el-row>
1214 - <Formitem label="回执状态" prop="factoryCode"> 584 + <el-row :gutter="5">
1215 - <el-select 585 + <!-- 业务状态 -->
586 + <el-col :span="3">
587 + <Formitem label="回执状态" prop="returnStatus">
588 + <el-input
1216 type="text" 589 type="text"
1217 - id="inputInner--declaredPort" 590 + class="inputShadow"
1218 - v-model="searchForm.declaredPort" 591 + id="inputInner--returnStatus"
592 + resize="none"
593 + v-model="formData.returnStatus"
1219 clearable 594 clearable
1220 placeholder="" 595 placeholder=""
1221 - > 596 + ></el-input>
1222 - <el-option
1223 - v-for="(item, index) in dictData.userport"
1224 - :key="index"
1225 - :label="item.name"
1226 - :value="item.name"
1227 - ></el-option>
1228 - </el-select>
1229 </Formitem> 597 </Formitem>
1230 </el-col> 598 </el-col>
1231 - <el-col :span="4"> 599 + <!-- 申报类型 -->
1232 - <Formitem label="申报类型" prop="factoryCode"> 600 + <el-col :span="3">
1233 - <el-select 601 + <Formitem label="申报类型" prop="appType">
602 + <el-input
1234 type="text" 603 type="text"
1235 - id="inputInner--declaredPort" 604 + class="inputShadow"
1236 - v-model="searchForm.declaredPort" 605 + id="inputInner--appType"
606 + resize="none"
607 + v-model="formData.appType"
1237 clearable 608 clearable
1238 placeholder="" 609 placeholder=""
1239 - > 610 + ></el-input>
1240 - <el-option
1241 - v-for="(item, index) in dictData.userport"
1242 - :key="index"
1243 - :label="item.name"
1244 - :value="item.name"
1245 - ></el-option>
1246 - </el-select>
1247 - </Formitem>
1248 - </el-col>
1249 - <el-col :span="4">
1250 - <Formitem label="申报时间" prop="declareDate">
1251 - <el-date-picker
1252 - v-model="value1"
1253 - type="date"
1254 - placeholder="选择日期">
1255 - </el-date-picker>
1256 </Formitem> 611 </Formitem>
1257 </el-col> 612 </el-col>
1258 - <el-col :span="5"> 613 + <!-- 申报时间 -->
1259 - <Formitem label="备注" prop="consignmentCode"> 614 + <el-col :span="3">
1260 - <el-popover 615 + <Formitem label="申报时间" prop="appTime">
1261 - placement="bottom"
1262 - width="320"
1263 - trigger="manual"
1264 - popper-class="popoverconsignmentCode"
1265 - v-model="textareaVisible.formItemconsignmentCode"
1266 - >
1267 <el-input 616 <el-input
1268 - name="consignmentCode-textarea" 617 + type="text"
1269 - type="textarea" 618 + class="inputShadow"
1270 - :rows="5" 619 + id="inputInner--appTime"
1271 - id="popoverInputconsignmentCode"
1272 - class="inputShadow textareaPopover"
1273 - v-model="searchForm.consignmentCode"
1274 resize="none" 620 resize="none"
1275 - maxlength="13000" 621 + v-model="formData.appTime"
622 + clearable
1276 placeholder="" 623 placeholder=""
1277 - @blur="textareaBlur"
1278 ></el-input> 624 ></el-input>
625 + </Formitem>
626 + </el-col>
627 + <!-- 备注 -->
628 + <el-col :span="9">
629 + <Formitem label="备注" prop="note">
1279 <el-input 630 <el-input
1280 - slot="reference" 631 + type="text"
1281 - name="consignmentCode"
1282 - type="textarea"
1283 - :rows="1"
1284 class="inputShadow" 632 class="inputShadow"
1285 - id="inputInner--consignmentCode" 633 + id="inputInner--note"
1286 - v-model="searchForm.consignmentCode"
1287 resize="none" 634 resize="none"
635 + v-model="formData.note"
636 + clearable
1288 placeholder="" 637 placeholder=""
1289 - @focus="textareaFocus"
1290 ></el-input> 638 ></el-input>
1291 - </el-popover>
1292 </Formitem> 639 </Formitem>
1293 </el-col> 640 </el-col>
1294 </el-row> 641 </el-row>
1295 </el-form> 642 </el-form>
1296 - 643 + <div
1297 - <h5>回执信息</h5> 644 + :class="{ entryTitle: true, titleBorder: logtableType ? false : true }"
1298 - <ReceiptInfoTable :showActionColumn="true" /> 645 + style="margin-top: 10px"
1299 - 646 + >
1300 - <h5>商品明细</h5> 647 + <div>
1301 - <ProductDetailTable :columns="columns" :tableData="tableData"> 648 + 回执信息
1302 - <!-- 自定义插槽内容:例如计量单位列 --> 649 + <el-button type="text" @click="hiddenLogTable">
1303 - <template v-slot:unit="{ row }"> 650 + <svg-icon v-if="logtableType" icon-class="downIcon"></svg-icon>
1304 - <span>{{ row.unit }}</span> 651 + <svg-icon v-else icon-class="upIcon"></svg-icon>
1305 - <i class="el-icon-top" style="margin-left: 5px;"></i> 652 + </el-button>
1306 - </template> 653 + </div>
1307 - </ProductDetailTable> 654 + </div>
655 + <ReceiptInfoTable
656 + v-if="logtableType"
657 + :tableData="logData"
658 + :headerData="logHeaderData"
659 + />
660 + <div class="entryTitle" style="margin-top: 10px">商品明细</div>
661 + <ProductDetailTable
662 + :tableData="detailData"
663 + :bodyHeader="detialHeaderData"
664 + />
665 + <div style="margin-bottom: 20px; text-align: center"></div>
1308 </div> 666 </div>
1309 </template> 667 </template>
1310 668
1311 <script> 669 <script>
1312 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; 670 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
1313 import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 671 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
1314 - 672 +import { getListDetail } from "@/api/exportDetail-api.js";
1315 export default { 673 export default {
1316 - name: "exportTransportDetail.vue", 674 + name: "",
1317 - components: {ProductDetailTable, ReceiptInfoTable}, 675 + components: { ProductDetailTable, ReceiptInfoTable },
1318 data() { 676 data() {
1319 return { 677 return {
1320 - searchForm: { 678 + id: null,
1321 - declaredPort: "", 679 + formData: {},
1322 - consStatus: "", 680 + logData: [],
1323 - consignmentCode: "", 681 + logHeaderData: [
1324 - accsDataImportTime: [], 682 + {
1325 - ownerName: "", 683 + name: "回执状态",
1326 - consignmentHeadCode: "", 684 + value: "returnStatus",
1327 - isPushCustomsSys: "", 685 + width: "200",
1328 - waitOperStatus: "", 686 + align: "left",
1329 - declTime: [],
1330 }, 687 },
1331 - textareaVisible: { 688 + {
1332 - formItemconsignmentCode: false, 689 + name: "状态时间",
1333 - formItemconsignmentHeadCode: false, 690 + value: "returnTime",
691 + width: "400",
692 + align: "left",
1334 }, 693 },
1335 - dictData: { 694 + {
1336 - userport: [ 695 + name: "回执描述",
1337 - {name: "Shanghai Port", code: "SH"}, 696 + value: "returnInfo",
1338 - {name: "Beijing Port", code: "BJ"}, 697 + width: "",
1339 - {name: "Guangzhou Port", code: "GZ"}, 698 + align: "left",
1340 - {name: "Shenzhen Port", code: "SZ"},
1341 - {name: "Tianjin Port", code: "TJ"},
1342 - ],
1343 }, 699 },
1344 - // 动态列配置
1345 - columns: [
1346 - { prop: "index", label: "序号", width: "60" },
1347 - { prop: "recordNumber", label: "备案编号", width: "120" },
1348 - { prop: "productName", label: "商品名称", width: "200" },
1349 - { prop: "productCode", label: "商品编码", width: "150" },
1350 - { prop: "productModel", label: "商品规格型号", width: "150" },
1351 - { prop: "unitPrice", label: "单价", width: "80" },
1352 - { prop: "totalPrice", label: "总价", width: "80" },
1353 - { prop: "currency", label: "币制", width: "80" },
1354 - { prop: "legalQuantity", label: "法定数量", width: "100" },
1355 - { prop: "legalUnit", label: "法定单位", width: "80" },
1356 - { prop: "secondQuantity", label: "第二数量", width: "100" },
1357 - { prop: "secondUnit", label: "第二单位", width: "80" },
1358 - { prop: "originCountry", label: "原产国", width: "120" },
1359 - { prop: "tradeCountry", label: "贸易国", width: "120" },
1360 - { prop: "grossWeight", label: "毛重(KG)", width: "100" }
1361 ], 700 ],
1362 - // 表格数据 701 + detailData: [],
1363 - tableData: [ 702 + detialHeaderData: [
703 + {
704 + name: "序号",
705 + value: "gnum",
706 + width: "",
707 + align: "left",
708 + },
709 + {
710 + name: "商品名称",
711 + value: "itemName",
712 + width: "",
713 + align: "left",
714 + },
715 + {
716 + name: "商品编码",
717 + value: "itemNo",
718 + width: "",
719 + align: "left",
720 + },
721 + {
722 + name: "商品规格型号",
723 + value: "",
724 + width: "",
725 + align: "left",
726 + },
727 + {
728 + name: "单价",
729 + value: "price",
730 + width: "",
731 + align: "left",
732 + },
733 + {
734 + name: "总价",
735 + value: "totalPrice",
736 + width: "",
737 + align: "left",
738 + },
739 + {
740 + name: "币制",
741 + value: "currency",
742 + width: "",
743 + align: "left",
744 + slot: true,
745 + },
746 + {
747 + name: "法定数量",
748 + value: "qty1",
749 + width: "",
750 + align: "left",
751 + },
1364 { 752 {
1365 - index: 1, 753 + name: "法定单位",
1366 - productNumber: "6704200000", 754 + value: "unit1",
1367 - productName: "真人发发夹", 755 + width: "",
1368 - description: "测试内容", 756 + align: "left",
1369 - code: "485607096",
1370 - unit: "↑",
1371 - currency: "美元",
1372 - quantity: 1,
1373 - unitPrice: "645.78",
1374 - totalPrice: "645.78",
1375 - notes: "山东电子口岸已写,加签后上传",
1376 }, 757 },
1377 { 758 {
1378 - index: 2, 759 + name: "第二数量",
1379 - productNumber: "6704200000", 760 + value: "qty2",
1380 - productName: "真人发发夹", 761 + width: "",
1381 - description: "测试内容", 762 + align: "left",
1382 - code: "2145860720", 763 + },
1383 - unit: "↑", 764 + {
1384 - currency: "美元", 765 + name: "第二单位",
1385 - quantity: 2, 766 + value: "unit2",
1386 - unitPrice: "645.78", 767 + width: "",
1387 - totalPrice: "645.78", 768 + align: "left",
1388 - notes: "山东电子口岸已写,加签后上传", 769 + },
770 + {
771 + name: "毛重(KG)",
772 + value: "",
773 + width: "",
774 + align: "left",
1389 }, 775 },
1390 ], 776 ],
1391 - } 777 + loadings: {
778 + entryLoading: false,
1392 }, 779 },
1393 - methods: { 780 + logtableType: true,
1394 - textareaBlur(val) { 781 + };
1395 - let inputInner = document.querySelector( 782 + },
1396 - "#inputInner--" + val.target.name.split("-")[0] 783 + created() {
1397 - ); 784 + if (this.$route.params.data) {
1398 - this.textareaVisible["formItem" + val.target.name.split("-")[0]] = false; 785 + this.id = this.$route.params.data.id;
1399 - inputInner.style.display = "block"; 786 + this.searchData();
1400 - this.$nextTick(() => {
1401 - inputInner.blur();
1402 - if (
1403 - inputInner.value != undefined &&
1404 - inputInner.value != "" &&
1405 - inputInner.value != null
1406 - ) {
1407 - inputInner.classList.add("inputFocus");
1408 } else { 787 } else {
1409 - inputInner.classList.remove("inputFocus"); 788 + this.back();
1410 } 789 }
790 + },
791 + methods: {
792 + searchData() {
793 + this.loadings.entryLoading = true;
794 + getListDetail({ listId: this.id })
795 + .then((res) => {
796 + if (res.code === "200") {
797 + this.formData = res.data.exportList;
798 + this.detailData = res.data.exportListProductList;
799 + this.logData = res.data.exportListReceiptList;
800 + this.detailData.forEach((item, idx) => {
801 + item.index = idx;
1411 }); 802 });
1412 - let arr = []; 803 + } else {
1413 - this.searchForm[val.target.name.split("-")[0]] 804 + this.alertWarningMsg(res.message);
1414 - .replace(/[\n\,\;\;]/g, ",")
1415 - .replace(/[\t]/g, "")
1416 - .split(",")
1417 - .forEach((str, index) => {
1418 - if (str != null && str != "" && index <= 1000) {
1419 - arr.push(str.trim());
1420 } 805 }
806 + this.loadings.entryLoading = false;
807 + })
808 + .catch((err) => {
809 + console.log(err);
810 + this.loadings.entryLoading = false;
1421 }); 811 });
1422 - this.searchForm[val.target.name.split("-")[0]] = arr.join("\n");
1423 - this.$forceUpdate();
1424 }, 812 },
1425 - //文本域展示状态切换 813 + searchLogData() {},
1426 - textareaFocus(val) { 814 + hiddenLogTable() {
1427 - this.textareaVisible["formItem" + val.target.name.split("-")[0]] = true; 815 + this.logtableType = !this.logtableType;
1428 - this.$nextTick(() => {
1429 - document
1430 - .querySelector("#popoverInput" + val.target.name.split("-")[0])
1431 - .focus();
1432 - document.querySelector(
1433 - "#inputInner--" + val.target.name.split("-")[0]
1434 - ).style.display = "none";
1435 - });
1436 }, 816 },
1437 - } 817 + back() {
1438 -} 818 + this.$router.go(-1);
819 + },
820 + },
821 +};
1439 </script> 822 </script>
1440 823
1441 <style scoped lang="scss"> 824 <style scoped lang="scss">
1442 -.export-bill-detail { 825 +.entry {
1443 - background-color: white; 826 + width: 100%;
1444 - padding-left: 20px; 827 + height: 100%;
1445 - //border: 1px solid black; 828 + padding: 10px;
829 + background-color: #fff;
830 + overflow: auto;
831 +
832 + .entryInformation {
833 + width: 100%;
1446 height: 100%; 834 height: 100%;
1447 - .fedexFormItem {
1448 - background-color: #f5f5f5;
1449 - margin-right: 5px;
1450 - margin-bottom: 5px;
1451 - }
1452 - .fedexformSreach {
1453 - border-bottom: none;
1454 } 835 }
1455 - .first-header { 836 +
1456 - margin-top: 0; 837 + .entryTitle {
1457 - padding-top: 20px;
1458 display: flex; 838 display: flex;
1459 justify-content: space-between; 839 justify-content: space-between;
1460 - position: relative; 840 + font-weight: 600;
1461 - .returnButton { 841 + font-weight: 16px;
1462 - font-size: 14px; 842 + color: #000;
1463 - color: red; 843 + margin-bottom: 10px;
1464 - position: absolute;
1465 - right: 0;
1466 - top: 0px;
1467 - width: 80px;
1468 - height: 30px;
1469 - line-height: 30px;
1470 - text-align: center;
1471 - background-color: white;
1472 - border-radius: 5px;
1473 - margin-right: 20px;
1474 - margin-top: 20px;
1475 - cursor: pointer;
1476 - border: 1px solid red;
1477 } 844 }
845 +
846 + .titleBorder {
847 + border-bottom: 1px solid #333;
1478 } 848 }
1479 } 849 }
1480 </style> 850 </style>
......
...@@ -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) {
......
...@@ -15,12 +15,13 @@ ...@@ -15,12 +15,13 @@
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="logisticsNo"> 20 <Formitem label="运单编号" prop="logisticsNo">
20 <el-input 21 <el-input
21 type="text" 22 type="text"
22 class="inputShadow" 23 class="inputShadow"
23 - id="inputInner--orderNo" 24 + id="inputInner--logisticsNo"
24 resize="none" 25 resize="none"
25 v-model="formData.logisticsNo" 26 v-model="formData.logisticsNo"
26 clearable 27 clearable
...@@ -28,45 +29,49 @@ ...@@ -28,45 +29,49 @@
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="logisticsName"> 34 + <Formitem label="物流企业代码" prop="logisticsCode">
33 <el-input 35 <el-input
34 type="text" 36 type="text"
35 class="inputShadow" 37 class="inputShadow"
36 - id="inputInner--orderType" 38 + id="inputInner--logisticsCode"
37 resize="none" 39 resize="none"
38 - v-model="formData.logisticsName" 40 + v-model="formData.logisticsCode"
39 clearable 41 clearable
40 placeholder="" 42 placeholder=""
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="ebcname"> 48 + <Formitem label="物流企业名称" prop="logisticsName">
46 <el-input 49 <el-input
47 type="text" 50 type="text"
48 class="inputShadow" 51 class="inputShadow"
49 - id="inputInner--ebpcode" 52 + id="inputInner--logisticsName"
50 resize="none" 53 resize="none"
51 - v-model="formData.ebcname" 54 + v-model="formData.logisticsName"
52 clearable 55 clearable
53 placeholder="" 56 placeholder=""
54 ></el-input> 57 ></el-input>
55 </Formitem> 58 </Formitem>
56 </el-col> 59 </el-col>
57 - <el-col :span="6"> 60 + <!-- 电商企业名称 -->
58 - <Formitem label="电商企业代码" prop="ebccode"> 61 + <el-col :span="3">
62 + <Formitem label="电商企业名称" prop="ebcname">
59 <el-input 63 <el-input
60 type="text" 64 type="text"
61 class="inputShadow" 65 class="inputShadow"
62 - id="inputInner--ebpname" 66 + id="inputInner--ebcname"
63 resize="none" 67 resize="none"
64 - v-model="formData.ebccode" 68 + v-model="formData.ebcname"
65 clearable 69 clearable
66 placeholder="" 70 placeholder=""
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,12 +85,13 @@ ...@@ -80,12 +85,13 @@
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="ebcTelephone"> 90 <Formitem label="电商企业电话" prop="ebcTelephone">
85 <el-input 91 <el-input
86 type="text" 92 type="text"
87 class="inputShadow" 93 class="inputShadow"
88 - id="inputInner--ebcname" 94 + id="inputInner--ebcTelephone"
89 resize="none" 95 resize="none"
90 v-model="formData.ebcTelephone" 96 v-model="formData.ebcTelephone"
91 clearable 97 clearable
...@@ -93,12 +99,13 @@ ...@@ -93,12 +99,13 @@
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="freight"> 104 <Formitem label="运费" prop="freight">
98 <el-input 105 <el-input
99 type="text" 106 type="text"
100 class="inputShadow" 107 class="inputShadow"
101 - id="inputInner--goodsValue" 108 + id="inputInner--freight"
102 resize="none" 109 resize="none"
103 v-model="formData.freight" 110 v-model="formData.freight"
104 clearable 111 clearable
...@@ -106,14 +113,13 @@ ...@@ -106,14 +113,13 @@
106 ></el-input> 113 ></el-input>
107 </Formitem> 114 </Formitem>
108 </el-col> 115 </el-col>
109 - </el-row> 116 + <!-- 保价费 -->
110 - <el-row :gutter="5">
111 <el-col :span="3"> 117 <el-col :span="3">
112 <Formitem label="保价费" prop="insuredfee"> 118 <Formitem label="保价费" prop="insuredfee">
113 <el-input 119 <el-input
114 type="text" 120 type="text"
115 class="inputShadow" 121 class="inputShadow"
116 - id="inputInner--freight" 122 + id="inputInner--insuredfee"
117 resize="none" 123 resize="none"
118 v-model="formData.insuredfee" 124 v-model="formData.insuredfee"
119 clearable 125 clearable
...@@ -121,25 +127,34 @@ ...@@ -121,25 +127,34 @@
121 ></el-input> 127 ></el-input>
122 </Formitem> 128 </Formitem>
123 </el-col> 129 </el-col>
130 + </el-row>
131 + <el-row :gutter="5">
132 + <!-- 币制 -->
124 <el-col :span="3"> 133 <el-col :span="3">
125 <Formitem label="币制" prop="currency"> 134 <Formitem label="币制" prop="currency">
126 - <el-input 135 + <el-select
127 type="text" 136 type="text"
128 - class="inputShadow"
129 id="inputInner--currency" 137 id="inputInner--currency"
130 - resize="none"
131 v-model="formData.currency" 138 v-model="formData.currency"
132 clearable 139 clearable
133 placeholder="" 140 placeholder=""
134 - ></el-input> 141 + >
142 + <el-option
143 + v-for="(item, index) in dictData.currency"
144 + :key="index"
145 + :label="item.name"
146 + :value="item.value"
147 + ></el-option>
148 + </el-select>
135 </Formitem> 149 </Formitem>
136 </el-col> 150 </el-col>
151 + <!-- 毛重 -->
137 <el-col :span="3"> 152 <el-col :span="3">
138 <Formitem label="毛重" prop="grossWeight"> 153 <Formitem label="毛重" prop="grossWeight">
139 <el-input 154 <el-input
140 type="text" 155 type="text"
141 class="inputShadow" 156 class="inputShadow"
142 - id="inputInner--currency" 157 + id="inputInner--grossWeight"
143 resize="none" 158 resize="none"
144 v-model="formData.grossWeight" 159 v-model="formData.grossWeight"
145 clearable 160 clearable
...@@ -147,12 +162,13 @@ ...@@ -147,12 +162,13 @@
147 ></el-input> 162 ></el-input>
148 </Formitem> 163 </Formitem>
149 </el-col> 164 </el-col>
165 + <!-- 件数 -->
150 <el-col :span="3"> 166 <el-col :span="3">
151 <Formitem label="件数" prop="packNo"> 167 <Formitem label="件数" prop="packNo">
152 <el-input 168 <el-input
153 type="text" 169 type="text"
154 class="inputShadow" 170 class="inputShadow"
155 - id="inputInner--currency" 171 + id="inputInner--packNo"
156 resize="none" 172 resize="none"
157 v-model="formData.packNo" 173 v-model="formData.packNo"
158 clearable 174 clearable
...@@ -160,25 +176,13 @@ ...@@ -160,25 +176,13 @@
160 ></el-input> 176 ></el-input>
161 </Formitem> 177 </Formitem>
162 </el-col> 178 </el-col>
163 - <!-- <el-col :span="3"> 179 + <!-- 主要货物信息 -->
164 - <Formitem label="回执状态" prop="returnStatus">
165 - <el-input
166 - type="text"
167 - class="inputShadow"
168 - id="inputInner--returnStatus"
169 - resize="none"
170 - v-model="formData.returnStatus"
171 - clearable
172 - placeholder=""
173 - ></el-input>
174 - </Formitem>
175 - </el-col> -->
176 <el-col :span="3"> 180 <el-col :span="3">
177 <Formitem label="主要货物信息" prop="goodsInfo"> 181 <Formitem label="主要货物信息" prop="goodsInfo">
178 <el-input 182 <el-input
179 type="text" 183 type="text"
180 class="inputShadow" 184 class="inputShadow"
181 - id="inputInner--appType" 185 + id="inputInner--goodsInfo"
182 resize="none" 186 resize="none"
183 v-model="formData.goodsInfo" 187 v-model="formData.goodsInfo"
184 clearable 188 clearable
...@@ -186,33 +190,27 @@ ...@@ -186,33 +190,27 @@
186 ></el-input> 190 ></el-input>
187 </Formitem> 191 </Formitem>
188 </el-col> 192 </el-col>
193 + <!-- 回执状态 -->
189 <el-col :span="3"> 194 <el-col :span="3">
190 - <Formitem label="业务时间" prop="appTime"> 195 + <Formitem label="回执状态" prop="returnStatus">
191 - <el-input 196 + <el-select
192 - type="text"
193 - class="inputShadow"
194 - id="inputInner--appTime"
195 - resize="none"
196 - v-model="formData.appTime"
197 - clearable
198 - placeholder=""
199 - ></el-input>
200 - </Formitem>
201 - </el-col>
202 - <el-col :span="3">
203 - <Formitem label="回执状态" prop="appStatus">
204 - <el-input
205 type="text" 197 type="text"
206 - class="inputShadow" 198 + id="inputInner--returnStatus"
207 - id="inputInner--appTime" 199 + v-model="formData.returnStatus"
208 - resize="none"
209 - v-model="formData.appTime"
210 clearable 200 clearable
211 placeholder="" 201 placeholder=""
212 - ></el-input> 202 + >
203 + <el-option
204 + v-for="(item, index) in dictData.returnStatus"
205 + :key="index"
206 + :label="item.name"
207 + :value="item.code"
208 + ></el-option>
209 + </el-select>
213 </Formitem> 210 </Formitem>
214 </el-col> 211 </el-col>
215 - <el-col :span="12"> 212 + <!-- 备注 -->
213 + <el-col :span="9">
216 <Formitem label="备注" prop="note"> 214 <Formitem label="备注" prop="note">
217 <el-input 215 <el-input
218 type="text" 216 type="text"
...@@ -244,22 +242,16 @@ ...@@ -244,22 +242,16 @@
244 :tableData="logData" 242 :tableData="logData"
245 :headerData="logHeaderData" 243 :headerData="logHeaderData"
246 /> 244 />
247 -<!-- <div class="entryTitle" style="margin-top: 10px">商品明细</div>--> 245 + <div style="margin-bottom: 20px; text-align: center"></div>
248 -<!-- <ProductDetailTable-->
249 -<!-- :tableData="detailData"-->
250 -<!-- :bodyHeader="detialHeaderData"-->
251 -<!-- />-->
252 </div> 246 </div>
253 </template> 247 </template>
254 248
255 <script> 249 <script>
256 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; 250 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
257 -import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 251 +import { getTransportDetail } from "@/api/exportDetail-api.js";
258 -import {getOrderDetailData, getTransportDetail} from "@/api/exportDetail-api.js";
259 -
260 export default { 252 export default {
261 - name: "index.vue", 253 + name: "",
262 - components: {ProductDetailTable, ReceiptInfoTable}, 254 + components: { ReceiptInfoTable },
263 data() { 255 data() {
264 return { 256 return {
265 id: null, 257 id: null,
...@@ -288,62 +280,70 @@ export default { ...@@ -288,62 +280,70 @@ export default {
288 detailData: [], 280 detailData: [],
289 detialHeaderData: [ 281 detialHeaderData: [
290 { 282 {
283 + name: "序号",
284 + value: "gnum",
285 + width: "",
286 + align: "left",
287 + },
288 + {
291 name: "企业商品货号", 289 name: "企业商品货号",
292 - value: "", 290 + value: "itemNo",
293 width: "", 291 width: "",
294 align: "left", 292 align: "left",
295 }, 293 },
296 { 294 {
297 name: "商品企业商品名称", 295 name: "商品企业商品名称",
298 - value: "", 296 + value: "itemName",
299 width: "", 297 width: "",
300 align: "left", 298 align: "left",
301 }, 299 },
302 { 300 {
303 name: "企业商品描述", 301 name: "企业商品描述",
304 - value: "", 302 + value: "itemDescribe",
305 width: "", 303 width: "",
306 align: "left", 304 align: "left",
307 }, 305 },
308 { 306 {
309 name: "条码", 307 name: "条码",
310 - value: "", 308 + value: "barCode",
311 width: "", 309 width: "",
312 align: "left", 310 align: "left",
313 }, 311 },
314 { 312 {
315 name: "计量单位", 313 name: "计量单位",
316 - value: "", 314 + value: "unit",
317 width: "", 315 width: "",
318 align: "left", 316 align: "left",
317 + slot: true,
319 }, 318 },
320 { 319 {
321 name: "币制", 320 name: "币制",
322 - value: "", 321 + value: "currency",
323 width: "", 322 width: "",
324 align: "left", 323 align: "left",
324 + slot: true,
325 }, 325 },
326 { 326 {
327 name: "数量", 327 name: "数量",
328 - value: "", 328 + value: "qty",
329 width: "", 329 width: "",
330 align: "left", 330 align: "left",
331 }, 331 },
332 { 332 {
333 name: "单价", 333 name: "单价",
334 - value: "", 334 + value: "price",
335 width: "", 335 width: "",
336 align: "left", 336 align: "left",
337 }, 337 },
338 { 338 {
339 name: "总价", 339 name: "总价",
340 - value: "", 340 + value: "totalPrice",
341 width: "", 341 width: "",
342 align: "left", 342 align: "left",
343 }, 343 },
344 { 344 {
345 name: "备注", 345 name: "备注",
346 - value: "", 346 + value: "note",
347 width: "", 347 width: "",
348 align: "left", 348 align: "left",
349 }, 349 },
...@@ -365,15 +365,11 @@ export default { ...@@ -365,15 +365,11 @@ export default {
365 methods: { 365 methods: {
366 searchData() { 366 searchData() {
367 this.loadings.entryLoading = true; 367 this.loadings.entryLoading = true;
368 - getTransportDetail(this.id) 368 + getTransportDetail({ logisticsId: this.id })
369 .then((res) => { 369 .then((res) => {
370 if (res.code === "200") { 370 if (res.code === "200") {
371 this.formData = res.data.exportWaybill; 371 this.formData = res.data.exportWaybill;
372 - this.detailData = res.data.exportOrderProductList;
373 this.logData = res.data.exportWaybillReceiptList; 372 this.logData = res.data.exportWaybillReceiptList;
374 - this.detailData.forEach((item, idx) => {
375 - item.index = idx;
376 - });
377 } else { 373 } else {
378 this.alertWarningMsg(res.message); 374 this.alertWarningMsg(res.message);
379 } 375 }
...@@ -384,8 +380,7 @@ export default { ...@@ -384,8 +380,7 @@ export default {
384 this.loadings.entryLoading = false; 380 this.loadings.entryLoading = false;
385 }); 381 });
386 }, 382 },
387 - searchLogData() { 383 + searchLogData() {},
388 - },
389 hiddenLogTable() { 384 hiddenLogTable() {
390 this.logtableType = !this.logtableType; 385 this.logtableType = !this.logtableType;
391 }, 386 },
......
1 <template> 1 <template>
2 - <div class="export-bill-detail"> 2 + <div class="entry" v-loading="loadings.entryLoading">
3 - <h5 class="first-header"> 3 + <div class="entryTitle">
4 - 清单总分单详情 4 + <div>清单总分单详情</div>
5 - <div class="returnButton" @click="$router.back()">返回</div> 5 + <div>
6 - </h5> 6 + <el-button class="entrySaveButton" @click="back">返 回</el-button>
7 + </div>
8 + </div>
7 <el-form 9 <el-form
8 - class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder" 10 + class="fedexFormStyle"
9 ref="sreachForm" 11 ref="sreachForm"
10 - :model="searchForm" 12 + :model="formData"
11 label-position="top" 13 label-position="top"
12 disabled 14 disabled
13 size="small" 15 size="small"
14 > 16 >
15 - <el-row class="row-border"> 17 + <el-row :gutter="5">
16 - <el-col :span="5"> 18 + <!-- 提运单号 -->
17 - <Formitem label="提运单号" prop="consignmentCode"> 19 + <el-col :span="3">
18 - <el-popover 20 + <Formitem label="提运单号" prop="billNo">
19 - placement="bottom"
20 - width="320"
21 - trigger="manual"
22 - popper-class="popoverconsignmentCode"
23 - v-model="textareaVisible.formItemconsignmentCode"
24 - >
25 - <el-input
26 - name="consignmentCode-textarea"
27 - type="textarea"
28 - :rows="5"
29 - id="popoverInputconsignmentCode"
30 - class="inputShadow textareaPopover"
31 - v-model="searchForm.consignmentCode"
32 - resize="none"
33 - maxlength="13000"
34 - placeholder=""
35 - @blur="textareaBlur"
36 - ></el-input>
37 <el-input 21 <el-input
38 - slot="reference" 22 + type="text"
39 - name="consignmentCode"
40 - type="textarea"
41 - :rows="1"
42 class="inputShadow" 23 class="inputShadow"
43 - id="inputInner--consignmentCode" 24 + id="inputInner--billNo"
44 - v-model="searchForm.consignmentCode"
45 resize="none" 25 resize="none"
26 + v-model="formData.billNo"
27 + clearable
46 placeholder="" 28 placeholder=""
47 - @focus="textareaFocus"
48 ></el-input> 29 ></el-input>
49 - </el-popover>
50 </Formitem> 30 </Formitem>
51 </el-col> 31 </el-col>
52 - <el-col :span="4"> 32 + <!-- 申报地海关 -->
53 - <Formitem label="申报地海关" prop="factoryCode"> 33 + <el-col :span="3">
54 - <el-popover 34 + <Formitem label="申报地海关" prop="customsCode">
55 - placement="bottom"
56 - width="320"
57 - trigger="manual"
58 - popper-class="popoverconsignmentCode"
59 - v-model="textareaVisible.formItemconsignmentCode"
60 - >
61 <el-input 35 <el-input
62 - name="consignmentCode-textarea" 36 + type="text"
63 - type="textarea"
64 - :rows="5"
65 - id="popoverInputconsignmentCode"
66 - class="inputShadow textareaPopover"
67 - v-model="searchForm.consignmentCode"
68 - resize="none"
69 - maxlength="13000"
70 - placeholder=""
71 - @blur="textareaBlur"
72 - ></el-input>
73 - <el-input
74 - slot="reference"
75 - name="consignmentCode"
76 - type="textarea"
77 - :rows="1"
78 class="inputShadow" 37 class="inputShadow"
79 - id="inputInner--consignmentCode" 38 + id="inputInner--customsCode"
80 - v-model="searchForm.consignmentCode"
81 resize="none" 39 resize="none"
40 + v-model="formData.customsCode"
41 + clearable
82 placeholder="" 42 placeholder=""
83 - @focus="textareaFocus"
84 ></el-input> 43 ></el-input>
85 - </el-popover>
86 </Formitem> 44 </Formitem>
87 </el-col> 45 </el-col>
88 - <el-col :span="5"> 46 + <!-- 电子口岸编号 -->
89 - <Formitem label="电子口岸编号" prop="consignmentCode"> 47 + <el-col :span="3">
90 - <el-popover 48 + <Formitem label="电子口岸编号" prop="preNo">
91 - placement="bottom"
92 - width="320"
93 - trigger="manual"
94 - popper-class="popoverconsignmentCode"
95 - v-model="textareaVisible.formItemconsignmentCode"
96 - >
97 <el-input 49 <el-input
98 - name="consignmentCode-textarea" 50 + type="text"
99 - type="textarea"
100 - :rows="5"
101 - id="popoverInputconsignmentCode"
102 - class="inputShadow textareaPopover"
103 - v-model="searchForm.consignmentCode"
104 - resize="none"
105 - maxlength="13000"
106 - placeholder=""
107 - @blur="textareaBlur"
108 - ></el-input>
109 - <el-input
110 - slot="reference"
111 - name="consignmentCode"
112 - type="textarea"
113 - :rows="1"
114 class="inputShadow" 51 class="inputShadow"
115 - id="inputInner--consignmentCode" 52 + id="inputInner--preNo"
116 - v-model="searchForm.consignmentCode"
117 resize="none" 53 resize="none"
54 + v-model="formData.preNo"
55 + clearable
118 placeholder="" 56 placeholder=""
119 - @focus="textareaFocus"
120 ></el-input> 57 ></el-input>
121 - </el-popover>
122 </Formitem> 58 </Formitem>
123 </el-col> 59 </el-col>
124 - <el-col :span="5"> 60 + <!-- 监管场所代码 -->
125 - <Formitem label="监管场所代码" prop="consignmentCode"> 61 + <el-col :span="3">
126 - <el-popover 62 + <Formitem label="监管场所代码" prop="loctNo">
127 - placement="bottom"
128 - width="320"
129 - trigger="manual"
130 - popper-class="popoverconsignmentCode"
131 - v-model="textareaVisible.formItemconsignmentCode"
132 - >
133 <el-input 63 <el-input
134 - name="consignmentCode-textarea" 64 + type="text"
135 - type="textarea" 65 + class="inputShadow"
136 - :rows="5" 66 + id="inputInner--loctNo"
137 - id="popoverInputconsignmentCode"
138 - class="inputShadow textareaPopover"
139 - v-model="searchForm.consignmentCode"
140 resize="none" 67 resize="none"
141 - maxlength="13000" 68 + v-model="formData.loctNo"
69 + clearable
142 placeholder="" 70 placeholder=""
143 - @blur="textareaBlur"
144 ></el-input> 71 ></el-input>
72 + </Formitem>
73 + </el-col>
74 + <!-- 申报企业代码 -->
75 + <el-col :span="3">
76 + <Formitem label="申报企业代码" prop="agentCode">
145 <el-input 77 <el-input
146 - slot="reference" 78 + type="text"
147 - name="consignmentCode"
148 - type="textarea"
149 - :rows="1"
150 class="inputShadow" 79 class="inputShadow"
151 - id="inputInner--consignmentCode" 80 + id="inputInner--agentCode"
152 - v-model="searchForm.consignmentCode"
153 resize="none" 81 resize="none"
82 + v-model="formData.agentCode"
83 + clearable
154 placeholder="" 84 placeholder=""
155 - @focus="textareaFocus"
156 ></el-input> 85 ></el-input>
157 - </el-popover>
158 </Formitem> 86 </Formitem>
159 </el-col> 87 </el-col>
160 - <el-col :span="5"> 88 + <!-- 申报企业名称 -->
161 - <Formitem label="申报企业代码" prop="consignmentCode"> 89 + <el-col :span="6">
162 - <el-popover 90 + <Formitem label="申报企业名称" prop="agentName">
163 - placement="bottom"
164 - width="320"
165 - trigger="manual"
166 - popper-class="popoverconsignmentCode"
167 - v-model="textareaVisible.formItemconsignmentCode"
168 - >
169 <el-input 91 <el-input
170 - name="consignmentCode-textarea" 92 + type="text"
171 - type="textarea" 93 + class="inputShadow"
172 - :rows="5" 94 + id="inputInner--agentName"
173 - id="popoverInputconsignmentCode"
174 - class="inputShadow textareaPopover"
175 - v-model="searchForm.consignmentCode"
176 resize="none" 95 resize="none"
177 - maxlength="13000" 96 + v-model="formData.agentName"
97 + clearable
178 placeholder="" 98 placeholder=""
179 - @blur="textareaBlur"
180 ></el-input> 99 ></el-input>
100 + </Formitem>
101 + </el-col>
102 + <!-- 运输方式 -->
103 + <el-col :span="3">
104 + <Formitem label="运输方式" prop="trafMode">
181 <el-input 105 <el-input
182 - slot="reference" 106 + type="text"
183 - name="consignmentCode"
184 - type="textarea"
185 - :rows="1"
186 class="inputShadow" 107 class="inputShadow"
187 - id="inputInner--consignmentCode" 108 + id="inputInner--trafMode"
188 - v-model="searchForm.consignmentCode"
189 resize="none" 109 resize="none"
110 + v-model="formData.trafMode"
111 + clearable
190 placeholder="" 112 placeholder=""
191 - @focus="textareaFocus"
192 ></el-input> 113 ></el-input>
193 - </el-popover>
194 </Formitem> 114 </Formitem>
195 </el-col> 115 </el-col>
196 </el-row> 116 </el-row>
197 - <el-row> 117 + <el-row :gutter="5">
198 - <el-col :span="5"> 118 + <!-- 运输工具名称 -->
199 - <Formitem label="申报企业名称" prop="consignmentCode"> 119 + <el-col :span="3">
200 - <el-popover 120 + <Formitem label="运输工具名称" prop="trafName">
201 - placement="bottom"
202 - width="320"
203 - trigger="manual"
204 - popper-class="popoverconsignmentCode"
205 - v-model="textareaVisible.formItemconsignmentCode"
206 - >
207 - <el-input
208 - name="consignmentCode-textarea"
209 - type="textarea"
210 - :rows="5"
211 - id="popoverInputconsignmentCode"
212 - class="inputShadow textareaPopover"
213 - v-model="searchForm.consignmentCode"
214 - resize="none"
215 - maxlength="13000"
216 - placeholder=""
217 - @blur="textareaBlur"
218 - ></el-input>
219 <el-input 121 <el-input
220 - slot="reference" 122 + type="text"
221 - name="consignmentCode"
222 - type="textarea"
223 - :rows="1"
224 class="inputShadow" 123 class="inputShadow"
225 - id="inputInner--consignmentCode" 124 + id="inputInner--trafName"
226 - v-model="searchForm.consignmentCode"
227 resize="none" 125 resize="none"
126 + v-model="formData.trafName"
127 + clearable
228 placeholder="" 128 placeholder=""
229 - @focus="textareaFocus"
230 ></el-input> 129 ></el-input>
231 - </el-popover>
232 </Formitem> 130 </Formitem>
233 </el-col> 131 </el-col>
234 - <el-col :span="4"> 132 + <!-- 航班航次号 -->
235 - <Formitem label="运输方式" prop="factoryCode"> 133 + <el-col :span="3">
236 - <el-select 134 + <Formitem label="航班航次号" prop="voyageNo">
135 + <el-input
237 type="text" 136 type="text"
238 - id="inputInner--declaredPort" 137 + class="inputShadow"
239 - v-model="searchForm.declaredPort" 138 + id="inputInner--voyageNo"
139 + resize="none"
140 + v-model="formData.voyageNo"
240 clearable 141 clearable
241 placeholder="" 142 placeholder=""
242 - > 143 + ></el-input>
243 - <el-option
244 - v-for="(item, index) in dictData.userport"
245 - :key="index"
246 - :label="item.name"
247 - :value="item.name"
248 - ></el-option>
249 - </el-select>
250 </Formitem> 144 </Formitem>
251 </el-col> 145 </el-col>
252 - <el-col :span="5"> 146 + <!-- 提运单号 -->
253 - <Formitem label="运输工具名称" prop="consignmentCode"> 147 + <el-col :span="3">
254 - <el-popover 148 + <Formitem label="提运单号" prop="billNo">
255 - placement="bottom"
256 - width="320"
257 - trigger="manual"
258 - popper-class="popoverconsignmentCode"
259 - v-model="textareaVisible.formItemconsignmentCode"
260 - >
261 <el-input 149 <el-input
262 - name="consignmentCode-textarea" 150 + type="text"
263 - type="textarea"
264 - :rows="5"
265 - id="popoverInputconsignmentCode"
266 - class="inputShadow textareaPopover"
267 - v-model="searchForm.consignmentCode"
268 - resize="none"
269 - maxlength="13000"
270 - placeholder=""
271 - @blur="textareaBlur"
272 - ></el-input>
273 - <el-input
274 - slot="reference"
275 - name="consignmentCode"
276 - type="textarea"
277 - :rows="1"
278 class="inputShadow" 151 class="inputShadow"
279 - id="inputInner--consignmentCode" 152 + id="inputInner--billNo"
280 - v-model="searchForm.consignmentCode"
281 resize="none" 153 resize="none"
154 + v-model="formData.billNo"
155 + clearable
282 placeholder="" 156 placeholder=""
283 - @focus="textareaFocus"
284 ></el-input> 157 ></el-input>
285 - </el-popover>
286 </Formitem> 158 </Formitem>
287 </el-col> 159 </el-col>
288 - 160 + <!-- 境内运输工具编号 -->
289 - <el-col :span="5"> 161 + <el-col :span="3">
290 - <Formitem label="航班航次号" prop="consignmentCode"> 162 + <Formitem label="境内运输工具编号" prop="domesticTrafNo">
291 - <el-popover
292 - placement="bottom"
293 - width="320"
294 - trigger="manual"
295 - popper-class="popoverconsignmentCode"
296 - v-model="textareaVisible.formItemconsignmentCode"
297 - >
298 - <el-input
299 - name="consignmentCode-textarea"
300 - type="textarea"
301 - :rows="5"
302 - id="popoverInputconsignmentCode"
303 - class="inputShadow textareaPopover"
304 - v-model="searchForm.consignmentCode"
305 - resize="none"
306 - maxlength="13000"
307 - placeholder=""
308 - @blur="textareaBlur"
309 - ></el-input>
310 <el-input 163 <el-input
311 - slot="reference" 164 + type="text"
312 - name="consignmentCode"
313 - type="textarea"
314 - :rows="1"
315 class="inputShadow" 165 class="inputShadow"
316 - id="inputInner--consignmentCode" 166 + id="inputInner--domesticTrafNo"
317 - v-model="searchForm.consignmentCode"
318 resize="none" 167 resize="none"
168 + v-model="formData.domesticTrafNo"
169 + clearable
319 placeholder="" 170 placeholder=""
320 - @focus="textareaFocus"
321 ></el-input> 171 ></el-input>
322 - </el-popover>
323 </Formitem> 172 </Formitem>
324 </el-col> 173 </el-col>
325 - 174 + <!-- 毛重 -->
326 - <el-col :span="5"> 175 + <el-col :span="3">
327 - <Formitem label="境内运输工具编号" prop="consignmentCode"> 176 + <Formitem label="毛重" prop="grossWeight">
328 - <el-popover
329 - placement="bottom"
330 - width="320"
331 - trigger="manual"
332 - popper-class="popoverconsignmentCode"
333 - v-model="textareaVisible.formItemconsignmentCode"
334 - >
335 <el-input 177 <el-input
336 - name="consignmentCode-textarea" 178 + type="text"
337 - type="textarea"
338 - :rows="5"
339 - id="popoverInputconsignmentCode"
340 - class="inputShadow textareaPopover"
341 - v-model="searchForm.consignmentCode"
342 - resize="none"
343 - maxlength="13000"
344 - placeholder=""
345 - @blur="textareaBlur"
346 - ></el-input>
347 - <el-input
348 - slot="reference"
349 - name="consignmentCode"
350 - type="textarea"
351 - :rows="1"
352 class="inputShadow" 179 class="inputShadow"
353 - id="inputInner--consignmentCode" 180 + id="inputInner--grossWeight"
354 - v-model="searchForm.consignmentCode"
355 resize="none" 181 resize="none"
182 + v-model="formData.grossWeight"
183 + clearable
356 placeholder="" 184 placeholder=""
357 - @focus="textareaFocus"
358 ></el-input> 185 ></el-input>
359 - </el-popover>
360 </Formitem> 186 </Formitem>
361 </el-col> 187 </el-col>
362 - 188 + <!-- 物流企业名称 -->
363 - <el-col :span="5"> 189 + <el-col :span="6">
364 - <Formitem label="毛重" prop="consignmentCode"> 190 + <Formitem label="物流企业名称" prop="logisticsName">
365 - <el-popover
366 - placement="bottom"
367 - width="320"
368 - trigger="manual"
369 - popper-class="popoverconsignmentCode"
370 - v-model="textareaVisible.formItemconsignmentCode"
371 - >
372 <el-input 191 <el-input
373 - name="consignmentCode-textarea" 192 + type="text"
374 - type="textarea"
375 - :rows="5"
376 - id="popoverInputconsignmentCode"
377 - class="inputShadow textareaPopover"
378 - v-model="searchForm.consignmentCode"
379 - resize="none"
380 - maxlength="13000"
381 - placeholder=""
382 - @blur="textareaBlur"
383 - ></el-input>
384 - <el-input
385 - slot="reference"
386 - name="consignmentCode"
387 - type="textarea"
388 - :rows="1"
389 class="inputShadow" 193 class="inputShadow"
390 - id="inputInner--consignmentCode" 194 + id="inputInner--logisticsName"
391 - v-model="searchForm.consignmentCode"
392 resize="none" 195 resize="none"
196 + v-model="formData.logisticsName"
197 + clearable
393 placeholder="" 198 placeholder=""
394 - @focus="textareaFocus"
395 ></el-input> 199 ></el-input>
396 - </el-popover>
397 </Formitem> 200 </Formitem>
398 </el-col> 201 </el-col>
399 - 202 + <!-- 报文总数 -->
400 - <el-col :span="5"> 203 + <el-col :span="3">
401 - <Formitem label="物流企业名称" prop="consignmentCode"> 204 + <Formitem label="报文总数" prop="msgCount">
402 - <el-popover
403 - placement="bottom"
404 - width="320"
405 - trigger="manual"
406 - popper-class="popoverconsignmentCode"
407 - v-model="textareaVisible.formItemconsignmentCode"
408 - >
409 <el-input 205 <el-input
410 - name="consignmentCode-textarea" 206 + type="text"
411 - type="textarea"
412 - :rows="5"
413 - id="popoverInputconsignmentCode"
414 - class="inputShadow textareaPopover"
415 - v-model="searchForm.consignmentCode"
416 - resize="none"
417 - maxlength="13000"
418 - placeholder=""
419 - @blur="textareaBlur"
420 - ></el-input>
421 - <el-input
422 - slot="reference"
423 - name="consignmentCode"
424 - type="textarea"
425 - :rows="1"
426 class="inputShadow" 207 class="inputShadow"
427 - id="inputInner--consignmentCode" 208 + id="inputInner--msgCount"
428 - v-model="searchForm.consignmentCode"
429 resize="none" 209 resize="none"
210 + v-model="formData.msgCount"
211 + clearable
430 placeholder="" 212 placeholder=""
431 - @focus="textareaFocus"
432 ></el-input> 213 ></el-input>
433 - </el-popover>
434 </Formitem> 214 </Formitem>
435 </el-col> 215 </el-col>
436 - 216 + </el-row>
437 - <el-col :span="4"> 217 + <el-row :gutter="5">
438 - <Formitem label="报文总数" prop="factoryCode"> 218 + <!-- 报文序号 -->
439 - <el-select 219 + <el-col :span="3">
220 + <Formitem label="报文序号" prop="msgSeqNo">
221 + <el-input
440 type="text" 222 type="text"
441 - id="inputInner--declaredPort" 223 + class="inputShadow"
442 - v-model="searchForm.declaredPort" 224 + id="inputInner--msgSeqNo"
225 + resize="none"
226 + v-model="formData.msgSeqNo"
443 clearable 227 clearable
444 placeholder="" 228 placeholder=""
445 - > 229 + ></el-input>
446 - <el-option
447 - v-for="(item, index) in dictData.userport"
448 - :key="index"
449 - :label="item.name"
450 - :value="item.name"
451 - ></el-option>
452 - </el-select>
453 </Formitem> 230 </Formitem>
454 </el-col> 231 </el-col>
455 - 232 + <!-- 业务状态 -->
456 - <el-col :span="5"> 233 + <el-col :span="3">
457 - <Formitem label="报文序号" prop="consignmentCode"> 234 + <Formitem label="业务状态" prop="returnStatus">
458 - <el-popover
459 - placement="bottom"
460 - width="320"
461 - trigger="manual"
462 - popper-class="popoverconsignmentCode"
463 - v-model="textareaVisible.formItemconsignmentCode"
464 - >
465 - <el-input
466 - name="consignmentCode-textarea"
467 - type="textarea"
468 - :rows="5"
469 - id="popoverInputconsignmentCode"
470 - class="inputShadow textareaPopover"
471 - v-model="searchForm.consignmentCode"
472 - resize="none"
473 - maxlength="13000"
474 - placeholder=""
475 - @blur="textareaBlur"
476 - ></el-input>
477 <el-input 235 <el-input
478 - slot="reference" 236 + type="text"
479 - name="consignmentCode"
480 - type="textarea"
481 - :rows="1"
482 class="inputShadow" 237 class="inputShadow"
483 - id="inputInner--consignmentCode" 238 + id="inputInner--returnStatus"
484 - v-model="searchForm.consignmentCode"
485 resize="none" 239 resize="none"
240 + v-model="formData.returnStatus"
241 + clearable
486 placeholder="" 242 placeholder=""
487 - @focus="textareaFocus"
488 ></el-input> 243 ></el-input>
489 - </el-popover>
490 </Formitem> 244 </Formitem>
491 </el-col> 245 </el-col>
492 - </el-row> 246 + <!-- 申报类型 -->
493 - <el-row> 247 + <el-col :span="3">
494 - <el-col :span="4"> 248 + <Formitem label="申报类型" prop="appTypeStr">
495 - <Formitem label="回执状态" prop="factoryCode"> 249 + <el-input
496 - <el-select
497 type="text" 250 type="text"
498 - id="inputInner--declaredPort" 251 + class="inputShadow"
499 - v-model="searchForm.declaredPort" 252 + id="inputInner--appTypeStr"
253 + resize="none"
254 + v-model="formData.appTypeStr"
500 clearable 255 clearable
501 placeholder="" 256 placeholder=""
502 - > 257 + ></el-input>
503 - <el-option
504 - v-for="(item, index) in dictData.userport"
505 - :key="index"
506 - :label="item.name"
507 - :value="item.name"
508 - ></el-option>
509 - </el-select>
510 </Formitem> 258 </Formitem>
511 </el-col> 259 </el-col>
512 - <el-col :span="4"> 260 + <!-- 申报日期 -->
513 - <Formitem label="申报类型" prop="factoryCode"> 261 + <el-col :span="3">
514 - <el-select 262 + <Formitem label="申报日期" prop="appTime">
263 + <el-input
515 type="text" 264 type="text"
516 - id="inputInner--declaredPort" 265 + class="inputShadow"
517 - v-model="searchForm.declaredPort" 266 + id="inputInner--appTime"
267 + resize="none"
268 + v-model="formData.appTime"
518 clearable 269 clearable
519 placeholder="" 270 placeholder=""
520 - > 271 + ></el-input>
521 - <el-option
522 - v-for="(item, index) in dictData.userport"
523 - :key="index"
524 - :label="item.name"
525 - :value="item.name"
526 - ></el-option>
527 - </el-select>
528 - </Formitem>
529 - </el-col>
530 - <el-col :span="4">
531 - <Formitem label="申报日期" prop="declareDate">
532 - <el-date-picker
533 - v-model="value1"
534 - type="date"
535 - placeholder="选择日期">
536 - </el-date-picker>
537 </Formitem> 272 </Formitem>
538 </el-col> 273 </el-col>
539 - <el-col :span="5"> 274 + <!-- 备注 -->
540 - <Formitem label="备注" prop="consignmentCode"> 275 + <el-col :span="12">
541 - <el-popover 276 + <Formitem label="备注" prop="note">
542 - placement="bottom"
543 - width="320"
544 - trigger="manual"
545 - popper-class="popoverconsignmentCode"
546 - v-model="textareaVisible.formItemconsignmentCode"
547 - >
548 - <el-input
549 - name="consignmentCode-textarea"
550 - type="textarea"
551 - :rows="5"
552 - id="popoverInputconsignmentCode"
553 - class="inputShadow textareaPopover"
554 - v-model="searchForm.consignmentCode"
555 - resize="none"
556 - maxlength="13000"
557 - placeholder=""
558 - @blur="textareaBlur"
559 - ></el-input>
560 <el-input 277 <el-input
561 - slot="reference" 278 + type="text"
562 - name="consignmentCode"
563 - type="textarea"
564 - :rows="1"
565 class="inputShadow" 279 class="inputShadow"
566 - id="inputInner--consignmentCode" 280 + id="inputInner--note"
567 - v-model="searchForm.consignmentCode"
568 resize="none" 281 resize="none"
282 + v-model="formData.note"
283 + clearable
569 placeholder="" 284 placeholder=""
570 - @focus="textareaFocus"
571 ></el-input> 285 ></el-input>
572 - </el-popover>
573 </Formitem> 286 </Formitem>
574 </el-col> 287 </el-col>
575 </el-row> 288 </el-row>
576 </el-form> 289 </el-form>
577 - 290 + <div
578 - <h5>回执信息</h5> 291 + :class="{ entryTitle: true, titleBorder: logtableType ? false : true }"
579 - <ReceiptInfoTable /> 292 + style="margin-top: 10px"
580 - 293 + >
581 - <h5>商品明细</h5> 294 + <div>
582 - <ProductDetailTable /> 295 + 回执信息
296 + <el-button type="text" @click="hiddenLogTable">
297 + <svg-icon v-if="logtableType" icon-class="downIcon"></svg-icon>
298 + <svg-icon v-else icon-class="upIcon"></svg-icon>
299 + </el-button>
300 + </div>
301 + </div>
302 + <ReceiptInfoTable
303 + v-if="logtableType"
304 + :tableData="logData"
305 + :headerData="logHeaderData"
306 + />
307 + <div class="entryTitle" style="margin-top: 10px">商品明细</div>
308 + <ProductDetailTable
309 + :tableData="detailData"
310 + :bodyHeader="detialHeaderData"
311 + />
312 + <div style="margin-bottom: 20px; text-align: center"></div>
583 </div> 313 </div>
584 </template> 314 </template>
585 315
586 <script> 316 <script>
587 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; 317 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
588 import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 318 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
589 - 319 +import { getListBranchDetail } from "@/api/exportDetail-api.js";
590 export default { 320 export default {
591 - name: "index.vue", 321 + name: "",
592 - components: {ProductDetailTable, ReceiptInfoTable}, 322 + components: { ProductDetailTable, ReceiptInfoTable },
593 data() { 323 data() {
594 return { 324 return {
595 - searchForm: { 325 + id: null,
596 - declaredPort: "", 326 + formData: {},
597 - consStatus: "", 327 + logData: [],
598 - consignmentCode: "", 328 + logHeaderData: [
599 - accsDataImportTime: [], 329 + {
600 - ownerName: "", 330 + name: "回执状态",
601 - consignmentHeadCode: "", 331 + value: "returnStatus",
602 - isPushCustomsSys: "", 332 + width: "200",
603 - waitOperStatus: "", 333 + align: "left",
604 - declTime: [], 334 + },
335 + {
336 + name: "状态时间",
337 + value: "returnTime",
338 + width: "400",
339 + align: "left",
605 }, 340 },
606 - textareaVisible: { 341 + {
607 - formItemconsignmentCode: false, 342 + name: "回执描述",
608 - formItemconsignmentHeadCode: false, 343 + value: "returnInfo",
344 + width: "",
345 + align: "left",
609 }, 346 },
610 - dictData: {
611 - userport: [
612 - {name: "Shanghai Port", code: "SH"},
613 - {name: "Beijing Port", code: "BJ"},
614 - {name: "Guangzhou Port", code: "GZ"},
615 - {name: "Shenzhen Port", code: "SZ"},
616 - {name: "Tianjin Port", code: "TJ"},
617 ], 347 ],
348 + detailData: [],
349 + detialHeaderData: [
350 + {
351 + name: "序号",
352 + value: "gnum",
353 + width: "",
354 + align: "left",
618 }, 355 },
619 - } 356 + {
357 + name: "总包号",
358 + value: "totalPackageNo",
359 + width: "",
360 + align: "left",
620 }, 361 },
621 - methods: { 362 + {
622 - textareaBlur(val) { 363 + name: "物流运单编号",
623 - let inputInner = document.querySelector( 364 + value: "logisticsNo",
624 - "#inputInner--" + val.target.name.split("-")[0] 365 + width: "",
625 - ); 366 + align: "left",
626 - this.textareaVisible["formItem" + val.target.name.split("-")[0]] = false; 367 + },
627 - inputInner.style.display = "block"; 368 + {
628 - this.$nextTick(() => { 369 + name: "出口清单编号",
629 - inputInner.blur(); 370 + value: "invtNo",
630 - if ( 371 + width: "",
631 - inputInner.value != undefined && 372 + align: "left",
632 - inputInner.value != "" && 373 + },
633 - inputInner.value != null 374 + {
634 - ) { 375 + name: "备注",
635 - inputInner.classList.add("inputFocus"); 376 + value: "note",
377 + width: "",
378 + align: "left",
379 + },
380 + ],
381 + loadings: {
382 + entryLoading: false,
383 + },
384 + logtableType: true,
385 + };
386 + },
387 + created() {
388 + if (this.$route.params.data) {
389 + this.id = this.$route.params.data.id;
390 + this.searchData();
636 } else { 391 } else {
637 - inputInner.classList.remove("inputFocus"); 392 + this.back();
638 } 393 }
394 + },
395 + methods: {
396 + searchData() {
397 + this.loadings.entryLoading = true;
398 + getListBranchDetail({ totalScoreId: this.id })
399 + .then((res) => {
400 + if (res.code === "200") {
401 + this.formData = res.data.exportTotalScore;
402 + this.detailData = res.data.exportTotalScoreItemList;
403 + this.logData = res.data.exportTotalScoreReceiptList;
404 + this.detailData.forEach((item, idx) => {
405 + item.index = idx;
639 }); 406 });
640 - let arr = []; 407 + } else {
641 - this.searchForm[val.target.name.split("-")[0]] 408 + this.alertWarningMsg(res.message);
642 - .replace(/[\n\,\;\;]/g, ",")
643 - .replace(/[\t]/g, "")
644 - .split(",")
645 - .forEach((str, index) => {
646 - if (str != null && str != "" && index <= 1000) {
647 - arr.push(str.trim());
648 } 409 }
410 + this.loadings.entryLoading = false;
411 + })
412 + .catch((err) => {
413 + console.log(err);
414 + this.loadings.entryLoading = false;
649 }); 415 });
650 - this.searchForm[val.target.name.split("-")[0]] = arr.join("\n");
651 - this.$forceUpdate();
652 }, 416 },
653 - //文本域展示状态切换 417 + searchLogData() {},
654 - textareaFocus(val) { 418 + hiddenLogTable() {
655 - this.textareaVisible["formItem" + val.target.name.split("-")[0]] = true; 419 + this.logtableType = !this.logtableType;
656 - this.$nextTick(() => {
657 - document
658 - .querySelector("#popoverInput" + val.target.name.split("-")[0])
659 - .focus();
660 - document.querySelector(
661 - "#inputInner--" + val.target.name.split("-")[0]
662 - ).style.display = "none";
663 - });
664 }, 420 },
665 - } 421 + back() {
666 -} 422 + this.$router.go(-1);
423 + },
424 + },
425 +};
667 </script> 426 </script>
668 427
669 <style scoped lang="scss"> 428 <style scoped lang="scss">
670 -.export-bill-detail { 429 +.entry {
671 - background-color: white; 430 + width: 100%;
672 - padding-left: 20px; 431 + height: 100%;
673 - //border: 1px solid black; 432 + padding: 10px;
433 + background-color: #fff;
434 + overflow: auto;
435 +
436 + .entryInformation {
437 + width: 100%;
674 height: 100%; 438 height: 100%;
675 - .fedexFormItem {
676 - background-color: #f5f5f5;
677 - margin-right: 5px;
678 - margin-bottom: 5px;
679 - }
680 - .fedexformSreach {
681 - border-bottom: none;
682 } 439 }
683 - .first-header { 440 +
684 - margin-top: 0; 441 + .entryTitle {
685 - padding-top: 20px;
686 display: flex; 442 display: flex;
687 justify-content: space-between; 443 justify-content: space-between;
688 - position: relative; 444 + font-weight: 600;
689 - .returnButton { 445 + font-weight: 16px;
690 - font-size: 14px; 446 + color: #000;
691 - color: red; 447 + margin-bottom: 10px;
692 - position: absolute;
693 - right: 0;
694 - top: 0px;
695 - width: 80px;
696 - height: 30px;
697 - line-height: 30px;
698 - text-align: center;
699 - background-color: white;
700 - border-radius: 5px;
701 - margin-right: 20px;
702 - margin-top: 20px;
703 - cursor: pointer;
704 - border: 1px solid red;
705 } 448 }
449 +
450 + .titleBorder {
451 + border-bottom: 1px solid #333;
706 } 452 }
707 } 453 }
708 </style> 454 </style>
......
...@@ -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) {
......
1 <template> 1 <template>
2 - <div class="export-bill-detail"> 2 + <div class="entry" v-loading="loadings.entryLoading">
3 - <h5 class="first-header"> 3 + <div class="entryTitle">
4 - 离境单详情 4 + <div>离境单详情</div>
5 - <div class="returnButton" @click="$router.back()">返回</div> 5 + <div>
6 - </h5> 6 + <el-button class="entrySaveButton" @click="back">返 回</el-button>
7 + </div>
8 + </div>
7 <el-form 9 <el-form
8 - class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder" 10 + class="fedexFormStyle"
9 ref="sreachForm" 11 ref="sreachForm"
10 - :model="searchForm" 12 + :model="formData"
11 label-position="top" 13 label-position="top"
12 disabled 14 disabled
13 size="small" 15 size="small"
14 > 16 >
15 - <el-row class="row-border"> 17 + <el-row :gutter="5">
16 - <el-col :span="5"> 18 + <!-- 提运单号 -->
17 - <Formitem label="提运单号" prop="consignmentCode"> 19 + <el-col :span="3">
18 - <el-popover 20 + <Formitem label="提运单号" prop="billNo">
19 - placement="bottom"
20 - width="320"
21 - trigger="manual"
22 - popper-class="popoverconsignmentCode"
23 - v-model="textareaVisible.formItemconsignmentCode"
24 - >
25 <el-input 21 <el-input
26 - name="consignmentCode-textarea" 22 + type="text"
27 - type="textarea"
28 - :rows="5"
29 - id="popoverInputconsignmentCode"
30 - class="inputShadow textareaPopover"
31 - v-model="searchForm.consignmentCode"
32 - resize="none"
33 - maxlength="13000"
34 - placeholder=""
35 - @blur="textareaBlur"
36 - ></el-input>
37 - <el-input
38 - slot="reference"
39 - name="consignmentCode"
40 - type="textarea"
41 - :rows="1"
42 class="inputShadow" 23 class="inputShadow"
43 - id="inputInner--consignmentCode" 24 + id="inputInner--billNo"
44 - v-model="searchForm.consignmentCode"
45 resize="none" 25 resize="none"
46 - placeholder="" 26 + v-model="formData.billNo"
47 - @focus="textareaFocus"
48 - ></el-input>
49 - </el-popover>
50 - </Formitem>
51 - </el-col>
52 - <el-col :span="4">
53 - <Formitem label="报送类型" prop="factoryCode">
54 - <el-select
55 - type="text"
56 - id="inputInner--declaredPort"
57 - v-model="searchForm.declaredPort"
58 clearable 27 clearable
59 placeholder="" 28 placeholder=""
60 - > 29 + ></el-input>
61 - <el-option
62 - v-for="(item, index) in dictData.userport"
63 - :key="index"
64 - :label="item.name"
65 - :value="item.name"
66 - ></el-option>
67 - </el-select>
68 </Formitem> 30 </Formitem>
69 </el-col> 31 </el-col>
70 - <el-col :span="4"> 32 + <!-- 报送类型 -->
71 - <Formitem label="回执状态" prop="factoryCode"> 33 + <el-col :span="3">
72 - <el-select 34 + <Formitem label="报送类型" prop="appType">
35 + <el-input
73 type="text" 36 type="text"
74 - id="inputInner--declaredPort" 37 + class="inputShadow"
75 - v-model="searchForm.declaredPort" 38 + id="inputInner--appType"
39 + resize="none"
40 + v-model="formData.appType"
76 clearable 41 clearable
77 placeholder="" 42 placeholder=""
78 - > 43 + ></el-input>
79 - <el-option
80 - v-for="(item, index) in dictData.userport"
81 - :key="index"
82 - :label="item.name"
83 - :value="item.name"
84 - ></el-option>
85 - </el-select>
86 </Formitem> 44 </Formitem>
87 </el-col> 45 </el-col>
88 - <el-col :span="5"> 46 + <!-- 业务状态 -->
89 - <Formitem label="报送时间" prop="consignmentCode"> 47 + <el-col :span="3">
90 - <el-popover 48 + <Formitem label="业务状态" prop="returnStatus">
91 - placement="bottom"
92 - width="320"
93 - trigger="manual"
94 - popper-class="popoverconsignmentCode"
95 - v-model="textareaVisible.formItemconsignmentCode"
96 - >
97 - <el-input
98 - name="consignmentCode-textarea"
99 - type="textarea"
100 - :rows="5"
101 - id="popoverInputconsignmentCode"
102 - class="inputShadow textareaPopover"
103 - v-model="searchForm.consignmentCode"
104 - resize="none"
105 - maxlength="13000"
106 - placeholder=""
107 - @blur="textareaBlur"
108 - ></el-input>
109 <el-input 49 <el-input
110 - slot="reference" 50 + type="text"
111 - name="consignmentCode"
112 - type="textarea"
113 - :rows="1"
114 class="inputShadow" 51 class="inputShadow"
115 - id="inputInner--consignmentCode" 52 + id="inputInner--returnStatus"
116 - v-model="searchForm.consignmentCode"
117 resize="none" 53 resize="none"
54 + v-model="formData.returnStatus"
55 + clearable
118 placeholder="" 56 placeholder=""
119 - @focus="textareaFocus"
120 ></el-input> 57 ></el-input>
121 - </el-popover>
122 </Formitem> 58 </Formitem>
123 </el-col> 59 </el-col>
124 - <el-col :span="4"> 60 + <!-- 报送时间 -->
125 - <Formitem label="物流企业名称" prop="factoryCode"> 61 + <el-col :span="3">
126 - <el-popover 62 + <Formitem label="报送时间" prop="appTime">
127 - placement="bottom"
128 - width="320"
129 - trigger="manual"
130 - popper-class="popoverconsignmentCode"
131 - v-model="textareaVisible.formItemconsignmentCode"
132 - >
133 - <el-input
134 - name="consignmentCode-textarea"
135 - type="textarea"
136 - :rows="5"
137 - id="popoverInputconsignmentCode"
138 - class="inputShadow textareaPopover"
139 - v-model="searchForm.consignmentCode"
140 - resize="none"
141 - maxlength="13000"
142 - placeholder=""
143 - @blur="textareaBlur"
144 - ></el-input>
145 <el-input 63 <el-input
146 - slot="reference" 64 + type="text"
147 - name="consignmentCode"
148 - type="textarea"
149 - :rows="1"
150 class="inputShadow" 65 class="inputShadow"
151 - id="inputInner--consignmentCode" 66 + id="inputInner--appTime"
152 - v-model="searchForm.consignmentCode"
153 resize="none" 67 resize="none"
68 + v-model="formData.appTime"
69 + clearable
154 placeholder="" 70 placeholder=""
155 - @focus="textareaFocus"
156 ></el-input> 71 ></el-input>
157 - </el-popover>
158 </Formitem> 72 </Formitem>
159 </el-col> 73 </el-col>
160 - <el-col :span="5"> 74 + <!-- 物流企业名称 -->
161 - <Formitem label="物流企业代码" prop="consignmentCode"> 75 + <el-col :span="3">
162 - <el-popover 76 + <Formitem label="物流企业名称" prop="logisticsName">
163 - placement="bottom"
164 - width="320"
165 - trigger="manual"
166 - popper-class="popoverconsignmentCode"
167 - v-model="textareaVisible.formItemconsignmentCode"
168 - >
169 <el-input 77 <el-input
170 - name="consignmentCode-textarea" 78 + type="text"
171 - type="textarea"
172 - :rows="5"
173 - id="popoverInputconsignmentCode"
174 - class="inputShadow textareaPopover"
175 - v-model="searchForm.consignmentCode"
176 - resize="none"
177 - maxlength="13000"
178 - placeholder=""
179 - @blur="textareaBlur"
180 - ></el-input>
181 - <el-input
182 - slot="reference"
183 - name="consignmentCode"
184 - type="textarea"
185 - :rows="1"
186 class="inputShadow" 79 class="inputShadow"
187 - id="inputInner--consignmentCode" 80 + id="inputInner--logisticsName"
188 - v-model="searchForm.consignmentCode"
189 resize="none" 81 resize="none"
82 + v-model="formData.logisticsName"
83 + clearable
190 placeholder="" 84 placeholder=""
191 - @focus="textareaFocus"
192 ></el-input> 85 ></el-input>
193 - </el-popover>
194 </Formitem> 86 </Formitem>
195 </el-col> 87 </el-col>
196 - <el-col :span="5"> 88 + <!-- 物流企业代码 -->
197 - <Formitem label="申报地海关代码" prop="consignmentCode"> 89 + <el-col :span="3">
198 - <el-popover 90 + <Formitem label="物流企业代码" prop="logisticsCode">
199 - placement="bottom"
200 - width="320"
201 - trigger="manual"
202 - popper-class="popoverconsignmentCode"
203 - v-model="textareaVisible.formItemconsignmentCode"
204 - >
205 <el-input 91 <el-input
206 - name="consignmentCode-textarea" 92 + type="text"
207 - type="textarea"
208 - :rows="5"
209 - id="popoverInputconsignmentCode"
210 - class="inputShadow textareaPopover"
211 - v-model="searchForm.consignmentCode"
212 - resize="none"
213 - maxlength="13000"
214 - placeholder=""
215 - @blur="textareaBlur"
216 - ></el-input>
217 - <el-input
218 - slot="reference"
219 - name="consignmentCode"
220 - type="textarea"
221 - :rows="1"
222 class="inputShadow" 93 class="inputShadow"
223 - id="inputInner--consignmentCode" 94 + id="inputInner--logisticsCode"
224 - v-model="searchForm.consignmentCode"
225 resize="none" 95 resize="none"
96 + v-model="formData.logisticsCode"
97 + clearable
226 placeholder="" 98 placeholder=""
227 - @focus="textareaFocus"
228 ></el-input> 99 ></el-input>
229 - </el-popover>
230 </Formitem> 100 </Formitem>
231 </el-col> 101 </el-col>
232 - <el-col :span="4"> 102 + <!-- 申报地海关代码 -->
233 - <Formitem label="运输方式" prop="factoryCode"> 103 + <el-col :span="3">
234 - <el-select 104 + <Formitem label="申报地海关代码" prop="customsCode">
105 + <el-input
235 type="text" 106 type="text"
236 - id="inputInner--declaredPort" 107 + class="inputShadow"
237 - v-model="searchForm.declaredPort" 108 + id="inputInner--customsCode"
109 + resize="none"
110 + v-model="formData.customsCode"
238 clearable 111 clearable
239 placeholder="" 112 placeholder=""
240 - > 113 + ></el-input>
241 - <el-option
242 - v-for="(item, index) in dictData.userport"
243 - :key="index"
244 - :label="item.name"
245 - :value="item.name"
246 - ></el-option>
247 - </el-select>
248 </Formitem> 114 </Formitem>
249 </el-col> 115 </el-col>
250 - <el-col :span="5"> 116 + <!-- 运输方式 -->
251 - <Formitem label="运输工具名称" prop="consignmentCode"> 117 + <el-col :span="3">
252 - <el-popover 118 + <Formitem label="运输方式" prop="trafMode">
253 - placement="bottom"
254 - width="320"
255 - trigger="manual"
256 - popper-class="popoverconsignmentCode"
257 - v-model="textareaVisible.formItemconsignmentCode"
258 - >
259 - <el-input
260 - name="consignmentCode-textarea"
261 - type="textarea"
262 - :rows="5"
263 - id="popoverInputconsignmentCode"
264 - class="inputShadow textareaPopover"
265 - v-model="searchForm.consignmentCode"
266 - resize="none"
267 - maxlength="13000"
268 - placeholder=""
269 - @blur="textareaBlur"
270 - ></el-input>
271 <el-input 119 <el-input
272 - slot="reference" 120 + type="text"
273 - name="consignmentCode"
274 - type="textarea"
275 - :rows="1"
276 class="inputShadow" 121 class="inputShadow"
277 - id="inputInner--consignmentCode" 122 + id="inputInner--trafMode"
278 - v-model="searchForm.consignmentCode"
279 resize="none" 123 resize="none"
124 + v-model="formData.trafMode"
125 + clearable
280 placeholder="" 126 placeholder=""
281 - @focus="textareaFocus"
282 ></el-input> 127 ></el-input>
283 - </el-popover>
284 </Formitem> 128 </Formitem>
285 </el-col> 129 </el-col>
286 </el-row> 130 </el-row>
287 - <el-row> 131 + <el-row :gutter="5">
288 - <el-col :span="5"> 132 + <!-- 运输工具名称 -->
289 - <Formitem label="离境时间" prop="consignmentCode"> 133 + <el-col :span="3">
290 - <el-popover 134 + <Formitem label="运输工具名称" prop="trafName">
291 - placement="bottom"
292 - width="320"
293 - trigger="manual"
294 - popper-class="popoverconsignmentCode"
295 - v-model="textareaVisible.formItemconsignmentCode"
296 - >
297 - <el-input
298 - name="consignmentCode-textarea"
299 - type="textarea"
300 - :rows="5"
301 - id="popoverInputconsignmentCode"
302 - class="inputShadow textareaPopover"
303 - v-model="searchForm.consignmentCode"
304 - resize="none"
305 - maxlength="13000"
306 - placeholder=""
307 - @blur="textareaBlur"
308 - ></el-input>
309 <el-input 135 <el-input
310 - slot="reference" 136 + type="text"
311 - name="consignmentCode"
312 - type="textarea"
313 - :rows="1"
314 class="inputShadow" 137 class="inputShadow"
315 - id="inputInner--consignmentCode" 138 + id="inputInner--trafName"
316 - v-model="searchForm.consignmentCode"
317 resize="none" 139 resize="none"
140 + v-model="formData.trafName"
141 + clearable
318 placeholder="" 142 placeholder=""
319 - @focus="textareaFocus"
320 ></el-input> 143 ></el-input>
321 - </el-popover>
322 </Formitem> 144 </Formitem>
323 </el-col> 145 </el-col>
324 - <el-col :span="5"> 146 + <!-- 离境时间 -->
325 - <Formitem label="申报日期" prop="consignmentCode"> 147 + <el-col :span="3">
326 - <el-popover 148 + <Formitem label="离境时间" prop="leaveTime">
327 - placement="bottom"
328 - width="320"
329 - trigger="manual"
330 - popper-class="popoverconsignmentCode"
331 - v-model="textareaVisible.formItemconsignmentCode"
332 - >
333 <el-input 149 <el-input
334 - name="consignmentCode-textarea" 150 + type="text"
335 - type="textarea"
336 - :rows="5"
337 - id="popoverInputconsignmentCode"
338 - class="inputShadow textareaPopover"
339 - v-model="searchForm.consignmentCode"
340 - resize="none"
341 - maxlength="13000"
342 - placeholder=""
343 - @blur="textareaBlur"
344 - ></el-input>
345 - <el-input
346 - slot="reference"
347 - name="consignmentCode"
348 - type="textarea"
349 - :rows="1"
350 class="inputShadow" 151 class="inputShadow"
351 - id="inputInner--consignmentCode" 152 + id="inputInner--leaveTime"
352 - v-model="searchForm.consignmentCode"
353 resize="none" 153 resize="none"
154 + v-model="formData.leaveTime"
155 + clearable
354 placeholder="" 156 placeholder=""
355 - @focus="textareaFocus"
356 ></el-input> 157 ></el-input>
357 - </el-popover>
358 </Formitem> 158 </Formitem>
359 </el-col> 159 </el-col>
360 - 160 + <!-- 申报日期 -->
361 - <el-col :span="5"> 161 + <el-col :span="3">
362 - <Formitem label="备注" prop="consignmentCode"> 162 + <Formitem label="申报日期" prop="createTimeStr">
363 - <el-popover
364 - placement="bottom"
365 - width="320"
366 - trigger="manual"
367 - popper-class="popoverconsignmentCode"
368 - v-model="textareaVisible.formItemconsignmentCode"
369 - >
370 - <el-input
371 - name="consignmentCode-textarea"
372 - type="textarea"
373 - :rows="5"
374 - id="popoverInputconsignmentCode"
375 - class="inputShadow textareaPopover"
376 - v-model="searchForm.consignmentCode"
377 - resize="none"
378 - maxlength="13000"
379 - placeholder=""
380 - @blur="textareaBlur"
381 - ></el-input>
382 <el-input 163 <el-input
383 - slot="reference" 164 + type="text"
384 - name="consignmentCode"
385 - type="textarea"
386 - :rows="1"
387 class="inputShadow" 165 class="inputShadow"
388 - id="inputInner--consignmentCode" 166 + id="inputInner--createTimeStr"
389 - v-model="searchForm.consignmentCode"
390 resize="none" 167 resize="none"
391 - placeholder="" 168 + v-model="formData.createTimeStr"
392 - @focus="textareaFocus"
393 - ></el-input>
394 - </el-popover>
395 - </Formitem>
396 - </el-col>
397 - </el-row>
398 - <el-row>
399 - <el-col :span="4">
400 - <Formitem label="回执状态" prop="factoryCode">
401 - <el-select
402 - type="text"
403 - id="inputInner--declaredPort"
404 - v-model="searchForm.declaredPort"
405 - clearable
406 - placeholder=""
407 - >
408 - <el-option
409 - v-for="(item, index) in dictData.userport"
410 - :key="index"
411 - :label="item.name"
412 - :value="item.name"
413 - ></el-option>
414 - </el-select>
415 - </Formitem>
416 - </el-col>
417 - <el-col :span="4">
418 - <Formitem label="申报类型" prop="factoryCode">
419 - <el-select
420 - type="text"
421 - id="inputInner--declaredPort"
422 - v-model="searchForm.declaredPort"
423 clearable 169 clearable
424 placeholder="" 170 placeholder=""
425 - > 171 + ></el-input>
426 - <el-option
427 - v-for="(item, index) in dictData.userport"
428 - :key="index"
429 - :label="item.name"
430 - :value="item.name"
431 - ></el-option>
432 - </el-select>
433 - </Formitem>
434 - </el-col>
435 - <el-col :span="4">
436 - <Formitem label="申报日期" prop="declareDate">
437 - <el-date-picker
438 - v-model="value1"
439 - type="date"
440 - placeholder="选择日期">
441 - </el-date-picker>
442 </Formitem> 172 </Formitem>
443 </el-col> 173 </el-col>
444 - <el-col :span="5"> 174 + <!-- 备注 -->
445 - <Formitem label="备注" prop="consignmentCode"> 175 + <el-col :span="9">
446 - <el-popover 176 + <Formitem label="备注" prop="note">
447 - placement="bottom"
448 - width="320"
449 - trigger="manual"
450 - popper-class="popoverconsignmentCode"
451 - v-model="textareaVisible.formItemconsignmentCode"
452 - >
453 <el-input 177 <el-input
454 - name="consignmentCode-textarea" 178 + type="text"
455 - type="textarea"
456 - :rows="5"
457 - id="popoverInputconsignmentCode"
458 - class="inputShadow textareaPopover"
459 - v-model="searchForm.consignmentCode"
460 - resize="none"
461 - maxlength="13000"
462 - placeholder=""
463 - @blur="textareaBlur"
464 - ></el-input>
465 - <el-input
466 - slot="reference"
467 - name="consignmentCode"
468 - type="textarea"
469 - :rows="1"
470 class="inputShadow" 179 class="inputShadow"
471 - id="inputInner--consignmentCode" 180 + id="inputInner--note"
472 - v-model="searchForm.consignmentCode"
473 resize="none" 181 resize="none"
182 + v-model="formData.note"
183 + clearable
474 placeholder="" 184 placeholder=""
475 - @focus="textareaFocus"
476 ></el-input> 185 ></el-input>
477 - </el-popover>
478 </Formitem> 186 </Formitem>
479 </el-col> 187 </el-col>
480 </el-row> 188 </el-row>
481 </el-form> 189 </el-form>
482 - 190 + <div
483 - <h5>回执信息</h5> 191 + :class="{ entryTitle: true, titleBorder: logtableType ? false : true }"
484 - <ReceiptInfoTable /> 192 + style="margin-top: 10px"
485 - 193 + >
486 - <h5>商品明细</h5> 194 + <div>
487 - <ProductDetailTable /> 195 + 回执信息
196 + <el-button type="text" @click="hiddenLogTable">
197 + <svg-icon v-if="logtableType" icon-class="downIcon"></svg-icon>
198 + <svg-icon v-else icon-class="upIcon"></svg-icon>
199 + </el-button>
200 + </div>
201 + </div>
202 + <ReceiptInfoTable
203 + v-if="logtableType"
204 + :tableData="logData"
205 + :headerData="logHeaderData"
206 + />
207 + <div class="entryTitle" style="margin-top: 10px">商品明细</div>
208 + <ProductDetailTable
209 + :tableData="detailData"
210 + :bodyHeader="detialHeaderData"
211 + />
212 + <div style="margin-bottom: 20px; text-align: center"></div>
488 </div> 213 </div>
489 </template> 214 </template>
490 215
491 <script> 216 <script>
492 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; 217 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
493 import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 218 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
494 - 219 +import { getLogisticsExitDetail } from "@/api/exportDetail-api.js";
495 export default { 220 export default {
496 name: "index.vue", 221 name: "index.vue",
497 - components: {ProductDetailTable, ReceiptInfoTable}, 222 + components: { ProductDetailTable, ReceiptInfoTable },
498 data() { 223 data() {
499 return { 224 return {
500 - searchForm: { 225 + id: null,
501 - declaredPort: "", 226 + formData: {},
502 - consStatus: "", 227 + logData: [],
503 - consignmentCode: "", 228 + logHeaderData: [
504 - accsDataImportTime: [], 229 + {
505 - ownerName: "", 230 + name: "回执状态",
506 - consignmentHeadCode: "", 231 + value: "returnStatus",
507 - isPushCustomsSys: "", 232 + width: "200",
508 - waitOperStatus: "", 233 + align: "left",
509 - declTime: [], 234 + },
235 + {
236 + name: "状态时间",
237 + value: "returnTime",
238 + width: "400",
239 + align: "left",
510 }, 240 },
511 - textareaVisible: { 241 + {
512 - formItemconsignmentCode: false, 242 + name: "回执描述",
513 - formItemconsignmentHeadCode: false, 243 + value: "returnInfo",
244 + width: "",
245 + align: "left",
514 }, 246 },
515 - dictData: {
516 - userport: [
517 - {name: "Shanghai Port", code: "SH"},
518 - {name: "Beijing Port", code: "BJ"},
519 - {name: "Guangzhou Port", code: "GZ"},
520 - {name: "Shenzhen Port", code: "SZ"},
521 - {name: "Tianjin Port", code: "TJ"},
522 ], 247 ],
248 + detailData: [],
249 + detialHeaderData: [
250 + {
251 + name: "序号",
252 + value: "gnum",
253 + width: "",
254 + align: "left",
523 }, 255 },
524 - } 256 + {
257 + name: "总包号",
258 + value: "totalPackageNo",
259 + width: "",
260 + align: "left",
525 }, 261 },
526 - methods: { 262 + {
527 - textareaBlur(val) { 263 + name: "物流运单编号",
528 - let inputInner = document.querySelector( 264 + value: "logisticsNo",
529 - "#inputInner--" + val.target.name.split("-")[0] 265 + width: "",
530 - ); 266 + align: "left",
531 - this.textareaVisible["formItem" + val.target.name.split("-")[0]] = false; 267 + },
532 - inputInner.style.display = "block"; 268 + {
533 - this.$nextTick(() => { 269 + name: "备注",
534 - inputInner.blur(); 270 + value: "note",
535 - if ( 271 + width: "",
536 - inputInner.value != undefined && 272 + align: "left",
537 - inputInner.value != "" && 273 + },
538 - inputInner.value != null 274 + ],
539 - ) { 275 + loadings: {
540 - inputInner.classList.add("inputFocus"); 276 + entryLoading: false,
277 + },
278 + logtableType: true,
279 + };
280 + },
281 + created() {
282 + if (this.$route.params.data) {
283 + this.id = this.$route.params.data.id;
284 + this.searchData();
541 } else { 285 } else {
542 - inputInner.classList.remove("inputFocus"); 286 + this.back();
543 } 287 }
288 + },
289 + methods: {
290 + searchData() {
291 + this.loadings.entryLoading = true;
292 + getLogisticsExitDetail({ logisticsDepartureId: this.id })
293 + .then((res) => {
294 + if (res.code === "200") {
295 + this.formData = res.data.exportLogisticsDeparture;
296 + this.detailData = res.data.exportLogisticsDepartureItemList;
297 + this.logData = res.data.exportLogisticsDepartureReceiptList;
298 + this.detailData.forEach((item, idx) => {
299 + item.index = idx;
544 }); 300 });
545 - let arr = []; 301 + } else {
546 - this.searchForm[val.target.name.split("-")[0]] 302 + this.alertWarningMsg(res.message);
547 - .replace(/[\n\,\;\;]/g, ",")
548 - .replace(/[\t]/g, "")
549 - .split(",")
550 - .forEach((str, index) => {
551 - if (str != null && str != "" && index <= 1000) {
552 - arr.push(str.trim());
553 } 303 }
304 + this.loadings.entryLoading = false;
305 + })
306 + .catch((err) => {
307 + console.log(err);
308 + this.loadings.entryLoading = false;
554 }); 309 });
555 - this.searchForm[val.target.name.split("-")[0]] = arr.join("\n");
556 - this.$forceUpdate();
557 }, 310 },
558 - //文本域展示状态切换 311 + searchLogData() {},
559 - textareaFocus(val) { 312 + hiddenLogTable() {
560 - this.textareaVisible["formItem" + val.target.name.split("-")[0]] = true; 313 + this.logtableType = !this.logtableType;
561 - this.$nextTick(() => {
562 - document
563 - .querySelector("#popoverInput" + val.target.name.split("-")[0])
564 - .focus();
565 - document.querySelector(
566 - "#inputInner--" + val.target.name.split("-")[0]
567 - ).style.display = "none";
568 - });
569 }, 314 },
570 - } 315 + back() {
571 -} 316 + this.$router.go(-1);
317 + },
318 + },
319 +};
572 </script> 320 </script>
573 321
574 <style scoped lang="scss"> 322 <style scoped lang="scss">
575 -.export-bill-detail { 323 +.entry {
576 - background-color: white; 324 + width: 100%;
577 - padding-left: 20px; 325 + height: 100%;
578 - //border: 1px solid black; 326 + padding: 10px;
327 + background-color: #fff;
328 + overflow: auto;
329 +
330 + .entryInformation {
331 + width: 100%;
579 height: 100%; 332 height: 100%;
580 - .fedexFormItem {
581 - background-color: #f5f5f5;
582 - margin-right: 5px;
583 - margin-bottom: 5px;
584 - }
585 - .fedexformSreach {
586 - border-bottom: none;
587 } 333 }
588 - .first-header { 334 +
589 - margin-top: 0; 335 + .entryTitle {
590 - padding-top: 20px;
591 display: flex; 336 display: flex;
592 justify-content: space-between; 337 justify-content: space-between;
593 - position: relative; 338 + font-weight: 600;
594 - .returnButton { 339 + font-weight: 16px;
595 - font-size: 14px; 340 + color: #000;
596 - color: red; 341 + margin-bottom: 10px;
597 - position: absolute;
598 - right: 0;
599 - top: 0px;
600 - width: 80px;
601 - height: 30px;
602 - line-height: 30px;
603 - text-align: center;
604 - background-color: white;
605 - border-radius: 5px;
606 - margin-right: 20px;
607 - margin-top: 20px;
608 - cursor: pointer;
609 - border: 1px solid red;
610 } 342 }
343 +
344 + .titleBorder {
345 + border-bottom: 1px solid #333;
611 } 346 }
612 } 347 }
613 </style> 348 </style>
......
...@@ -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 =
......