From 72b2af86d8a739b8d91a558fdbb65b854ba46728 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 21 May 2024 23:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=8A=A8=E5=B9=B3?=
 =?UTF-8?q?=E5=9D=87=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/SystemConfigList.vue     | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/jshERP-web/src/views/system/SystemConfigList.vue b/jshERP-web/src/views/system/SystemConfigList.vue
index 4fa94f41..36abc97f 100644
--- a/jshERP-web/src/views/system/SystemConfigList.vue
+++ b/jshERP-web/src/views/system/SystemConfigList.vue
@@ -102,6 +102,20 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row class="form-row" :gutter="24">
+          <a-col :lg="12" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多账户">
+              <a-switch checked-children="启用" un-checked-children="关闭" v-model="multiAccountFlagSwitch" @change="onMultiAccountChange"></a-switch>
+              （启用后，采购订单、采购入库、采购退货、销售订单、销售出库、销售退货等单据的结算账户可以进行多账户选择）
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="移动平均价">
+              <a-switch checked-children="启用" un-checked-children="关闭" v-model="moveAvgPriceFlagSwitch" @change="onMoveAvgPriceChange"></a-switch>
+              （默认为关闭状态，代表成本价等于商品信息页面录入的采购价。开启之后将通过移动平均来计算成本价）
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row class="form-row" :gutter="24" v-if="isShowApproval">
           <a-col :lg="12" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多级审核">
@@ -117,10 +131,6 @@
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多账户">
-              <a-switch checked-children="启用" un-checked-children="关闭" v-model="multiAccountFlagSwitch" @change="onMultiAccountChange"></a-switch>
-              （启用后，采购订单、采购入库、采购退货、销售订单、销售出库、销售退货等单据的结算账户可以进行多账户选择）
-            </a-form-item>
           </a-col>
         </a-row>
       </a-form>
@@ -161,7 +171,8 @@
         multiBillTypeSelect: [], //单据类型
         originalMultiBillTypeSelect: [], //原始单据类型
         isShowApproval: false, //是否展示多级审核
-        multiAccountFlagSwitch: false, //多账户审核
+        multiAccountFlagSwitch: false, //多账户
+        moveAvgPriceFlagSwitch: false, //移动平均价
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -257,6 +268,9 @@
               if (record.multiAccountFlag != null) {
                 this.multiAccountFlagSwitch = record.multiAccountFlag == '1' ? true : false;
               }
+              if (record.moveAvgPriceFlag != null) {
+                this.moveAvgPriceFlagSwitch = record.moveAvgPriceFlag == '1' ? true : false;
+              }
             }
           } else {
             this.$message.info(res.data);
@@ -373,6 +387,10 @@
         this.model.multiAccountFlag = checked?'1':'0'
         this.handleChange()
       },
+      onMoveAvgPriceChange(checked) {
+        this.model.moveAvgPriceFlag = checked?'1':'0'
+        this.handleChange()
+      },
       //改变内容
       handleChange() {
         this.confirmLoading = true