新增会议缴费

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

@@ -173,7 +173,7 @@
                                     <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">按报名人员类型收取，不同人员收取不同费用</el-radio>
+                                            <el-radio label="1">按报名人员类型收取，不同人员收取不同费用<span class="c-999">(不作设置默认统一收取标准费用。)</span></el-radio>
                                         </el-radio-group>
                                     </div>
                                 </el-form-item>

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

@@ -116,12 +116,12 @@
             <vxe-column title="支付状态" field="remark" min-width="100" :formatter="colNoData">
                 <template #default="{ row }">
                     {{ selectDictLabel(dm_pay_status, row?.payStatus)}}
-                    <el-tooltip content="系统单号" placement="top" effect="light">
+                    <el-tooltip :content="`系统单号${row?.outTradeNo}`" placement="top" effect="light">
                         <el-icon v-if="row.payStatus == '1'"><QuestionFilled /></el-icon>
                     </el-tooltip>
                 </template>
             </vxe-column>
-            <vxe-column title="开票信息" field="remark" min-width="100" :formatter="colNoData" />
+            <vxe-column title="开票信息" field="remark" min-width="100" :formatter="colNoData" ></vxe-column>
             <vxe-column title="特殊说明" min-width="100" fixed="right">
                 <template #default="{ row }">
                     {{ +row?.tempJoin?'通过临时报名通道报名':'-' }}
@@ -141,10 +141,12 @@
             </vxe-column>
             <vxe-column v-if="form?.conditions?.totalCheck == '1' || form?.meetingCharge?.hasFee == '1'" title="操作" width="250" align="center" fixed="right">
                 <template #default="{ row }">
-                    <el-button type="danger" size="small" v-if="row?.res !== '0' && row?.signInFlag !=='1' && form?.conditions?.totalCheck == '1'&& row?.payStatus == '1'" @click="openDialog(row)" style="color: white">重审</el-button>
+                    <el-button type="danger" size="small" v-if="row?.res !== '0' && row?.signInFlag !=='1' && form?.conditions?.totalCheck == '1'&& row?.payStatus == '1' && form?.meetingCharge?.hasFee !== '1'" @click="openDialog(row)" style="color: white">重审</el-button>
                     <el-button size="small" color="#33aeeb" @click="openDialog(row)" style="color: white" v-if="row?.res == '0' && form?.conditions?.totalCheck == '1'&& row?.payStatus == '1'">审核</el-button>
                     <el-button v-if="row.payStatus !== '1'" size="small" color="#e99d42" style="color: white" @click="openModification(row)">修改费用金额</el-button>
-                    <el-button v-if="row.payType === '2'" size="small" color="#81b337" style="color: white" @click="openTransfer(row)">确认收到转账</el-button>
+                    <el-button v-if="row.payType === '2'&& row.payStatus !== '1'" size="small" color="#81b337" style="color: white" @click="openTransfer(row)">确认收到转账</el-button>
+                    <div v-if="row.payStatus == '1' &&row?.res !== '0'&& row?.trainingStatus == '2'">用户报名未成功，请至微信商户号进行退款</div>
+                    <div v-if="row.payType === '10'">该报名已退款</div>
                 </template>
             </vxe-column>
         </vxe-table>
@@ -192,6 +194,32 @@
             </div>
         </template>
     </el-dialog>
+    <el-dialog v-model="invoicingInformation" title="开票信息" width="360" center>
+        <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
+            <div>名称:</div>
+            <div>123</div>
+        </div>
+        <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
+            <div>税号:</div>
+            <div>123131312321313123123</div>
+        </div>
+        <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
+            <div>单位地址:</div>
+            <div>萨达</div>
+        </div>
+        <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
+            <div>电话号码:</div>
+            <div>17754441247</div>
+        </div>
+        <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
+            <div>开户银行:</div>
+            <div>工行</div>
+        </div>
+        <div class="d-flex a-c j-sb pt-10 pb-10 f-s-16">
+            <div>银行账户:</div>
+            <div>123131312321313123123</div>
+        </div>
+    </el-dialog>
     <registrationInfo v-if="showTemporary" v-model:show="showTemporary" :info="temporaryRegistration"></registrationInfo>
 </template>
 <script setup name="MeetingDetailInfo" lang="ts">
@@ -230,6 +258,7 @@ const modiFication=ref<any>(false)
 const showTransfer = ref(false)
 const participationFee = ref()
 const editPricedata = ref()
+const invoicingInformation = ref(false)
 const fromvalue = ref({
     targetId: '',
     msg: ''
@@ -306,6 +335,7 @@ const openTransfer = (row)=>{
 const confirmTransfer = async()=>{
     await confirmSigPublicPay(editPricedata.value?.id)
     showTransfer.value = false
+     getList();
 }
 const changeEditPrice = async ()=>{
     await editPrice({

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

@@ -32,6 +32,30 @@
                 <el-descriptions-item min-width="100px" label="创建时间:">{{ form?.createTime || '-' }}</el-descriptions-item>
                 <el-descriptions-item min-width="100px" label="收取参会费用标准:">{{ form?.meetingCharge?.pricing || '-' }}元/每人</el-descriptions-item>
             </el-descriptions>
+            <div class="d-flex f-s-14 c-666 mb-10" v-if="+form?.meetingCharge?.hasFee">
+                <div>参会费用：</div>
+                <div class="flex1 ov-hd" v-if="+form?.meetingCharge?.hasFlatFee">
+                    <template v-for="(item, index) in form?.meetingCharge?.typeCharge" :key="index">
+                        <div v-if="+item?.check">
+                            <span class="f-w-6">
+                                {{ selectDictLabels(dm_check_join_type, item?.vipLevel, ',')}}
+                            </span>
+                            <span v-if="!+item?.certType ">不收取费用</span>
+                            <span v-if="+item?.certType">
+                                <span v-if="item?.vipLevel !== 'P'">每个单位</span>
+                                免除费用{{ item?.total }}人，其余报名人员每人收取费用{{ item?.cost }}元
+                            </span>
+                        </div>
+                        <div v-if="!+item?.check">
+                            <span class="f-w-6">
+                                {{ selectDictLabels(dm_check_join_type, item?.vipLevel, ',')}}
+                            </span>
+                            <span>每人收取费用{{ form?.meetingCharge?.pricing }}</span>
+                        </div>
+                    </template>
+                </div>
+                <div class="flex1 ov-hd" v-if="!+form?.meetingCharge?.hasFlatFee">统一收取费用{{form?.meetingCharge?.pricing}}元</div>
+            </div>
             <div class="d-flex f-s-14 c-666 mb-10">
                 <div class="flex1">
                     <div class="c-333 mb-10">