diff --git a/src/api/emis/emisSite.js b/src/api/emis/emisSite.js
index 12cb68be..efa93f19 100644
--- a/src/api/emis/emisSite.js
+++ b/src/api/emis/emisSite.js
@@ -18,6 +18,15 @@ export function listSimpleEmisSite(query) {
})
}
+// 查询网点列表 - 精简
+export function listSeaWay(query) {
+ return request({
+ url: '/emis/emisSite/listSeaWay',
+ method: 'get',
+ params: query
+ })
+}
+
// 查询网点详细
export function getEmisSite(id) {
return request({
diff --git a/src/main.js b/src/main.js
index dd7a8e1f..3b087062 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,7 +17,7 @@ import directive from './directive' // directive
import plugins from './plugins' // plugins
// const ElectronStore = require('electron-store');
// const electronStore = new ElectronStore({encryptionKey: '123456'});
-import { download,getRemoteFile } from '@/utils/request'
+import { download,downloadByPostJsonBody,getRemoteFile } from '@/utils/request'
import { triggerTrans } from '@/utils/custom'
import TanexPrinterSdk from '@/utils/TanexPrinterSdk'
import XDNoticeSdk from '@/utils/XDNoticeSdk'
@@ -93,6 +93,7 @@ Vue.prototype.addExportAuditRecord = addExportAuditRecord
Vue.prototype.download = download
Vue.prototype.getRemoteFile = getRemoteFile
+Vue.prototype.downloadByPostJsonBody = downloadByPostJsonBody
Vue.prototype.handleTree = handleTree
Vue.prototype.handleOptions = handleOptions
Vue.prototype.Base64 = Base64
diff --git a/src/utils/request.js b/src/utils/request.js
index a39b9f04..87f32cbf 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -175,6 +175,33 @@ export function download(url, params, filename) {
})
}
+//
+export function downloadByPostJsonBody(url, data, filename) {
+ downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+ return service.post(
+ url,JSON.stringify(data),
+ {
+ headers: { 'Content-Type': 'application/json;charset=utf-8' },
+ responseType: 'blob'
+ }).then(async (data) => {
+ const isLogin = await blobValidate(data);
+ if (isLogin) {
+ const blob = new Blob([data])
+ saveAs(blob, filename)
+ } else {
+ const resText = await data.text();
+ const rspObj = JSON.parse(resText);
+ const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+ Message.error(errMsg);
+ }
+ downloadLoadingInstance.close();
+ }).catch((r) => {
+ console.error(r)
+ Message.error('下载文件出现错误，请联系管理员！')
+ downloadLoadingInstance.close();
+ })
+}
+
// 通用下载方法
export function getRemoteFile(url, params) {
return new Promise((resolve, reject) => {
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
index bd52eec6..a3c21e15 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@@ -171,6 +171,7 @@
plain
icon="el-icon-download"
size="mini"
+ v-hasPermi="['emis:emisSettleBill:exportToSeaWaybill']"
@click="handleExportToSeaWaybill"
>海运账单下载
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
index 68c73204..37d420c9 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
@@ -26,7 +26,7 @@
type="warning"
plain
size="mini"
- @click="handlePayRecordReturn"
+ @click="handlePayRecordReturn(scope.row)"
v-hasPermi="['emis:emisSettlePayRecord:return']"
>撤销收款
@@ -242,7 +242,7 @@ export default {
handlePayRecordReturn(row){
const id = row.id;
- this.$modal.confirm('是否回退').then(function() {
+ this.$modal.confirm('是否撤销收款').then(function() {
return payRecordReturn(id);
}).then(() => {
this.getList();
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index db3d9a75..5108b9c3 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -406,8 +406,8 @@
-
-
+
+
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index 5a355391..7fb398c9 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -432,8 +432,8 @@
-
-
+
+
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index 5a49bbab..ff54b165 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -423,8 +423,8 @@
-
-
+
+
diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
index ad135bbd..296e98fa 100644
--- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
+++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
@@ -361,8 +361,8 @@
-
-
+
+
diff --git a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
index 37011512..8477faa8 100644
--- a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
+++ b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
@@ -196,6 +196,15 @@
@click="handleExport"
>导出
+
+
+ 导出进仓明细
+
@@ -498,6 +507,19 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
+ handleExportDtl() {
+ if(this.selectionList&&this.selectionList.length>0){
+
+ let inNos = [];
+ for(let i=0;i
-
-
+
+
-
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index bd189f3b..17f8cd65 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -562,8 +562,8 @@
-
-
+
+
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 706bc34b..ad949d79 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -528,8 +528,8 @@
-
-
+
+
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index aedaf2f7..bfc3a5db 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -532,8 +532,8 @@
-
-
+
+
diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index 4e9f3625..2ffead93 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -136,8 +136,8 @@
{{ form.ladingBillCode }}
{{ form.companyCode }}
- {{ form.departurePort }}
- {{ form.destinationPort }}
+ {{ form.departurePortName }}
+ {{ form.destinationPortName }}
{{ form.boxQuantity }}
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index b9015f27..e3aea0d3 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -556,16 +556,14 @@
-
-
+
-
-
+
@@ -839,6 +837,9 @@ import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import CityPicker2 from '@/views/emis/EmisBaseTools/CityPicker.vue';
import DistrictPicker2 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
+import SeaSiteSimplePicker0 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
+import SeaSiteSimplePicker1 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
+
import GoodsSimplePicker from '@/views/emis/EmisBaseTools/GoodsSimplePicker.vue';
import GoodsMultiplePicker from '@/views/emis/EmisBaseTools/GoodsMultiplePicker.vue';
@@ -901,7 +902,9 @@ components: {
ProvincePicker2,
CityPicker2,
DistrictPicker2,
- ExchangeRatePanel
+ ExchangeRatePanel,
+ SeaSiteSimplePicker0,
+ SeaSiteSimplePicker1
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index d972e39e..e62f3754 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -556,16 +556,14 @@
-
-
+
-
-
+
@@ -824,6 +822,10 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import SeaSiteSimplePicker0 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
+import SeaSiteSimplePicker1 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
+
+
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
@@ -901,7 +903,9 @@ components: {
ProvincePicker2,
CityPicker2,
DistrictPicker2,
- ExchangeRatePanel
+ ExchangeRatePanel,
+ SeaSiteSimplePicker0,
+ SeaSiteSimplePicker1
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 3fe92c25..1a7e7646 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -558,16 +558,14 @@
-
-
+
-
-
+
@@ -827,6 +825,10 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import SeaSiteSimplePicker0 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
+import SeaSiteSimplePicker1 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
+
+
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
@@ -904,7 +906,9 @@ components: {
ProvincePicker2,
CityPicker2,
DistrictPicker2,
- ExchangeRatePanel
+ ExchangeRatePanel,
+ SeaSiteSimplePicker0,
+ SeaSiteSimplePicker1
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index eecdcc05..d80e6452 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -782,8 +782,8 @@
提单号:{{billDetail.ladingBillCode}}
贵司编号:{{billDetail.companyCode}}
- 起运港:{{billDetail.departurePort}}
- 目的港:{{billDetail.destinationPort}}
+ 起运港:{{billDetail.departurePortName}}
+ 目的港:{{billDetail.destinationPortName}}
箱量:{{billDetail.boxQuantity}}
@@ -808,16 +808,14 @@
-
-
+
-
-
+
@@ -1167,6 +1165,9 @@ import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import CityPicker2 from '@/views/emis/EmisBaseTools/CityPicker.vue';
import DistrictPicker2 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
+import SeaSiteSimplePicker0 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
+import SeaSiteSimplePicker1 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
+
import GoodsSimplePicker from '@/views/emis/EmisBaseTools/GoodsSimplePicker.vue';
import GoodsMultiplePicker from '@/views/emis/EmisBaseTools/GoodsMultiplePicker.vue';
@@ -1235,7 +1236,9 @@ export default {
ProvincePicker2,
CityPicker2,
DistrictPicker2,
- feeItemForm
+ feeItemForm,
+ SeaSiteSimplePicker0,
+ SeaSiteSimplePicker1
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',