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

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

@@ -263,7 +263,12 @@ export default {
         if (item.passInfo !== 0) {
           this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
           let fileData = JSON.parse(JSON.stringify(item)).dockUserList
-          this.dataList = fileData[0].standardInfoList
+          for (let i = 0; i<fileData.length; i++) {
+            if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
+              this.dataList = fileData[0].standardInfoList
+              this.standardInfoList = this.dataList
+            }
+          }
         } else {
           let fileData = JSON.parse(JSON.stringify(item)).dockUserList
           for (let i = 0; i<fileData.length; i++) {

src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue

@@ -273,7 +273,7 @@ export default {
       this.$nextTick(() => {
         if (item.responUserList !== undefined) {
           let listJSON = JSON.parse(JSON.stringify(item.responUserList))
-          this.dataList = [listJSON][0].standardInfoList
+          this.dataList = [listJSON][0]
         } else {
           if (item.dockUserList !== undefined) {
             let listJSON = JSON.parse(JSON.stringify(item.dockUserList))

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

@@ -339,9 +339,7 @@ export default {
       this.backLoading = true
       if (this.commentText) {
         var json = {
-          responUserList: {
+          responUserList: this.dataList,
-            standardInfoList: this.dataList
-          },
           actionFlag: 1,
           commentText: this.commentText
         }

src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue

@@ -92,10 +92,11 @@
               <template slot="title">选择人员</template>
             </ProcessTitle>
             <el-form-item class="add-form-item" label="入会人员:">
+              <el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
               <el-input
-                :disabled="true"
+                placeholder="请选择参会人员"
-                style="width: 30%"
+                style="width: 50%"
-                placeholder="请选择入会人员"
+                @click.native="choiceRole"
                 v-model="ch_pageData.meetingInRole"
               />
             </el-form-item>
@@ -131,6 +132,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      check-more
+      role-title="请选择入会成员"
+      :result-list="nodeList"
+      :is-show-phone.sync="modalshowflag"
+      @checkedRole="checkedRole"
+    />
   </div>
 </template>
 
@@ -164,6 +172,7 @@ export default {
       },
       ch_rules: {},
       nodeList: [],
+      modalshowflag: false,
       commentText: '',
 
       isBack: false,
@@ -201,7 +210,6 @@ export default {
       this.$nextTick(() => {
         this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
         this.uploadFileLength = this.ch_pageData.fileTextList.length
-        this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
       })
     },
@@ -270,6 +278,28 @@ export default {
         window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
       }
     },
+
+    choiceRole () {
+      this.nodeList = []
+      if ( this.ch_pageData.meetingInRoleId.length > 0) {
+        this.nodeList = this.ch_pageData.meetingInRoleId.split(',')
+      }
+      this.modalshowflag = true
+    },
+    checkedRole (data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach( item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.ch_pageData.meetingInRoleId = idList
+      this.ch_pageData.meetingInRole = nameList
+    },
   }
 }
 </script>

src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue

@@ -96,9 +96,11 @@
               <template slot="title">选择人员</template>
             </ProcessTitle>
             <el-form-item class="add-form-item" label="入会人员:">
+              <el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input>
               <el-input
-                :disabled="true"
+                placeholder="请选择入会成员"
-                style="width: 30%"
+                style="width: 50%"
+                @click.native="choiceRole"
                 v-model="rh_pageData.comityOpRole"
               />
             </el-form-item>
@@ -134,6 +136,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      check-more
+      role-title="请选择入会成员"
+      :result-list="nodeList"
+      :is-show-phone.sync="modalshowflag"
+      @checkedRole="checkedRole"
+    />
   </div>
 </template>
 
@@ -177,6 +186,7 @@ export default {
       commentText: '',
       roleShowflag: false,
       nodeList: [],
+      modalshowflag: false,
       detailData: [],
       loading: false,
 
@@ -210,7 +220,6 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
-        this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         this.infoSourcesLength = this.rh_pageData.infoSources.length
         // this.rh_pageData.comityFileNum = this.fileTextList
@@ -283,7 +292,28 @@ export default {
           });
         }
       })
-    }
+    },
+    choiceRole () {
+      this.nodeList = []
+      if ( this.rh_pageData.comityOpRoleId.length > 0) {
+        this.nodeList = this.rh_pageData.comityOpRoleId.split(',')
+      }
+      this.modalshowflag = true
+    },
+    checkedRole (data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach( item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.rh_pageData.comityOpRoleId = idList
+      this.rh_pageData.comityOpRole = nameList
+    },
   }
 }
 </script>

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

@@ -55,6 +55,10 @@
           <el-table-column prop="dutyEngineer" width="150" label="责任工程师" align="center"/>
           <el-table-column label="选择分发责任人" prop="dutyPeopleInfo" align="center">
             <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.dutyPeopleInfoId"
+                style="display: none"
+              />
               <el-input
                 @click.native="clickOpen(scope.row)"
                 v-model="scope.row.dutyPeopleInfo"
@@ -212,16 +216,21 @@ export default {
       if (this.multipleSelection.length === 0) {
         this.$message.warning("请选择至少一条数据进行分发责任人");
       } else {
-        this.nodeList = []
+        this.phoneRoleList = []
-        this.nodeList.push(id)
+        if (this.multipleSelection[0].dutyPeopleInfoId.length > 0) {
+          this.phoneRoleList = this.multipleSelection[0].dutyPeopleInfoId.split(',')
+        }
         this.modalshowflag = true
       }
     },
     // 每行选择负责人点击操作
     clickOpen(val, id) {
+      console.log()
       this.$refs.multipleTable.clearSelection()
       this.rowDutyPeople = val
-      this.phoneRoleList = this.rowDutyPeople
+      if (this.rowDutyPeople.dutyPeopleId.length > 0) {
+        this.phoneRoleList = this.rowDutyPeople.dutyPeopleId.split(',')
+      }
       this.drawerTitle = '选择分发责任人'
       this.modalshowflag = true
     },
@@ -235,8 +244,8 @@ export default {
 
     // 转办按钮
     handleTurnTo() {
+      this.phoneRoleList = []
       this.modalshowflag = true
-      this.phoneRoleList = this.roleTransfer
       this.drawerTitle = '转办处理人'
     },
     // 保存按钮
@@ -306,8 +315,6 @@ export default {
 
     drawerCheck (data) {
       if (this.drawerTitle === '转办处理人') {
-        this.roleTransfer = data
-        this.phoneRoleList = this.roleTransfer
         this.turnLoading = true
         changeAssigneeNew({
           taskId: this.taskIds, // 任务id
@@ -324,9 +331,11 @@ export default {
           }
         })
       } else {
-        this.roleDutyPeople = data
+        if (data.length > 0) {
-        this.phoneRoleList = this.roleDutyPeople
+          this.roleDutyPeople = data[0].id
-        this.roleRow = data[0]
+          this.phoneRoleList = this.roleDutyPeople.split(',')
+          this.roleRow = data[0]
+        }
         // 选取负责人时的操作
         if (this.multipleSelection.length === 0) {
           this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
@@ -344,30 +353,6 @@ export default {
       }
       this.modalshowflag = false
     },
-    //查询按钮
-    /*getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
-        this.realList = this.dataList.filter(item => {
-          let matchId = true; // 标准号 筛选
-          let matchName = true; // 项目名称 筛选
-          let matchUnit = true; // 部门 筛选
-
-          if (standId) {
-            const keysId = standId
-              .toUpperCase() // 转大写
-              .replace(' ', '') // 删掉空格
-              .split('') // 切割成 单个字
-            matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
-          }
-          if (productName) {
-            matchName = item.productName === productName;
-          }
-          if (responsibleUnit) {
-            matchUnit = item.responsibleUnit === responsibleUnit;
-          }
-          return matchId && matchName && matchUnit;
-        })
-        this.dataList = this.realList
-      },*/
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({

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

@@ -56,6 +56,10 @@
           <el-table-column label="选择责任人" prop="dutyPeople" width="200" align="center">
             <template slot-scope="scope">
               <div style="display: inline;">
+                <el-input
+                  v-model="scope.row.dutyPeopleInfoId"
+                  style="display: none"
+                />
                 <el-input
                   class="input-button"
                   style="width: 60%"
@@ -186,6 +190,13 @@ export default {
       this.$nextTick(() => {
         if (item.passInfo !== 0) {
           this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
+          let fileData = JSON.parse(JSON.stringify(item)).dockUserList
+          for (let i = 0; i<fileData.length; i++) {
+            if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
+              this.dataList = fileData[0].standardInfoList
+              this.standardInfoList = this.dataList
+            }
+          }
         } else {
           let fileData = JSON.parse(JSON.stringify(item)).dockUserList
           for (let i = 0; i<fileData.length; i++) {
@@ -201,8 +212,9 @@ export default {
     selectPeople(val) {
       this.$refs.multipleTable.clearSelection();
       this.newDataList = val
-      this.nodeList = []
+      if (this.newDataList.dutyPeopleId.length > 0) {
-      this.phoneRoleList = this.roleDutyPeople
+        this.phoneRoleList = this.newDataList.dutyPeopleId.split(',')
+      }
       this.showPage = true
       this.roleTitle = '选择人员信息'
     },
@@ -211,8 +223,11 @@ export default {
       if (this.selectTableMore.length === 0) {
         this.$message.warning("请选择至少一条数据进行分发责任人");
       } else {
-        this.nodeList = []
+        this.phoneRoleList = []
-        this.nodeList.push(id)
+        if (this.multipleSelection[0].dutyPeopleId.length > 0) {
+          this.phoneRoleList = this.multipleSelection[0].dutyPeopleId.split(',')
+        }
+        this.modalshowflag = true
         this.modalshowflag = true
       }
     },
@@ -225,7 +240,7 @@ export default {
     },
     // 转办按钮
     handleTurnTo() {
-      this.phoneRoleList = this.roleTransfer
+      this.phoneRoleList = []
       this.showPage = true
       this.roleTitle = '转办处理人'
     },
@@ -351,12 +366,10 @@ export default {
 
     phoneSumit (data) {
       if (this.roleTitle === '转办处理人') {
-        this.roleTransfer = data
-        this.phoneRoleList = this.roleTransfer
         this.turnLoading = true
         changeAssigneeNew({
           taskId: this.taskIds, // 任务id
-          assignee: this.phoneRoleList[0].id, // 被委托人
+          assignee: data[0].id, // 被委托人
           userId: this.userId, // 委托人
           pId: this.pId // 流程实例
         }).then(res =>{
@@ -371,17 +384,19 @@ export default {
           }
         })
       } else {
-        this.roleDutyPeople = data
+        if (data.length > 0) {
-        this.phoneRoleList = this.roleDutyPeople
+          this.roleDutyPeople = data[0].id
-        this.roleForm = data[0]
+          this.phoneRoleList = this.roleDutyPeople.split(',')
+          this.roleForm = data[0]
+        }
         // 选择责任人时input框内值
         if (this.selectTableMore.length ===0) {
-          this.newDataList.dutyPeople = this.roleForm.userName
+          this.newDataList.dutyPeople = this.roleForm.name
-          this.newDataList.dutyPeopleId = this.roleForm.usId
+          this.newDataList.dutyPeopleId = this.roleForm.id
         }else {
           this.selectTableMore.forEach(item => {
-            item.dutyPeople = this.roleForm.userName
+            item.dutyPeople = this.roleForm.name
-            item.dutyPeopleId = this.roleForm.usId
+            item.dutyPeopleId = this.roleForm.id
           })
         }
         this.lastDataList = this.dataList

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

@@ -90,13 +90,6 @@
       >
       </el-upload>
     </el-dialog>
-<!--    <Role-tree
-      check-box
-      :is-title="drawerTitle"
-      :is-visible.sync="modalshowflag"
-      :nodeList="nodeList"
-      @checkedRole="drawerCheck"
-    />-->
     <!-- 写有 check-more 是多人，没有就是单人 -->
     <phone-role
       :role-title="roleTitle"
@@ -247,7 +240,6 @@ export default {
     },
     // 转办选人框
     phoneSumit (data) {
-      this.phoneRoleList = data
       changeAssigneeNew({
         taskId: this.taskIds, // 任务id
         assignee: data[0].id, // 被委托人