Wang Zi Wen пре 2 година
родитељ
комит
d4c50a6aa4

+ 4 - 7
ruoyi-ui/src/views/branch/approve/detail/common-detail.vue

@@ -2,7 +2,7 @@
   <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="visible" :append-to-body="true" width="600px">
     <el-form ref="form" :model="taskForm" :rules="rules" label-width="80px">
       <el-form-item label="支部成员" prop="userId">
-        <el-select v-model="taskForm.userId" placeholder="请选择支部成员" disabled="true">
+        <el-select v-model="taskForm.userId" placeholder="请选择支部成员" :disabled="true">
           <el-option
             v-for="dict in userList"
             :key="dict.dictValue"
@@ -55,9 +55,6 @@ export default {
       // 用户列表
       userList: [],
       rules: {
-        userId: [
-          { required: true, message: "支部成员不能为空", trigger: "blur" }
-        ],
         oldDeptId: [
           { required: true, message: "原支部不能为空", trigger: "blur" }
         ],
@@ -88,9 +85,6 @@ export default {
   },
   methods: {
     init(id, taskId, processId, taskName, dialogType) {
-
-      this.getUserList();
-
       // 流转列表
       getHistorylist({ "processId": processId }).then(response => {
         this.historyList = response.rows;
@@ -117,8 +111,11 @@ export default {
         this.taskForm.oldDeptId = Number(response.data.oldDeptId);
         this.taskForm.newDeptId = Number(response.data.newDeptId);
         this.taskForm.userId = Number(response.data.userId);
+        console.log(typeof(this.taskForm.newDeptId))
+        console.log(typeof(this.taskForm.userId))
       });
       this.getTreeselect();
+      this.getUserList();
     },
 
     /** 查询用户列表 */

+ 17 - 0
ruoyi-ui/src/views/branch/zbjs/dymc/index.vue

@@ -297,6 +297,16 @@
     <!-- 转移申请对话框 -->
     <el-dialog :title="titleApply" :visible.sync="openApply" width="400px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="绑定用户" prop="userId">
+          <el-select v-model="form.userId" placeholder="请选择绑定用户" disabled="true">
+            <el-option
+              v-for="dict in userList"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="原支部" prop="oldDeptId">
           <treeselect v-model="form.oldDeptId" :options="deptOptions" :show-count="true" placeholder="请选择原支部" disabled="true" />
         </el-form-item>
@@ -768,3 +778,10 @@
     font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
   }
 </style>
+
+<style scoped lang="scss">
+  ::v-deep .el-input.is-disabled .el-input__inner {
+    color: #606266;
+    background-color: transparent;
+  }
+</style>