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

src/pages/config/pages/mechanismManage/pages/workgroup.vue

@@ -244,7 +244,9 @@ export default {
       }, {
         _this: this
       }, res => {
-        res.data.records.map(item => {
+        this.workData = res.data.records
+        let work = res.data.records
+        work.map(item => {
           item.workLeaderGroup = [];
           item.workPeopleGroup = [];
           var workLeaderArray = item.workLeader.split(",");
@@ -258,8 +260,8 @@ export default {
             item.workPeopleGroup.push({ name: workPeopleArray[j], id: workPeopleIdArray[j] });
           }
         });
-        this.workData = res.data.records;
         this.total = res.data.total;
+        this.Loading = false
       }, e => {
       });
     },
@@ -340,11 +342,14 @@ export default {
     },
     //取消新增
     cancelModel() {
+      this.Loading = true
       this.addForm = {
         workGroup: "",
         workPeopleGroup: [],
         workLeaderGroup:  []
       };
+      this.getWorkData();
+      this.$refs.workGroup.clearSelection()
       this.addModel = false;
     },
     //确定新增
@@ -357,6 +362,7 @@ export default {
             } else if (!this.addForm.workPeopleGroup.length) {
               this.$message.warning("请选择工作组组员");
             } else {
+              this.Loading = true
               let workLeader = "", workLeaderId = "";
               this.addForm.workLeaderGroup.map(item => {
                 workLeader += item.name;
@@ -395,6 +401,7 @@ export default {
             } else if (!this.addForm.workPeopleGroup.length) {
               this.$message.warning("请选择工作组组员");
             } else {
+              this.Loading = true
               let workLeader = "";
               let workLeaderId = "";
               this.addForm.workLeaderGroup.map(item => {

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

@@ -205,7 +205,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '起草单位高级经理审核'){
+          }else if (row.taskInfo === '批准'){
             this.$router.push({
               name: 'bussLibrary8',
               query: {

src/pages/processCenter/pages/creatProcess/bzpg/step1.vue

@@ -1058,11 +1058,15 @@ export default {
       this.projectList = data;
     },
     choiceZRR(scope, type, title, id) {
+      console.log(scope);
       if (scope != null) {
         this.currentIndex = scope.$index;
+        this.nodeList = [];
+        this.nodeList.push(scope.row.distributePersonId);
+      }else{
+        this.nodeList = [];
+        this.nodeList.push(id);
       }
-      this.nodeList = [];
-      this.nodeList.push(id);
       this.type = type;
       this.drawerTitle = title;
       this.modalshowflag = true;

src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue

@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <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/qbrk/step8.vue

@@ -592,7 +592,7 @@
                 loading: false,
                 dataLoading: true,
                 drawerModal: false,
-                taskInfo:'起草单位高级经理审核',
+                taskInfo:'批准',
                 assigneeNewLoading: false,
                 disabledState: true,
                 userId:this.$store.getters.userInfo.userId,

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -648,6 +648,7 @@ export default {
         this.$message.warning("请选择一条数据进行带入");
       } else {
         this.addShow = false
+        this.dataList = []
         this.projectId = this.selectedList[0].id;
         this.listForm.projectId = this.selectedList[0].id;
         this.listForm.projectNumber = this.selectedList[0].projectNumber;

src/pages/processCenter/pages/phone/qbrk-product/step10.vue

@@ -3,7 +3,7 @@
     <!--        企标制修订-技术标准流程-->
     <ProcessHeaderPhone toggle>
       <template slot="proName">企标制修订-产品标准</template>
-      <template slot="proNode">审核</template>
+      <template slot="proNode">审定</template>
     </ProcessHeaderPhone>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/qbrk/step8.vue

@@ -275,7 +275,7 @@ export default {
       loading: false,
       dataLoading: true,
       drawerModal: false,
-      taskInfo:'起草单位高级经理审核',
+      taskInfo:'批准',
       assigneeNewLoading: false,
       disabledState: true,
       userId:this.$store.getters.userInfo.userId,

src/pages/processCenter/pages/phone/wfhxzg/step2.vue

@@ -288,6 +288,7 @@ export default {
       let json = {
         dockUserList: list,
         passInfo: this.passInfo,
+        passFlag: '0',
         commentText: this.commentInfo
       }
       let flag=false

src/pages/processCenter/pages/phone/wfhxzg/step3.vue

@@ -2,7 +2,7 @@
   <div class="phoneWfhxStep3 phoneBox">
     <ProcessHeaderPhone toggle>
       <template slot="proName">未符合项整改流程</template>
-      <template slot="proNode">确认负责人流程</template>
+      <template slot="proNode">合规排查(上传合规举证材料)</template>
     </ProcessHeaderPhone>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/xmpg/step4.vue

@@ -466,7 +466,7 @@ export default {
       if (!this.commentText) {
         this.$message.warning("请填写审批意见");
       } else {
-        this.listForm.dlFlag = "2";
+        this.listForm.passFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.$http.post("lawss/activiti/completeTask", {
@@ -487,7 +487,7 @@ export default {
     //提交事件
     handleSubmit() {
       this.isSubmit = true;
-      this.listForm.dlFlag = "1";
+      this.listForm.passFlag = "0";
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {

src/pages/processCenter/pages/phone/xmpg/step5.vue

@@ -485,7 +485,7 @@ export default {
     //提交事件
     handleSubmit() {
       this.isSubmit = true;
-      this.listForm.dlFlag = "1";
+      this.listForm.dataList = this.dataList
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {

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

@@ -419,7 +419,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '起草单位高级经理审核'){
+          }else if (row.taskInfo === '批准'){
             this.$router.push({
               name: 'bussLibrary8',
               query: {

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

@@ -389,7 +389,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (mes.taskInfo === '起草单位高级经理审核'){
+            }else if (mes.taskInfo === '批准'){
               this.$router.push({
                 name: 'bussLibrary8',
                 query: {