diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index dacadf1d2..14b75db94 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -5,9 +5,9 @@
-
历史评分
基础信息
基础信息
+
历史评分
审批历史
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index a5c66ef99..d00176e2a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -5,9 +5,9 @@
-
会签评分
基础信息
会签意见
+
会签评分
审批历史
@@ -911,9 +911,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value) || value > 1) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 1ac758a7a..0a9e910ad 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -5,8 +5,8 @@
-
评审评分
基础信息
+
评审评分
审批历史
@@ -907,9 +907,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value) || value > 1) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index 5ffbb93b8..3d95b44bd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -5,8 +5,8 @@
-
复审评分
基础信息
+
复审评分
审批历史
@@ -691,9 +691,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value) || value > 1) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index d54e207e9..8114ec4eb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -510,9 +510,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value)) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 69e207330..0978416e6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -5,8 +5,8 @@
-
审核评分
基础信息
+
审核评分
审批历史
@@ -702,9 +702,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value) || value > 1) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index e378edc5a..5d39dd4b7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -5,8 +5,8 @@
-
历史评分
基础信息
+
历史评分
审批历史
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 7925669ed..a92b1f78c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -5,8 +5,8 @@
-
评审评分
基础信息
+
评审评分
审批历史
@@ -907,9 +907,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value) || value > 1) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 2abddd12b..dfaa51e38 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -139,7 +139,7 @@ @@ -522,6 +522,12 @@ export default { esName: [ { required: true, message:"请输入企标名称", trigger: "blur" } ], + rqbName: [ + { required: true, message: "请选择代替企标编号", trigger: "blur" } + ], + area: [ + { required: true, message: "请选择适用车型", trigger: "change" } + ], reviseStatus: [ { required: true, message: "请选择制修订类型", trigger: "blur" } ], @@ -543,6 +549,21 @@ export default { drafterName: [ {required: true, message: '请选择起草人', trigger: 'change'}, ], + tsJson: [ + {required: true, message: '请选择体系结构', trigger: 'change'}, + ], + isRelate: [ + {required: true, message: '请选择采用国内外标准情况', trigger: 'change'}, + ], + technologic: [ + {required: true, message: '请输入指标依据', trigger: 'blur'}, + ], + esStandRelations: [ + {required: true, message: '请输入采用标准', trigger: 'blur'}, + ], + useLevel: [ + {required: true, message: '请选择采标程度', trigger: 'change'}, + ], newReason: [ {required: true, message: '请输入立项原因', trigger: 'blur'}, ], diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index ae6d37c89..6946cffd7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -167,7 +167,7 @@ - - - + + + + + + +
{{ item.name }} - - - + + + @@ -717,8 +717,11 @@ export default { examineName: "" }, qbfsFormRules: { - // unit: [ - // { required: true, message: "请选择起草单位", trigger: "change" } + projectTarget: [ + { required: true, message: "请输入项目目标", trigger: "blur" } + ], + // fileName: [ + // { required: true, message: "请上传附件", trigger: "blur" } // ], bussSort: [ { required: true, message: "请选择企标类别", trigger: "blur" } @@ -726,30 +729,54 @@ export default { esName: [ { required: true, validator: standNameVerify, trigger: "blur" } ], + rqbName: [ + { required: true, message: "请输入代替企标编号", trigger: "blur" } + ], reviseStatus: [ { required: true, message: "请选择制修订类型", trigger: "blur" } ], - // resPersonName: [ - // { required: true, message: "请输入评审责任人", trigger: "blur" } - // ], - // wgLeaderName: [ - // { required: true, message: "请输入工作组组长", trigger: "blur" } - // ], - // unitName: [ - // { required: true, message: "请选择起草责任单位", trigger: "blur" } - // ], - // draftTime: [ - // { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" } - // ], - // releaseTime: [ - // {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, - // ], + unitName: [ + { required: true, message: "请选择起草单位", trigger: "change" } + ], drafterName: [ - {required: true, message: '请选择起草人', trigger: 'change'}, + { required: true, message: "请选择起草人", trigger: "change" } + ], + resPersonName: [ + { required: true, message: "请输入评审责任人", trigger: "blur" } + ], + wgLeaderName: [ + { required: true, message: "请输入工作组组长", trigger: "blur" } + ], + draftTime: [ + { required: true, message: "请选择计划标准初稿完成时间", trigger: "change" } + ], + releaseTime: [ + { required: true, message: "请选择计划标准发布时间", trigger: "change" } + ], + endTime: [ + { required: true, message: "请选择立项完成时间", trigger: "change" } + ], + tsJson: [ + { required: true, message: "请选择体系结构", trigger: "change" } + ], + area: [ + { required: true, message: "请选择适用车型", trigger: "change" } + ], + isRelate: [ + { required: true, message: "请选择是否采用标准", trigger: "change" } + ], + technologic: [ + { required: true, message: "请输入指标依据", trigger: "blur" } + ], + useLevel: [ + { required: true, message: "请选择采标程度", trigger: "change" } + ], + newReason: [ + {required: true, message: '请输入立项原因', trigger: 'blur'}, + ], + esStandRelations: [ + {required: true, message: '请输入采用标准', trigger: 'blur'}, ], - // newReason: [ - // {required: true, message: '请输入立项原因', trigger: 'blur'}, - // ], }, } @@ -1313,8 +1340,11 @@ export default { idList += item.id; nameList += item.name; }); + console.log(nameList) this.roleForm.countersigner = idList; this.roleForm.countersignerName = nameList; + this.qbfsForm.resPerson = idList; + this.qbfsForm.resPersonName = nameList; } }, }; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 1b036b1b6..ff9c46b06 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -880,6 +880,7 @@ export default { dataListChildren.splice(index, 1) } this.dataList = dataListChildren; + console.log(this.dataList) this.total = this.dataList.length; }