From c25ff8f764dec425b65d312484fc1276a875000b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 9 Jul 2021 00:11:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=87=91=E9=A2=9D=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/financial/dialog/FinancialDetail.vue   |  6 +-----
 .../src/views/financial/modules/ItemInModal.vue      |  2 +-
 .../src/views/financial/modules/ItemOutModal.vue     | 12 ++++++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index 497a323a..40709784 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -69,11 +69,6 @@
                   {{model.totalPrice}}
                 </a-form-item>
               </a-col>
-              <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠金额">
-                  {{model.discountMoney}}
-                </a-form-item>
-              </a-col>
               <a-col :span="6">
                 <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额">
                   {{model.changeAmount}}
@@ -81,6 +76,7 @@
               </a-col>
               <a-col :span="6"></a-col>
               <a-col :span="6"></a-col>
+              <a-col :span="6"></a-col>
             </a-row>
           </section>
         </template>
diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue
index 1d6c3d2e..46000376 100644
--- a/jshERP-web/src/views/financial/modules/ItemInModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue
@@ -73,7 +73,7 @@
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入金额">
-              <a-input placeholder="请输入收入金额" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" />
+              <a-input placeholder="请输入收入金额" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" :readOnly="true"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
index 4d7e004a..c8309907 100644
--- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
@@ -63,8 +63,8 @@
         </a-row>
         <a-row class="form-row" :gutter="24">
           <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
-              <a-select placeholder="选择付款账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出账户">
+              <a-select placeholder="选择支出账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
                 <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -72,8 +72,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
-              <a-input placeholder="请输入付款金额" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" />
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出金额">
+              <a-input placeholder="请输入支出金额" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" :readOnly="true"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
@@ -158,12 +158,12 @@
           },
           accountId:{
             rules: [
-              { required: true, message: '请选择付款账户!' }
+              { required: true, message: '请选择支出账户!' }
             ]
           },
           changeAmount:{
             rules: [
-              { required: true, message: '请输入付款金额!' }
+              { required: true, message: '请输入支出金额!' }
             ]
           }
         },