旅行团单数据新增时下拉数据

cjy-project/src/main/resources/mapper/estate/TravelClubRouteMapper.xml

@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectTravelClubRouteListByOrganCode" resultMap="TravelClubRouteResult">
         <include refid="selectTravelClubRouteVo"/>
-        where organ_code =#{organCode}
+        where organ_code =#{organCode} and del_flag !='2'
     </select>
     <select id="selectDestinationTeamList"  resultMap="DestinationRankingMap">
         select (select t2.region_name from region t2 where t2.region_id =t1.departure_province_code

ruoyi-ui/src/api/estate/travelClubRoute.js

@@ -60,3 +60,9 @@ export function getEarthCountry() {
   })
 }
 
+export function getLineNameList(){
+  return request({
+    url:'/estate/travelClubRoute/selectTravelClubRouteList',
+    method: 'get'
+  })
+}

ruoyi-ui/src/views/system/management/estate/travel-club-route-tourist/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
+    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="100px" size="small">
       <el-form-item label="开团时间" prop="departureDate">
         <el-date-picker v-model="queryParams.departureDate"
                         clearable
@@ -114,10 +114,18 @@
     <el-table v-loading="loading" :data="travelClubRouteTouristList" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="55"/>
       <el-table-column v-if="false" align="center" label="主键" prop="id"/>
-      <el-table-column align="center" label="出团时间" prop="lineName"/>
+      <el-table-column align="center" label="出团时间" prop="departureDate">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.departureDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="线路名称" prop="lineName"/>
       <el-table-column align="center" label="游客姓名" prop="touristName"/>
-      <el-table-column align="center" label="性别" prop="sex"/>
+      <el-table-column align="center" label="性别" prop="sex">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="年龄" prop="age"/>
       <el-table-column align="center" label="手机号" prop="phone"/>
       <el-table-column align="center" label="客源地" prop="provinceCode"/>
@@ -163,10 +171,10 @@
         <el-form-item label="旅行线路" prop="travelClubRouteId">
           <el-select v-model="form.travelClubRouteId" clearable placeholder="数据来源">
             <el-option
-              v-for="dict in dict.type.travel_line_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+              v-for="item in lineNameList"
+              :key="item.id"
+              :label="item.lineName"
+              :value="item.id"
             />
           </el-select>
         </el-form-item>
@@ -236,11 +244,12 @@ import {
   addTravelClubRouteTourist,
   updateTravelClubRouteTourist
 } from "@/api/estate/travelClubRouteTourist";
+import {getLineNameList} from "@/api/estate/travelClubRoute";
 import tickt from "@/views/system/management/ticket-data/ticket-check-flow/tickt";
 
 export default {
   name: "TravelClubRouteTourist",
-  dicts: ['data_sources','travel_line_type'],
+  dicts: ['data_sources','travel_line_type','sys_user_sex'],
   mixins:[tickt],
   data() {
     return {
@@ -278,7 +287,9 @@ export default {
         phone: null,
         certificate: null,
         dataSources: null
+
       },
+      lineNameList:[],
       // 表单参数
       form: {},
       // 表单校验
@@ -377,6 +388,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.getLineNameList();
       this.title = "添加旅行团单游客数据信息";
     },
     /** 修改按钮操作 */
@@ -385,6 +397,7 @@ export default {
       const id = row.id || this.ids
       getTravelClubRouteTourist(id).then(response => {
         this.form = response.data;
+        this.getLineNameList();
         this.open = true;
         this.title = "修改旅行团单游客数据信息";
       });
@@ -420,11 +433,12 @@ export default {
       }).catch(() => {
       });
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('estate/travelClubRouteTourist/export', {
-        ...this.queryParams
-      }, `travelClubRouteTourist_${new Date().getTime()}.xlsx`)
+
+    getLineNameList(){
+      getLineNameList().then(res =>{
+        console.log(res)
+         this.lineNameList = res.data
+      })
     }
   }
 };