From f98406ab045383e1d56680d528e9b36b6f824b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 17 Oct 2023 23:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=BD=93=E5=89=8D=E4=BD=99=E9=A2=9D=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/AccountList.vue          | 3 +--
 jshERP-web/src/views/system/modules/AccountModal.vue | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/jshERP-web/src/views/system/AccountList.vue b/jshERP-web/src/views/system/AccountList.vue
index 6c2deade..cf3c472e 100644
--- a/jshERP-web/src/views/system/AccountList.vue
+++ b/jshERP-web/src/views/system/AccountList.vue
@@ -128,8 +128,7 @@
           { title: '名称', dataIndex: 'name', width: 100, align: "left"},
           { title: '编号', dataIndex: 'serialNo', width: 150, align: "left"},
           { title: '期初金额', dataIndex: 'initialAmount', width: 100, align: "left"},
-          { title: '当前余额', dataIndex: 'currentAmount', width: 100, align: "left"},
-          { title: '备注', dataIndex: 'remark', width: 100, align: "left"},
+          { title: '备注', dataIndex: 'remark', width: 200, align: "left"},
           { title: '排序', dataIndex: 'sort', width: 60, align: "left"},
           { title: '状态',dataIndex: 'enabled',width:60,align:"center",
             scopedSlots: { customRender: 'customRenderEnabledFlag' }
diff --git a/jshERP-web/src/views/system/modules/AccountModal.vue b/jshERP-web/src/views/system/modules/AccountModal.vue
index fbc10605..a9f1472a 100644
--- a/jshERP-web/src/views/system/modules/AccountModal.vue
+++ b/jshERP-web/src/views/system/modules/AccountModal.vue
@@ -13,7 +13,7 @@
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      style="top:15%;height: 65%;">
+      style="top:15%;height: 55%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -30,9 +30,6 @@
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初金额">
             <a-input placeholder="请输入期初金额" v-decorator.trim="[ 'initialAmount' ]" />
           </a-form-item>
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="当前余额">
-            <a-input placeholder="请输入当前余额" :read-only="true" v-decorator.trim="[ 'currentAmount' ]" />
-          </a-form-item>
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
             <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
           </a-form-item>
@@ -90,7 +87,7 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'name', 'serialNo', 'initialAmount', 'currentAmount', 'sort', 'remark'))
+          this.form.setFieldsValue(pick(this.model,'name', 'serialNo', 'initialAmount', 'sort', 'remark'))
           autoJumpNextInput('accountModal')
         });
       },