bug修改

src/views/financial-management/expenditure-management/expenditure-detail.vue

@@ -1100,7 +1100,8 @@ export default {
           customers: data.customers, // 是否是新客 0 是 1 否
           petCount: data.petCount,
           cardBalance: data.cardBalance ? data.cardBalance : '-',
-          ownerId: data.id
+          ownerId: data.id,
+          membershipCard: data.membershipCard
         }
         hospitalGetInfoById(this.rowData.medicalRecordId).then(res => {
           console.log('hospitalGetInfoById', res)
@@ -1218,7 +1219,8 @@ export default {
             customers: data.customers, // 是否是新客 0 是 1 否
             petCount: data.petCount,
             cardBalance: data.cardBalance ? data.cardBalance : '-',
-            ownerId: data.id
+            ownerId: data.id,
+            membershipCard: data.membershipCard
           }
           if (this.detailType === '0') {
             this.settlementData = this.rowData
@@ -1341,7 +1343,8 @@ export default {
           customers: data.customers, // 是否是新客 0 是 1 否
           petCount: data.petCount,
           cardBalance: data.cardBalance ? data.cardBalance : '-',
-          ownerId: data.id
+          ownerId: data.id,
+          membershipCard: data.membershipCard
         }
         this.rowData['petOwnerBo'] = temp
         this.petOwnerBo = temp

src/views/financial-management/expenditure-management/expenditure-management.vue

@@ -309,7 +309,7 @@ export default {
         confirmButtonClass: 'queryBtn',
         type: 'warning'
       }).then(() => {
-        // 设备服务费调用接口和其他的不一样 这个在api里体现
+        // 设备服务费调用接口和其他的不一样 这个在api里体现 只有医院的是这样
         expenditure({ id: row.id, tradeType: (row.tradeType === '9' && this.deptLevel === '2') }).then(res => {
           console.log('expenditure', res)
           this.$message.success('操作成功')

src/views/financial-management/payment-management/components/settlement-modle.vue

@@ -87,7 +87,7 @@
       <el-row>
         <el-col v-if="settlementForm.payType" :span="8">
           <el-form-item label="支付金额" prop="paymentAmount">
-            <el-input v-model="settlementForm.paymentAmount" :disabled="!(settlementForm.settlementType === 'single' || settlementForm.isSinglePay === true)" placeholder="请输入支付金额" @change="setDeduct">
+            <el-input v-model="settlementForm.paymentAmount" :disabled="!(settlementForm.settlementType === 'single' || settlementForm.isSinglePay === true)" placeholder="请输入支付金额" @input="handleInput" @change="setDeduct">
               <template #suffix>元</template>
             </el-input>
           </el-form-item>
@@ -183,7 +183,7 @@ export default {
       rules: {
         paymentAmount: [
           { required: true, message: '请输入支付金额', trigger: 'blur' },
-          { pattern: /^\d+$/, message: '请输入有效的数字', trigger: 'blur' }
+          { pattern: /^[0-9]+(.[0-9]{1,2})?$/, message: '请输入有效的数字', trigger: 'blur' }
         ],
         payType: [
           { required: true, message: '请选择结算方式', trigger: 'change' }
@@ -259,6 +259,11 @@ export default {
   mounted() {
   },
   methods: {
+    handleInput() {
+      if (parseFloat(this.settlementForm.paymentAmount) > 99999.99) {
+        this.settlementForm.paymentAmount = '99999.99'
+      }
+    },
     payTypeChange(data) {
       console.log(data)
       // 如果勾选了多条缴费信息则支付金额为标准价格另如果结算方式为会员卡则需要乘以会员折扣
@@ -297,7 +302,7 @@ export default {
             this.submit()
           } else {
             // 会员卡余额 判断支付金额 是否大于会员卡余额 及 会员卡状态是否启用
-            if (this.settlementForm.payType === '1' && this.settlementForm.paymentAmount > this.ownerData.cardBalance) {
+            if (this.settlementForm.payType === '1' && parseFloat(this.settlementForm.paymentAmount) > parseFloat(this.ownerData.cardBalance)) {
               this.$message.error('会员卡余额不足，请充值或更换其他结算方式')
             } else if (this.settlementForm.payType === '1' && this.ownerData.status === '1') {
               this.$message.error('会员卡状态未启用，请更换其他结算方式或联系管理员')

src/views/financial-management/payment-management/payment-detail.vue

@@ -741,7 +741,8 @@ export default {
           petCount: data.petCount,
           cardBalance: data.cardBalance ? data.cardBalance : '-',
           ownerId: data.id,
-          discount: data.discount
+          discount: data.discount,
+          membershipCard: data.membershipCard
         }
         hospitalGetInfoById(this.rowData.medicalRecordId).then(res => {
           console.log('hospitalGetInfoById', res)
@@ -874,7 +875,8 @@ export default {
             petCount: data.petCount,
             cardBalance: data.cardBalance ? data.cardBalance : '-',
             ownerId: data.id,
-            discount: data.discount
+            discount: data.discount,
+            membershipCard: data.membershipCard
           }
           if (this.detailType === '0') {
             this.settlementData = this.rowData

src/views/financial-management/payment-management/payment-management.vue

@@ -347,7 +347,8 @@ export default {
           petCount: data.petCount,
           cardBalance: data.cardBalance ? data.cardBalance : '-',
           ownerId: data.id,
-          discount: data.discount
+          discount: data.discount,
+          membershipCard: data.membershipCard
         }
         this.settlementData = row
         this.settlementData['ownerData'] = temp

src/views/financial-management/payment-management/payment-single-detail.vue

@@ -599,7 +599,8 @@ export default {
           petCount: data.petCount,
           cardBalance: data.cardBalance ? data.cardBalance : '-',
           ownerId: data.id,
-          discount: data.discount
+          discount: data.discount,
+          membershipCard: data.membershipCard
         }
         hospitalGetInfoById(rowData.medicalRecordId).then(res => {
           console.log('hospitalGetInfoById', res)
@@ -666,7 +667,8 @@ export default {
           petCount: data.petCount,
           cardBalance: data.cardBalance ? data.cardBalance : '-',
           ownerId: data.id,
-          discount: data.discount
+          discount: data.discount,
+          membershipCard: data.membershipCard
         }
         this.createSettlementData([this.singleData])
         if (this.settlementData.canPay) {

src/views/financial-management/revenue-management/revenue-detail.vue

@@ -1108,7 +1108,8 @@ export default {
           customers: data.customers, // 是否是新客 0 是 1 否
           petCount: data.petCount,
           cardBalance: data.cardBalance ? data.cardBalance : '-',
-          ownerId: data.id
+          ownerId: data.id,
+          membershipCard: data.membershipCard
         }
         hospitalGetInfoById(this.rowData.medicalRecordId).then(res => {
           console.log('hospitalGetInfoById', res)
@@ -1226,7 +1227,8 @@ export default {
             customers: data.customers, // 是否是新客 0 是 1 否
             petCount: data.petCount,
             cardBalance: data.cardBalance ? data.cardBalance : '-',
-            ownerId: data.id
+            ownerId: data.id,
+            membershipCard: data.membershipCard
           }
           if (this.detailType === '0') {
             this.settlementData = this.rowData
@@ -1350,7 +1352,8 @@ export default {
           customers: data.customers, // 是否是新客 0 是 1 否
           petCount: data.petCount,
           cardBalance: data.cardBalance ? data.cardBalance : '-',
-          ownerId: data.id
+          ownerId: data.id,
+          membershipCard: data.membershipCard
         }
         this.rowData['petOwnerBo'] = temp
       })

src/views/service-management/registration-queue/registration-add.vue

@@ -528,7 +528,8 @@ export default {
             customers: data.customers, // 是否是新客 0 是 1 否
             petCount: data.petCount,
             cardBalance: data.cardBalance ? data.cardBalance : '-',
-            ownerId: data.id
+            ownerId: data.id,
+            membershipCard: data.membershipCard
           }
           Object.assign(this.form, temp)
           this.showPetInfo = true