From fbe40d8d5fa59a1861ff42483523674976ddc83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 25 Oct 2021 00:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=B4=A2=E5=8A=A1=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=93=E7=AE=97=E7=9A=84=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/financial/mixins/FinancialModalMixin.js |  8 ++++++++
 .../src/views/financial/modules/GiroModal.vue     | 15 ++++++++++++++-
 .../src/views/financial/modules/ItemInModal.vue   | 15 ++++++++++++++-
 .../src/views/financial/modules/ItemOutModal.vue  | 15 ++++++++++++++-
 .../src/views/financial/modules/MoneyInModal.vue  |  9 +++++++++
 .../src/views/financial/modules/MoneyOutModal.vue |  9 +++++++++
 6 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
index b5525903..8fc34809 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
@@ -157,12 +157,20 @@ export const FinancialModalMixin = {
       this.$refs.customerModalForm.title = "新增客户（提醒：如果找不到新添加的客户，请到用户管理检查是否分配了该客户权限）";
       this.$refs.customerModalForm.disableSubmit = false;
     },
+    addAccount() {
+      this.$refs.accountModalForm.add();
+      this.$refs.accountModalForm.title = "新增结算账户";
+      this.$refs.accountModalForm.disableSubmit = false;
+    },
     vendorModalFormOk() {
       this.initSupplier()
     },
     customerModalFormOk() {
       this.initCustomer()
     },
+    accountModalFormOk() {
+      this.initAccount()
+    },
     //单元值改变一个字符就触发一次
     onValueChange(event) {
       let that = this
diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue
index 3c72ce66..c529f67e 100644
--- a/jshERP-web/src/views/financial/modules/GiroModal.vue
+++ b/jshERP-web/src/views/financial/modules/GiroModal.vue
@@ -60,6 +60,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
               <a-select placeholder="选择付款账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <div slot="dropdownRender" slot-scope="menu">
+                  <v-nodes :vnodes="menu" />
+                  <a-divider style="margin: 4px 0;" />
+                  <div style="padding: 4px 8px; cursor: pointer;"
+                       @mousedown="e => e.preventDefault()" @click="addAccount"><a-icon type="plus" /> 新增结算账户</div>
+                </div>
                 <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -85,10 +91,12 @@
         </a-row>
       </a-form>
     </a-spin>
+    <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
+  import AccountModal from '../../system/modules/AccountModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -98,8 +106,13 @@
     name: "GiroModal",
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
+      AccountModal,
       JUpload,
-      JDate
+      JDate,
+      VNodes: {
+        functional: true,
+        render: (h, ctx) => ctx.props.vnodes,
+      }
     },
     data () {
       return {
diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue
index 70c325bd..0f53b1ef 100644
--- a/jshERP-web/src/views/financial/modules/ItemInModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue
@@ -68,6 +68,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入账户">
               <a-select placeholder="选择收入账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <div slot="dropdownRender" slot-scope="menu">
+                  <v-nodes :vnodes="menu" />
+                  <a-divider style="margin: 4px 0;" />
+                  <div style="padding: 4px 8px; cursor: pointer;"
+                       @mousedown="e => e.preventDefault()" @click="addAccount"><a-icon type="plus" /> 新增结算账户</div>
+                </div>
                 <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -93,10 +99,12 @@
         </a-row>
       </a-form>
     </a-spin>
+    <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
+  import AccountModal from '../../system/modules/AccountModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -106,8 +114,13 @@
     name: "ItemInModal",
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
+      AccountModal,
       JUpload,
-      JDate
+      JDate,
+      VNodes: {
+        functional: true,
+        render: (h, ctx) => ctx.props.vnodes,
+      }
     },
     data () {
       return {
diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
index 803e9961..cb410e8d 100644
--- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
@@ -68,6 +68,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出账户">
               <a-select placeholder="选择支出账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <div slot="dropdownRender" slot-scope="menu">
+                  <v-nodes :vnodes="menu" />
+                  <a-divider style="margin: 4px 0;" />
+                  <div style="padding: 4px 8px; cursor: pointer;"
+                       @mousedown="e => e.preventDefault()" @click="addAccount"><a-icon type="plus" /> 新增结算账户</div>
+                </div>
                 <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -93,10 +99,12 @@
         </a-row>
       </a-form>
     </a-spin>
+    <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
+  import AccountModal from '../../system/modules/AccountModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -106,8 +114,13 @@
     name: "ItemOutModal",
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
+      AccountModal,
       JUpload,
-      JDate
+      JDate,
+      VNodes: {
+        functional: true,
+        render: (h, ctx) => ctx.props.vnodes,
+      }
     },
     data () {
       return {
diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
index 5641f9fa..7913e00f 100644
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -88,6 +88,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
               <a-select placeholder="选择收款账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <div slot="dropdownRender" slot-scope="menu">
+                  <v-nodes :vnodes="menu" />
+                  <a-divider style="margin: 4px 0;" />
+                  <div style="padding: 4px 8px; cursor: pointer;"
+                       @mousedown="e => e.preventDefault()" @click="addAccount"><a-icon type="plus" /> 新增结算账户</div>
+                </div>
                 <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -121,12 +127,14 @@
     </a-spin>
     <debt-bill-list ref="debtBillList" @ok="debtBillListOk"></debt-bill-list>
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
+    <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import DebtBillList from '../dialog/DebtBillList'
   import CustomerModal from '../../system/modules/CustomerModal'
+  import AccountModal from '../../system/modules/AccountModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -138,6 +146,7 @@
     components: {
       DebtBillList,
       CustomerModal,
+      AccountModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index bce27161..8faa560b 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -88,6 +88,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
               <a-select placeholder="选择付款账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                <div slot="dropdownRender" slot-scope="menu">
+                  <v-nodes :vnodes="menu" />
+                  <a-divider style="margin: 4px 0;" />
+                  <div style="padding: 4px 8px; cursor: pointer;"
+                       @mousedown="e => e.preventDefault()" @click="addAccount"><a-icon type="plus" /> 新增结算账户</div>
+                </div>
                 <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -121,12 +127,14 @@
     </a-spin>
     <debt-bill-list ref="debtBillList" @ok="debtBillListOk"></debt-bill-list>
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
+    <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import DebtBillList from '../dialog/DebtBillList'
   import VendorModal from '../../system/modules/VendorModal'
+  import AccountModal from '../../system/modules/AccountModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -138,6 +146,7 @@
     components: {
       DebtBillList,
       VendorModal,
+      AccountModal,
       JUpload,
       JDate,
       VNodes: {