修改bug

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

@@ -53,7 +53,34 @@
                                     <el-input v-model="form.tel" maxlength="20" placeholder="请输入联系电话" clearable />
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="12">
+                            <el-col :span="6">
+                                <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">
+                                        <div class="d-flex f-s-14" style="white-space: nowrap;">
+                                            <div>每成功参会（签到成功）1人发放</div>
+                                            <el-input v-model="form.points" style="width: 45px" />
+                                            <div>个单位积分。</div>
+                                        </div>
+                                    </el-form-item>
+                                </div>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="是否电子手签" prop="eleSignature">
+                                    <div class="d-flex a-c">
+                                        <el-radio-group v-model="form.eleSignature" style="flex-wrap: nowrap">
+                                            <el-radio label="1">是</el-radio>
+                                            <el-radio label="0">否</el-radio>
+                                        </el-radio-group>
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="24">
                                 <el-form-item label="可报名人员类型" prop="conditions.typeCheck">
                                     <el-checkbox-group v-model="checkedVipLevels" @change="handleCheckedChange">
                                         <el-checkbox v-for="city in form.conditions.typeCheck" :key="city" :label="city" :value="city">
@@ -76,7 +103,7 @@
                                     </div>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="12" v-if="form.conditions.totalCheck == '1'">
+                            <el-col :span="18" v-if="form.conditions.totalCheck == '1'">
                                 <el-form-item prop="restrictiveConditions">
                                     <template #label>
                                         <span>限制条件</span>
@@ -136,24 +163,8 @@
                                     </div>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="6">
-                                <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">
-                                        <div class="d-flex f-s-14" style="white-space: nowrap;">
-                                            <div>每成功参会（签到成功）1人发放</div>
-                                            <el-input v-model="form.points" style="width: 45px" />
-                                            <div>个单位积分。</div>
-                                        </div>
-                                    </el-form-item>
-                                </div>
-                            </el-col>
-                            <el-col :span="12">
+                            
+                            <el-col :span="24">
                                 <el-form-item label="是否收取参会费用" prop="meetingCharge.hasFee">
                                     <div class="d-flex a-c">
                                         <el-radio-group v-model="form.meetingCharge.hasFee" style="flex-wrap: nowrap">
@@ -202,16 +213,7 @@
                                     </div>
                                 </div>
                             </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="是否电子手签" prop="eleSignature">
-                                    <div class="d-flex a-c">
-                                        <el-radio-group v-model="form.eleSignature" style="flex-wrap: nowrap">
-                                            <el-radio label="1">是</el-radio>
-                                            <el-radio label="0">否</el-radio>
-                                        </el-radio-group>
-                                    </div>
-                                </el-form-item>
-                            </el-col>
+                           
                         </el-row>
                         <el-row :gutter="20">
                             <el-col :span="12">

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

@@ -94,7 +94,7 @@
             <vxe-column title="职务" field="position" min-width="100" :formatter="colNoData" />
             <vxe-column title="联系方式" field="contact" min-width="100" :formatter="colNoData" />
             <vxe-column title="备注" field="remark" min-width="100" :formatter="colNoData" />
-            <vxe-column title="参会费用" field="joinFee" min-width="100" :formatter="colNoData" />
+            <vxe-column title="参会费用" field="joinFee" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'"/>
             <vxe-column title="报名信息" min-width="80" fixed="right">
                 <template #default="{ row }">
                     <div class="c-s-p"><u @click="checkRegostrationInfo(row)">查看报名信息</u></div>
@@ -107,13 +107,13 @@
                     <div v-else>-</div>
                 </template>
             </vxe-column>
-            <vxe-column title="支付方式" field="payType" min-width="100" :formatter="colNoData">
+            <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'">微信支付</div>
                     <div v-if="row.payType === '2'">对公转账</div>
                 </template>
             </vxe-column>
