From ebda2f5e079088277b8a1883d7da5afc8efdc3c5 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 7 Apr 2023 09:30:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=9B=9E=E7=AD=94=20?= =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/personal/pages/my-questions/index2.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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; +//} From 7e069207d9f0484a9f3b330ac8e5495bf4d21dcd Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 7 Apr 2023 10:09:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7(=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E6=A0=87=E5=87=86=E8=B5=B7=E8=8D=89)=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2-?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86(=E8=B5=B7=E8=8D=89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@
- - + +
基础信息
From 3acba5cc9533ff95869206a9823a2803e4cd25fa Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 7 Apr 2023 10:33:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E6=8C=89=E9=92=AE=20=E6=8E=A5=E5=8F=97?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=8E=A5=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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">接收
From 3bd52c8c62aeeb52c5e75bdef527984f33a71030 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 7 Apr 2023 11:36:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=20?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=A1=B5=E5=BF=85=E5=A1=AB=20=E5=85=B6?= =?UTF-8?q?=E4=BD=99=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk/step1.vue | 6 +++--- .../processCenter/pages/creatProcess/qbrk/step13.vue | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) 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判断