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

Merge pull request 'develop-运单录入' (#4) from develop-运单录入 into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/4
This commit is contained in:
wuteng 2025-06-24 18:14:27 +08:00
commit 1168df2c11
12 changed files with 268 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/emis/customerService/traceRecordList.vue
View File

@ -118,7 +118,14 @@ export default {
break;
}
}
// 把揽件移动到数组第一位
const index = this.scanRecordList.findIndex(item => item.scanType == 10);
if (index !== -1) {
const item = this.scanRecordList[index];
this.scanRecordList.splice(index, 1);
this.scanRecordList.unshift(item);
}
this.loading = false;
});

18
src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
View File

@ -1189,8 +1189,8 @@ export default {
return;
}
let item = billRes.rows[0];
this.emisCoPackDetail.push(item);
if(this.coPackType=="edit"){
if(this.coPackType=="edit")
{
let packDetail = {
batchNo: this.form.batchNo,
billCode: item.billCode,
@ -1202,11 +1202,19 @@ export default {
createBy: this.$store.getters.empCode,
createTime: parseTime(new Date())
};
let response = await addEmisTmsSiteBatchDtl(packDetail);
if(!response || response.code != 200){
this.$modal.msgError(response && response.msg || '组批次明细新增失败')
try{
let response = await addEmisTmsSiteBatchDtl(packDetail);
}catch(e){
console.log('e',e)
return;
}
this.emisCoPackDetail.push(item);
// if(!response || response.code != 200){
// this.$modal.msgError(response && response.msg || '组批次明细新增失败')
// return;
// }
}else{
this.emisCoPackDetail.push(item);
}
}
}

4
src/views/emis/emisWaybill/batchWaybillRecord.vue
View File

@ -566,8 +566,8 @@ export default {
this.orderList = this.orderList.concat(this.tmpDataList);
//拼接remark 和virtualRemark
this.orderList.forEach((item,index)=>{
if(item.blVirtual ==='是'){
item.remark = `${item.remark && item.remark.toString().replace(/\s/g, '').length>0?item.remark+',':''}${item.masterBillCode && item.masterBillCode.toString().replace(/\s/g, '').length>0 ?'此单为虚拟单，对应主单为:'+item.masterBillCode:''}`
if(item.blVirtual ==='是' && item.transLineType ==='缅甸快递'){
item.remark = `${item.remark && item.remark.toString().replace(/\s/g, '').length>0?item.remark+',':''}${item.masterBillCode && item.masterBillCode.toString().replace(/\s/g, '').length>0 ?'该单为虚拟单：对应主单为:'+item.masterBillCode:''}`
}
})
this.tmpDataList=[];

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

@ -1,6 +1,6 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<!-- label-width="100px" -->
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="6">
@ -558,9 +558,8 @@
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
{{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
</span>
</template>
{{remarkFormat(scope.row)}}
</template>
</el-table-column>
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
<el-table-column :label="$t('图片上传')" align="center" prop="blUploadPic" min-width="100" >
@ -913,6 +912,17 @@ export default {
}).join(',');
}
},
//格式化录单备注显示
remarkFormat(row){
let remark=row.remark;
if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
if(remark && remark.trim()!==''){
remark=remark+','
}
remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
}
return remark;
},
rowKey (row) {
return row.id;
},

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

@ -1,6 +1,6 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<!-- label-width="100px" -->
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="9">
@ -557,10 +557,8 @@
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
{{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
</span>
</template>
{{ remarkFormat(scope.row) }}
</template>
</el-table-column>
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
@ -892,6 +890,17 @@ export default {
}).join(',');
}
},
//格式化录单备注显示
remarkFormat(row){
let remark=row.remark;
if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
if(remark && remark.trim()!==''){
remark=remark+','
}
remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
}
return remark;
},
rowKey (row) {
return row.id;
},

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

@ -1,7 +1,7 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="9">
@ -524,8 +524,7 @@
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark)}}
</span>
{{ remarkFormat(scope.row) }}
</template>
</el-table-column>
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
@ -540,12 +539,6 @@
<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"/>
<el-table-column :label="$t('是否为虚拟单')" align="center" prop="blVirtual" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-tag v-if="scope.row.blVirtual==1" type="success">是</el-tag>
<el-tag v-else type="danger">否</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('主单号')" align="center" prop="masterBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('主单对应的虚拟单')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
@ -932,6 +925,17 @@ export default {
}).join(',');
}
},
//格式化录单备注显示
remarkFormat(row){
let remark=row.remark;
if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
if(remark && remark.trim()!==''){
remark=remark+','
}
remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
}
return remark;
},
rowKey (row) {
return row.id;
},

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