-            <vxe-column title="支付状态" field="outTradeNo" min-width="100" :formatter="colNoData">
+            <vxe-column title="支付状态" field="outTradeNo" 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">
@@ -121,7 +121,7 @@
                     </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" v-if="form?.meetingCharge?.hasFee =='1'">
                 <template #default="{ row }">
                     <div v-if="row.payStatus == '1'&& !+row?.invoiceStatus" @click="checkInvoiceData(row.invoiceInfo)" class="pointer">查看</div>
                     <div v-if="row.payStatus == '1' && +row?.invoiceStatus" @click="checkInvoiceData(row.invoiceInfo)" class="pointer" style="color: red;">已开票，点击查看</div>
@@ -147,16 +147,16 @@
             <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' && 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' &&form?.trainingStatus !== '2'">审核</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'&& row.payStatus !== '1'" size="small" color="#81b337" style="color: white" @click="openTransfer(row)">确认收到转账</el-button>
+                    <el-button size="small" color="#33aeeb" @click="openDialog(row)" style="color: white" v-if="row?.res == '0' && form?.conditions?.totalCheck == '1' &&form?.trainingStatus !== '2'">审核</el-button>
+                    <el-button v-if="row.res=='3' || row.res== '5'" size="small" color="#e99d42" style="color: white" @click="openModification(row)">修改费用金额</el-button>
+                    <el-button v-if="row.res== '5'" size="small" color="#81b337" style="color: white" @click="openTransfer(row)">确认收到转账</el-button>
                     <div v-if="row.payStatus == '1' && row?.res == '0'&& form?.trainingStatus == '2'">用户报名未成功，请至微信商户号进行退款</div>
                     <div v-if="row.payType === '10'">该报名已退款</div>
-                    <el-upload v-if="form?.trainingStatus == '2' && row.payStatus == '1' && +row?.hasInvoice && !+row?.invoiceStatus && row.payType !== '10'" class="upload-demo" :action="uploadFileUrl" multiple :limit="1" :on-success="handleSuccess" :headers="headers" :show-file-list="false" accept=".pdf,.PDF">
+                    <el-upload v-if="form?.trainingStatus == '2' && +row.joinFee && +row?.hasInvoice && !+row?.invoiceStatus && row.payType !== '10' &&form?.meetingCharge?.hasFee =='1'" class="upload-demo" :action="uploadFileUrl" multiple :limit="1" :on-success="handleSuccess" :headers="headers" :show-file-list="false" accept=".pdf,.PDF">
                         <el-button size="small" color="#33aeeb" style="color: white" @click=" invoiceId = row.id">上传发票</el-button>
                     </el-upload>
-                    <el-upload v-if="form?.trainingStatus == '2' && row.payStatus == '1' && +row?.hasInvoice && +row?.invoiceStatus && row.payType !== '10'" class="upload-demo" :action="uploadFileUrl" multiple :limit="1" :on-success="handleSuccess" :headers="headers" :show-file-list="false" accept=".pdf,.PDF">
-                        <el-button type="primary">重新上传</el-button>
+                    <el-upload v-if="form?.trainingStatus == '2' && +row.joinFee && +row?.hasInvoice && +row?.invoiceStatus && row.payType !== '10' &&form?.meetingCharge?.hasFee =='1'" class="upload-demo" :action="uploadFileUrl" multiple :limit="1" :on-success="handleSuccess" :headers="headers" :show-file-list="false" accept=".pdf,.PDF">
+                        <el-button type="primary" color="#33aeeb" style="color: white" @click=" invoiceId = row.id">重新上传</el-button>
                     </el-upload>
                 </template>
             </vxe-column>
@@ -201,7 +201,7 @@
         </div>
         <template #footer>
             <div class="dialog-footer">
-                <el-button @click="modiFication = false">我再看看</el-button>
+                <el-button @click="showTransfer = false">我再看看</el-button>
                 <el-button type="primary" @click="confirmTransfer">确认收到转账</el-button>
             </div>
         </template>
@@ -371,7 +371,7 @@ const handleSuccess = async(res,uploadFile)=>{
         id:invoiceId.value,
         invoiceUrl:{
             fileName:res.data.fileName,
-            url:res.data.fileName,
+            url:res.data.url,
             fileSize:uploadFile.raw.size
         }
     })