From dcbafd2f2a81097c411b7243d603399cec20d8c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 9 Feb 2023 20:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/DepotList.vue           | 4 ++--
 jshERP-web/src/views/system/RoleList.vue            | 2 +-
 jshERP-web/src/views/system/TenantList.vue          | 2 +-
 jshERP-web/src/views/system/modules/RoleModal.vue   | 4 ++--
 jshERP-web/src/views/system/modules/TenantModal.vue | 4 ++--
 jshERP-web/src/views/system/modules/UserModal.vue   | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jshERP-web/src/views/system/DepotList.vue b/jshERP-web/src/views/system/DepotList.vue
index 9be17b3b..405239ec 100644
--- a/jshERP-web/src/views/system/DepotList.vue
+++ b/jshERP-web/src/views/system/DepotList.vue
@@ -14,8 +14,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入描述查询" v-model="queryParam.remark"></a-input>
+                <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入备注查询" v-model="queryParam.remark"></a-input>
                 </a-form-item>
               </a-col>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue
index 287a55c4..29be9f59 100644
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -138,7 +138,7 @@
             title: '价格屏蔽', align:"left", dataIndex: 'priceLimitStr', width: 100
           },
           {
-            title: '描述', align:"left", dataIndex: 'description', width: 150
+            title: '备注', align:"left", dataIndex: 'description', width: 150
           },
           { title: '排序', align:"left", dataIndex: 'sort', width: 50},
           { title: '状态',dataIndex: 'enabled',width:60,align:"center",
diff --git a/jshERP-web/src/views/system/TenantList.vue b/jshERP-web/src/views/system/TenantList.vue
index 91f5f352..df1d1e12 100644
--- a/jshERP-web/src/views/system/TenantList.vue
+++ b/jshERP-web/src/views/system/TenantList.vue
@@ -139,7 +139,7 @@
           },
           { title: '创建时间', dataIndex: 'createTimeStr', width: 100, align: "center"},
           { title: '到期时间', dataIndex: 'expireTimeStr', width: 100, align: "center"},
-          { title: '描述', dataIndex: 'remark', width: 200, align: "center", ellipsis:true}
+          { title: '备注', dataIndex: 'remark', width: 200, align: "center", ellipsis:true}
         ],
         url: {
           list: "/tenant/list",
diff --git a/jshERP-web/src/views/system/modules/RoleModal.vue b/jshERP-web/src/views/system/modules/RoleModal.vue
index f9854561..e7a23469 100644
--- a/jshERP-web/src/views/system/modules/RoleModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleModal.vue
@@ -41,8 +41,8 @@
               <a-icon type="question-circle" style="width:6%; padding-left: 5px; font-size: 18px;" />
             </a-tooltip>
           </a-form-item>
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
-            <a-textarea :rows="1" placeholder="请输入描述" v-decorator="[ 'description', validatorRules.description ]" />
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+            <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'description', validatorRules.description ]" />
           </a-form-item>
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
             <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
diff --git a/jshERP-web/src/views/system/modules/TenantModal.vue b/jshERP-web/src/views/system/modules/TenantModal.vue
index c1027d66..5c7bad6a 100644
--- a/jshERP-web/src/views/system/modules/TenantModal.vue
+++ b/jshERP-web/src/views/system/modules/TenantModal.vue
@@ -32,8 +32,8 @@
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="到期时间">
             <j-date style="width:100%" placeholder="请选择到期时间" v-decorator.trim="[ 'expireTime' ]" :show-time="true"/>
           </a-form-item>
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
-            <a-textarea :rows="2" placeholder="请输入描述" v-decorator.trim="[ 'remark' ]" />
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+            <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/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue
index b989d133..faaa880b 100644
--- a/jshERP-web/src/views/system/modules/UserModal.vue
+++ b/jshERP-web/src/views/system/modules/UserModal.vue
@@ -53,8 +53,8 @@
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
             <a-input placeholder="请输入排序" v-decorator.trim="[ 'userBlngOrgaDsplSeq' ]" />
           </a-form-item>
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
-            <a-textarea :rows="2" placeholder="请输入描述" v-decorator="[ 'description' ]" />
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+            <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'description' ]" />
           </a-form-item>
         </a-form>
       </a-spin>