From 99422c7bd9bbd72efd1ec25b71a62097520d8e0c 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, 26 Oct 2021 00:34:56 +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=E8=B4=A2=E5=8A=A1=E4=BA=BA=E5=91=98=E7=9A=84?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=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 ++++++++
 .../views/financial/modules/AdvanceInModal.vue    | 15 ++++++++++++++-
 .../src/views/financial/modules/GiroModal.vue     |  9 +++++++++
 .../src/views/financial/modules/ItemInModal.vue   |  9 +++++++++
 .../src/views/financial/modules/ItemOutModal.vue  |  9 +++++++++
 .../src/views/financial/modules/MoneyInModal.vue  |  9 +++++++++
 .../src/views/financial/modules/MoneyOutModal.vue |  9 +++++++++
 7 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
index 8fc34809..d23ee221 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
@@ -162,6 +162,11 @@ export const FinancialModalMixin = {
       this.$refs.accountModalForm.title = "新增结算账户";
       this.$refs.accountModalForm.disableSubmit = false;
     },
+    addPerson() {
+      this.$refs.personModalForm.add();
+      this.$refs.personModalForm.title = "新增经手人";
+      this.$refs.personModalForm.disableSubmit = false;
+    },
     vendorModalFormOk() {
       this.initSupplier()
     },
@@ -171,6 +176,9 @@ export const FinancialModalMixin = {
     accountModalFormOk() {
       this.initAccount()
     },
+    personModalFormOk() {
+      this.initPerson()
+    },
     //单元值改变一个字符就触发一次
     onValueChange(event) {
       let that = this
diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
index 4a4ab01a..0575afe7 100644
--- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
+++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
@@ -29,6 +29,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
               <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                 :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="addPerson"><a-icon type="plus" /> 新增经手人</div>
+                </div>
                 <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -88,10 +94,12 @@
         </a-row>
       </a-form>
     </a-spin>
+    <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
+  import PersonModal from '../../system/modules/PersonModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -101,8 +109,13 @@
     name: "AdvanceInModal",
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
+      PersonModal,
       JUpload,
-      JDate
+      JDate,
+      VNodes: {
+        functional: true,
+        render: (h, ctx) => ctx.props.vnodes,
+      }
     },
     data () {
       return {
diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue
index c529f67e..891a24bc 100644
--- a/jshERP-web/src/views/financial/modules/GiroModal.vue
+++ b/jshERP-web/src/views/financial/modules/GiroModal.vue
@@ -19,6 +19,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
               <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                 :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="addPerson"><a-icon type="plus" /> 新增经手人</div>
+                </div>
                 <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -92,11 +98,13 @@
       </a-form>
     </a-spin>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
+    <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import AccountModal from '../../system/modules/AccountModal'
+  import PersonModal from '../../system/modules/PersonModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -107,6 +115,7 @@
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
       AccountModal,
+      PersonModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue
index 0f53b1ef..55fe9a9a 100644
--- a/jshERP-web/src/views/financial/modules/ItemInModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue
@@ -29,6 +29,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
               <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                 :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="addPerson"><a-icon type="plus" /> 新增经手人</div>
+                </div>
                 <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -100,11 +106,13 @@
       </a-form>
     </a-spin>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
+    <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import AccountModal from '../../system/modules/AccountModal'
+  import PersonModal from '../../system/modules/PersonModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -115,6 +123,7 @@
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
       AccountModal,
+      PersonModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
index cb410e8d..6a5b6690 100644
--- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
@@ -29,6 +29,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
               <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                 :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="addPerson"><a-icon type="plus" /> 新增经手人</div>
+                </div>
                 <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -100,11 +106,13 @@
       </a-form>
     </a-spin>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
+    <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import AccountModal from '../../system/modules/AccountModal'
+  import PersonModal from '../../system/modules/PersonModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -115,6 +123,7 @@
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
       AccountModal,
+      PersonModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
index 7913e00f..736a94ee 100644
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -35,6 +35,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
               <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                 :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="addPerson"><a-icon type="plus" /> 新增经手人</div>
+                </div>
                 <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -128,6 +134,7 @@
     <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>
+    <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
   </j-modal>
 </template>
 <script>
@@ -135,6 +142,7 @@
   import DebtBillList from '../dialog/DebtBillList'
   import CustomerModal from '../../system/modules/CustomerModal'
   import AccountModal from '../../system/modules/AccountModal'
+  import PersonModal from '../../system/modules/PersonModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -147,6 +155,7 @@
       DebtBillList,
       CustomerModal,
       AccountModal,
+      PersonModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index 8faa560b..39916572 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -35,6 +35,12 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
               <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                 :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="addPerson"><a-icon type="plus" /> 新增经手人</div>
+                </div>
                 <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -128,6 +134,7 @@
     <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>
+    <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
   </j-modal>
 </template>
 <script>
@@ -135,6 +142,7 @@
   import DebtBillList from '../dialog/DebtBillList'
   import VendorModal from '../../system/modules/VendorModal'
   import AccountModal from '../../system/modules/AccountModal'
+  import PersonModal from '../../system/modules/PersonModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -147,6 +155,7 @@
       DebtBillList,
       VendorModal,
       AccountModal,
+      PersonModal,
       JUpload,
       JDate,
       VNodes: {