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

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

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/5
This commit is contained in:
wuteng 2025-06-25 18:09:05 +08:00
commit d5ce6d4bc6
4 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -525,12 +525,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="form.transLine==='012' || form.transLine=='002' || form.transLine === '014'"> <el-col :span="12" v-if="['012','002','014','078'].includes(form.transLine)">
<el-form-item label="" prop="blVirtual"> <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-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-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="(form.transLine==='012' || form.transLine=='002' || form.transLine === '014') && form.blVirtual === '1'"> <el-col :span="12" v-if="['012','002','014','078'].includes(form.transLine)">
<el-form-item :label="$t('关联主单')" prop="masterBillCode" label-width="70px"> <el-form-item :label="$t('关联主单')" prop="masterBillCode" label-width="70px">
<MasterBillCodePicker v-model="form.masterBillCode" :searchParams="masterBillSearchParams" @onMasterBillCodeChange="onMasterBillCodeChange"></MasterBillCodePicker> <MasterBillCodePicker v-model="form.masterBillCode" :searchParams="masterBillSearchParams" @onMasterBillCodeChange="onMasterBillCodeChange"></MasterBillCodePicker>
</el-form-item> </el-form-item>
@ -1595,6 +1595,10 @@ methods: {
} }
this.form = response.data; this.form = response.data;
//处理始发网点为空 始发网点等于寄件网点
if(!this.form.startSiteCode || this.form.startSiteCode.trim()==''){
this.form.startSiteCode=this.form.sendSiteCode;
}
if(this.form.lockFlag=="T"&&this.action!='got'){ if(this.form.lockFlag=="T"&&this.action!='got'){
this.$confirm(this.form.lockReason, '提示', { this.$confirm(this.form.lockReason, '提示', {
confirmButtonText: '确认', confirmButtonText: '确认',
@ -1806,11 +1810,11 @@ methods: {
}, },
onProductChange(item,transType){ onProductChange(item,transType){
//非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单 //非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单
if(!['002','012','014'].includes(item[0])){ if(!['002','012','014','078'].includes(item[0])){
this.form.masterBillCode = null; this.form.masterBillCode = null;
this.form.blVirtual = null; this.form.blVirtual = null;
} }
if(item[0]!=='002' && this.form.remark && this.form.remark!==null){ if(item && !['002'].includes(item[0]) && this.form.remark && this.form.remark!==null){
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, ''); this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
} }
if(item!=null && item.length==2){ if(item!=null && item.length==2){
@ -2443,7 +2447,7 @@ methods: {
if (val) { if (val) {
this.form.masterBillCode = val.value; this.form.masterBillCode = val.value;
this.masterBillProductType = val.productType; this.masterBillProductType = val.productType;
if (this.form.transLine === '002') { if (['002'].includes(this.form.transLine)) {
if (this.form.remark==null || this.form.remark.trim() === '') { if (this.form.remark==null || this.form.remark.trim() === '') {
//生成备注 //生成备注
this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`; this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`;

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

@ -527,12 +527,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="form.transLine==='012' || form.transLine=='002' || form.transLine === '014'"> <el-col :span="12" v-if="['012','002','014','078'].includes(form.transLine)">
<el-form-item label="" prop="blVirtual"> <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-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-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="(form.transLine==='012' || form.transLine=='002' || form.transLine === '014') && form.blVirtual === '1'"> <el-col :span="12" v-if="['012','002','014','078'].includes(form.transLine)">
<el-form-item :label="$t('关联主单')" prop="masterBillCode" label-width="70px"> <el-form-item :label="$t('关联主单')" prop="masterBillCode" label-width="70px">
<MasterBillCodePicker v-model="form.masterBillCode" :searchParams="masterBillSearchParams" @onMasterBillCodeChange="onMasterBillCodeChange"></MasterBillCodePicker> <MasterBillCodePicker v-model="form.masterBillCode" :searchParams="masterBillSearchParams" @onMasterBillCodeChange="onMasterBillCodeChange"></MasterBillCodePicker>
</el-form-item> </el-form-item>
@ -1583,6 +1583,10 @@ methods: {
} }
this.form = response.data; this.form = response.data;
//处理始发网点为空 始发网点等于寄件网点的值
if(!this.form.startSiteCode || this.form.startSiteCode.trim()==''){
this.form.startSiteCode=this.form.sendSiteCode;
}
if(this.form.lockFlag=="T"&&this.action!='got'){ if(this.form.lockFlag=="T"&&this.action!='got'){
this.$confirm(this.form.lockReason, '提示', { this.$confirm(this.form.lockReason, '提示', {
confirmButtonText: '确认', confirmButtonText: '确认',
@ -1798,11 +1802,11 @@ methods: {
}, },
onProductChange(item,transType){ onProductChange(item,transType){
//非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单 //非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单
if(!['002','012','014'].includes(item[0])){ if(!['002','012','014','078'].includes(item[0])){
this.form.masterBillCode = null; this.form.masterBillCode = null;
this.form.blVirtual = null; this.form.blVirtual = null;
} }
if(item[0]!=='002' && this.form.remark && this.form.remark!==null){ if(item && !['002'].includes(item[0]) && this.form.remark && this.form.remark!==null){
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, ''); this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
} }
if(item!=null && item.length==2){ if(item!=null && item.length==2){
@ -2438,13 +2442,13 @@ methods: {
this.form.billCode="" this.form.billCode=""
} }
}, },
//获取虚拟运单关联主单 //获取虚拟运单关联主单
onMasterBillCodeChange(val) { onMasterBillCodeChange(val) {
if (val) { if (val) {
this.form.masterBillCode = val.value; this.form.masterBillCode = val.value;
this.masterBillProductType = val.productType; this.masterBillProductType = val.productType;
if (this.form.transLine === '002') { if (['002'].includes(this.form.transLine)) {
if (this.form.remark==null || this.form.remark.trim() === '') { if (this.form.remark == null || this.form.remark.trim() === '') {
//生成备注 //生成备注
this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`; this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`;
} else { } else {
@ -2453,19 +2457,19 @@ methods: {
this.form.remark = this.form.remark.replace(/主单为[\da-zA-Z]+/g, '主单为' + val.value); this.form.remark = this.form.remark.replace(/主单为[\da-zA-Z]+/g, '主单为' + val.value);
} else { } else {
//判断结尾是不是逗号 //判断结尾是不是逗号
if(!this.form.remark.endsWith(',')){ if (!this.form.remark.endsWith(',')) {
this.form.remark = this.form.remark +','; this.form.remark = this.form.remark + ',';
} }
this.form.remark =this.form.remark + '该单为虚拟单：对应主单为' + val.value; this.form.remark = this.form.remark + '该单为虚拟单：对应主单为' + val.value;
} }
} }
} else { } else {
//删除备注中虚拟单部分 //删除备注中虚拟单部分
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, ''); this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
} }
}else { } else {
//删除备注中虚拟单部分 //删除备注中虚拟单部分
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, ''); this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
} }
}, },
//虚拟单变化 //虚拟单变化

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

@ -529,12 +529,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="form.transLine==='012' || form.transLine=='002' || form.transLine === '014'"> <el-col :span="12" v-if="['012','002','014','078'].includes(form.transLine)">
<el-form-item label="" prop="blVirtual"> <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-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-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="(form.transLine==='012' || form.transLine=='002' || form.transLine === '014') && form.blVirtual === '1'"> <el-col :span="12" v-if="['012','002','014','078'].includes(form.transLine)">
<el-form-item :label="$t('关联主单')" prop="masterBillCode" label-width="70px"> <el-form-item :label="$t('关联主单')" prop="masterBillCode" label-width="70px">
<MasterBillCodePicker v-model="form.masterBillCode" :searchParams="masterBillSearchParams" @onMasterBillCodeChange="onMasterBillCodeChange"></MasterBillCodePicker> <MasterBillCodePicker v-model="form.masterBillCode" :searchParams="masterBillSearchParams" @onMasterBillCodeChange="onMasterBillCodeChange"></MasterBillCodePicker>
</el-form-item> </el-form-item>
@ -1803,11 +1803,11 @@ methods: {
}, },
onProductChange(item,transType){ onProductChange(item,transType){
//非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单 //非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单
if(item && !['002','012','014'].includes(item[0])){ if(item && !['002','012','014','078'].includes(item[0])){
this.form.masterBillCode = null; this.form.masterBillCode = null;
this.form.blVirtual = null; this.form.blVirtual = null;
} }
if(item && item[0]!=='002' && this.form.remark && this.form.remark!==null){ if(item && !['002'].includes(item[0]) && this.form.remark && this.form.remark!==null){
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, ''); this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
} }
if(item!=null && item.length==2){ if(item!=null && item.length==2){
@ -2435,8 +2435,8 @@ methods: {
if (val) { if (val) {
this.form.masterBillCode = val.value; this.form.masterBillCode = val.value;
this.masterBillProductType = val.productType; this.masterBillProductType = val.productType;
if (this.form.transLine === '002') { if (['002'].includes(this.form.transLine)) {
if (this.form.remark==null || this.form.remark.trim() === '') { if (this.form.remark == null || this.form.remark.trim() === '') {
//生成备注 //生成备注
this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`; this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`;
} else { } else {
@ -2445,19 +2445,19 @@ methods: {
this.form.remark = this.form.remark.replace(/主单为[\da-zA-Z]+/g, '主单为' + val.value); this.form.remark = this.form.remark.replace(/主单为[\da-zA-Z]+/g, '主单为' + val.value);
} else { } else {
//判断结尾是不是逗号 //判断结尾是不是逗号
if(!this.form.remark.endsWith(',')){ if (!this.form.remark.endsWith(',')) {
this.form.remark = this.form.remark +','; this.form.remark = this.form.remark + ',';
} }
this.form.remark =this.form.remark + '该单为虚拟单：对应主单为' + val.value; this.form.remark = this.form.remark + '该单为虚拟单：对应主单为' + val.value;
} }
} }
} else { } else {
//删除备注中虚拟单部分 //删除备注中虚拟单部分
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, ''); this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
} }
}else { } else {
//删除备注中虚拟单部分 //删除备注中虚拟单部分
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, ''); this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
} }
}, },
//虚拟单变化 //虚拟单变化

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

@ -832,7 +832,7 @@
</el-row> </el-row>
</el-col> </el-col>
<!-- 虚拟单调整 --> <!-- 虚拟单调整 -->
<el-col :span="24" v-if="(form.transLine==='012' || form.transLine=='002' || form.transLine === '014') && applyType&&(applyTypeArr.includes('43'))"> <el-col :span="24" v-if="['012','002','014','078'].includes(form.transLine) && applyType&&(applyTypeArr.includes('43'))">
<el-row :gutter="0" class="md-row"> <el-row :gutter="0" class="md-row">
<el-col :span="3" class="md-title"> <el-col :span="3" class="md-title">
<span>虚拟单调整</span> <span>虚拟单调整</span>