From 9c3d5bccd7b4e927c3f6245820ee5f9aaea74914 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 26 Jun 2025 10:13:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=8D=95=EF=BC=8C=E5=85=B3?=
=?UTF-8?q?=E8=81=94=E4=B8=BB=E5=8D=95=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../EmisBaseTools/MasterBillCodePicker.vue | 6 +++++-
src/views/emis/emisWaybill/waybillGot.vue | 20 +++++++++++--------
src/views/emis/emisWaybill/waybillModify.vue | 14 ++++++++-----
src/views/emis/emisWaybill/waybillRecord.vue | 14 ++++++++-----
4 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/src/views/emis/EmisBaseTools/MasterBillCodePicker.vue b/src/views/emis/EmisBaseTools/MasterBillCodePicker.vue
index e869cf3c..86f6dbd0 100644
--- a/src/views/emis/EmisBaseTools/MasterBillCodePicker.vue
+++ b/src/views/emis/EmisBaseTools/MasterBillCodePicker.vue
@@ -9,6 +9,7 @@
v-model="svalue"
:placeholder="placeholder"
style="width: 100%"
+ @blur="onBlur"
@focus="onFocus"
@change="onChange"
>
@@ -83,7 +84,10 @@ export default {
this.$emit("onMasterBillCodeChange", valObject);//子组件传选中对象到父组件
this.$emit("input", this.svalue); // 子组件值传到父组件 基础双向绑定
},
-
+ onBlur(val) {
+ this.$emit("input", this.svalue);
+ this.dispatch('ElFormItem', 'el.form.blur');
+ },
queryData(val) {
this.queryParams = {...this.searchParams};
this.queryParams.billCode = val;
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 7a8a950c..fe63a334 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -530,7 +530,7 @@
是否为虚拟单
-
+
@@ -1051,7 +1051,7 @@ data() {
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
],
//自定义校验
- masterBillCode:[
+ masterBillCode:[{ required: true, message: "关联主单不能为空", trigger: ["blur", 'change'] },
{validator: checkmasterProductType, trigger: ['blur', 'change']}
],
dispatchMethod: [
@@ -2448,7 +2448,7 @@ methods: {
this.form.masterBillCode = val.value;
this.masterBillProductType = val.productType;
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}`;
} else {
@@ -2457,18 +2457,22 @@ methods: {
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 +',';
+ if (!this.form.remark.endsWith(',')) {
+ this.form.remark = this.form.remark + ',';
}
- this.form.remark =this.form.remark + '该单为虚拟单：对应主单为' + val.value;
+ this.form.remark = this.form.remark + '该单为虚拟单：对应主单为' + val.value;
}
}
} else {
//删除备注中虚拟单部分
+ if (this.form.remark) {
+ this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
+ }
+ }
+ } else {
+ if (this.form.remark) {
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
- }else{
- this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
},
//虚拟单变化
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 7cf0f5fe..149d3faf 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -532,7 +532,7 @@
是否为虚拟单
-
+
@@ -1050,8 +1050,8 @@ data() {
packType: [
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
],
- //自定义校验
- masterBillCode:[
+ //自定义校验
+ masterBillCode:[{ required: true, message: "关联主单不能为空", trigger: ["blur", 'change'] },
{validator: checkmasterProductType, trigger: ['blur', 'change']}
],
dispatchMethod: [
@@ -2465,11 +2465,15 @@ methods: {
}
} else {
//删除备注中虚拟单部分
- this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
+ if(this.form.remark){
+ this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
+ }
}
} else {
//删除备注中虚拟单部分
- this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
+ if(this.form.remark){
+ this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
+ }
}
},
//虚拟单变化
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index cac0cc4d..f6788c41 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -534,7 +534,7 @@
是否为虚拟单
-
+
@@ -1055,8 +1055,8 @@ data() {
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
],
//自定义校验
- masterBillCode:[
- {validator: checkmasterProductType, trigger: ['blur', 'change']}
+ masterBillCode: [{ required: true, message: "关联主单不能为空", trigger: ["blur", 'change'] },
+ { validator: checkmasterProductType, trigger: ['blur', 'change'] }
],
dispatchMethod: [
{ required: true, message: "派件方式不能为空", trigger: ["blur",'change'] }
@@ -2453,11 +2453,15 @@ methods: {
}
} else {
//删除备注中虚拟单部分
- this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
+ if (this.form.remark) {
+ this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
+ }
}
} else {
//删除备注中虚拟单部分
- this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
+ if(this.form.remark){
+ this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
+ }
}
},
//虚拟单变化