Merge branch 'master-charge' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front into master-charge

package.json

@@ -57,7 +57,8 @@
     "vue-qr": "^4.0.9",
     "vue-router": "4.4.5",
     "vue-types": "5.1.3",
-    "vxe-table": "4.6.17"
+    "vxe-table": "4.6.17",
+    "esbuild": "0.25.10"
   },
   "devDependencies": {
     "@eslint/js": "9.15.0",

src/views/training/models/meeting-detail-attend.vue

@@ -118,7 +118,7 @@
                 </el-form-item>
                 <el-form-item label="支付方式：" prop="payType">
                     <el-select v-model="queryParams.payType" placeholder="请选择支付方式" clearable style="width: 180px">
-                        <el-option v-for="item in [{value:'1',label:'微信支付'},{value:'2',label:'对公转账'}]" :key="item.value" :label="item.label" :value="item.value" />
+                        <el-option v-for="item in [{value:'1',label:'微信支付'},{value:'2',label:'对公转账/现场支付'},{value:'3',label:'对公转账'},{value:'4',label:'现场支付'}]" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="是否需要开票：" prop="hasInvoice">
@@ -167,9 +167,9 @@
             <vxe-column title="支付方式" field="payType" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'">
                 <template #default="{ row }">
                     <div v-if="row.payType === '1' && +row?.joinFee" class="f-w-5">微信支付</div>
-                    <div v-if="row.payType === '2' && +row?.joinFee" class="f-w-5">对公转账</div>
-                    <div v-if="row.payType === '3' && +row?.joinFee" class="f-w-5">对公转账收款</div>
-                    <div v-if="row.payType === '4' && +row?.joinFee" class="f-w-5">现场收款</div>
+                    <div v-if="row.payType === '2' && +row?.joinFee" class="f-w-5">对公转账/现场支付</div>
+                    <div v-if="row.payType === '3' && +row?.joinFee" class="f-w-5">对公转账</div>
+                    <div v-if="row.payType === '4' && +row?.joinFee" class="f-w-5">现场支付</div>
                     <div v-if="(row?.payType !=='1'&& row?.payType !=='2' && row?.payType !=='3' && row?.payType !=='4') || !+row?.joinFee">-</div>
                 </template>
             </vxe-column>