Merge branch 'develop_new' into fix_foton

# Conflicts:
#	src/components/roleTree/index.vue
This commit is contained in:
zyn
2022-12-08 14:47:50 +08:00
2 changed files with 29 additions and 7 deletions
@@ -755,10 +755,10 @@ export default {
{ required: true, message: "请输入工作组组长", trigger: "blur" }
],
draftTime: [
{ required: true, message: "请选择计划标准初稿完成时间", trigger: "change" }
{ required: true, message: "请选择计划标准初稿完成时间", trigger: "blur" }
],
releaseTime: [
{ required: true, message: "请选择计划标准发布时间", trigger: "change" }
{ required: true, message: "请选择计划标准发布时间", trigger: "blur" }
],
endTime: [
{ required: true, message: "请选择立项完成时间", trigger: "change" }
@@ -767,10 +767,10 @@ export default {
{ required: true, message: "请选择体系结构", trigger: "change" }
],
area: [
{ required: true, message: "请选择适用车型", trigger: "change" }
{ required: true, message: "请选择适用车型", trigger: "blur" }
],
isRelate: [
{ required: true, message: "请选择是否采用标准", trigger: "change" }
{ required: true, message: "请选择是否采用标准", trigger: "blur" }
],
technologic: [
{ required: true, message: "请输入指标依据", trigger: "blur" }
@@ -1135,6 +1135,17 @@ export default {
},
TXJGenterDrawer () {
let list = this.$refs.TXJGTree.getCheckedNodes()
if (this.$refs.TXJGTree.getCheckedNodes().length > 1) {
this.$message.warning('仅能选择一个体系结构')
return;
}
if(list.length > 0){
let parenList = list.filter ( item => item.parentId === null || item.parentId === '');
if (parenList.length > 0) {
this.$message.error('请选择二级及以下目录')
return
}
}
let id = ''
let name = ''
list.map(item => {
@@ -1169,6 +1180,7 @@ export default {
},
QYBZcloseDrawer () {
this.clearQYBZ()
this.QYBZmodal = false;//关闭弹窗
},
QYBZenterDrawer () {
console.log(this.QYBZformSelect);