Merge remote-tracking branch 'origin/develop' into develop

src/pages/home2/components/todoList/index.vue

@@ -1571,7 +1571,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if(row.taskInfo === '会签并填写意见') {
+          } else if(row.taskInfo === '会签') {
             this.$router.push({
               name: 'qbfzStep3',
               query:{
@@ -1605,7 +1605,7 @@ export default {
               }
             })
           }
-          else if(row.taskInfo === '审定责任人审定') {
+          else if(row.taskInfo === '审定') {
             this.$router.push({
               name: 'qbfzStep6',
               query:{
@@ -1616,7 +1616,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '批准负责人批准') {
+          }else if(row.taskInfo === '批准') {
             this.$router.push({
               name: 'qbfzStep7',
               query:{

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

@@ -2,7 +2,7 @@
   <div class="qbfz-step7">
     <ProcessHeader toggle>
       <template slot="proName">企标废止流程</template>
-      <template slot="proNode">批准负责人批准</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/qbfz/step1.vue

@@ -3,7 +3,7 @@
   <div class="qbfz-step1">
     <ProcessHeader toggle>
       <template slot="proName">企标废止流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -126,19 +126,19 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
                   <h4>标准法规工程师</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.prcCreateUserName" placeholder="流程发起人"
+                    <el-input v-model="roleForm.prcCreateUserName" placeholder="起草"
                               disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择标准法规部部长审核" placement="top"
+            <el-timeline-item timestamp="审核" placement="top"
                               :color="roleForm.dockUser ? '#66b1ff' : ''" >
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
@@ -152,43 +152,43 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择会签人员进行会签" placement="top"
+            <el-timeline-item timestamp="会签" placement="top"
                               :color="roleForm.countersigner ? '#66b1ff' : ''" >
               <el-card>
                 <el-form-item prop="countersignerName" style="margin-bottom: 0">
-                  <h4>会签人员</h4>
+                  <h4>相关责任人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.countersigner" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.countersignerName" placeholder="选择会签人员"
+                    <el-input v-model="roleForm.countersignerName" placeholder="选择相关责任人"
                               @click.native="choiceZRRS">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择审定责任人审定" placement="top"
+            <el-timeline-item timestamp="审定" placement="top"
                               :color="roleForm.examine ? '#66b1ff' : ''" >
               <el-card>
                 <el-form-item prop="examineName" style="margin-bottom: 0">
-                  <h4>审定责任人</h4>
+                  <h4>标准体系工作组组长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.examine" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.examineName" placeholder="选择审定责任人"
-                              @click.native="choiceZRR('examine', '选择审定责任人', roleForm.examine)">
+                    <el-input v-model="roleForm.examineName" placeholder="选择标准体系工作组组长"
+                              @click.native="choiceZRR('examine', '选择标准体系工作组组长', roleForm.examine)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择批准负责人批准" placement="top"
+            <el-timeline-item timestamp="批准" placement="top"
                               :color="roleForm.approver ? '#66b1ff' : ''" >
               <el-card>
                 <el-form-item prop="approverName" style="margin-bottom: 0">
-                  <h4>批准负责人</h4>
+                  <h4>标准法规部高级经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.approver" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.approverName" placeholder="选择批准负责人"
-                              @click.native="choiceZRR('approver', '选择批准负责人', roleForm.approver)">
+                    <el-input v-model="roleForm.approverName" placeholder="选择标准法规部高级经理"
+                              @click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)">
                     </el-input>
                   </div>
                 </el-form-item>

src/pages/processCenter/pages/creatProcess/qbfz/step2.vue

@@ -2,7 +2,7 @@
   <div class="qbfz-step2">
     <ProcessHeader toggle>
       <template slot="proName">企标废止流程</template>
-      <template slot="proNode">标准法规部部长审核</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/qbfz/step3.vue

@@ -2,7 +2,7 @@
   <div class="qbfz-step2">
     <ProcessHeader toggle>
       <template slot="proName">企标废止流程</template>
-      <template slot="proNode">会签人员会签并填写意见</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/qbfz/step4.vue

@@ -292,15 +292,17 @@ export default {
           { required: true, message: "请选择下一步状态", trigger: "change" }
         ]
       },
-      associationOptions: [{
-        value: "修订",
-        label: "修订"
-      }, {
+      associationOptions: [
+      // {
+      //   value: "修订",
+      //   label: "修订"
+      // },
+      {
         value: "废止",
         label: "废止"
       }, {
-        value: "有效",
-        label: "有效"
+        value: "现行有效",
+        label: "现行有效"
       }]
     };
   },

src/pages/processCenter/pages/creatProcess/qbfz/step5.vue

@@ -2,7 +2,7 @@
   <div class="qbfz-step5">
     <ProcessHeader toggle>
       <template slot="proName">企标废止流程</template>
-      <template slot="proNode">标准法规部部长审核</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/qbfz/step6.vue

@@ -2,7 +2,7 @@
   <div class="qbfz-step6">
     <ProcessHeader toggle>
       <template slot="proName">企标废止流程</template>
-      <template slot="proNode">审定责任人审核</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/qbfz/step7.vue

@@ -2,7 +2,7 @@
   <div class="qbfz-step7">
     <ProcessHeader toggle>
       <template slot="proName">企标废止流程</template>
-      <template slot="proNode">批准负责人批准</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/qbzxdlx/step1.vue

@@ -532,12 +532,23 @@ export default {
           _this: this
         }, res => {
           if(res.ok){
-            this.qblx_pageData.qblxData = res.data
+            if(res.data.length){
+              this.qblx_pageData.qblxData = res.data
+              this.$message.success('文件上传成功')
+            }else{
+              this.$message.warning('请勿上传为空的文件')
+            }
           }else{
-           alert(res.message)
+            this.$confirm(res.message, "提示", {
+              confirmButtonText: "确认",
+              confirmButtonClass: "common-button-primary",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+            }).catch(() => {
+            });
           }
         })
-        this.$message.success('文件上传成功')
         this.importModalshowflag = false
         this.$nextTick(() => {
           this.$refs.importFileAboutStand.clearFiles()
@@ -946,9 +957,10 @@ export default {
     },
     //流程提交事件
     handleSubmit() {
-      let jsonData = this.qblx_pageData.qblxData
-      this.qblx_pageData.qblxFile = this.fileInfoList
-      this.qblx_pageData.commentText = this.commentText;
+      if(this.qblx_pageData.qblxData.length){
+        let jsonData = this.qblx_pageData.qblxData
+        this.qblx_pageData.qblxFile = this.fileInfoList
+        this.qblx_pageData.commentText = this.commentText;
         this.$refs["qblx_pageData"].validate((valid) => {
           if (valid) {
             this.$refs["roleForm"].validate(async (valid) => {
@@ -960,7 +972,7 @@ export default {
                     .then(() => {
                       finishCount++
                     }).catch(e => {
-                  })
+                    })
                 }
                 if (finishCount === jsonData.length) {
                   this.isSubmit = false
@@ -975,6 +987,10 @@ export default {
             return this.$message.warning("请完善基础信息");
           }
         });
+      }else{
+        this.$message.warning('立项列表不能为空')
+      }
+
     },
 
   }

src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue

@@ -220,7 +220,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="''">
+          <el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
             <div class="card-box" @click="handleCreateProcess('23')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -250,7 +250,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="''">
+          <el-card shadow="hover" v-btn-permission="'afa3d1aee5fd8027b18675621afdeff6'">
             <div class="card-box" @click="handleCreateProcess('25')">
               <div class="card-top">
                 <div class="card-top-left">

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -2081,7 +2081,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if(row.taskInfo === '会签并填写意见') {
+          } else if(row.taskInfo === '会签') {
             this.$router.push({
               name: 'qbfzStep3',
               query:{
@@ -2115,7 +2115,7 @@ export default {
               }
             })
           }
-          else if(row.taskInfo === '审定责任人审定') {
+          else if(row.taskInfo === '审定') {
             this.$router.push({
               name: 'qbfzStep6',
               query:{
@@ -2126,7 +2126,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '批准负责人批准') {
+          }else if(row.taskInfo === '批准') {
             this.$router.push({
               name: 'qbfzStep7',
               query:{

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -878,7 +878,7 @@ export default {
             name: 'qbfzStep1',
             query: {
               type: '24',
-              processName: '企标废止流程',
+              processName: mes.taskInfo,
               bpnId: id
             }
           })