From 7039f82c43d5367c21a715ed7e51cca75c14cf1a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 16:11:39 +0800
Subject: [PATCH] 8-26人员管理对接角色权限结束

---
 src/views/laboratory/personnel/index.vue |   56 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/views/laboratory/personnel/index.vue b/src/views/laboratory/personnel/index.vue
index a4849d5..4259f2f 100644
--- a/src/views/laboratory/personnel/index.vue
+++ b/src/views/laboratory/personnel/index.vue
@@ -36,31 +36,31 @@
               :label-width="formLabelWidth"
               prop="account"
             >
-              <el-input v-model="form.account" autocomplete="off" />
+              <el-input v-model="form.account" />
             </el-form-item>
             <el-form-item label="骞撮緞" :label-width="formLabelWidth">
-              <el-input v-model="form.age" autocomplete="off" />
+              <el-input v-model="form.age" />
             </el-form-item>
             <el-form-item
               label="閭"
               :label-width="formLabelWidth"
               prop="email"
             >
-              <el-input v-model="form.email" autocomplete="off" />
+              <el-input v-model="form.email" />
             </el-form-item>
             <el-form-item
               label="鍚嶅瓧"
               :label-width="formLabelWidth"
               prop="name"
             >
-              <el-input v-model="form.name" autocomplete="off" />
+              <el-input v-model="form.name" />
             </el-form-item>
             <el-form-item
               label="鐢佃瘽"
               :label-width="formLabelWidth"
               prop="phone"
             >
-              <el-input v-model="form.phone" autocomplete="off" />
+              <el-input v-model="form.phone" />
             </el-form-item>
 
             <el-form-item
@@ -83,7 +83,20 @@
               :label-width="formLabelWidth"
               prop="roleId"
             >
-              <el-input v-model="form.roleId" autocomplete="off" />
+              <el-select
+                v-model="form.roleId"
+                clearable
+                style="100%"
+                placeholder="璇烽�夋嫨鏉冮檺"
+              >
+                <el-option
+                  v-for="item in roleList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -118,7 +131,9 @@
           <el-table-column prop="age" label="骞撮緞" min-width="150">
             <template scope="scope">
               {{
-                scope.row.age === "" || scope.row.age === undefined
+                scope.row.age === "" ||
+                scope.row.age === null ||
+                scope.row.age == undefined
                   ? "---"
                   : scope.row.age
               }}
@@ -128,12 +143,20 @@
           <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="180" />
           <el-table-column prop="phone" label="鐢佃瘽" min-width="200">
             <template scope="scope">
-              {{ scope.row.phone === "" ? "---" : scope.row.phone }}
+              {{
+                scope.row.phone === "" || scope.row.phone === undefined
+                  ? "---"
+                  : scope.row.phone
+              }}
             </template>
           </el-table-column>
           <el-table-column prop="email" label="閭" min-width="200">
             <template scope="scope">
-              {{ scope.row.email === "" ? "---" : scope.row.email }}
+              {{
+                scope.row.email === "" || scope.row.email === undefined
+                  ? "---"
+                  : scope.row.email
+              }}
             </template>
           </el-table-column>
           <el-table-column
@@ -192,6 +215,7 @@
   data() {
     return {
       keyword: "",
+      roleList: "",
       personnerlTable: [],
       filteredpersonnerlTable: [],
       currentindex: 1,
@@ -233,9 +257,9 @@
         phone: [
           // { required: true, message: '璇疯緭鍏�11浣嶇數璇濆彿鐮�', trigger: 'blur' },
           {
-            pattern: /^1[345789]\d{9}$/,
+            pattern: /^1[3456789]\d{9}$/,
             message: "闈炴硶鎵嬫満鍙风爜",
-            trigger: "blur",
+            trigger: ["blur", "change"],
           },
         ],
         email: [
@@ -384,6 +408,7 @@
         this.options,
         row.departmentId
       );
+      this.form.roleId = row.roleName;
       this.form.age = row.age;
       this.form.account = row.account;
     },
@@ -393,13 +418,22 @@
         this.clearCascaderBlank(this.options);
       });
     },
+    getRoleList() {
+      get("/user/list").then((res) => {
+        console.log(`output->res`, res);
+        this.roleList = res.data;
+      });
+    },
   },
   watch: {
     dialogFormVisible: {
       handler(newVal, oldVal) {
         if (newVal == false) {
+          this.isUpdate = false;
           this.form = {};
           this.$refs.form.resetFields();
+        } else {
+          this.getRoleList();
         }
       },
     },

--
Gitblit v1.9.3