@ -2,7 +2,7 @@
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- :span="6" -->
@ -530,9 +530,7 @@
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
</span>
{{ remarkFormat(scope.row) }}
</template>
</el-table-column>
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
@ -883,6 +881,17 @@ export default {
}).join(',');
}
},
//格式化录单备注显示
remarkFormat(row){
let remark=row.remark;
if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
if(remark && remark.trim()!==''){
remark=remark+','
}
remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
}
return remark;
},
rowKey (row) {
return row.id;
},

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

@ -233,8 +233,8 @@
</el-row>
<el-descriptions title="" size="small" :column="1" style="margin-top:10px;margin-bottom: 30px;">
<el-descriptions-item label="运单备注" :span="4">
{{form.remark }} {{ form.remark && form.remark.trim()!=='' && form.virtualRemark && form.virtualRemark.trim()!==''?',':'' }}
<span v-if="form.blVirtual==0 && form.virtualRemark!== null && form.virtualRemark!=='' ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(form.virtualRemark) }}
{{form.remark }} {{ form.remark && form.remark.trim()!=='' && form.virtualRemark && form.virtualRemark.trim()!=='' && form.transLine==='002' && form.sendDate > '2025-06-23 20:00:00'?',':'' }}
<span v-if="form.blVirtual==0 && form.virtualRemark!== null && form.virtualRemark!=='' && form.transLine==='002' && form.sendDate > '2025-06-23 20:00:00' ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(form.virtualRemark) }}
</span>
</el-descriptions-item>
</el-descriptions>

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

