* 小程序变更

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

@@ -43,26 +43,26 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="现场调研" prop="conferenceFlag">
+      <el-form-item label="现场调研" prop="conferenceFlag" v-if="this.applyType == 1">
         <el-select v-model="queryParams.conferenceFlag" placeholder="请选择现场调研" clearable>
           <el-option
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="申请类型" prop="applyType">
-        <el-select v-model="queryParams.applyType" placeholder="请选择申请类型" clearable>
-          <el-option
-              v-for="dict in dict.type.apply_type"
+              v-for="dict in dict.type.conference_flag"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
           />
         </el-select>
       </el-form-item>
+<!--      <el-form-item label="申请类型" prop="applyType">-->
+<!--        <el-select v-model="queryParams.applyType" placeholder="请选择申请类型" clearable>-->
+<!--          <el-option-->
+<!--              v-for="dict in dict.type.apply_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="审核状态" prop="reviewState">
         <el-select v-model="queryParams.reviewState" placeholder="请选择审核状态" clearable>
           <el-option
@@ -80,16 +80,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-        >新增
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--            type="primary"-->
+<!--            plain-->
+<!--            icon="el-icon-plus"-->
+<!--            size="mini"-->
+<!--            @click="handleAdd"-->
+<!--        >新增-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
             type="success"
@@ -127,7 +127,6 @@
 
     <el-table v-loading="loading" :data="usrApplyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="参会人" align="center" prop="usrName" />
       <el-table-column label="联系电话" align="center" prop="tel" />
       <el-table-column label="参会人单位" align="center" prop="orgUnitName" />
@@ -138,9 +137,9 @@
           <dict-tag :options="dict.type.met_usr_type" :value="scope.row.usrType" />
         </template>
       </el-table-column>
-      <el-table-column label="现场调研" align="center" prop="conferenceFlag">
+      <el-table-column label="现场调研" align="center" prop="conferenceFlag" v-if="this.applyType == 1">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.conferenceFlag" />
+          <dict-tag :options="dict.type.conference_flag" :value="scope.row.conferenceFlag" />
         </template>
       </el-table-column>
       <el-table-column label="申请类型" align="center" prop="applyType">
@@ -155,15 +154,9 @@
       </el-table-column>
       <el-table-column label="备注" align="center" prop="reviewMsg" />
       <el-table-column label="与会内容" align="center" prop="contentTitle" />
-      <el-table-column label="创建时间" align="center" prop="updateTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-        </template>
+      <el-table-column label="创建时间" align="center" prop="updateTime" width="80">
       </el-table-column>
-      <el-table-column label="修改时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
+      <el-table-column label="修改时间" align="center" prop="createTime" width="80">
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -230,26 +223,26 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="现场调研" prop="conferenceFlag">
+        <el-form-item label="现场调研" prop="conferenceFlag" v-if="this.applyType == 1">
           <el-radio-group v-model="form.conferenceFlag">
             <el-radio
-                v-for="dict in dict.type.sys_yes_no"
+                v-for="dict in dict.type.conference_flag"
                 :key="dict.value"
                 :label="dict.value"
             >{{ dict.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="申请类型" prop="applyType">
-          <el-select v-model="form.applyType" placeholder="请选择申请类型">
-            <el-option
-                v-for="dict in dict.type.apply_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="申请类型" prop="applyType">-->
+<!--          <el-select v-model="form.applyType" placeholder="请选择申请类型">-->
+<!--            <el-option-->
+<!--                v-for="dict in dict.type.apply_type"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.label"-->
+<!--                :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="审核状态" prop="reviewState">
           <el-radio-group v-model="form.reviewState">
             <el-radio
@@ -298,7 +291,7 @@ import { addUsrApply, delUsrApply, getUsrApply, listUsrApply, rejectUsrApply, up
 
 export default {
   name: 'UsrApply',
-  dicts: ['apply_type', 'sys_yes_no', 'review_state', 'met_usr_type'],
+  dicts: ['apply_type', 'conference_flag', 'review_state', 'met_usr_type'],
   data() {
     return {
       // 遮罩层
@@ -330,9 +323,11 @@ export default {
         uniLevel: null,
         usrType: null,
         conferenceFlag: null,
-        applyType: null,
+        applyType: this.$route.query.meetingType,
         reviewState: null,
+
       },
+      applyType: '',
       // 表单参数
       form: {},
       // 表单校验
@@ -340,6 +335,7 @@ export default {
     };
   },
   created() {
+    this.applyType = this.$route.query.meetingType;
     this.getList();
   },
   methods: {
@@ -417,7 +413,7 @@ export default {
         usrType: null,
         conferenceFlag: null,
         conferenceRel: null,
-        applyType: null,
+        applyType: this.$route.query.meetingType,
         reviewState: null,
         reviewMsg: null,
         usrWechatId: null,