diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue index 4de6ebf4e..bbaae19e5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue @@ -369,6 +369,13 @@ + + @@ -477,7 +484,7 @@ value-format="yyyy-MM-dd" > - +
{{ item.name | ellipsis2 }} @@ -738,16 +745,23 @@ export default { showDrawerClose () { this.showDrawer = false }, + verifySort3(){ + // 技术标准返回true 产品标准返回false + if(this.form.standSort){ + return this.form.standSort.indexOf("Q/QCBFC") === -1 && this.form.standSort.indexOf("Q/FT X") === -1 + } + return false + }, verifySort2(){ if(this.showForm.reviewResults && this.showForm.reviewResults === '1'){ - return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1); + return !!(this.form.standSort && (this.form.standSort.indexOf("Q/QCBFC") !== -1 || this.form.standSort.indexOf("Q/FT X") !== -1 )); }else { return "" } }, verifySort(){ if(this.form.reviewResults && this.form.reviewResults === '1'){ - return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1); + return !!(this.form.standSort && (this.form.standSort.indexOf("Q/QCBFC") !== -1 || this.form.standSort.indexOf("Q/FT X") !== -1 )); }else { return "" } diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue index cf2689342..136429059 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue @@ -366,6 +366,13 @@
+ + diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index 769005a90..4d7ee4053 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -29,7 +29,7 @@ :LXDListSub = "LXDList === undefined ? [] : LXDList" :FSDListSub = "FSDList === undefined ? [] : FSDList" :disabledState = "disabledState" - :opinionsShow2 = "false" + :opinionsShow2 = "true" :verifySarStandard = "verifySarStandard" @emitDataLoading="emitDataLoading" @formCancel="formCancel" @@ -288,6 +288,9 @@ export default { reviewResults: [ {required: true, message: "请选择复审结果", trigger: "change"} ], + QCRBUSS: [ + {required: true, message: "请选择主起草人", trigger: "change"} + ], draftTime: [ {required: true, message: "请选择初稿完成日期", trigger: "change"} ],