vue2-client 1.16.15 → 1.16.18

package/src/base-client/components/his/XCharge/XCharge.vue

@@ -32,12 +32,11 @@
       </a-button>
     </div>
 
-    <a-divider/>
+    <a-divider v-if="isMixedPaymentEnabled && selectedMethods.length > 1"/>
 
-    <!-- 支付详情（同一行展示） -->
-    <div v-if="(isMixedPaymentEnabled && selectedMethods.length > 0) || (!isMixedPaymentEnabled && selectedMethod)" class="mixed-payment-section simple">
-      <!-- 混合支付：所有金额输入在同一行展示 -->
-      <div v-if="isMixedPaymentEnabled" class="payment-operation-row">
+    <!-- 支付详情（同一行展示，仅在混合支付且选择方式>1时出现） -->
+    <div v-if="isMixedPaymentEnabled && selectedMethods.length > 1" class="mixed-payment-section simple">
+      <div class="payment-operation-row">
         <div class="payment-inline">
           <div v-for="method in selectedMethods" :key="method" class="inline-field">
             <label class="form-label">{{ getAmountLabel(method) }}</label>
@@ -51,21 +50,6 @@
           </div>
         </div>
       </div>
-      <!-- 单一支付：同一行展示一个输入 -->
-      <div v-if="!isMixedPaymentEnabled && selectedMethod" class="payment-operation-row">
-        <div class="payment-inline">
-          <div class="inline-field">
-            <label class="form-label">{{ getAmountLabel(selectedMethod) }}</label>
-            <a-input
-              v-model="paymentAmounts[selectedMethod]"
-              type="number"
-              placeholder="请输入金额"
-              class="form-input"
-              @change="updatePaymentAmount(selectedMethod, $event)"
-            />
-          </div>
-        </div>
-      </div>
     </div>
 
     <a-divider/>
