新增会议缴费

src/views/training/meeting-add/index.vue

@@ -137,17 +137,17 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="6">
-                                <div class="d-flex" style="align-items: flex-end;">
+                                <div class="d-flex flex-cln j-st" style="">
                                     <el-form-item label="发放积分" prop="pointsFlag" class="">
                                         <el-radio-group v-model="form.pointsFlag" style="flex-wrap: nowrap">
                                             <el-radio label="1">是</el-radio>
                                             <el-radio label="0">否</el-radio>
                                         </el-radio-group>
                                     </el-form-item>
-                                    <el-form-item label="" prop="points" v-if="form.pointsFlag == '1'" class="flex1 pl-10">
-                                        <div class="d-flex f-s-14">
+                                    <el-form-item label="" prop="points" v-if="form.pointsFlag == '1'" class="flex1">
+                                        <div class="d-flex f-s-14" style="white-space: nowrap;">
                                             <div>每成功参会（签到成功）1人发放</div>
-                                            <el-input v-model="form.points" style="width: 60px" />
+                                            <el-input v-model="form.points" style="width: 45px" />
                                             <div>个单位积分。</div>
                                         </div>
                                     </el-form-item>
@@ -165,7 +165,7 @@
                                 <el-form-item prop="meetingCharge.pricing" v-if="form.meetingCharge.hasFee == '1'">
                                     <div class="d-flex">
                                         <div class="c-#606266 f-w-6" style="">收费标准：</div>
-                                        <el-input class="flex1 pl-5" v-model.number="form.meetingCharge.pricing" maxlength="20" placeholder="请输入收费标准" clearable style="max-width: 200px;" />
+                                        <el-input class="flex1 pl-5" v-model="form.meetingCharge.pricing" maxlength="20" placeholder="请输入收费标准" clearable style="max-width: 200px;" />
                                         <div class="pl-10">元/人</div>
                                     </div>
                                 </el-form-item>
@@ -173,7 +173,10 @@
                                     <div>
                                         <el-radio-group v-model="form.meetingCharge.hasFlatFee" style="display: flex;flex-direction: column;align-items: flex-start;">
                                             <el-radio label="0">所有人统一收取标准费用</el-radio>
-                                            <el-radio label="1">按报名人员类型收取，不同人员收取不同费用<span class="c-999">(不作设置默认统一收取标准费用。)</span></el-radio>
+                                            <el-radio label="1">
+                                                按报名人员类型收取，不同人员收取不同费用
+                                                <span class="c-999">(不作设置默认统一收取标准费用。)</span>
+                                            </el-radio>
                                         </el-radio-group>
                                     </div>
                                 </el-form-item>
@@ -185,13 +188,12 @@
                                                 <el-select v-model="item.certType" placeholder="" clearable style="width: 100px">
                                                     <el-option v-for="item in hasPartialFree" :key="item.value" :label="item.label" :value="item.value" />
                                                 </el-select>
-                                                <div class="pl-10 f-s-14">免费</div>
                                                 <div v-if="+item?.certType" class="d-flex a-c">
                                                     <div v-if="item.vipLevel != 'P'" class="pl-10 f-s-14" style="white-space: nowrap;">每个单位免费</div>
                                                     <div v-else class="pl-10 f-s-14" style="white-space: nowrap;">免费</div>
-                                                    <el-input class="pl-10" v-model="item.total" maxlength="20" placeholder="请输入免费人数" style="width: 150px" :disabled="!+item.check"/>
+                                                    <el-input class="pl-10" v-model="item.total" maxlength="20" placeholder="请输入免费人数" style="width: 130px" :disabled="!+item.check" />
                                                     <div class="f-s-14" style="white-space: nowrap;">人,其余每人收费</div>
-                                                    <el-input class="pl-10" v-model="item.cost" maxlength="20" placeholder="请输入费用" style="width: 150px" :disabled="!+item.check"/>
+                                                    <el-input class="pl-10" v-model="item.cost" maxlength="20" placeholder="请输入费用" style="width: 130px" :disabled="!+item.check" />
                                                     <div f-s-14>元</div>
                                                 </div>
                                             </div>