@ -161,7 +161,7 @@
</el-row>
<!-- v-if="action=='add' || action=='preAdd'" -->
<div style="position: absolute;right: 80px;top: 60px;z-index: 100;">
<div style="position: absolute;right: 80px;top: 50px;z-index: 100;">
<!-- -->
<div style="display:inline-flex;font-size: 15px;font-weight: 700;">
@ -171,6 +171,10 @@
<EmisSiteSimplePicker v-if="$store.getters.ownerSiteCode== '88888'" v-model="form.sendSiteCode" @onChange="onSendSiteSelect" ></EmisSiteSimplePicker>
<el-input v-else v-model="form.sendSiteName" placeholder="" disabled />
</el-form-item>
<el-form-item prop="startSiteCode">
<span slot="label" style="color:gray">{{ $t('始发网点') }}:</span>
<EmisSiteSimplePicker v-model="form.startSiteCode" @onChange="onStartSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</div>
<div style="margin-left: 12px;" v-if="totalAvailablePag.mainHasCnt>0">
{{ $t('主单剩余') }}:<span>{{ totalAvailablePag.mainHasCnt }}</span>
@ -521,6 +525,16 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.transLine==='012' || form.transLine=='002' || form.transLine === '014'">
<el-form-item label="" prop="blVirtual">
<el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blVirtual" :true-label="'1'" :false-label="'0'" @change="handleVirtualChange"><span style="font-size:10px">是否为虚拟单</span></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12" v-if="(form.transLine==='012' || form.transLine=='002' || form.transLine === '014') && form.blVirtual === '1'">
<el-form-item :label="$t('关联主单')" prop="masterBillCode" label-width="70px">
<MasterBillCodePicker v-model="form.masterBillCode" :searchParams="masterBillSearchParams" @onMasterBillCodeChange="onMasterBillCodeChange"></MasterBillCodePicker>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.blGenSubbill==1">
<el-form-item :label="$t('子单号')" prop="billCodeSub" label-width="70px">
<el-input v-model="form.billCodeSub" rows="5" type="textarea" placeholder="" disabled />
@ -863,6 +877,7 @@ import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue'
import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
import MasterBillCodePicker from '@/views/emis/EmisBaseTools/MasterBillCodePicker.vue';
// import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
@ -909,12 +924,21 @@ components: {
DistrictPicker2,
ExchangeRatePanel,
SeaSiteSimplePicker0,
SeaSiteSimplePicker1
SeaSiteSimplePicker1,
MasterBillCodePicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','sys_currency_type'],
data() {
//校验关联主单线路
var checkmasterProductType = (rule, value, callback) => {
if (this.masterBillProductType && this.masterBillProductType != this.form.productType) {
callback(new Error('主单和虚拟单线路不一致'));// 关联主单和运单线路不一致
} else {
callback();
}
}
return {
activeNames:['1','2','3','4'],
exchangeRate:null,
@ -1026,6 +1050,10 @@ data() {
packType: [
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
],
//自定义校验
masterBillCode:[
{validator: checkmasterProductType, trigger: ['blur', 'change']}
],
dispatchMethod: [
{ required: true, message: "派件方式不能为空", trigger: ["blur",'change'] }
],
@ -1056,6 +1084,10 @@ data() {
sendSiteCode: [
{ required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] }
],
//始发网点
startSiteCode: [
{ required: true, message: "始发网点代码不能为空", trigger: ["blur",'change'] }
],
// sendDate: [
// { required: true, message: "发货时间不能为空", trigger: "blur" }
// ],
@ -1096,6 +1128,13 @@ data() {
};
},
computed: {
masterBillSearchParams() {
return {
transLineType: this.form.transLine,
productType: this.form.productType,
sendSiteCode: this.form.sendSiteCode
}
}
},
watch: {
@ -1610,8 +1649,10 @@ methods: {
// this.form.sendDate = parseTime(new Date());
this.form.sendSiteCode=this.$store.getters.ownerSiteCode;
this.form.sendSiteName=this.$store.getters.ownerSiteName;
this.form.startSiteCode = this.$store.getters.ownerSiteCode;
this.form.startSiteName = this.$store.getters.ownerSiteName;
this.form = {...this.form}
this.form.customsEclaration='1';
this.form.customsClear='1';
// this.form.pickupMethod='2';
@ -1764,6 +1805,14 @@ methods: {
this.resetForm("form");
},
onProductChange(item,transType){
//非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单
if(!['002','012','014'].includes(item[0])){
this.form.masterBillCode = null;
this.form.blVirtual = null;
}
if(item[0]!=='002' && this.form.remark && this.form.remark!==null){
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
if(item!=null && item.length==2){
this.form.transLine=item[0];
this.form.productType=item[1];
@ -1777,15 +1826,28 @@ methods: {
if(!item){
this.form.sendSiteCode = null;
this.form.sendSiteName = null;
this.form.startSiteCode = null;
this.form.startSiteName = null;
return;
}
this.form.sendSiteCode=item.siteCode;
this.form.sendSiteName=item.siteName;
this.form.startSiteCode=item.siteCode;
this.form.startSiteName=item.siteName;
this.initGetTotalAvailablePag(this.form.sendSiteCode);
this.calcBillFee();
},
onStartSiteSelect(item){
if(!item){
this.form.startSiteCode = null;
this.form.startSiteName = null;
return;
}
this.form.startSiteCode=item.siteCode;
this.form.startSiteName=item.siteName;
},
/** 提交按钮 */
submitForm() {
@ -2376,6 +2438,45 @@ methods: {
this.form.billCode=""
}
},
//获取虚拟运单关联主单
onMasterBillCodeChange(val) {
if (val) {
this.form.masterBillCode = val.value;
this.masterBillProductType = val.productType;
if (this.form.transLine === '002') {
if (this.form.remark==null || this.form.remark.trim() === '') {
//生成备注
this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`;
} else {
if (this.form.remark.indexOf('该单为虚拟单：对应主单为') > -1) {
//替换主单号
this.form.remark = this.form.remark.replace(/主单为[\da-zA-Z]+/g, '主单为' + val.value);
} else {
//判断结尾是不是逗号
if(!this.form.remark.endsWith(',')){
this.form.remark = this.form.remark +',';
}
this.form.remark =this.form.remark + '该单为虚拟单：对应主单为' + val.value;
}
}
} else {
//删除备注中虚拟单部分
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
}else{
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
},
//虚拟单变化
handleVirtualChange(){
if(this.form.blVirtual!=='1'){
this.form.masterBillCode =null;
//删除备注中虚拟单内容
if(this.form.remark && this.form.remark.trim()!=''){
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
}
}
}
};
</script>

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

@ -1641,7 +1641,7 @@ methods: {
this.form.sendSiteName=this.$store.getters.ownerSiteName;
this.form.startSiteCode = this.$store.getters.ownerSiteCode;
this.form.startSiteName = this.$store.getters.ownerSiteName;
this.form = {...this.form}
this.form.customsEclaration='1';
this.form.customsClear='1';
@ -1797,11 +1797,13 @@ methods: {
this.resetForm("form");
},
onProductChange(item,transType){
//非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单
if(item !==null && item[0]!=='012' && item[0]!=='002' && item[0] !== '014'){
this.form.remark=null;
this.form.masterBillCode=null;
this.form.blVirtual=null;
//非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单
if(!['002','012','014'].includes(item[0])){
this.form.masterBillCode = null;
this.form.blVirtual = null;
}
if(item[0]!=='002' && this.form.remark && this.form.remark!==null){
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
if(item!=null && item.length==2){
this.form.transLine=item[0];
@ -2441,24 +2443,39 @@ methods: {
if (val) {
this.form.masterBillCode = val.value;
this.masterBillProductType = val.productType;
//生成备注
if (val && this.form.remark && this.form.remark.trim() !== '') {
this.form.remark = this.form.remark.replace(/主单为[\da-zA-Z]+/g, '主单为' + val.value);
if (this.form.transLine === '002') {
if (this.form.remark==null || this.form.remark.trim() === '') {
//生成备注
this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`;
} else {
if (this.form.remark.indexOf('该单为虚拟单：对应主单为') > -1) {
//替换主单号
this.form.remark = this.form.remark.replace(/主单为[\da-zA-Z]+/g, '主单为' + val.value);
} else {
//判断结尾是不是逗号
if(!this.form.remark.endsWith(',')){
this.form.remark = this.form.remark +',';
}
this.form.remark =this.form.remark + '该单为虚拟单：对应主单为' + val.value;
}
}
} else {
this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`;
//删除备注中虚拟单部分
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
} else {
//清空
this.form.masterBillCode = null;
this.masterBillProductType = null;
this.form.remark = null;
}
}else {
//删除备注中虚拟单部分
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
},
//虚拟单变化
handleVirtualChange(){
if(this.form.blVirtual!=='1'){
this.form.remark = null;
this.form.masterBillCode =null;
//删除备注中虚拟单内容
if(this.form.remark && this.form.remark.trim()!=''){
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
}
}
}
@ -2529,13 +2546,13 @@ methods: {
// .el-input-number--mini {
// width: 100%;
// line-height: 26px;
// }
.el-input-number {
width: 100%!important;
}
.el-input-number.is-without-controls .el-input__inner {
// }
.el-input-number {
width: 100% !important;
}
.el-input-number.is-without-controls .el-input__inner {
height: 28px;
line-height: 28px;
border: none;
@ -2543,13 +2560,14 @@ methods: {
font-size: 10px;
padding: 0px;
text-align: center;
}
}
}
.el-collapse-item__content {
padding-bottom: 0px;
padding-bottom: 0px;
}
.el-collapse-item__header{
.el-collapse-item__header {
pointer-events: none;
}

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

@ -1646,6 +1646,7 @@ methods: {
this.form.sendSiteName=this.$store.getters.ownerSiteName;
this.form.startSiteCode = this.$store.getters.ownerSiteCode;
this.form.startSiteName = this.$store.getters.ownerSiteName;
this.form = {...this.form}
this.form.customsEclaration='1';
this.form.customsClear='1';
@ -1802,10 +1803,12 @@ methods: {
},
onProductChange(item,transType){
//非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单
if(item !==null && item[0]!=='012' && item[0]!=='002' && item[0] !== '014'){
this.form.remark=null;
this.form.masterBillCode=null;
this.form.blVirtual=null;
if(item && !['002','012','014'].includes(item[0])){
this.form.masterBillCode = null;
this.form.blVirtual = null;
}
if(item && item[0]!=='002' && this.form.remark && this.form.remark!==null){
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
if(item!=null && item.length==2){
this.form.transLine=item[0];
@ -1828,7 +1831,7 @@ methods: {
this.form.sendSiteName=item.siteName;
this.form.startSiteCode=item.siteCode;
this.form.startSiteName=item.siteName;
//深拷贝转换
this.initGetTotalAvailablePag(this.form.sendSiteCode);
this.calcBillFee();
@ -2427,26 +2430,44 @@ methods: {
this.form.billCode=""
}
},
//获取虚拟运单关联主单
//获取虚拟运单关联主单
onMasterBillCodeChange(val) {
if (val) {
this.form.masterBillCode = val.value;
this.masterBillProductType = val.productType;
// this.masterBillProductType = '242011';
//生成备注
this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`;
} else {
//清空
this.form.masterBillCode = null;
this.masterBillProductType = null;
this.form.remark = null;
}
if (this.form.transLine === '002') {
if (this.form.remark==null || this.form.remark.trim() === '') {
//生成备注
this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`;
} else {
if (this.form.remark.indexOf('该单为虚拟单：对应主单为') > -1) {
//替换主单号
this.form.remark = this.form.remark.replace(/主单为[\da-zA-Z]+/g, '主单为' + val.value);
} else {
//判断结尾是不是逗号
if(!this.form.remark.endsWith(',')){
this.form.remark = this.form.remark +',';
}
this.form.remark =this.form.remark + '该单为虚拟单：对应主单为' + val.value;
}
}
} else {
//删除备注中虚拟单部分
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
}else {
//删除备注中虚拟单部分
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
},
//虚拟单变化
handleVirtualChange(){
if(this.form.blVirtual!=='1'){
this.form.remark = null;
this.form.masterBillCode =null;
//删除备注中虚拟单内容
if(this.form.remark && this.form.remark.trim()!=''){
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
}
}
}

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

@ -2113,7 +2113,7 @@ export default {
onMasterBillCodeChange(val) {
if (val) {
this.masterBillProductType = val.productType;
//调整虚拟单备注 把此单为虚拟单之后的单号替换
//调整虚拟单备注 把该单为虚拟单之后的单号替换
if (this.form.remark && this.form.remark.trim() !== ''
) {
this.form.remark = this.form.remark.replace(/主单为[\da-zA-Z]+/g, '主单为' + val.value);;