@@ -163,6 +147,29 @@ export default {
     if (hasParam) this.hasInitialized = true
   },
   methods: {
+    // 同步 data 中的 selectedMethods / paymentAmounts 到本地状态；并补回缺失的 data 字段
+    hydrateFromData () {
+      const incomingMethods = Array.isArray(this.data && this.data.selectedMethods) ? this.data.selectedMethods : undefined
+      const incomingAmounts = this.data && this.data.paymentAmounts && typeof this.data.paymentAmounts === 'object' ? this.data.paymentAmounts : undefined
+
+      if (incomingMethods) {
+        this.selectedMethods = [...incomingMethods]
+        this.selectedMethod = this.selectedMethods[0] || ''
+      } else {
+        this.data.selectedMethods = [...this.selectedMethods]
+        this.data.selectedMethod = this.selectedMethod
+      }
+
+      if (incomingAmounts) {
+        // 用 $set 逐项写入，保持响应式
+        Object.keys(incomingAmounts).forEach(k => this.$set(this.paymentAmounts, k, incomingAmounts[k]))
+      } else if (!this.data.paymentAmounts) {
+        this.$set(this.data, 'paymentAmounts', { ...this.paymentAmounts })
+      }
+
+      // 根据 amounts 回算合计
+      this.calculateTotalPayment()
+    },
     selectMethod (value) {
       this.selectedMethod = value
       this.data.selectedMethod = value
@@ -170,6 +177,8 @@ export default {
       if (!this.isMixedPaymentEnabled && value) {
         if (!this.paymentAmounts[value]) this.initPaymentData(value)
       }
+      // 同步到数据模型，单一模式下也记录 selectedMethods 便于父层读取
+      this.data.selectedMethods = this.isMixedPaymentEnabled ? [...this.selectedMethods] : (value ? [value] : [])
       this.$emit(this.eventNames.method, value)
     },
     // 新增：切换支付方式选择（支持多选）
@@ -187,6 +196,7 @@ export default {
 
       // 更新选中状态
       this.selectedMethod = this.selectedMethods.length > 0 ? this.selectedMethods[0] : ''
+      this.data.selectedMethod = this.selectedMethod
       this.data.selectedMethods = [...this.selectedMethods]
 
       this.$emit(this.eventNames.methods, this.selectedMethods)
@@ -198,14 +208,18 @@ export default {
       if (index > -1) {
         this.selectedMethods.splice(index, 1)
         this.removePaymentData(methodKey)
+        // 同步所选方式到数据模型
+        this.data.selectedMethods = [...this.selectedMethods]
+        this.selectedMethod = this.selectedMethods[0] || ''
+        this.data.selectedMethod = this.selectedMethod
         this.$emit(this.eventNames.methods, this.selectedMethods)
       }
     },
-    // 新增：初始化支付数据
-    initPaymentData (methodKey) {
-      this.$set(this.paymentAmounts, methodKey, '')
+    // 新增：初始化支付数据（可传入初始金额，默认空字符串）
+    initPaymentData (methodKey, initialValue = '') {
+      this.$set(this.paymentAmounts, methodKey, initialValue)
       if (!this.data.paymentAmounts || typeof this.data.paymentAmounts !== 'object') this.$set(this.data, 'paymentAmounts', {})
-      this.$set(this.data.paymentAmounts, methodKey, '')
+      this.$set(this.data.paymentAmounts, methodKey, initialValue)
     },
     // 新增：移除支付数据
     removePaymentData (methodKey) {
@@ -217,11 +231,7 @@ export default {
       const method = this.config.paymentMethods.find(m => m.key === methodKey)
       return method ? method.label : methodKey
     },
-    // 获取金额字段展示名（配置映射 / paymentMethods.amountLabel / 默认「{方式}金额」）
-    getAmountLabel (methodKey) {
-      return (this.amountLabelMap && this.amountLabelMap[methodKey]) || `${methodKey}金额`
-    },
-    // 新增：获取支付金额字段标签（优先配置映射，其次方法自带 amountLabel，最后回退）
+    // 获取支付金额字段标签（优先配置映射，其次方法自带 amountLabel，最后回退）
     getAmountLabel (methodKey) {
       const mapped = (this.config.paymentAmountLabels && this.config.paymentAmountLabels[methodKey]) || ''
       if (mapped) return mapped
@@ -268,22 +278,44 @@ export default {
           if (res.eventNames && typeof res.eventNames === 'object') {
             this.eventNames = { ...this.eventNames, ...res.eventNames }
           }
-          this.selectedMethod = res.paymentMethods?.[0]?.key || ''
-
-          // 如果启用混合支付，初始化选中状态
-          if (this.isMixedPaymentEnabled && res.paymentMethods?.length > 0) {
-            this.selectedMethods = [res.paymentMethods[0].key]
-            this.initPaymentData(res.paymentMethods[0].key)
-          } else if (!this.isMixedPaymentEnabled && this.selectedMethod) {
-            // 单一支付初始化
-            this.initPaymentData(this.selectedMethod)
+          // 处理默认选中项（支持 paymentMethods[].default === true）
+          const methods = Array.isArray(this.config.paymentMethods) ? this.config.paymentMethods : []
+          const defaultMethods = methods.filter(m => m && m.default === true)
+
+          if (this.isMixedPaymentEnabled) {
+            // 混合支付：默认选中全部 default=true 的方式；若没有默认，则保留现有逻辑选择第一个
+            if (defaultMethods.length > 0) {
+              this.selectedMethods = defaultMethods.map(m => m.key).filter(Boolean)
+            } else if (methods.length > 0) {
+              this.selectedMethods = [methods[0].key]
+            } else {
+              this.selectedMethods = []
+            }
+            // 初始化金额为 0
+            this.selectedMethods.forEach(k => this.initPaymentData(k, 0))
+            this.selectedMethod = this.selectedMethods[0] || ''
+            // 同步到数据模型
+            this.data.selectedMethods = [...this.selectedMethods]
+          } else {
+            // 单一支付：若存在默认项，选中第一个默认；否则选中第一个
+            if (defaultMethods.length > 0) {
+              this.selectedMethod = defaultMethods[0] && defaultMethods[0].key || ''
+            } else {
+              this.selectedMethod = methods[0] && methods[0].key || ''
+            }
+            if (this.selectedMethod) this.initPaymentData(this.selectedMethod, 0)
+            // 同步到数据模型，单一模式下也记录 selectedMethods
+            this.data.selectedMethods = this.selectedMethod ? [this.selectedMethod] : []
           }
 
           // 初始化数据：仅当传入了有效 param 时才拉取数据
           const hasParam = param && Object.keys(param || {}).length > 0
           if (hasParam && res.dataSourceConfig) {
             runLogic(res.dataSourceConfig, param, 'af-his').then(resData => {
-              this.data = { ...resData }
+              // 合并数据，避免覆盖 selectedMethods / paymentAmounts 等本地状态
+              this.data = { ...this.data, ...resData }
+              // 让本地状态与 data 保持一致
+              this.hydrateFromData()
             }).catch(error => {
               console.warn('数据获取失败（保持现有数据）:', error)
             })
@@ -295,10 +327,12 @@ export default {
       this.getConfig(this.queryParamsName, param)
     },
     async init (conditionData) {
-      if(conditionData.data){
-        this.data = { ...conditionData.data }
+      if (conditionData.data) {
+        // 合并初始化数据，避免覆盖 selectedMethods / paymentAmounts 等本地状态
+        this.data = { ...this.data, ...conditionData.data }
+        this.hydrateFromData()
       }
-      if(conditionData.params){
+      if (conditionData.params) {
         await this.getConfig(this.queryParamsName, conditionData.params)
       }
       this.hasInitialized = true
@@ -342,9 +376,16 @@ export default {
       this.$emit(this.eventNames.action, actionData)
     },
     bottomFieldsChange (e, item) {
-      if (item.changeEventName && this.$listeners[item.changeEventName]) {
-        this.$emit(item.changeEventName, e, item)
-      }
+      // 统一抛出到底部字段变更事件到父级组件
+      this.$emit('bottomFieldChange', {
+        event: e,
+        item: item,
+        field: item.field,
+        value: e && e.target ? e.target.value : undefined
+      })
+
+      // 保持原有的自定义事件逻辑（向后兼容）
+      if (item.changeEventName && this.$listeners[item.changeEventName]) this.$emit(item.changeEventName, e, item)
     }
   },
   watch: {