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

Merge pull request 'master-调整项目不显示bug' (#32) from master-调整项目不显示bug into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/32
This commit is contained in:
wuteng 2025-07-18 16:47:33 +08:00
commit 0caec1bb67
13 changed files with 213 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue
View File

@ -20,7 +20,7 @@
@click.native="onClick"
@visible-change="reverseArrow"
>
<el-option v-for="item in optionItems" :key="item.custNo" :label="item.custName" :value="item.custNo" ></el-option>
<el-option v-for="item in optionItems" :key="item.custNo" :label="item.custName+((item.status==0)?'-已停用':'')" :value="item.custNo" ></el-option>
</el-select>
</template>
<script>

5
src/views/emis/EmisBaseTools/ProvincePicker.vue
View File

@ -81,8 +81,9 @@ methods: {
},
onChange() {
this.$emit("input", this.svalue);
this.$emit("onChange");
},
//传选中值对象
let selItem = this.optionItems.find(item => item.regionCode == this.svalue);
this.$emit("onChange", selItem);},
queryData(val,key) {
this.optionItems =[];

4
src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
View File

@ -207,13 +207,13 @@
<!-- <el-table-column :label="$t('联系人')" align="center" prop="contact" min-width="100" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="170" :show-overflow-tooltip="true" /> -->
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<!-- <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('申请人')" align="center" prop="createByName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('申请站点')" align="center" prop="createSiteName" min-width="100" :show-overflow-tooltip="true"/>

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

@ -35,7 +35,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
</el-form-item>
<el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@ -51,10 +51,10 @@
</el-col>
<el-col :span="6">
<el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" ></TransLinePicker>
<TransLineAllPicker v-model="queryParams.transLineType" isInitiated="true" ></TransLineAllPicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
<TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker>
</el-form-item>
@ -628,6 +628,9 @@ import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDet
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
import { formatSearchStr,deepClone } from '@/utils/index'
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
export default {
name: "CenterWaybillList",
@ -650,7 +653,10 @@ export default {
EmisSiteSimplePicker2,
ProblemTypeMultiplePicker,
TraceWaybillDetailView
TraceWaybillDetailView,
TransLineAllPicker,
TransProductAllPicker,
AllMonthpayAccountPicker
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',

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

@ -51,7 +51,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
</el-form-item>
<el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@ -67,10 +67,10 @@
</el-col>
<el-col :span="5">
<el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" ></TransLinePicker>
<TransLineAllPicker v-model="queryParams.transLineType" isInitiated="true" ></TransLineAllPicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
<TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker>
</el-form-item>
</el-col>
</el-row>
@ -623,6 +623,9 @@ import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDet
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
import { formatSearchStr,deepClone } from '@/utils/index'
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
export default {
// name: "SendWaybillList",
@ -644,8 +647,10 @@ export default {
EmisSiteSimplePicker2,
ProblemTypeMultiplePicker,
TraceWaybillDetailView
TraceWaybillDetailView,
TransLineAllPicker,
TransProductAllPicker,
AllMonthpayAccountPicker
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

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

@ -53,7 +53,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="onCustNoChange"></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" @onChange="onCustNoChange"></AllMonthpayAccountPicker>
</el-form-item>
<el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@ -69,10 +69,10 @@
<el-col :span="5">
<el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" ></TransLinePicker>
<TransLineAllPicker v-model="queryParams.transLineType" isInitiated="true" ></TransLineAllPicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
<TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker>
</el-form-item>
</el-col>
</el-row>
@ -568,8 +568,9 @@ import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
@ -583,7 +584,7 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import TraceDetail from '@/views/emis/customerService/traceDetail.vue';
import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue';
@ -625,7 +626,9 @@ export default {
TraceDetail,
WaybillDetailReadOnly,
TransLineAllPicker,
TransProductAllPicker,
AllMonthpayAccountPicker
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

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

@ -56,7 +56,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="onCustNoChange"></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" @onChange="onCustNoChange"></AllMonthpayAccountPicker>
</el-form-item>
<el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@ -72,10 +72,10 @@
<el-col :span="5">
<el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" ></TransLinePicker>
<TransLineAllPicker v-model="queryParams.transLineType" isInitiated="true" ></TransLineAllPicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
<TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker>
</el-form-item>
</el-col>
</el-row>
@ -611,6 +611,9 @@ import { queryLastRecord } from "@/api/emis/emisTmsScanRecord";
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
import { formatSearchStr,deepClone } from '@/utils/index'
import clip from '@/utils/clipboard'
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
export default {
name: "SendWaybillListNew",
@ -638,7 +641,9 @@ export default {
TraceDetail,
WaybillDetailReadOnly,
TransLineAllPicker,
TransProductAllPicker,
AllMonthpayAccountPicker
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

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

@ -113,12 +113,12 @@
</el-col>
<el-col :span="6" v-if="form.pickupMethod==2">
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
<EmisUserSimplePicker0 :placeholder="$t('取件员')" :siteCode="form.sendSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
<EmisUserSimplePicker0 :placeholder="$t('取件员')" :siteCode="form.startSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="6" v-if="form.pickupMethod==1">
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
<EmisUserSimplePicker1 :placeholder="$t('操作员')" :siteCode="form.sendSiteCode" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
<EmisUserSimplePicker1 :placeholder="$t('操作员')" :siteCode="form.startSiteCode" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
</el-form-item>
</el-col>
@ -2224,7 +2224,8 @@ methods: {
sendSiteCode: this.form.sendSiteCode,
dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode,
customsClear:this.form.customsClear,
customsEclaration:this.form.customsEclaration
customsEclaration:this.form.customsEclaration,
startSiteCode:this.form.startSiteCode
}

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

@ -113,12 +113,12 @@
</el-col>
<el-col :span="6" v-if="form.pickupMethod==2">
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
<EmisUserSimplePicker0 :placeholder="$t('取件员')" :siteCode="form.sendSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
<EmisUserSimplePicker0 :placeholder="$t('取件员')" :siteCode="form.startSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="6" v-if="form.pickupMethod==1">
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
<EmisUserSimplePicker1 :placeholder="$t('操作员')" :siteCode="form.sendSiteCode" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
<EmisUserSimplePicker1 :placeholder="$t('操作员')" :siteCode="form.startSiteCode" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
</el-form-item>
</el-col>
@ -242,7 +242,7 @@
<el-form-item :label="$t('国家地区')" prop="sender.province" >
<div style="display:inline-flex">
<country-picker1 v-model="form.sender.country" ></country-picker1>
<province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
<province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px" @onChange="onChangeSenderProvince"></province-picker1>
<city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
<district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
</div>
@ -306,7 +306,7 @@
<el-form-item :label="$t('国家地区')" prop="reciever.province">
<div style="display:inline-flex">
<country-picker2 v-model="form.reciever.country" ></country-picker2>
<ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country" style="margin-left:5px" @onChange="handleCalcDestSite" ></ProvincePicker2>
<ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country" style="margin-left:5px" @onChange="onChangeRecieverProvince"></ProvincePicker2>
<city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px" @onChange="handleCalcDestSite" ></city-picker2>
<district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px" @onChange="handleCalcDestSite" ></district-picker2>
</div>
@ -939,6 +939,31 @@ data() {
callback();
}
}
//校验寄件国家地区国家和省份是否匹配
var checkSenderCountryProvince = (rule, value, callback) => {
if (this.form.sender.country && this.senderCountryCode) {
if (this.form.sender.country != this.senderCountryCode) {
callback(new Error('寄件国家和省份不一致'));
} else {
callback();
}
} else {
callback();
}
}
//校验收件国家地区国家和省份是否匹配
var checkRecieverCountryProvince = (rule, value, callback) => {
console.log('value',value, this.form.reciever.country , this.recieverCountryCode)
if (this.form.reciever.country && this.recieverCountryCode) {
if (this.form.reciever.country != this.recieverCountryCode) {
callback(new Error('收件国家和省份不一致'));
} else {
callback();
}
} else {
callback();
}
}
return {
activeNames:['1','2','3','4'],
exchangeRate:null,
@ -968,6 +993,9 @@ data() {
subHasCnt:0
},
sendSiteSelectCount:0,//寄件网点变化次数
//寄件人省份的国家
senderCountryCode:null,
recieverCountryCode:null,
// 表单校验
rules: {
billCode: [
@ -987,7 +1015,9 @@ data() {
{ required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] }
],
province: [
{ required: true, message: "收货省不能为空", trigger: ["blur",'change'] }
{ required: true, message: "收货省不能为空", trigger: ["blur",'change'] }, {
validator: checkRecieverCountryProvince, trigger: ['blur', 'change']
}
],
company: [
{ required: true, message: "收货公司不能为空", trigger: ["blur",'change'] }
@ -1013,7 +1043,8 @@ data() {
{ required: true, message: "寄件人国家不能为空", trigger: ["blur",'change'] }
],
province: [
{ required: true, message: "寄件省不能为空", trigger: ["blur",'change'] }
{ required: true, message: "寄件省不能为空", trigger: ["blur",'change'] },{
validator: checkSenderCountryProvince, trigger: ['blur', 'change'] }
],
company: [
{ required: true, message: "寄件公司不能为空", trigger: ["blur",'change'] }
@ -2486,6 +2517,19 @@ methods: {
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
}
},
//寄件省份变化
onChangeSenderProvince(val){
if(val){
this.senderCountryCode = val.countryCode;
}
},
//收件省份变化
onChangeRecieverProvince(val){
if(val){
this.recieverCountryCode = val.countryCode;
}
this.handleCalcDestSite();
}
}
};

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

@ -114,7 +114,7 @@
</el-col>
<el-col :span="6" v-if="form.pickupMethod==2">
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
<EmisUserSimplePicker0 :placeholder="$t('取件员')" :siteCode="form.sendSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
<EmisUserSimplePicker0 :placeholder="$t('取件员')" :siteCode="form.startSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="6" v-if="form.pickupMethod==1">
@ -243,7 +243,7 @@
<el-form-item :label="$t('国家地区')" prop="sender.province" >
<div style="display:inline-flex">
<country-picker1 v-model="form.sender.country" ></country-picker1>
<province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
<province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px" @onChange="onChangeSenderProvince"></province-picker1>
<city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
<district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
</div>
@ -307,7 +307,7 @@
<el-form-item :label="$t('国家地区')" prop="reciever.province">
<div style="display:inline-flex">
<country-picker2 v-model="form.reciever.country" ></country-picker2>
<ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country" style="margin-left:5px" @onChange="handleCalcDestSite" ></ProvincePicker2>
<ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country" style="margin-left:5px" @onChange="onChangeRecieverProvince" ></ProvincePicker2>
<city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px" @onChange="handleCalcDestSite" ></city-picker2>
<district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px" @onChange="handleCalcDestSite" ></district-picker2>
</div>
@ -941,6 +941,30 @@ data() {
callback();
}
}
//校验寄件国家地区国家和省份是否匹配
var checkSenderCountryProvince = (rule, value, callback) => {
if (this.form.sender.country && this.senderCountryCode) {
if (this.form.sender.country != this.senderCountryCode) {
callback(new Error('寄件国家和省份不一致'));
} else {
callback();
}
} else {
callback();
}
}
//校验收件国家地区国家和省份是否匹配
var checkRecieverCountryProvince = (rule, value, callback) => {
if (this.form.reciever.country && this.recieverCountryCode) {
if (this.form.reciever.country != this.recieverCountryCode) {
callback(new Error('收件国家和省份不一致'));
} else {
callback();
}
} else {
callback();
}
}
return {
activeNames:['1','2','3','4'],
exchangeRate:null,
@ -971,7 +995,9 @@ data() {
mainHasCnt:0,
subHasCnt:0
},
//寄件人省份的国家
senderCountryCode:null,
recieverCountryCode:null,
// 表单校验
rules: {
billCode: [
@ -991,7 +1017,9 @@ data() {
{ required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] }
],
province: [
{ required: true, message: "收货省不能为空", trigger: ["blur",'change'] }
{ required: true, message: "收货省不能为空", trigger: ["blur", 'change'] }, {
validator: checkRecieverCountryProvince, trigger: ['blur', 'change']
}
],
company: [
{ required: true, message: "收货公司不能为空", trigger: ["blur",'change'] }
@ -1017,7 +1045,10 @@ data() {
{ required: true, message: "寄件人国家不能为空", trigger: ["blur",'change'] }
],
province: [
{ required: true, message: "寄件省不能为空", trigger: ["blur",'change'] }
{ required: true, message: "寄件省不能为空", trigger: ["blur",'change'] },{
validator: checkSenderCountryProvince, trigger: ['blur', 'change']
}
],
company: [
{ required: true, message: "寄件公司不能为空", trigger: ["blur",'change'] }
@ -1992,7 +2023,6 @@ methods: {
},
// 计算目的站点
handleCalcDestSite(){
if(this.form.reciever.country != this.form.destinationCountry){
this.$confirm('收件国和目的国不一致,请调整！', '提示', {
confirmButtonText: '确认',
@ -2474,6 +2504,19 @@ methods: {
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
}
},
//寄件省份变化
onChangeSenderProvince(val){
if(val){
this.senderCountryCode = val.countryCode;
}
},
//收件省份变化
onChangeRecieverProvince(val){
if(val){
this.recieverCountryCode = val.countryCode;
}
this.handleCalcDestSite();
}
}
};

2
src/views/emis/emisWaybillAjustApply/WaybillAjustCenterConfirm.vue
View File

@ -225,7 +225,7 @@
<el-table-column :label="$t('目的地')" align="center" prop="waybillDetail.destinationName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
<el-table-column :label="$t('付款方式')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<template slot-scope="scope" v-if="scope.row.waybillDetail">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
</template>
</el-table-column>

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

@ -234,7 +234,7 @@
</el-col>
<el-col :span="14">
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
<EmisUserSimplePicker0 :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
<EmisUserSimplePicker0 :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" :siteCode="form.startSiteCode"></EmisUserSimplePicker0>
</el-form-item>
</el-col>
@ -251,7 +251,7 @@
</el-col>
<el-col :span="14">
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
<EmisUserSimplePicker0 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker0>
<EmisUserSimplePicker0 :placeholder="$t('操作员')" :siteCode="form.startSiteCode" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
@ -634,7 +634,7 @@
<el-form-item :label="$t('国家地区')" prop="sender.province" >
<div style="display:inline-flex">
<country-picker1 v-model="form.sender.country" ></country-picker1>
<province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
<province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px" @onChange="onChangeSenderProvince"></province-picker1>
<city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
<district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
</div>
@ -691,7 +691,7 @@
<el-form-item :label="$t('国家地区')" prop="reciever.province">
<div style="display:inline-flex">
<country-picker2 v-model="form.reciever.country" ></country-picker2>
<ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country" style="margin-left:5px" @onChange="handleCalcDestSite" ></ProvincePicker2>
<ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country" style="margin-left:5px" @onChange="onChangeRecieverProvince"></ProvincePicker2>
<city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px" @onChange="handleCalcDestSite" ></city-picker2>
<district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px" @onChange="handleCalcDestSite" ></district-picker2>
</div>
@ -1297,6 +1297,30 @@ export default {
callback();
}
}
//校验寄件国家地区国家和省份是否匹配
var checkSenderCountryProvince = (rule, value, callback) => {
if (this.form.sender.country && this.senderCountryCode) {
if (this.form.sender.country != this.senderCountryCode) {
callback(new Error('寄件国家和省份不一致'));
} else {
callback();
}
} else {
callback();
}
}
//校验收件国家地区国家和省份是否匹配
var checkRecieverCountryProvince = (rule, value, callback) => {
if (this.form.reciever.country && this.recieverCountryCode) {
if (this.form.reciever.country != this.recieverCountryCode) {
callback(new Error('收件国家和省份不一致'));
} else {
callback();
}
} else {
callback();
}
}
return {
triggerCount:0,
activeNames:['1','2','3','4'],
@ -1314,6 +1338,9 @@ export default {
masterBillProductType:null,
// 表单参数
form:{},
//寄件人省份的国家
senderCountryCode:null,
recieverCountryCode:null,
// 表单校验
rules: {
billCode: [
@ -1333,7 +1360,9 @@ export default {
{ required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] }
],
province: [
{ required: true, message: "收货省不能为空", trigger: ["blur",'change'] }
{ required: true, message: "收货省不能为空", trigger: ["blur",'change'] }, {
validator: checkRecieverCountryProvince, trigger: ['blur', 'change']
}
],
company: [
{ required: true, message: "发件公司不能为空", trigger: ["blur",'change'] }
@ -1359,7 +1388,8 @@ export default {
{ required: true, message: "寄件人国家不能为空", trigger: ["blur",'change'] }
],
province: [
{ required: true, message: "寄件省不能为空", trigger: ["blur",'change'] }
{ required: true, message: "寄件省不能为空", trigger: ["blur",'change'] },{
validator: checkSenderCountryProvince, trigger: ['blur', 'change'] }
],
company: [
{ required: true, message: "发件公司不能为空", trigger: ["blur",'change'] }
@ -1498,6 +1528,7 @@ export default {
this.applyTypeArr=[];
}
console.log("====>this.applyTypeArr==>",this.applyTypeArr);
this.initCountryCode();
},
deep: true
},
@ -2140,6 +2171,30 @@ export default {
this.form.startSiteCode = item.siteCode;
this.form.startSiteName = item.siteName;
},
//寄件省份变化
onChangeSenderProvince(val){
console.log('onChangeSenderProvince',val)
if(val){
this.senderCountryCode = val.countryCode;
}
},
//收件省份变化
onChangeRecieverProvince(val){
console.log('val++++++',val)
if(val){
this.recieverCountryCode = val.countryCode;
}
this.handleCalcDestSite();
},
//初始化选中省份的国家
initCountryCode(){
if(this.form.sender){
this.senderCountryCode = this.form.sender.country;
}
if(this.form.reciever){
this.recieverCountryCode = this.form.reciever.country;
}
}
}
};
</script>

4
src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue
View File

@ -21,7 +21,9 @@
</el-col>
<el-col :span="24" >
<el-form-item label="调整数值" prop="applyValue">
<AdjustPanel ref="refAdjustDetail" :applyType="form.applyType" :oldValue="form.jsonDataObj.oldValue" :newValue="form.jsonDataObj.newValue" :disabled="isFormDisabled"></AdjustPanel>
<template v-if="form.jsonDataObj">
<AdjustPanel ref="refAdjustDetail" :applyType="form.applyType" :oldValue="form.jsonDataObj.oldValue" :newValue="form.jsonDataObj.newValue" :disabled="isFormDisabled"></AdjustPanel>
</template>
</el-form-item>
</el-col>
<el-col :span="24">