合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!41

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">接受</el-button>
+                     (item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接收</el-button>
           </div>
 <!--          <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
 <!--            <span @click="dealWith(item)"-->

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;
+//}
 </style>

src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue

@@ -2,8 +2,8 @@
     <div class="bzrkStep1">
         <!--        标准入库流程-->
         <ProcessHeader toggle>
-            <template slot="proName">企标制修订计划管控</template>
-            <template slot="proNode">技术标准起草</template>
+            <template slot="proName">企标制修订-技术标准</template>
+            <template slot="proNode">起草</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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'}
                     ],

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判断