FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_new' into develop

Browse Source
This commit is contained in:
liyawei
2022-11-23 12:40:07 +08:00
parent 888d6861fd a450fd3835
commit e9f30a6446
7 changed files with 49 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+11
View File
@@ -1698,6 +1698,17 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if(row.taskInfo === '技术标准起草') {
this.$router.push({
name: 'qbzxdjhgkStep6',
query:{
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} }
break; break;
case "26": case "26":
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+4 -6
View File
@@ -403,16 +403,14 @@ export default {
}) })
}, },
methods: { methods: {
validateForm () { validateForm (callback) {
let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
flag = true callback && callback()
} else { } else{
flag = false this.$message.warning("请完善基础信息");
} }
}) })
return flag
}, },
choiceShow(){ choiceShow(){
this.getStandDataBtn() this.getStandDataBtn()
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+4 -6
View File
@@ -425,16 +425,14 @@ export default {
}) })
}, },
methods: { methods: {
validateForm () { validateForm (callback) {
let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
flag = true callback && callback()
} else { } else{
flag = false this.$message.warning("请完善基础信息");
} }
}) })
return flag
}, },
choiceShow(){ choiceShow(){
this.getStandDataBtn() this.getStandDataBtn()
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+4 -7
View File
@@ -446,7 +446,6 @@ export default {
} }
}; };
const standNameVerify = async (rule, value, callback) => { const standNameVerify = async (rule, value, callback) => {
debugger
if (value === '' || value === null) { if (value === '' || value === null) {
return callback(new Error('请输入企标名称')) return callback(new Error('请输入企标名称'))
} else { } else {
@@ -1021,16 +1020,14 @@ export default {
this.$refs.qbfsForm.validateField('resPersonName'); this.$refs.qbfsForm.validateField('resPersonName');
} }
}, },
validateForm () { validateForm (callback) {
let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
flag = true callback && callback()
} else { } else{
flag = false this.$message.warning("请完善基础信息");
} }
}) })
return flag
} }
}, },
}; };
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+4 -6
View File
@@ -1021,16 +1021,14 @@ export default {
this.$refs.qbfsForm.validateField('resPersonName'); this.$refs.qbfsForm.validateField('resPersonName');
} }
}, },
validateForm () { validateForm (callback) {
let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
flag = true callback && callback()
} else { } else{
flag = false this.$message.warning("请完善基础信息");
} }
}) })
return flag
}, },
choiceShow(){ choiceShow(){
this.showType = 'one' this.showType = 'one'
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+4 -6
View File
@@ -412,16 +412,14 @@ export default {
}) })
}, },
methods: { methods: {
validateForm () { validateForm (callback) {
let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
flag = true callback && callback()
} else { } else{
flag = false this.$message.warning("请完善基础信息");
} }
}) })
return flag
}, },
choiceShow(){ choiceShow(){
this.getStandDataBtn() this.getStandDataBtn()
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+18 -12
View File
@@ -527,9 +527,8 @@ export default {
this.$message.warning('企标名称已存在,请更改!') this.$message.warning('企标名称已存在,请更改!')
}else { }else {
if (this.$route.query.prcNum === undefined) { if (this.$route.query.prcNum === undefined) {
let flag = this.$refs["childForm"].validateForm(); this.$refs["childForm"].validateForm(()=>{
let qbzxdFrom = this.$refs["childForm"].qbfsForm; let qbzxdFrom = this.$refs["childForm"].qbfsForm;
if (flag) {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
@@ -578,13 +577,16 @@ export default {
this.$message.warning("请完善人员信息"); this.$message.warning("请完善人员信息");
} }
}); });
} else { });
this.$message.warning("请完善基础信息");
} // if (flag) {
//
// } else {
// this.$message.warning("请完善基础信息");
// }
} else { } else {
let flag = this.$refs["childForm"].validateForm(); let flag = this.$refs["childForm"].validateForm(() => {
let qbzxdFrom = this.$refs["childForm"].qbfsForm; let qbzxdFrom = this.$refs["childForm"].qbfsForm;
if (flag) {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
@@ -609,9 +611,13 @@ export default {
this.$message.warning("请完善人员信息"); this.$message.warning("请完善人员信息");
} }
}); });
} else { });
this.$message.warning("请完善基础信息");
} // if (flag) {
//
// } else {
// this.$message.warning("请完善基础信息");
// }
} }
} }
}, },