From 478da405fe0eb33cf4057404bb22a1dd9224f3ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 9 Oct 2021 21:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=93=E5=BA=93=E3=80=81?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E3=80=81=E7=94=A8=E6=88=B7=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/modules/DepotModal.vue   |  2 +-
 .../src/views/system/modules/RoleModal.vue    |  2 +-
 .../src/views/system/modules/UserModal.vue    | 19 +++++++++----------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/jshERP-web/src/views/system/modules/DepotModal.vue b/jshERP-web/src/views/system/modules/DepotModal.vue
index 0ce8d69d..8a8fdaba 100644
--- a/jshERP-web/src/views/system/modules/DepotModal.vue
+++ b/jshERP-web/src/views/system/modules/DepotModal.vue
@@ -39,7 +39,7 @@
           <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
-          <a-input placeholder="请输入备注" v-decorator.trim="[ 'remark' ]" />
+          <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'remark' ]" />
         </a-form-item>
       </a-form>
     </a-spin>
diff --git a/jshERP-web/src/views/system/modules/RoleModal.vue b/jshERP-web/src/views/system/modules/RoleModal.vue
index f02c8be9..cd4c8e6d 100644
--- a/jshERP-web/src/views/system/modules/RoleModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleModal.vue
@@ -27,7 +27,7 @@
           </a-select>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
-          <a-textarea :rows="5" placeholder="请输入描述" v-decorator="[ 'description', validatorRules.description ]" />
+          <a-textarea :rows="2" placeholder="请输入描述" v-decorator="[ 'description', validatorRules.description ]" />
         </a-form-item>
       </a-form>
     </a-spin>
diff --git a/jshERP-web/src/views/system/modules/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue
index a05a6e51..679b8b91 100644
--- a/jshERP-web/src/views/system/modules/UserModal.vue
+++ b/jshERP-web/src/views/system/modules/UserModal.vue
@@ -49,7 +49,7 @@
           <a-input placeholder="请输入排序" v-decorator.trim="[ 'userBlngOrgaDsplSeq' ]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
-          <a-textarea :rows="1" placeholder="请输入描述" v-decorator="[ 'description' ]" />
+          <a-textarea :rows="2" placeholder="请输入描述" v-decorator="[ 'description' ]" />
         </a-form-item>
       </a-form>
     </a-spin>
@@ -116,8 +116,6 @@
       }
     },
     created () {
-      this.loadOrgaData()
-      this.loadRoleData()
       const token = Vue.ls.get(ACCESS_TOKEN);
       this.headers = {"X-Access-Token":token}
     },
@@ -126,13 +124,14 @@
         this.edit({});
       },
       edit (record) {
-        let that = this;
-        that.form.resetFields();
-        that.userId = record.id;
-        that.visible = true;
-        that.model = Object.assign({}, record);
-        that.$nextTick(() => {
-          that.form.setFieldsValue(pick(this.model,'loginName','username','roleId','orgaId','position',
+        this.loadOrgaData()
+        this.loadRoleData()
+        this.form.resetFields();
+        this.userId = record.id;
+        this.visible = true;
+        this.model = Object.assign({}, record);
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'loginName','username','roleId','orgaId','position',
             'phonenum','email','userBlngOrgaDsplSeq','description'))
         });
       },