@@ -364,10 +366,10 @@ const fixedField = ref<FieldDefinition[]>([{
     required: '1'
 }])
 const hasPartialFree = ref([{
-    label: '全部',
+    label: '全部免费',
     value: '0'
 }, {
-    label: '部分',
+    label: '部分免费',
     value: '1'
 }])
 const scrollOptions = {
@@ -563,10 +565,7 @@ const rules = reactive({
         }
     ],
     'meetingCharge.hasFee': [{ required: true, message: '请选择是否收取参会费用', trigger: 'change' }],
-    'meetingCharge.pricing': [{ required: true, message: '请输入收费标准', trigger: 'blur' }, {
-        type: 'number',  // 正确的配置方式：作为单独的验证规则
-        message: '收费标准必须为数字'
-    }],
+    'meetingCharge.pricing': [{ required: true, message: '请输入收费标准', trigger: 'blur' }],
     'meetingCharge.hasFlatFee': [{ required: true, message: '请选择收费标准', trigger: 'change' }],
     certFlag: [{ required: true, message: '请选择是否颁发证书', trigger: 'change' }],
     certificateInfo: [{ required: true, message: '请选择证书名称', trigger: 'change' }],

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

@@ -113,7 +113,7 @@
                     <div v-if="row.payType === '2'">对公转账</div>
                 </template>
             </vxe-column>
-            <vxe-column title="支付状态" field="remark" min-width="100" :formatter="colNoData">
+            <vxe-column title="支付状态" field="outTradeNo" min-width="100" :formatter="colNoData">
                 <template #default="{ row }">
                     {{ selectDictLabel(dm_pay_status, row?.payStatus)}}
                     <el-tooltip :content="`系统单号${row?.outTradeNo}`" placement="top" effect="light">
@@ -121,7 +121,11 @@
                     </el-tooltip>
                 </template>
             </vxe-column>
-            <vxe-column title="开票信息" field="remark" min-width="100" :formatter="colNoData" ></vxe-column>
+            <vxe-column title="开票信息" field="remark" min-width="100" :formatter="colNoData">
+                <template #default="{ row }">
+                    <div v-if="row.payStatus == '1'" @click="checkInvoiceData(row.invoiceInfo)">查看</div>
+                </template>
+            </vxe-column>
             <vxe-column title="特殊说明" min-width="100" fixed="right">
                 <template #default="{ row }">
                     {{ +row?.tempJoin?'通过临时报名通道报名':'-' }}
@@ -194,30 +198,30 @@
             </div>
         </template>
     </el-dialog>
-    <el-dialog v-model="invoicingInformation" title="开票信息" width="360" center>
+    <el-dialog v-model="invoicingInformation" title="开票信息" width="600" center>
         <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
             <div>名称:</div>
-            <div>123</div>
+            <div>{{ invoiceData?.headTitle || '-' }}</div>
         </div>
         <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
             <div>税号:</div>
-            <div>123131312321313123123</div>
+            <div>{{ invoiceData?.taxSn || '-'}}</div>
         </div>
         <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
             <div>单位地址:</div>
-            <div>萨达</div>
+            <div>{{ invoiceData?.address || '-'}}</div>
         </div>
         <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
             <div>电话号码:</div>
-            <div>17754441247</div>
+            <div>{{ invoiceData?.contactPhone || '-'}}</div>
         </div>
         <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
             <div>开户银行:</div>
-            <div>工行</div>
+            <div>{{ invoiceData?.bankName || '-'}}</div>
         </div>
         <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
             <div>银行账户:</div>
-            <div>123131312321313123123</div>
+            <div>{{ invoiceData?.bankAccount || '-'}}</div>
         </div>
     </el-dialog>
     <registrationInfo v-if="showTemporary" v-model:show="showTemporary" :info="temporaryRegistration"></registrationInfo>
@@ -259,10 +263,15 @@ const showTransfer = ref(false)
 const participationFee = ref()
 const editPricedata = ref()
 const invoicingInformation = ref(false)
+const invoiceData = ref()
 const fromvalue = ref({
     targetId: '',
     msg: ''
 })
+const checkInvoiceData = (row)=>{
+    invoicingInformation.value = true
+    invoiceData.value = row
+}
 const checkRegostrationInfo = (row) => {
     temporaryRegistration.value = row;
     showTemporary.value = true;