diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 39023f501..ca846edeb 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -22,7 +22,7 @@ (item.prcType == 9 && item.taskInfo == '解读') || (item.prcType == 6 && item.taskInfo === '合规评估') || (item.prcType == 6 && item.taskInfo == '批准') || (item.prcType == 2 && item.taskInfo === '调研结果反馈') || (item.prcType == 8 && item.taskInfo === '合规排查(上传合规举证材料)') || (item.prcType == 10 && item.taskInfo === '清单完善1') || (item.prcType == 26 && item.taskInfo === '立项确认') || - (item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接受 + (item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接收 diff --git a/src/pages/personal/pages/my-questions/index2.vue b/src/pages/personal/pages/my-questions/index2.vue index ea96ba414..bb86a2284 100644 --- a/src/pages/personal/pages/my-questions/index2.vue +++ b/src/pages/personal/pages/my-questions/index2.vue @@ -224,11 +224,11 @@ export default { white-space: pre-wrap; /* CSS 2.1 */ white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */ } -.info-answer{ - height: 200px; - width: 100%; - position: absolute; - bottom: 0; - //border-top: 1px solid #cccccc; -} +//.info-answer{ +// height: 200px; +// width: 100%; +// position: absolute; +// bottom: 0; +// //border-top: 1px solid #cccccc; +//} diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index c581fb4f1..8c9dfc88a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -2,8 +2,8 @@
- - + +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 33c58b718..f7993f0d7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1746,9 +1746,9 @@ issueTime: [ {required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - {required: true, message: '请选择企标实施日期', trigger: 'change'} - ], + // putTime: [ + // {required: true, message: '请选择企标实施日期', trigger: 'change'} + // ], FBGBUSSName: [ {required: false, message: '请上传发布稿', validator: validateFBGBUSS, trigger: 'blur'} ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 0acd7b641..869892d72 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -708,6 +708,12 @@ } callback() }; + const validateMadelSubName = (rule, value, callback) => { + if(this.madelSubList.length === 0){ + callback(new Error('请上传培训文件!')) + } + callback() + }; return { pickerOptions: { shortcuts: [{ @@ -1085,6 +1091,12 @@ // DTQBBHBUSS: [ // { required: true, message: '请选择代替企标编号', trigger: 'change' } // ], + madelSubName: [ + { required: true, message: '请上传培训文件',validator: validateMadelSubName, trigger: 'blur' } + ], + putTime: [ + { required: true, message: "请选择企标实施日期", trigger: "change" } + ] }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断