虚拟单,关联主单必填
This commit is contained in:
parent
5ad5911cc8
commit
9c3d5bccd7
@ -9,6 +9,7 @@
|
|||||||
v-model="svalue"
|
v-model="svalue"
|
||||||
:placeholder="placeholder"
|
:placeholder="placeholder"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
|
@blur="onBlur"
|
||||||
@focus="onFocus"
|
@focus="onFocus"
|
||||||
@change="onChange"
|
@change="onChange"
|
||||||
>
|
>
|
||||||
@ -83,7 +84,10 @@ export default {
|
|||||||
this.$emit("onMasterBillCodeChange", valObject);//子组件传选中对象到父组件
|
this.$emit("onMasterBillCodeChange", valObject);//子组件传选中对象到父组件
|
||||||
this.$emit("input", this.svalue); // 子组件值传到父组件 基础双向绑定
|
this.$emit("input", this.svalue); // 子组件值传到父组件 基础双向绑定
|
||||||
},
|
},
|
||||||
|
onBlur(val) {
|
||||||
|
this.$emit("input", this.svalue);
|
||||||
|
this.dispatch('ElFormItem', 'el.form.blur');
|
||||||
|
},
|
||||||
queryData(val) {
|
queryData(val) {
|
||||||
this.queryParams = {...this.searchParams};
|
this.queryParams = {...this.searchParams};
|
||||||
this.queryParams.billCode = val;
|
this.queryParams.billCode = val;
|
||||||
|
|||||||
@ -530,7 +530,7 @@
|
|||||||
<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="['012','002','014','078'].includes(form.transLine)">
|
<el-col :span="12" v-if="['012','002','014','078'].includes(form.transLine) && form.blVirtual === '1'">
|
||||||
<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>
|
||||||
@ -1051,7 +1051,7 @@ data() {
|
|||||||
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
|
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
|
||||||
],
|
],
|
||||||
//自定义校验
|
//自定义校验
|
||||||
masterBillCode:[
|
masterBillCode:[{ required: true, message: "关联主单不能为空", trigger: ["blur", 'change'] },
|
||||||
{validator: checkmasterProductType, trigger: ['blur', 'change']}
|
{validator: checkmasterProductType, trigger: ['blur', 'change']}
|
||||||
],
|
],
|
||||||
dispatchMethod: [
|
dispatchMethod: [
|
||||||
@ -2465,11 +2465,15 @@ methods: {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//删除备注中虚拟单部分
|
//删除备注中虚拟单部分
|
||||||
|
if (this.form.remark) {
|
||||||
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if (this.form.remark) {
|
||||||
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//虚拟单变化
|
//虚拟单变化
|
||||||
handleVirtualChange(){
|
handleVirtualChange(){
|
||||||
|
|||||||
@ -532,7 +532,7 @@
|
|||||||
<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="['012','002','014','078'].includes(form.transLine)">
|
<el-col :span="12" v-if="['012','002','014','078'].includes(form.transLine) && form.blVirtual === '1' ">
|
||||||
<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>
|
||||||
@ -1051,7 +1051,7 @@ data() {
|
|||||||
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
|
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
|
||||||
],
|
],
|
||||||
//自定义校验
|
//自定义校验
|
||||||
masterBillCode:[
|
masterBillCode:[{ required: true, message: "关联主单不能为空", trigger: ["blur", 'change'] },
|
||||||
{validator: checkmasterProductType, trigger: ['blur', 'change']}
|
{validator: checkmasterProductType, trigger: ['blur', 'change']}
|
||||||
],
|
],
|
||||||
dispatchMethod: [
|
dispatchMethod: [
|
||||||
@ -2465,12 +2465,16 @@ methods: {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//删除备注中虚拟单部分
|
//删除备注中虚拟单部分
|
||||||
|
if(this.form.remark){
|
||||||
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
//删除备注中虚拟单部分
|
//删除备注中虚拟单部分
|
||||||
|
if(this.form.remark){
|
||||||
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//虚拟单变化
|
//虚拟单变化
|
||||||
handleVirtualChange(){
|
handleVirtualChange(){
|
||||||
|
|||||||
@ -534,7 +534,7 @@
|
|||||||
<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="['012','002','014','078'].includes(form.transLine)">
|
<el-col :span="12" v-if="['012','002','014','078'].includes(form.transLine) && form.blVirtual === '1'">
|
||||||
<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>
|
||||||
@ -1055,7 +1055,7 @@ data() {
|
|||||||
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
|
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
|
||||||
],
|
],
|
||||||
//自定义校验
|
//自定义校验
|
||||||
masterBillCode:[
|
masterBillCode: [{ required: true, message: "关联主单不能为空", trigger: ["blur", 'change'] },
|
||||||
{ validator: checkmasterProductType, trigger: ['blur', 'change'] }
|
{ validator: checkmasterProductType, trigger: ['blur', 'change'] }
|
||||||
],
|
],
|
||||||
dispatchMethod: [
|
dispatchMethod: [
|
||||||
@ -2453,12 +2453,16 @@ methods: {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//删除备注中虚拟单部分
|
//删除备注中虚拟单部分
|
||||||
|
if (this.form.remark) {
|
||||||
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
//删除备注中虚拟单部分
|
//删除备注中虚拟单部分
|
||||||
|
if(this.form.remark){
|
||||||
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
this.form.remark = this.form.remark.replace(/该单为虚拟单:对应主单为[\da-zA-Z]+/g, '');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//虚拟单变化
|
//虚拟单变化
|
||||||
handleVirtualChange(){
|
handleVirtualChange(){
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user