From 34e9605033b51eed37a3c7e1df4e4a2f394c9ab0 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期二, 13 九月 2022 10:42:16 +0800
Subject: [PATCH] 问题修改

---
 src/views/system/user/index.vue |   53 +++++++++++++++++++++++++++++------------------------
 1 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ae03d32..0301f3a 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -64,18 +64,18 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="鍒涘缓鏃堕棿">
-            <el-date-picker
-              v-model="dateRange"
-              size="small"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="寮�濮嬫棩鏈�"
-              end-placeholder="缁撴潫鏃ユ湡"
-            ></el-date-picker>
-          </el-form-item>
+          <!--<el-form-item label="鍒涘缓鏃堕棿">-->
+            <!--<el-date-picker-->
+              <!--v-model="dateRange"-->
+              <!--size="small"-->
+              <!--style="width: 240px"-->
+              <!--value-format="yyyy-MM-dd"-->
+              <!--type="daterange"-->
+              <!--range-separator="-"-->
+              <!--start-placeholder="寮�濮嬫棩鏈�"-->
+              <!--end-placeholder="缁撴潫鏃ユ湡"-->
+            <!--&gt;</el-date-picker>-->
+          <!--</el-form-item>-->
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -141,9 +141,9 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="閮ㄩ棬" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="鐢ㄦ埛璐︽埛" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="鎵�鍦ㄩ儴闂�" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
           <el-table-column label="鐘舵��" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
@@ -164,6 +164,7 @@
             label="鎿嶄綔"
             align="center"
             width="160"
+            fixed="right"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
@@ -178,6 +179,7 @@
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
+                class="del-btn"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
               >鍒犻櫎</el-button>
@@ -207,12 +209,12 @@
     </el-row>
 
     <!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <Dialog :title="title" :visible.sync="open" width="600px" :append-to-body="true" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="璐﹀彿" prop="userName">
-              <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
+            <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛璐︽埛" prop="userName">
+              <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴疯处鎴�" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -306,7 +308,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="澶囨敞">
-              <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+              <el-input v-model="form.remark" type="textarea" maxlength="128" :rows="4" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -315,7 +317,7 @@
             <el-form-item label="鍏ヨ亴鏃堕棿">
               <el-date-picker
                 v-model="form.entryTime"
-                type="datetime"
+                type="date"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨鍏ヨ亴鏃堕棿">
               </el-date-picker>
@@ -332,10 +334,10 @@
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
         <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
-    </el-dialog>
+    </Dialog>
 
     <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <Dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -362,7 +364,7 @@
         <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
         <el-button @click="upload.open = false">鍙� 娑�</el-button>
       </div>
-    </el-dialog>
+    </Dialog>
   </div>
 </template>
 
@@ -498,6 +500,9 @@
         ],
         deptId: [
           { required: true, message: "鎵�鍦ㄩ儴闂ㄤ笉鑳戒负绌�", trigger: "blur" }
+        ],
+        remarks: [
+          {max: 128, message: '鏈�澶氳緭鍏�128涓瓧绗�', trigger: 'blur' }
         ]
       }
     };
@@ -676,7 +681,7 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() {
         return delUser(userIds);
       }).then(() => {
         this.getList();

--
Gitblit v1.9.1