commit

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html

@@ -839,12 +839,30 @@ layout("/layouts/platform.html"){
             },
             selectQueryUserForPayer(keyword, options) {
                 options.length = 0
-                this.$axios.post("/platform/unionReimburse/apply/listUser", {keyword: keyword}).then((res) => {
+                if (this.formData.reimburseFundSource === "UNION_REIMBURSE_FUND_SOURCE_3" && !this.formData.clubId) {
+                    this.$message.warning("请先选择协会")
+                    return
+                }
+                this.$axios.post("/platform/unionReimburse/apply/listPayerUser", {
+                    keyword: keyword,
+                    reimburseFundSource: this.formData.reimburseFundSource,
+                    clubId: this.formData.clubId
+                }).then((res) => {
                     if (res.code === 0) {
                         options.push(...res.data)
                     }
                 })
             },
+            resetPayerInfo() {
+                this.$set(this.formData, "payer", null)
+                this.$set(this.formData, "payerName", null)
+                this.$set(this.formData, "payerLoginname", null)
+                this.$set(this.formData, "bankUserName", null)
+                this.$set(this.formData, "bankCardNumber", null)
+                this.$set(this.formData, "bankOfDeposit", null)
+                this.$set(this, "historyData", [])
+                this.$set(this, "payerOptions", [])
+            },
             appendCurrentPayerOption() {
                 if (!this.formData.payer) {
                     return
@@ -929,7 +947,12 @@ layout("/layouts/platform.html"){
                 if (this.formData.payer) {
                     await this.getUserBankHistory();
                 } else {
-                    this.historyData = []
+                    this.$set(this, "historyData", [])
+                    this.$set(this.formData, "payerName", null)
+                    this.$set(this.formData, "payerLoginname", null)
+                    this.$set(this.formData, "bankUserName", null)
+                    this.$set(this.formData, "bankCardNumber", null)
+                    this.$set(this.formData, "bankOfDeposit", null)
                 }
                 const user = this.payerOptions.find(o => o.id === this.formData.payer)
                 if (user) {
@@ -1355,6 +1378,7 @@ layout("/layouts/platform.html"){
                     this.$set(this.formData, "clubId", this.clubOptions[0].id)
                     this.$set(this.formData, "clubName", this.clubOptions[0].clubName)
                 }
+                this.resetPayerInfo()
                 this.reimburseFundSourceChange()
             },
             clubChange() {
@@ -1363,11 +1387,13 @@ layout("/layouts/platform.html"){
                     if (selectedClub) {
                         this.$set(this.formData, "clubName", selectedClub.clubName)
                     }
+                    this.resetPayerInfo()
                     this.reimburseFundSourceChange()
                     return
                 }
                 this.$set(this.formData, "clubName", null)
                 this.$set(this.formData, "fundBalance", null)
+                this.resetPayerInfo()
                 this.fundBalanceText = "请选择协会"
             },
             // 经费来源查询

src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html

@@ -456,15 +456,15 @@ layout("/layouts/platform_h5.html"){
                         <van-field
                             v-model="formData.deathTime"
                             name="deathTime"
-                            label="去逝时间"
+                            label="去世时间"
                             readonly
-                            placeholder="请选择去逝时间"
+                            placeholder="请选择去世时间"
                             @click="openDatePicker('showDeathTimePicker')"
                             clickable
                             is-link
                         ></van-field>
                         <van-popup position="bottom" round v-model:show="showDeathTimePicker">
-                            <van-datetime-picker type="date" title="选择去逝时间" :min-date="minDate" :max-date="maxDate"
+                            <van-datetime-picker type="date" title="选择去世时间" :min-date="minDate" :max-date="maxDate"
                                                  @cancel="closePopup('showDeathTimePicker')"
                                                  @confirm="onDateConfirm('deathTime', 'showDeathTimePicker', $event)"></van-datetime-picker>
                         </van-popup>
@@ -1423,9 +1423,6 @@ layout("/layouts/platform_h5.html"){
                 this.normalizeContactFields()
                 this.normalizeCondolenceDateFields()
                 this.rebuildInvoiceSummary()
-                if (!this.validateInvoiceDetailsBeforeSubmit()) {
-                    return
-                }
                 this.$axios.post("/platform/unionReimburse/apply/save", { data: JSON.stringify(this.formData) })
                     .then((res) => {
                         this.$toast.clear()