This commit is contained in:
linfso 2025-04-29 10:20:53 +08:00
parent 7c567ddc4d
commit f9e2854060
19 changed files with 117 additions and 44 deletions

View File

@ -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({

View File

@ -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

View File

@ -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) => {

View File

@ -171,6 +171,7 @@
plain
icon="el-icon-download"
size="mini"
v-hasPermi="['emis:emisSettleBill:exportToSeaWaybill']"
@click="handleExportToSeaWaybill"
>海运账单下载</el-button>
</el-col>

View File

@ -26,7 +26,7 @@
type="warning"
plain
size="mini"
@click="handlePayRecordReturn"
@click="handlePayRecordReturn(scope.row)"
v-hasPermi="['emis:emisSettlePayRecord:return']"
>撤销收款</el-button>
</div>
@ -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();

View File

@ -406,8 +406,8 @@
<el-table-column :label="$t('出账日期')" align="center" prop="createTime" min-width="170" />
<el-table-column :label="$t('提单号')" align="center" prop="waybillDetail.ladingBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="waybillDetail.departurePort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="waybillDetail.destinationPort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="waybillDetail.departurePortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="waybillDetail.destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('箱量')" align="center" prop="waybillDetail.boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('贵司编号')" align="center" prop="waybillDetail.companyCode" min-width="80" :show-overflow-tooltip="true"/>

View File

@ -432,8 +432,8 @@
<el-table-column :label="$t('出账日期')" align="center" prop="createTime" min-width="170" />
<el-table-column :label="$t('提单号')" align="center" prop="waybillDetail.ladingBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="waybillDetail.departurePort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="waybillDetail.destinationPort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="waybillDetail.departurePortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="waybillDetail.destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('箱量')" align="center" prop="waybillDetail.boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('贵司编号')" align="center" prop="waybillDetail.companyCode" min-width="80" :show-overflow-tooltip="true"/>

View File

@ -423,8 +423,8 @@
<el-table-column :label="$t('出账日期')" align="center" prop="createTime" min-width="170" />
<el-table-column :label="$t('提单号')" align="center" prop="waybillDetail.ladingBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="waybillDetail.departurePort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="waybillDetail.destinationPort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="waybillDetail.departurePortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="waybillDetail.destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('箱量')" align="center" prop="waybillDetail.boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('贵司编号')" align="center" prop="waybillDetail.companyCode" min-width="80" :show-overflow-tooltip="true"/>

View File

@ -361,8 +361,8 @@
<el-table-column :label="$t('出账日期')" align="center" prop="createTime" min-width="170" />
<el-table-column :label="$t('提单号')" align="center" prop="waybillDetail.ladingBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="waybillDetail.departurePort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="waybillDetail.destinationPort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="waybillDetail.departurePortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="waybillDetail.destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('箱量')" align="center" prop="waybillDetail.boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('贵司编号')" align="center" prop="waybillDetail.companyCode" min-width="80" :show-overflow-tooltip="true"/>

View File

@ -196,6 +196,15 @@
@click="handleExport"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
size="mini"
@click="handleExportDtl"
>导出进仓明细</el-button>
</el-col>
</el-row>
</div>
@ -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<this.selectionList.length;i++){
let item=this.selectionList[i];
inNos.push(item.inNo)
}
this.downloadByPostJsonBody('emis/emisWarehouseIn/exportWarehouseInInfo',
inNos, "进仓货物明细.xlsx")
}
},
/** 导出按钮操作 */
handleExport() {
const loadingInstance = this.$loading({

View File

@ -560,12 +560,11 @@
</template>
</el-table-column>
<el-table-column :label="$t('提单号')" align="center" prop="ladingBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="departurePort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="destinationPort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="departurePortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('箱量')" align="center" prop="boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('贵司编号')" align="center" prop="companyCode" min-width="80" :show-overflow-tooltip="true"/>
</XdTable>

View File

@ -562,8 +562,8 @@
</template>
</el-table-column>
<el-table-column :label="$t('提单号')" align="center" prop="ladingBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="departurePort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="destinationPort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="departurePortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('箱量')" align="center" prop="boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('贵司编号')" align="center" prop="companyCode" min-width="80" :show-overflow-tooltip="true"/>

View File

@ -528,8 +528,8 @@
</template>
</el-table-column>
<el-table-column :label="$t('提单号')" align="center" prop="ladingBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="departurePort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="destinationPort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="departurePortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('箱量')" align="center" prop="boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('贵司编号')" align="center" prop="companyCode" min-width="80" :show-overflow-tooltip="true"/>

View File

@ -532,8 +532,8 @@
</template>
</el-table-column>
<el-table-column :label="$t('提单号')" align="center" prop="ladingBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="departurePort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="destinationPort" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起运港')" align="center" prop="departurePortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的港')" align="center" prop="destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('箱量')" align="center" prop="boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('贵司编号')" align="center" prop="companyCode" min-width="80" :show-overflow-tooltip="true"/>

View File

@ -136,8 +136,8 @@
<el-descriptions-item label="提单号" v-if="form.carryType==4">{{ form.ladingBillCode }}</el-descriptions-item>
<el-descriptions-item label="贵司编号" v-if="form.carryType==4" :span="4">{{ form.companyCode }}</el-descriptions-item>
<el-descriptions-item label="起运港" v-if="form.carryType==4">{{ form.departurePort }}</el-descriptions-item>
<el-descriptions-item label="目的港" v-if="form.carryType==4">{{ form.destinationPort }}</el-descriptions-item>
<el-descriptions-item label="起运港" v-if="form.carryType==4">{{ form.departurePortName }}</el-descriptions-item>
<el-descriptions-item label="目的港" v-if="form.carryType==4">{{ form.destinationPortName }}</el-descriptions-item>
<el-descriptions-item label="箱量" v-if="form.carryType==4">{{ form.boxQuantity }}</el-descriptions-item>
</el-descriptions>

View File

@ -556,16 +556,14 @@
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('起运港')" prop="departurePort" label-width="70px" >
<div style="">
<el-input v-model="form.departurePort" placeholder="起运港" >
</el-input>
<SeaSiteSimplePicker0 :placeholder="$t('起运港')" v-model="form.departurePort" ></SeaSiteSimplePicker0>
</div>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('目的港')" prop="destinationPort" label-width="70px" >
<div style="">
<el-input v-model="form.destinationPort" placeholder="目的港" >
</el-input>
<SeaSiteSimplePicker1 :placeholder="$t('目的港')" v-model="form.destinationPort" ></SeaSiteSimplePicker1>
</div>
</el-form-item>
</el-col>
@ -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',

View File

@ -556,16 +556,14 @@
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('起运港')" prop="departurePort" label-width="70px" >
<div style="">
<el-input v-model="form.departurePort" placeholder="起运港" >
</el-input>
<SeaSiteSimplePicker0 :placeholder="$t('起运港')" v-model="form.departurePort" ></SeaSiteSimplePicker0>
</div>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('目的港')" prop="destinationPort" label-width="70px" >
<div style="">
<el-input v-model="form.destinationPort" placeholder="目的港" >
</el-input>
<SeaSiteSimplePicker1 :placeholder="$t('目的港')" v-model="form.destinationPort" ></SeaSiteSimplePicker1>
</div>
</el-form-item>
</el-col>
@ -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',

View File

@ -558,16 +558,14 @@
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('起运港')" prop="departurePort" label-width="70px" >
<div style="">
<el-input v-model="form.departurePort" placeholder="起运港" >
</el-input>
<SeaSiteSimplePicker0 :placeholder="$t('起运港')" v-model="form.departurePort" ></SeaSiteSimplePicker0>
</div>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('目的港')" prop="destinationPort" label-width="70px" >
<div style="">
<el-input v-model="form.destinationPort" placeholder="目的港" >
</el-input>
<SeaSiteSimplePicker1 :placeholder="$t('目的港')" v-model="form.destinationPort" ></SeaSiteSimplePicker1>
</div>
</el-form-item>
</el-col>
@ -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',

View File

@ -782,8 +782,8 @@
<span>
提单号:{{billDetail.ladingBillCode}} <br>
贵司编号:{{billDetail.companyCode}} <br>
起运港:{{billDetail.departurePort}} <br>
目的港:{{billDetail.destinationPort}} <br>
起运港:{{billDetail.departurePortName}} <br>
目的港:{{billDetail.destinationPortName}} <br>
箱量:{{billDetail.boxQuantity}} <br>
</span>
</el-col>
@ -808,16 +808,14 @@
<el-col :span="12" >
<el-form-item :label="$t('起运港')" prop="departurePort" label-width="70px" >
<div style="">
<el-input v-model="form.departurePort" placeholder="起运港" >
</el-input>
<SeaSiteSimplePicker0 :placeholder="$t('起运港')" v-model="form.departurePort" ></SeaSiteSimplePicker0>
</div>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item :label="$t('目的港')" prop="destinationPort" label-width="70px" >
<div style="">
<el-input v-model="form.destinationPort" placeholder="目的港" >
</el-input>
<SeaSiteSimplePicker1 :placeholder="$t('目的港')" v-model="form.destinationPort" ></SeaSiteSimplePicker1>
</div>
</el-form-item>
</el-col>
@ -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',