合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!87
This commit is contained in:
高嵩
2023-05-29 17:59:24 +08:00
39 changed files with 57 additions and 54 deletions
@@ -1463,7 +1463,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -935,7 +935,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -935,7 +935,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -935,7 +935,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1031,7 +1031,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1004,7 +1004,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -950,7 +950,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1011,7 +1011,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -934,7 +934,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1165,7 +1165,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1085,7 +1085,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1084,7 +1084,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -965,7 +965,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -935,7 +935,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -935,7 +935,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1011,7 +1011,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1094,7 +1094,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -913,7 +913,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1739,7 +1739,7 @@
standName: [
{required: true, validator: validateStandName, trigger: 'blur'},
{min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'},
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{required: false, message: '请输入企标英文名称', trigger: 'blur'},
@@ -946,7 +946,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -876,7 +876,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -945,7 +945,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1024,7 +1024,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1064,7 +1064,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1074,7 +1074,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1058,7 +1058,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -942,7 +942,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1342,7 +1342,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1307,7 +1307,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1100,7 +1100,7 @@
standName: [
{required: true, message: '请输入企标中文名称', trigger: 'blur'},
{min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'},
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{required: false, message: '请输入企标英文名称', trigger: 'blur'},
@@ -896,7 +896,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1089,7 +1089,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1147,7 +1147,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1057,7 +1057,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1307,7 +1307,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -925,7 +925,7 @@
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
{validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
// {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
],
standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -884,6 +884,7 @@ export default {
} else {
this.qbfsForm.rqbJson = this.QYBZformSelect[0].id
this.qbfsForm.rqbName = this.QYBZformSelect[0].standCode
this.qbfsForm.standNum = this.QYBZformSelect[0].standNumber
this.clearQYBZ()
this.QYBZmodal = false
}
@@ -696,6 +696,9 @@ export default {
mergeReason: [
{required: true, message: '请输入合并原因', trigger: 'blur'},
],
rqbName: [
{ required: true, message: "请选择代替企标编号", trigger: "blur" }
],
},
standinfoList: [],
standardSearch: {
@@ -899,6 +902,7 @@ export default {
} else {
this.qbfsForm.rqbJson = this.QYBZformSelect[0].id
this.qbfsForm.rqbName = this.QYBZformSelect[0].standCode
this.qbfsForm.standNum = this.QYBZformSelect[0].standNumber
this.clearQYBZ()
this.QYBZmodal = false
}
@@ -282,22 +282,7 @@
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="addForm.reviseStatus === '1'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.rqbJson">
</el-input>
<el-input
clearable
v-model="addForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ(addForm.rqbJson)">
</el-input>
</div>
</el-form-item>
<el-form-item v-else label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-form-item label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :required="addForm.reviseStatus === '2'" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
@@ -882,8 +867,8 @@
{required: true, message: '请选择起草人', trigger: 'change'},
],
rqbJson: [
{required: false, message: '请选择代替企标编号', trigger: ['change', 'blur']},
]
{ validator: this.validationRqbJson, trigger: 'change'},
],
},
form: {
page: 1,
@@ -919,6 +904,17 @@
},
},
methods: {
validationRqbJson(rule, value, callback){
if(this.addForm.reviseStatus === '2'){
if(!this.addForm.rqbJson || this.addForm.rqbJson === ''){
return callback(new Error('请选择代替企标编号'))
}else{
callback()
}
}else{
callback()
}
},
workChange (data) {
this.workGroupList = data
},
@@ -1079,6 +1075,7 @@
} else {
this.addForm.rqbJson = this.QYBZformSelect[0].id
this.addForm.rqbName = this.QYBZformSelect[0].standCode
this.addForm.standNum = this.QYBZformSelect[0].standNumber
this.QYBZform = {
page: 1,
standCode: '',
@@ -1344,6 +1341,7 @@
drafterName: '',
LXD:'',
LXDName:'',
standNum: ''
}
this.DrawerType = 'add'
this.addForm.planStatus = '6'