From 0d704977a91adb83c3ff9c1769fe4b73fc54a565 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 17:29:38 +0800
Subject: [PATCH] 采购单模板下载和导入

---
 admin-web/src/views/systemManger/server/user/index.vue |   49 ++++++++++++++++++++++++-------------------------
 1 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/admin-web/src/views/systemManger/server/user/index.vue b/admin-web/src/views/systemManger/server/user/index.vue
index e777bbb..2d13d56 100644
--- a/admin-web/src/views/systemManger/server/user/index.vue
+++ b/admin-web/src/views/systemManger/server/user/index.vue
@@ -44,7 +44,6 @@
 import edit from './edit';
 import editRole from './editRole';
 import * as finsystenant from '@/api/baseSetting/finsystenant';
-import * as DateFormatter from '@/utils/DateFormatter';
 import * as user from '@/api/user';
 
 export default {
@@ -59,9 +58,8 @@
       // 鎼滅储鏉′欢
       filterFrom: {
         tenantCode: 0,
-        trnantId: 0,
         userName: null,
-        userPhone: null,
+        userCode: null,
       },
       curOrgId: null,
       // 娣诲姞&缂栬緫璁剧疆
@@ -107,18 +105,11 @@
         },
         // 鍒椾俊鎭�
         columns: [
-          { title: '浜哄憳濮撳悕', field: 'userName', align: 'left' },
-          { title: '鍛樺伐缂栧彿', field: 'userCode', align: 'left' },
-          { title: '鎵嬫満鍙�', field: 'userPhone', align: 'center', width: 150 },
-          {
-            title: '鍒涘缓鏃堕棿',
-            field: 'createTime',
-            align: 'center',
-            width: 200,
-            formatter: (row) => {
-              return { value: DateFormatter.LongToDateTime(row.createTime) };
-            },
-          },
+          { title: '缂栧彿', field: 'userCode', align: 'left' },
+          { title: '鐢ㄦ埛濮撳悕', field: 'userName', align: 'left' },
+          { title: '鐧诲綍鍚�', field: 'userPhone', align: 'center' },
+          { title: '鎵�灞炴満鏋�', field: 'tenantName', align: 'center', width: 150 },
+          { title: '閮ㄩ棬', field: 'sysDeptName', align: 'center' },
           {
             field: 'status',
             title: '鐘舵��',
@@ -154,15 +145,15 @@
           width: '250', // 鍒楀
           attr: [
             {
-              title: '瑙掕壊',
-              events: (row) => {
-                this.showEditRole(row.id);
-              },
-            },
-            {
               title: '缂栬緫',
               events: (row) => {
                 this.showAdd(row.id);
+              },
+            },
+            {
+              title: '瑙掕壊',
+              events: (row) => {
+                this.showEditRole(row.id);
               },
             },
             {
@@ -244,13 +235,21 @@
       this.$modal
         .confirm('鏄惁纭鍒濆鍖栧悕绉颁负"' + row.userName + '"鐨勫瘑鐮侊紵')
         .then(function () {
-          user.updPassWord(row).then((res) => {});
+          user.updPassWord(row).then((res) => {
+          });
         })
         .then((res) => {
-          this.$message.success('鍒濆鍖栧瘑鐮佹垚鍔燂紒');
+          this.$modal
+            .confirm('鍒濆鍖栧瘑鐮佹垚鍔燂紝鏂板瘑鐮佷负锛�123456')
+            .then((res) => {
+
+            })
+            .catch(() => {
+            });
           this.search();
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     // 鏌ヨtable鍒楄〃
     search(pageNum) {
@@ -292,7 +291,7 @@
     reset() {
       this.filterFrom.tenantCode = null;
       this.filterFrom.userName = null;
-      this.filterFrom.userPhone = null;
+      this.filterFrom.userCode = null;
       this.filterFrom.status = 1;
       this.search(1);
     },

--
Gitblit v1.9.1