From 44394829462494f54672d2c188a5909c498317f1 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Tue, 25 Apr 2023 18:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E6=B2=A1=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissionApplication/launch.vue    |  5 +-
 .../monitorProcesses/monitorModal.vue         | 52 +++++++++++++++----
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index c17f415..524da9c 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -63,7 +63,6 @@
                             placeholder="请选择一级审批人员"></el-input>
                 </el-form-item>
               </el-col>
-
             </el-row>
             <el-row>
               <el-col :span="9">
@@ -340,7 +339,7 @@ export default {
                 //如果不是第一次
                 if (this.initShow) {
                   let dataJson = JSON.stringify(this.tableData)
-                  let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid})
+                  let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
                   this.completeProcess({
                     dataJson,
                     submitJson,
@@ -379,7 +378,7 @@ export default {
       form.userId = this.$store.getters.userInfo.usid
       //...this.applicationForm,...this.processForm,
       let dataJson = JSON.stringify(this.tableData)
-      let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid})
+      let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
       this.$api.process.startProcess(form).then(({data}) => {
         this.completeProcess({dataJson, submitJson, taskId: data.result, userId: form.userId, prcType: this.prcType})
       })
diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue
index dbbdf40..4eabd3b 100644
--- a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue
+++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue
@@ -3,13 +3,18 @@
     <el-dialog title="调整处理人" :visible.sync="dialogVisible" width="500px">
       <div class="label-input-form addModel">
         <el-form ref="form" :model="form" label-width="120px" :rules="rules" class="formData">
-          <el-form-item label="选择人员" prop="assignee" class="el-form-item">
-            <el-select v-model="form.assignee" class="icon-auth" collapse-tags
-                       placeholder="请选择">
-              <template v-for="item in userList">
-                <el-option :label="item.USNAME" :value="item.USID" :key="item.USID"></el-option>
-              </template>
-            </el-select>
+<!--          <el-form-item label="选择人员" prop="assignee" class="el-form-item">-->
+<!--            <el-select v-model="form.assignee" class="icon-auth" collapse-tags-->
+<!--                       placeholder="请选择">-->
+<!--              <template v-for="item in userList">-->
+<!--                <el-option :label="item.USNAME" :value="item.USID" :key="item.USID"></el-option>-->
+<!--              </template>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+          <el-form-item label="选择人员:" prop="assignee">
+            <el-input readonly :disabled="diasbleds" v-model="form.assigneeName"
+                      @click.native="handleCheck('clr')"
+                      placeholder="请选择人员"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -18,18 +23,31 @@
                 <el-button type="primary" @click="submit" class="btn">确 定</el-button>
             </span>
     </el-dialog>
+    <orgTable :visible.sync="visibleOrgTable" title="人员列表":config="{
+      value: orgTableVal,
+        valueName: orgTableValName
+     }" dialog-model  :workNumFlag="true" :maxSelected="1" @confirm="isTreeOk"></orgTable>
   </div>
 </template>
 
 <script>
+import orgTable from '@/components/OrgTable'
 export default {
   name: 'modal',
+  components:{
+    orgTable
+  },
   data() {
     return {
+      orgTableVal:'',
+      orgTableValName:'',
+      diasbleds:false,
+      visibleOrgTable: false,
       userList: [],
       dialogVisible: false,
       form: {
-        assignee: ''
+        assignee: '',
+        assigneeName: ''
       },
       rules: {
         assignee: [
@@ -49,6 +67,22 @@ export default {
     this.sysUserList()
   },
   methods: {
+    isTreeOk(checkedList){
+      const parts = []
+      const partsName = []
+      console.log(checkedList, '0009999')
+      checkedList.map((item, index) => {
+        parts.push(item.userId || item.USID)
+        partsName.push(item.uname)
+      })
+      this.form.assignee= parts.toString()
+      this.form.assigneeName = partsName.toString()
+    },
+    handleCheck(name) {
+      this.orgTableValName = this.form.assigneeName
+      this.orgTableVal = this.form.assignee
+      this.visibleOrgTable = true
+    },
     changeSelect(val) {
       this.checked = (val.length || this.reportF.reportUserIdList.length) === this.userList.length;
       // this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
@@ -74,7 +108,7 @@ export default {
           let userId = this.form.assignee
           let assignee = this.assigneeId
           if (userId == assignee) {
-            this.$message.warning("当前任务受理人就是您选择的")
+            this.$message.warning("当前任务受理人就是您选择的人员")
           } else {
             this.$api.process.changeAssignee({
               taskId: this.taskId.join(','),