From b60cbd3a267d1f3b27f8ac9ff590b314df5a823d Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Mon, 6 May 2024 00:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E8=B4=A6=E6=88=B7=E7=9A=84=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E5=BC=80=E5=85=B3=EF=BC=8C=E5=92=8C=E5=9C=A8=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=8D=95=E6=8D=AE=E7=95=8C=E9=9D=A2=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/mixins/BillModalMixin.js    | 17 ++++++++++++-----
 .../src/views/system/SystemConfigList.vue      | 18 +++++++++++++++---
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 1a33fa7e..1741df04 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -236,11 +236,18 @@ export const BillModalMixin = {
         if(res && res.code === 200) {
           let list = res.data.accountList
           let lastId = list.length>0?list[0].id:''
-          list.splice(0,0,{id: 0, name: '多账户'})
-          that.accountList = list
-          if(isChecked) {
-            that.form.setFieldsValue({'accountId': lastId})
-          }
+          getCurrentSystemConfig().then((res) => {
+            if (res.code === 200 && res.data) {
+              let multiAccountFlag = res.data.multiAccountFlag
+              if(multiAccountFlag==='1') {
+                list.splice(0,0,{id: 0, name: '多账户'})
+              }
+            }
+            that.accountList = list
+            if(isChecked) {
+              that.form.setFieldsValue({'accountId': lastId})
+            }
+          })
         }
       })
     },
diff --git a/jshERP-web/src/views/system/SystemConfigList.vue b/jshERP-web/src/views/system/SystemConfigList.vue
index f03afd74..4fa94f41 100644
--- a/jshERP-web/src/views/system/SystemConfigList.vue
+++ b/jshERP-web/src/views/system/SystemConfigList.vue
@@ -116,7 +116,12 @@
               <br/>（启用后，多级审核需配置流程，开启后需刷新浏览器才能看到效果）<a-button type="link" @click="handleReload">点此刷新</a-button>
             </a-form-item>
           </a-col>
-          <a-col :lg="12" :md="12" :sm="24"></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>
     </a-spin>
@@ -155,8 +160,8 @@
         originalMultiLevelApprovalFlag: '0', //原始多级审核状态
         multiBillTypeSelect: [], //单据类型
         originalMultiBillTypeSelect: [], //原始单据类型
-        isReadOnly: false,
-        isShowApproval: false,
+        isShowApproval: false, //是否展示多级审核
+        multiAccountFlagSwitch: false, //多账户审核
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -249,6 +254,9 @@
                 this.multiBillTypeSelect = record.multiBillType.split(',')
                 this.originalMultiBillTypeSelect = record.multiBillType
               }
+              if (record.multiAccountFlag != null) {
+                this.multiAccountFlagSwitch = record.multiAccountFlag == '1' ? true : false;
+              }
             }
           } else {
             this.$message.info(res.data);
@@ -361,6 +369,10 @@
         this.model.multiBillType = this.multiBillTypeSelect.join(",")
         this.handleChange()
       },
+      onMultiAccountChange(checked) {
+        this.model.multiAccountFlag = checked?'1':'0'
+        this.handleChange()
+      },
       //改变内容
       handleChange() {
         this.confirmLoading = true