feige
2023-06-06 4c10b44dd7d8f57934d7958d7134f2e77bbd0fa4
旅游详情,跳转页面都可以了,还有费用信息
3个文件已修改
80 ■■■■ 已修改文件
ruoyi-ui/src/router/index.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/Info.vue 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/index.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/router/index.js
@@ -358,7 +358,7 @@
        path: 'edit/:id(\\d+)',
        component: () => import('@/views/travel/edit'),
        name: 'edit',
        meta: { title: '编辑'}
        meta: { title: '编辑',activeMenu: '/geren/Ztravel'}
      }
    ]
  },
@@ -366,15 +366,14 @@
  {
    path: '/self/travel',
    component: Layout,
    permissions: ['person:travel:info'],
    hidden: true,
    permissions: ['person:travel:info'],
    children: [
      {
        path: 'show/:id(\\d+)',
        path: 'Info/:id',
        component: () => import('@/views/travel/Info'),
        name: 'show',
        meta: { title: '查看详情'}
        meta: { title: '查看详情',activeMenu: '/geren/Ztravel'}
      }
    ]
  },
ruoyi-ui/src/views/travel/Info.vue
@@ -89,25 +89,22 @@
      </el-row>
      <!-- 序号、基金/台账、时间、收入/支出、用途、使用人、现金/自动扣划、余额、电子文件、备注 操作-->
      <!-- 这里有个familyList数组 是在data()中定义的 -->
      <el-table v-loading="loading" :data="travelpriceList"  @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table v-loading="loading" :data="travelBase"  @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
        <el-table-column type="selection" width="55"  align="center" />
        <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
  
        <el-table-column label="起" prop="startTime" sortable width="100" align="center">
          <template slot-scope="scope">{{scope.row.startTime? scope.row.startTime: '————'}}</template>
        </el-table-column>
        <el-table-column label="止" prop="endTime" sortable width="100" align="center">
          <template slot-scope="scope">{{scope.row.endTime? scope.row.endTime: '————'}}</template>
        </el-table-column>
        <el-table-column label="总天数" prop="totalDay" sortable width="100" />
        <el-table-column label="标题" prop="title" sortable width="100" />
        <el-table-column label="时间" prop="address" sortable width="100" />
        
        <el-table-column label="总金额" prop="totalCost" sortable width="100" />
        <el-table-column label="餐费" prop="eat" sortable width="100" />
        <el-table-column label="住宿" prop="stay" sortable width="100" />
        <el-table-column label="交通" prop="traffic" sortable width="100" />
        <el-table-column label="门票" prop="entrance" sortable width="100" />
        <el-table-column label="购物" prop="shopping" sortable width="100" />
        <el-table-column label="地点" prop="address" sortable width="100" />
        <el-table-column label="人物" prop="people" sortable width="100" />
        <el-table-column label="标题" prop="title" sortable width="100" />
        <el-table-column label="旅期" prop="travel_period" sortable width="100" />
        <el-table-column label="持证旅游" prop="certificate" sortable width="100" />
        <el-table-column label="费用" prop="total_price" sortable width="100" />
        <el-table-column label="公费/自费" prop="self" sortable width="100" />
          <el-table-column label="电子文件" prop="remark" sortable width="100" />
        <el-table-column label="备注" prop="remark" sortable width="100" />
        
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -129,18 +126,14 @@
            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
              <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>
            </el-dropdown>
            <el-button
              size="mini"
              type="text"
              @click="handleShow(scope.row)"
            >查看明细</el-button>
          </template>
        </el-table-column>
      </el-table>
      <el-dialog :title="title" :visible.sync="openDataScope" width="1000px"  append-to-body>
        <el-table v-loading="loading" :data="travelpriceList[detailList]" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" >
        <el-table v-loading="loading" :data="travelpriceList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" >
          <el-table-column type="selection" width="55"  align="center" />
          <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
@@ -317,7 +310,7 @@
  
  
  //在system/note/index.js中导入接口函数  --接好了
  import {listTravelPrice,enload,getTravelPriceInfo,delTravelPrice, addTravelPrice, uploadPic} from "@/api/travel/index";
  import {listTravelPrice,listTravelBase,enload,getTravelPriceInfo,delTravelPrice, addTravelPrice, uploadPic} from "@/api/travel/index";
  
  export default {
    name: "Role",
@@ -339,7 +332,7 @@
        // 总条数
        total: 0,
        // 家大事记表格数据
        travelpriceList: [],
        travelBase: [],
        // 弹出层标题
        title: "",
        // 是否显示弹出层
@@ -382,7 +375,7 @@
          useFor:undefined,
          usePeople:undefined,
          createTime:undefined,
          fid:undefined
        },
        // 表单参数
        form: {},
@@ -451,7 +444,8 @@
      };
    },
    created() {
      this.getList();
         const id = this.$route.params && this.$route.params.id;
      this.getList(id);
  
    },
    methods: {
@@ -492,18 +486,18 @@
      //列表显示家大事记
  
  
      getList() {
      getList(fid) {
        this.loading = true;
        this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
        this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
        // console.log(this.queryParams)
          this.queryParams.fid = fid
        console.log(this.queryParams)
        //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
          listTravelPrice(this.queryParams).then(response => {
          listTravelBase(this.queryParams).then(response => {
            //  alert(123)
            //   console.log(response.data)
            this.travelpriceList = response.data.data;
            this.travelBase = response.data.data;
            console.log(this.travelBase)
            this.total = response.data.total;
            this.loading = false;
          }
@@ -718,4 +712,3 @@
  
  }
  </style>
ruoyi-ui/src/views/travel/index.vue
@@ -135,7 +135,7 @@
      <el-dialog :title="title" :visible.sync="openDataScope" width="1500px" append-to-body >
       <div style="background-color: #FEF7FC;">
        <el-table v-loading="loading" :data="travelpriceList[detailList]" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"  >
        <el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"  >
          <el-table-column type="selection" width="55"  align="center" />
          <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
          <el-table-column label="时间" prop="happenTime" sortable width="100" align="center">
@@ -493,7 +493,7 @@
            //  alert(123)
            //   console.log(response.data)
            this.travelpriceList = response.data.data;
            console.log(this.travelpriceList[0])
            this.total = response.data.total;
            this.loading = false;
          }
@@ -574,7 +574,10 @@
      handleShow(row){
      const id = row.id;
      this.openDataScope = true
      this.getList()
   //   this.getList()
      //alert(123)
      this.detailList = row.detailList
      // alert(row.index)
      this.title = "展示详情";
      
     },
@@ -582,6 +585,8 @@
      /** 查看详细信息 */
      handleCheck(row){
        const id = row.id;
       // alert(id)
      //  alert(row.fee_id)
        this.$router.push("/self/travel/Info/" + id);
      },
      /** 修改按钮操作 */
@@ -590,7 +595,7 @@
        let jd = true
  
        this.$router.push({
          path:"/self/travel/Info/" + id,
          path:"/self/travel/edit/" + id,
          query:{
            detail:jd
          }
@@ -710,4 +715,3 @@
  
  }
  </style>