From 748b72eb464f484f83f259787e139b00eeb2fc40 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 13 Apr 2023 11:11:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userManage/customerUser.vue | 45 ++++++++++++++-------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/views/userManage/customerUser.vue b/src/views/userManage/customerUser.vue
index 653d828..7f5a1de 100644
--- a/src/views/userManage/customerUser.vue
+++ b/src/views/userManage/customerUser.vue
@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="7">
       <el-form-item label="用户账号:" >
-        <el-input v-model="query.userName" style="width: 100%" placeholder="请输入用户账号"></el-input>
+        <el-input v-model="query.userName" style="width: 100%" placeholder="请输入用户账号" clearable></el-input>
       </el-form-item>
         </el-col>
         <el-col :span="7">
@@ -37,7 +37,7 @@
           <el-button type="primary" icon="search" @click="onSubmit"
             >查询</el-button
           >
-          <el-button type="primary" @click.native="handleForm(null, null)"
+          <el-button type="primary" v-if="currentCustomerId === 110" @click.native="handleForm(null, null)"
             >新增</el-button
           >
         </el-button-group>
@@ -58,7 +58,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作">
+      <el-table-column label="操作" v-if="currentCustomerId === 110">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -100,7 +100,7 @@
           <el-col :span="10" class="el-col" type="flex">
             <div class="text item">
               <el-form-item label="用户账号" prop="userName">
-                <el-input v-model="formData.userName" size="small"></el-input>
+                <el-input v-model="formData.userName" size="small" clearable></el-input>
               </el-form-item>
             </div>
           </el-col>
@@ -111,6 +111,7 @@
                   <el-input
                     v-model="formData.employeeName"
                     size="small"
+                    clearable
                   ></el-input>
                 </el-form-item>
               </div>
@@ -187,22 +188,6 @@ export default {
     currentCustomer: "",
   },
   data() {
-    let validatePass = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请输入密码"));
-      } else {
-        callback();
-      }
-    };
-    let validatePass2 = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请再次输入密码"));
-      } else if (value !== this.formData.passWord) {
-        callback(new Error("两次输入密码不一致!"));
-      } else {
-        callback();
-      }
-    };
     return {
       roles: [],
       query: {
@@ -233,7 +218,7 @@ export default {
       formData: formJson,
       formRules: {},
       addRules: {
-        userName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+        userName: [{ required: true, message: "请输入用户账号", trigger: "blur" }],
         passWord: [
           { required: true, message: "请输入密码", trigger: "blur" },
           { validator: validatePass, trigger: "blur" },
@@ -257,6 +242,23 @@ export default {
         ],
       },
       deleteLoading: false,
+      currentCustomerId: this.$store.getters.customerId
+    };
+    let validatePass = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请输入密码"));
+      } else {
+        callback();
+      }
+    };
+    let validatePass2 = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请再次输入密码"));
+      } else if (value !== this.formData.passWord) {
+        callback(new Error("两次输入密码不一致!"));
+      } else {
+        callback();
+      }
     };
   },
   methods: {
@@ -465,7 +467,6 @@ export default {
     };
   },
   created() {
-    console.log("----" + this.currentCustomer + "2---");
     this.query.customerId = this.currentCustomer;
     this.getList();
   },