+ 交通强国详情面板的功能迭代

ruoyi-ui/src/views/cp/usrApply/index.vue

@@ -159,27 +159,6 @@
           <dict-tag :options="dict.type.conference_flag" :value="scope.row.conferenceFlag" />
         </template>
       </el-table-column>
-      <el-table-column label="会场信息" align="center" prop="contentTitle" width="150" />
-      <el-table-column label="主题调研" align="center" prop="themeFlag" width="80">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.conference_flag" :value="scope.row.themeFlag" />
-        </template>
-      </el-table-column>
-      <el-table-column label="随行人员" align="left" prop="follows" width="180">
-        <template slot-scope="scope">
-          <div v-for="(item,index) in JSON.parse(scope.row.followsJson)" :key="index">
-            <span>姓名：{{ item.usrName }}</span>
-            <br />
-            <span>手机号：{{ item.tel }}</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="调研主题" align="center" prop="themeTile" width="150" />
-      <el-table-column label="申请类型" align="center" prop="applyType" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.apply_type" :value="scope.row.applyType" />
-        </template>
-      </el-table-column>
       <el-table-column label="审核状态" align="center" prop="reviewState" width="120">
         <template slot-scope="scope">
           <div style="display: flex;align-items: center; justify-content: center;">
@@ -198,6 +177,21 @@
 
         </template>
       </el-table-column>
+      <el-table-column label="随行人员" align="left" prop="follows" width="180">
+        <template slot-scope="scope">
+          <div v-for="(item,index) in JSON.parse(scope.row.followsJson)" :key="index">
+            <span>姓名：{{ item.usrName }}</span>
+            <br />
+            <span>手机号：{{ item.tel }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请类型" align="center" prop="applyType" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.apply_type" :value="scope.row.applyType" />
+        </template>
+      </el-table-column>
+
       <el-table-column label="审核信息" align="center" prop="reviewMsg" width="150" show-overflow-tooltip />
       <el-table-column label="会场信息" align="center" prop="contentTitle" width="150" />
       <el-table-column label="来程方式" align="center" prop="wayComing" width="100">
@@ -382,19 +376,12 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            <i class="el-icon-message"></i>
-            邮箱信息
-          </template>
-          {{ form.email }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
             <i class="el-icon-user"></i>
-            参会人角色
+            参会人类型
           </template>
           <dict-tag :options="dict.type.met_usr_type" :value="form.usrType" />
         </el-descriptions-item>
-        <template v-if="this.applyType == 1">
+        <template v-if="form.usrType == 1">
           <el-descriptions-item>
             <template slot="label">
               <i class="el-icon-user"></i>
@@ -402,16 +389,16 @@
             </template>
             <dict-tag :options="dict.type.conference_flag" :value="form.conferenceFlag" />
           </el-descriptions-item>
-          <el-descriptions-item>
-            <template slot="label">
-              <i class="el-icon-coordinate"></i>
-              会场信息
-            </template>
-            {{ form.contentTitle }}
-          </el-descriptions-item>
         </template>
         <el-descriptions-item>
           <template slot="label">
+            <i class="el-icon-message"></i>
+            邮箱信息
+          </template>
+          {{ form.email }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
             审核状态
           </template>
           <dict-tag :options="dict.type.review_state" :value="form.reviewState" />
@@ -430,7 +417,7 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            车次/航班/高速公路出入口
+            车次/航班
           </template>
           {{ form.comInfo }}
         </el-descriptions-item>
@@ -442,17 +429,32 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            车次/航班/高速公路出入口
+            车次/航班
           </template>
           {{ form.backInfo }}
         </el-descriptions-item>
-        <el-descriptions-item>
+        <el-descriptions-item span="2">
           <template slot="label">
             备注
           </template>
           {{ form.remark }}
         </el-descriptions-item>
+        <el-descriptions-item span="2">
+          <template slot="label">
+            随行人员
+          </template>
+          <el-card v-for="(o,index) in form.follows" :key="index" class="box-card" style="width: 185px">
+            <div class="text item">
+              <div>姓名：{{ o.usrName }}</div>
+              <div>手机号：{{ o.tel }}</div>
+            </div>
+          </el-card>
+        </el-descriptions-item>
       </el-descriptions>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="()=>handlePass(form)" icon="el-icon-check">通过</el-button>
+        <el-button type="danger" @click="()=>handleReject(form)" icon="el-icon-close">拒绝</el-button>
+      </div>
     </el-dialog>
     <el-dialog title="拒绝用户参会申请" :visible.sync="openReject" width="700px" append-to-body>
       <el-form ref="rejectForm" :model="form" :rules="rules" label-width="120px">
@@ -581,18 +583,27 @@ export default {
     rejectSubmitForm() {
       this.$refs.rejectForm.validate(valid => {
         if (valid) {
-          rejectUsrApply(this.form).then(response => {
+          rejectUsrApply({
+            id: this.form.id,
+            reviewMsg: this.form.reviewMsg,
+            reviewState: '1',
+          }).then(response => {
             this.$modal.msgSuccess('审核完成');
             this.openReject = false;
+            this.openDetail = false;
             this.getList();
           });
         }
       });
     },
     rejectCancel() {
+      const temp = {
+        ...this.form,
+      };
       this.openReject = false;
       this.openBatcheReject = false;
-      this.reset();
+      this.form.reviewState = temp.reviewState;
+      this.form.reviewMsg = temp.reviewMsg;
     },
 
     handlePass(row) {
@@ -603,6 +614,7 @@ export default {
       }).then(response => {
         this.$modal.msgSuccess('审核完成');
         this.openReject = false;
+        this.openDetail = false;
         this.getList();
       });
     },
@@ -615,6 +627,7 @@ export default {
         this.form.reviewState = '1';
       });
     },
+
     /** 查询cps_usr_apply与会申请列表 */
     getList() {
       this.loading = true;