修改bug

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

@@ -280,7 +280,7 @@
                                         <el-col :span="10">
                                             <el-form-item label="证书名称" :prop="`certificateInfo.${index}.certType`" :rules="[{ required: true, message: '请选择证书名称', trigger: 'change' }]">
                                                 <el-select v-model="item.certType" placeholder="证书名称" clearable>
-                                                    <el-option v-for="item in lm_training_cert" :key="item.value" :label="item.label" :value="item.value" />
+                                                    <el-option v-for="item in dm_training_cert" :key="item.value" :label="item.label" :value="item.value" />
                                                 </el-select>
                                             </el-form-item>
                                         </el-col>
@@ -347,7 +347,7 @@ import { FieldDefinition } from '../models/type';
 import meetingCustomPreview from '../models/meeting-custom-preview.vue';
 import MeetingEditors from '../models/meeting-editors.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { lm_training_join_type, yes_no, lm_training_cert, dm_check_join_type } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'yes_no', 'lm_training_cert', 'dm_check_join_type'));
+const { lm_training_join_type, yes_no, dm_training_cert, dm_check_join_type } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'yes_no', 'dm_training_cert', 'dm_check_join_type'));
 const fields = ref<FieldDefinition[]>([])
 const showSignIn = ref(false);
 const fixedField = ref<FieldDefinition[]>([{

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

@@ -31,7 +31,7 @@ import { MeetingDetailInfo } from '../models';
 import MeetingDetailAttend from '../models/meeting-detail-attend.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { lm_training_join_type, yes_no, lm_training_cert, lm_training_status, lm_training_signup_status_list } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'yes_no', 'lm_training_cert', 'lm_training_status', 'lm_training_signup_status_list'));
+const { lm_training_join_type, yes_no, dm_training_cert, lm_training_status, lm_training_signup_status_list } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'yes_no', 'dm_training_cert', 'lm_training_status', 'lm_training_signup_status_list'));
 // 获取详情
 const tabs = ref([
     { label: '参会人员信息', value: '1' },

src/views/training/meeting/index.vue

@@ -135,7 +135,7 @@ import { SignInCode, TemporaryRegistration } from '../models';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { lm_training_join_type, yes_no, lm_training_cert, lm_training_status,lm_training_join_status } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'yes_no', 'lm_training_cert', 'lm_training_status',"lm_training_join_status"));
+const { lm_training_join_type, yes_no, dm_training_cert, lm_training_status,lm_training_join_status } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'yes_no', 'dm_training_cert', 'lm_training_status',"lm_training_join_status"));
 const loading = ref(true);
 const showSearch = ref(true);
 const showSignIn = ref(false);

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

@@ -96,6 +96,21 @@
                         <el-option v-for="item in temp_join_type" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </el-form-item>
+                <el-form-item label="支付状态：" prop="tempJoin">
+                    <el-select v-model="queryParams.payStatus" placeholder="请选择支付状态" clearable style="width: 180px">
+                        <el-option v-for="item in dm_pay_status" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="支付方式：" prop="tempJoin">
+                    <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-select>
+                </el-form-item>
+                <el-form-item label="是否需要开票：" prop="tempJoin">
+                    <el-select v-model="queryParams.invoiceStatus" placeholder="请选择支付状态" clearable style="width: 180px">
+                        <el-option v-for="item in [{value:'0',label:'不需要'},{value:'1',label:'需要'}]" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="所在地区" label-width="70" prop="adcode">
                     <AreaCascader v-model="queryParams.adcode" :zlevel="2" checkStrictly @change="handleQuery"></AreaCascader>
                 </el-form-item>
@@ -141,7 +156,7 @@
                     <div v-if="row.payType === '2'">对公转账</div>
                 </template>
             </vxe-column>
-            <vxe-column title="支付状态" field="outTradeNo" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'">
+            <vxe-column title="支付状态" field="payStatus" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'">
                 <template #default="{ row }">
                     {{ selectDictLabel(dm_pay_status, row?.payStatus)}}
                     <el-tooltip :content="`系统单号${row?.outTradeNo}`" placement="top" effect="light">
@@ -328,6 +343,9 @@ const queryParams = ref<any>({
     pageNum: 1,
     pageSize: 10,
     trainingId: query?.id || '',
+    payStatus:'',
+    payType:'',
+    invoiceStatus:''
 });
 const loading = ref(false);
 const total = ref(0);

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

@@ -128,7 +128,7 @@
                     <vxe-column type="seq" width="60" title="序号" align="center" />
                     <vxe-column title="证书名称" min-width="100">
                         <template #default="{ row }">
-                            <DictTag :options="lm_training_cert" :value="row?.certType"></DictTag>
+                            <DictTag :options="dm_training_cert" :value="row?.certType"></DictTag>
                         </template>
                     </vxe-column>
                     <vxe-column title="证书模板">
@@ -172,7 +172,7 @@ import { onMounted, ref } from 'vue';
 import meetingCustomPreview from './meeting-custom-preview.vue';
 import { FieldDefinition } from './type';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { lm_training_join_type, dm_check_join_type, lm_training_cert, lm_training_status, lm_training_signup_status_list } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'dm_check_join_type', 'lm_training_cert', 'lm_training_status', 'lm_training_signup_status_list'));
+const { lm_training_join_type, dm_check_join_type, dm_training_cert, lm_training_status, lm_training_signup_status_list } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'dm_check_join_type', 'dm_training_cert', 'lm_training_status', 'lm_training_signup_status_list'));
 const props = defineProps({
     form: {
         type: Object,

src/views/training/models/meeting-editors.vue

@@ -193,7 +193,7 @@ import { propTypes } from '@/utils/propTypes';
 import MeetingCustom from './meeting-custom.vue';
 import { FieldDefinition } from './type';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { lm_training_join_type, yes_no, lm_training_cert, vip_level } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'yes_no', 'lm_training_cert', 'vip_level'));
+const { lm_training_join_type, yes_no, dm_training_cert, vip_level } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'yes_no', 'dm_training_cert', 'vip_level'));
 const props = defineProps({
     field: propTypes.any,
     show: propTypes.bool.def(false),