aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-04-25 09:04:28 +08:00
parent 019684bc93
commit f8085669eb
19 changed files with 403 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/emis/EmisBaseTools/TransProductCasPicker.vue
View File

@ -56,6 +56,7 @@ data() {
isInit: true,
lineCode:null,
transType:null,
prodCode:null,
searchVal:null,
lazyProps: {
@ -83,6 +84,7 @@ data() {
...item,
value: item.prodCode,
label: item.prodName+"("+item.agingDesc+")",
transType: node.data.transType,
leaf: true,
}));
@ -154,11 +156,11 @@ methods: {
onClear(){
this.svalue = null;
this.$emit("input", this.svalue);
this.$emit("onChange", this.svalue);
this.$emit("onChange", this.svalue,this.transType);
},
onBlur(){
this.$emit("input", this.svalue);
this.$emit("onChange", this.svalue);
this.$emit("onChange", this.svalue,this.transType);
},
onClick(){
this.isInit = false;
@ -166,9 +168,12 @@ methods: {
// this.prodCode=null;
},
onChange(value) {
console.log("=======onChange=>"+value)
const checkedNode = this.$refs["selectRef"].getCheckedNodes();
if(checkedNode&&checkedNode.length>0){
this.transType=checkedNode[0].data.transType;
}
this.$emit("input", this.svalue);
this.$emit("onChange", this.svalue);
this.$emit("onChange", this.svalue,this.transType);
this.resetCascader++
},
async initData(){
@ -186,6 +191,7 @@ methods: {
let node={
value: rows[0].lineCode,
label: rows[0].lineName,
transType: rows[0].transType,
children: []
}
let queryParamsProd={
@ -224,6 +230,7 @@ methods: {
let node={
value: item.lineCode,
label: item.lineName,
transType: item.transType,
children: []
}
this.lineList.push(node);

33
src/views/emis/emisCreditCustomer/index.vue
View File

@ -48,16 +48,13 @@
ref="refTable"
storageName="emisCreditCustomerList_main_250310"
storageName="emisCreditCustomerList_main_250425"
v-loading="loading"
border stripe
size="small"
:data="emisCreditCustomerList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@ -114,29 +111,31 @@
<el-table-column :label="$t('额度编号')" align="center" prop="accCode" min-width="150" />
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="170" :sortable="true" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('固定额度')" align="center" prop="creditMoney" min-width="120" :sortable="true"/>
<!-- <el-table-column label="状态" align="center" prop="blOpen" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.blOpen"
active-value="1"
inactive-value="0"
@change="switchChange(scope.row)">
</el-switch>
</template>
</el-table-column> -->
<el-table-column :label="$t('临时额度')" align="center" prop="tempCreditMoney" min-width="120" :sortable="true" />
<el-table-column :label="$t('剩余额度')" align="center" prop="curMoney" min-width="120" :sortable="true" >
<template slot-scope="scope">
{{ (scope.row.creditMoney - scope.row.useMoney).toFixed(2) }}
{{ (scope.row.tempCreditMoney - scope.row.useMoney).toFixed(2) }}
</template>
</el-table-column>
<el-table-column :label="$t('已使用额度')" align="center" prop="useMoney" min-width="120" :sortable="true">
<el-table-column :label="$t('总已用额度')" align="center" prop="useMoney" min-width="120" :sortable="true">
<template slot-scope="scope">
{{ scope.row.useMoney }}
</template>
</el-table-column>
<el-table-column :label="$t('账期内已用')" align="center" prop="inTermMoney" min-width="120" :sortable="true">
<template slot-scope="scope">
{{ scope.row.inTermMoney }}
</template>
</el-table-column>
<el-table-column :label="$t('超期已用')" align="center" prop="overTermMoney" min-width="120" :sortable="true">
<template slot-scope="scope">
{{ scope.row.overTermMoney }}
</template>
</el-table-column>
<el-table-column :label="$t('剩余比例(%)')" align="center" prop="curMoneyRate" min-width="130" :sortable="true">
<template slot-scope="scope">
{{ ( ((scope.row.creditMoney - scope.row.useMoney)/scope.row.creditMoney)*100 ).toFixed(2) }}%
{{ ( ((scope.row.tempCreditMoney - scope.row.useMoney)/(scope.row.tempCreditMoney))*100 ).toFixed(2) }}%
</template>
</el-table-column>
<el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="200" :show-overflow-tooltip="true">

29
src/views/emis/emisCreditSalesmen/index.vue
View File

@ -37,7 +37,7 @@
<XdTable v-loading="loading"
ref="refTable"
storageName="emisCreditSalesmenList_main_250310"
storageName="emisCreditSalesmenList_main_250425"
border stripe
size="small"
@ -103,30 +103,31 @@
<el-table-column :label="$t('额度编号')" align="center" prop="accCode" min-width="150" />
<el-table-column :label="$t('员工姓名')" align="center" prop="salesmen" min-width="120" :sortable="true"/>
<el-table-column :label="$t('固定额度')" align="center" prop="creditMoney" min-width="120" :sortable="true" />
<el-table-column :label="$t('临时额度')" align="center" prop="tempCreditMoney" min-width="120" :sortable="true" />
<!-- <el-table-column label="状态" align="center" prop="blOpen" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.blOpen"
active-value="1"
inactive-value="0"
@change="switchChange(scope.row)">
</el-switch>
</template>
</el-table-column> -->
<el-table-column :label="$t('剩余额度')" align="center" prop="curMoney" min-width="120" :sortable="true">
<template slot-scope="scope">
{{ (scope.row.creditMoney - scope.row.useMoney).toFixed(2) }}
{{ (scope.row.tempCreditMoney - scope.row.useMoney).toFixed(2) }}
</template>
</el-table-column>
<el-table-column :label="$t('已使用额度')" align="center" prop="useMoney" min-width="120" :sortable="true">
<el-table-column :label="$t('总已用额度')" align="center" prop="useMoney" min-width="120" :sortable="true">
<template slot-scope="scope">
{{ scope.row.useMoney }}
</template>
</el-table-column>
<el-table-column :label="$t('账期内已用')" align="center" prop="inTermMoney" min-width="120" :sortable="true">
<template slot-scope="scope">
{{ scope.row.inTermMoney }}
</template>
</el-table-column>
<el-table-column :label="$t('超期已用')" align="center" prop="overTermMoney" min-width="120" :sortable="true">
<template slot-scope="scope">
{{ scope.row.overTermMoney }}
</template>
</el-table-column>
<el-table-column :label="$t('剩余比例(%)')" align="center" prop="curMoneyRate" min-width="130" :sortable="true">
<template slot-scope="scope">
{{ ( ((scope.row.creditMoney - scope.row.useMoney)/scope.row.creditMoney)*100 ).toFixed(2) }}%
{{ ( ((scope.row.creditMoney + scope.row.tempCreditMoney - scope.row.useMoney)/(scope.row.creditMoney + scope.row.tempCreditMoney))*100 ).toFixed(2) }}%
</template>
</el-table-column>
<el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="200" :show-overflow-tooltip="true">

4
src/views/emis/emisSettleBill/ChargeBillMonthList.vue
View File

@ -9,10 +9,10 @@
<el-tab-pane :label="'收/退款:'+currentSettleBillNo" name="payRecordInput" v-if="currentSettleBillNo">
<PayRecordInput :settleBillNo="currentSettleBillNo" settleType="2" @on-changed="handleFormChanged" @on-cancel="cancelForm"></PayRecordInput>
</el-tab-pane>
<el-tab-pane :label="多单收款" name="payRecordInputByBillCode" v-if="showPayByBillCode">
<el-tab-pane :label="多单收款" name="payByBillCode" v-if="showPayByBillCode">
<PayRecordInput :settleBillNo="currentSettleBillNo" settleType="2" @on-changed="handleFormChanged" @on-cancel="cancelForm"></PayRecordInput>
</el-tab-pane>
<el-tab-pane :label="发票收款" name="payRecordInputByInvoice" v-if="showPayByInvoice">
<el-tab-pane :label="发票收款" name="payByInvoice" v-if="showPayByInvoice">
<PayRecordInput :settleBillNo="currentSettleBillNo" settleType="2" @on-changed="handleFormChanged" @on-cancel="cancelForm"></PayRecordInput>
</el-tab-pane>
<el-tab-pane v-for="(item, index) in billTabs" :key="index" :name="item.settleBillNo" :label="'账单:'+item.settleBillNo" closable >

18
src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
View File

@ -162,6 +162,15 @@
@click="handleExportToZip"
>电子账单打包下载</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExportToSeaWaybill"
>海运账单下载</el-button>
</el-col>
<!-- <el-col :span="1.5" v-if="confirmStatus==1">
<el-button
type="primary"
@ -576,6 +585,15 @@ export default {
});
}
},
handleExportToSeaWaybill() {
if(this.selectList&&this.selectList.length>0){
this.selectList.forEach(item=>{
this.download('emis/emisSettleBill/exportSeaWayBill', {
settleBillNo:item.settleBillNo
}, `${item.settleBillName}.xlsx`)
});
}
},
async handleExportToZip() {
if(this.selectList&&this.selectList.length>0){
const zip = new JSZip()

18
src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
View File

@ -165,6 +165,15 @@
@click="handleExportToZip"
>电子账单打包下载</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExportToSeaWaybill"
>海运账单下载</el-button>
</el-col>
<!-- <el-col :span="1.5" v-if="confirmStatus==1">
<el-button
type="primary"
@ -594,6 +603,15 @@ export default {
});
}
},
handleExportToSeaWaybill() {
if(this.selectList&&this.selectList.length>0){
this.selectList.forEach(item=>{
this.download('emis/emisSettleBill/exportSeaWayBill', {
settleBillNo:item.settleBillNo
}, `${item.settleBillName}.xlsx`)
});
}
},
async handleExportToZip() {
if(this.selectList&&this.selectList.length>0){
const zip = new JSZip()

7
src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
View File

@ -405,6 +405,13 @@
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
<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.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"/>
</XdTable>

7
src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
View File

@ -431,6 +431,13 @@
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
<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.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"/>
</XdTable>

6
src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
View File

@ -422,6 +422,12 @@
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
<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.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"/>
</XdTable>

7
src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
View File

@ -360,6 +360,13 @@
<el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
<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.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"/>
</XdTable>

6
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -559,6 +559,12 @@
<el-tag v-else type="danger">否</el-tag>
</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="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>

6
src/views/emis/emisWaybill/dispatchWaybillList.vue
View File

@ -561,6 +561,12 @@
<el-tag v-else type="danger">否</el-tag>
</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="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>

6
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -527,6 +527,12 @@
<el-tag v-else type="danger">否</el-tag>
</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="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>
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false" v-dialogDrag append-to-body>

6
src/views/emis/emisWaybill/sendWaybillListNew.vue
View File

@ -531,6 +531,12 @@
<el-tag v-else type="danger">否</el-tag>
</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="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>

6
src/views/emis/emisWaybill/waybillDetailReadOnly.vue
View File

@ -134,6 +134,12 @@
</el-descriptions-item>
<el-descriptions-item label="结算重量" :span="4">{{ form.settlementWeight }}(kg)</el-descriptions-item>
<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.boxQuantity }}</el-descriptions-item>
</el-descriptions>
</el-col>

68
src/views/emis/emisWaybill/waybillGot.vue
View File

@ -537,6 +537,46 @@
<el-input v-model="form.custOrderId" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('提单号')" prop="ladingBillCode" label-width="70px" >
<div style="">
<el-input v-model="form.ladingBillCode" placeholder="海运提单号" >
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('贵司编号')" prop="companyCode" label-width="70px" >
<div style="">
<el-input v-model="form.companyCode" placeholder="贵司编号" >
</el-input>
</div>
</el-form-item>
</el-col>
<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>
</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>
</div>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('箱量')" prop="boxQuantity" label-width="70px" >
<div style="">
<el-input v-model="form.boxQuantity" placeholder="箱量" >
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('运单备注')" prop="remark" label-width="70px">
<el-input v-model="form.remark" type="textarea" placeholder="" maxlength="300" oninput="value=value.replace(/[\r|\n]/g,'')"
@ -753,7 +793,7 @@
<div style="text-align: center;margin-top: 10px;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button type="primary" @click="submitForm" :disabled="isNeedCalcFee&&form.calcFeeType!=3&&form.blSpecialQuote!=1">{{$t('确 定')}}</el-button>
<el-button @click="initData">{{$t('重置')}}</el-button>
</div>
@ -883,6 +923,7 @@ data() {
form: {},
timer:null,
isNeedCalc:false,
isNeedCalcFee:false,
titleSelectAddress:'',
openSelectAddress:false,
printerStatus:0,
@ -1030,7 +1071,19 @@ data() {
],
operateEmployeeCode: [
{ required: true, message: "操作员代码不能为空", trigger: ["blur",'change'] }
]
],
ladingBillCode: [
{ required: true, message: "提单号不能为空", trigger: ["blur",'change'] }
],
departurePort: [
{ required: true, message: "起运港不能为空", trigger: ["blur",'change'] }
],
destinationPort: [
{ required: true, message: "目的港不能为空", trigger: ["blur",'change'] }
],
boxQuantity: [
{ required: true, message: "箱量不能为空", trigger: ["blur",'change'] }
],
}
};
},
@ -1692,7 +1745,13 @@ methods: {
lockFlag:null,
lockReason:null,
blSelfBillCode:null,
extInfo:null
extInfo:null,
ladingBillCode:null,
companyCode:null,
departurePort:null,
destinationPort:null,
boxQuantity:null,
carryType:null
};
this.resetForm("form");
},
@ -1700,6 +1759,7 @@ methods: {
if(item!=null && item.length==2){
this.form.transLine=item[0];
this.form.productType=item[1];
this.form.carryType=transType;
// this.calcBillFee();
this.handleCalcVolumeWeight();
@ -2051,6 +2111,7 @@ methods: {
this.form.settlementWeight = response.data.settlementWeight;
this.form.feeWeight = this.form.settlementWeight ;
this.isNeedCalcFee=true;
// 计算费用
this.calcBillFee();
// }
@ -2126,6 +2187,7 @@ methods: {
this.form.feeItems = newFeeList.concat(custFeeList);
this.handleCalcFeeItem();
this.isNeedCalcFee=false;
// if(newFeeList && newFeeList.lenght>0){
// }else{

70
src/views/emis/emisWaybill/waybillModify.vue
View File

@ -537,6 +537,46 @@
<el-input v-model="form.custOrderId" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('提单号')" prop="ladingBillCode" label-width="70px" >
<div style="">
<el-input v-model="form.ladingBillCode" placeholder="海运提单号" >
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('贵司编号')" prop="companyCode" label-width="70px" >
<div style="">
<el-input v-model="form.companyCode" placeholder="贵司编号" >
</el-input>
</div>
</el-form-item>
</el-col>
<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>
</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>
</div>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('箱量')" prop="boxQuantity" label-width="70px" >
<div style="">
<el-input v-model="form.boxQuantity" placeholder="箱量" >
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('运单备注')" prop="remark" label-width="70px">
<el-input v-model="form.remark" type="textarea" placeholder="" maxlength="300" oninput="value=value.replace(/[\r|\n]/g,'')"
@ -753,7 +793,7 @@
<div style="text-align: center;margin-top: 10px;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button type="primary" @click="submitForm" :disabled="isNeedCalcFee&&form.calcFeeType!=3&&form.blSpecialQuote!=1">{{$t('确 定')}}</el-button>
<el-button @click="initData">{{$t('重置')}}</el-button>
</div>
@ -883,6 +923,7 @@ data() {
form: {},
timer:null,
isNeedCalc:false,
isNeedCalcFee:false,
titleSelectAddress:'',
openSelectAddress:false,
printerStatus:0,
@ -1030,7 +1071,19 @@ data() {
],
operateEmployeeCode: [
{ required: true, message: "操作员代码不能为空", trigger: ["blur",'change'] }
]
],
ladingBillCode: [
{ required: true, message: "提单号不能为空", trigger: ["blur",'change'] }
],
departurePort: [
{ required: true, message: "起运港不能为空", trigger: ["blur",'change'] }
],
destinationPort: [
{ required: true, message: "目的港不能为空", trigger: ["blur",'change'] }
],
boxQuantity: [
{ required: true, message: "箱量不能为空", trigger: ["blur",'change'] }
],
}
};
},
@ -1676,7 +1729,13 @@ methods: {
lockFlag:null,
lockReason:null,
blSelfBillCode:null,
extInfo:null
extInfo:null,
ladingBillCode:null,
companyCode:null,
departurePort:null,
destinationPort:null,
boxQuantity:null,
carryType:null
};
this.resetForm("form");
},
@ -1684,6 +1743,7 @@ methods: {
if(item!=null && item.length==2){
this.form.transLine=item[0];
this.form.productType=item[1];
this.form.carryType=transType;
// this.calcBillFee();
this.handleCalcVolumeWeight();
@ -2035,6 +2095,8 @@ methods: {
this.form.settlementWeight = response.data.settlementWeight;
this.form.feeWeight = this.form.settlementWeight ;
this.isNeedCalcFee=true;
// 计算费用
this.calcBillFee();
// }
@ -2110,6 +2172,8 @@ methods: {
this.form.feeItems = newFeeList.concat(custFeeList);
this.handleCalcFeeItem();
this.isNeedCalcFee=false;
// if(newFeeList && newFeeList.lenght>0){
// }else{

86
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -491,6 +491,7 @@
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('包装类型')" prop="packType" label-width="70px">
<el-select multiple="" v-model="form.packType" placeholder="">
@ -538,6 +539,47 @@
<el-input v-model="form.custOrderId" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('提单号')" prop="ladingBillCode" label-width="70px" >
<div style="">
<el-input v-model="form.ladingBillCode" placeholder="海运提单号" >
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('贵司编号')" prop="companyCode" label-width="70px" >
<div style="">
<el-input v-model="form.companyCode" placeholder="贵司编号" >
</el-input>
</div>
</el-form-item>
</el-col>
<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>
</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>
</div>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.carryType==4">
<el-form-item :label="$t('箱量')" prop="boxQuantity" label-width="70px" >
<div style="">
<el-input v-model="form.boxQuantity" placeholder="箱量" >
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('运单备注')" prop="remark" label-width="70px">
<el-input v-model="form.remark" type="textarea" placeholder="" maxlength="300" oninput="value=value.replace(/[\r|\n]/g,'')"
@ -754,7 +796,7 @@
<div style="text-align: center;margin-top: 10px;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button type="primary" @click="submitForm" :disabled="isNeedCalcFee&&form.calcFeeType!=3&&form.blSpecialQuote!=1">{{$t('确 定')}}</el-button>
<el-button @click="initData">{{$t('重置')}}</el-button>
</div>
@ -884,12 +926,15 @@ data() {
form: {},
timer:null,
isNeedCalc:false,
isNeedCalcFee:false,
titleSelectAddress:'',
openSelectAddress:false,
printerStatus:0,
origBillCode:null,
// 可用面单数
totalAvailablePag:{
mainHasCnt:0,
@ -1027,11 +1072,24 @@ data() {
{ required: true, message: "销售联系人不能为空", trigger: ["blur",'change'] }
],
takePieceEmployeeCode: [
{ required: true, message: "取件员代码不能为空", trigger: ["blur",'change'] }
{ required: true, message: "取件员不能为空", trigger: ["blur",'change'] }
],
operateEmployeeCode: [
{ required: true, message: "操作员代码不能为空", trigger: ["blur",'change'] }
]
{ required: true, message: "操作员不能为空", trigger: ["blur",'change'] }
],
ladingBillCode: [
{ required: true, message: "提单号不能为空", trigger: ["blur",'change'] }
],
departurePort: [
{ required: true, message: "起运港不能为空", trigger: ["blur",'change'] }
],
destinationPort: [
{ required: true, message: "目的港不能为空", trigger: ["blur",'change'] }
],
boxQuantity: [
{ required: true, message: "箱量不能为空", trigger: ["blur",'change'] }
],
}
};
},
@ -1683,14 +1741,21 @@ methods: {
lockFlag:null,
lockReason:null,
blSelfBillCode:null,
extInfo:null
extInfo:null,
ladingBillCode:null,
companyCode:null,
departurePort:null,
destinationPort:null,
boxQuantity:null,
carryType:null
};
this.resetForm("form");
},
onProductChange(item){
onProductChange(item,transType){
if(item!=null && item.length==2){
this.form.transLine=item[0];
this.form.productType=item[1];
this.form.carryType=transType;
// this.calcBillFee();
this.handleCalcVolumeWeight();
@ -1965,10 +2030,6 @@ methods: {
row.realFee=parseFloat(eval(expr)).toFixed(2);
}
}
}
@ -2042,6 +2103,7 @@ methods: {
this.form.settlementWeight = response.data.settlementWeight;
this.form.feeWeight = this.form.settlementWeight ;
this.isNeedCalcFee=true;
// 计算费用
this.calcBillFee();
// }
@ -2117,12 +2179,12 @@ methods: {
this.form.feeItems = newFeeList.concat(custFeeList);
this.handleCalcFeeItem();
// if(newFeeList && newFeeList.lenght>0){
this.isNeedCalcFee=false;
// if(newFeeList && newFeeList.lenght>0){
// }else{
// this.form.feeItems=[]
// this.handleCalcFeeItem();
// // this.$confirm('该产品未配置报价，请联系管理员！', '提示', {
// // confirmButtonText: '确认',
// // cancelButtonText: '返回',

61
src/views/emis/emisWaybillAjustApply/adjustPanel.vue
View File

@ -773,7 +773,66 @@
</el-row>
</el-col>
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('42'))">
<el-row :gutter="0" class="md-row">
<el-col :span="3" class="md-title">
<span>海运信息调整</span>
</el-col>
<el-col :span="7" class="md-value">
<span>
提单号:{{billDetail.ladingBillCode}} <br>
贵司编号:{{billDetail.companyCode}} <br>
起运港:{{billDetail.departurePort}} <br>
目的港:{{billDetail.destinationPort}} <br>
箱量:{{billDetail.boxQuantity}} <br>
</span>
</el-col>
<el-col :span="14">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
<el-col :span="12">
<el-form-item :label="$t('提单号')" prop="ladingBillCode" label-width="70px" >
<div style="">
<el-input v-model="form.ladingBillCode" placeholder="海运提单号" >
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item :label="$t('贵司编号')" prop="companyCode" label-width="70px" >
<div style="">
<el-input v-model="form.companyCode" placeholder="贵司编号" >
</el-input>
</div>
</el-form-item>
</el-col>
<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>
</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>
</div>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item :label="$t('箱量')" prop="boxQuantity" label-width="70px" >
<div style="">
<el-input v-model="form.boxQuantity" placeholder="箱量" >
</el-input>
</div>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
</el-col>
</el-row>
<!-- ||applyTypeArr.includes('12') -->