Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2023-09-10 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1

 ruoyi-ui/src/views/travel/index.vue

@@ -2,7 +2,7 @@
  <div class="app-container" style="opacity: 1;">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <h1 style="font-size:21px">完美旅途</h1>
      <el-form-item label="时间" prop="startTime">
      <el-form-item label="时间" prop="startTime" >
        <el-date-picker
          v-model="dateRange"
          style="width: 240px;"
@@ -52,122 +52,187 @@
          v-hasPermi="['system:role:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['family:note:export']"
        >导出</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExportTemplate"
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
      <el-col :span="1.2">
        <el-upload
          action=""
          class="upload-demo"
          :show-file-list="false"
          :http-request="handleEnport"
        >
          <el-button size="mini"   type="primary"
                     plain
                     icon="el-icon-plus" >导入</el-button>

        </el-upload>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <!-- 序号、基金/台账、时间、收入/支出、用途、使用人、现金/自动扣划、余额、电子文件、备注 操作-->
    <!-- 这里有个familyList数组 是在data()中定义的 -->
    <el-table v-loading="loading" :data="travelpriceList"  @selection-change="handleSelectionChange" @row-click="handleShow" :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 fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="40"/>
      <el-table-column label="旅游名称" prop="tableName" sortable width="100" />
      <el-table-column label="标题" prop="title" sortable width="100" />
      <el-table-column label="去向" prop="destination" sortable width="50" />
    <el-table v-loading="loading" :data="travelpriceList" @row-click="getRowId" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="expand" :cell-class-name="expandRowClassName">
        <template slot-scope="props">
          <div  >
            <el-table  :header-row-class-name="tableHeaderRowClassName"  v-loading="loading" :data="travelBase[props.row.id]"  style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;" :row-class-name="tableRowClassName1" >
              <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="50px"/>

              <el-table-column label="时间" prop="happenTime" sortable width="100" align="center" >
                <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
              </el-table-column>

              <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="travelPeriod" sortable width="100" /> -->
              <el-table-column label="持证旅游" prop="certificate" sortable width="100" />
              <el-table-column label="总费用" prop="totalPrice" sortable width="100" />
              <el-table-column label="公费/自费" prop="self" sortable width="100" >
                <template slot-scope="scope">{{scope.row.self==0?'公费':'自费'}}</template>
              </el-table-column>
              <el-table-column label="餐费" prop="eat" sortable width="70px" />
              <el-table-column label="住宿" prop="stay" sortable width="70px" />
              <el-table-column label="交通" prop="traffic" sortable width="70px" />
              <el-table-column label="门票" prop="entrance" sortable width="70px" />
              <el-table-column label="购物" prop="shopping" sortable width="70px" />
              <el-table-column label="电子文件" prop="url" width="160" >
                <template slot-scope="scope" >
                  <img
                    class="el-upload-list__item-thumbnail"
                    src="../../assets/images/deviceLis.png"
                    alt=""
                    style="width: 35px; height: 35px;"
                    fit="cover"
                    v-if="scope.row.url !== null"
                  >
                  <img
                    class="el-upload-list__item-thumbnail"
                    src="../../assets/images/deviceA.png"
                    alt=""
                    style="width: 35px; height: 35px;"
                    fit="cover"
                    v-if="scope.row.url === null"
                  >
                </template>
              </el-table-column>
              <el-table-column label="备注" prop="remark" sortable width="100" />


              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
                  <el-button
                    size="mini"
                    type="text"
                    icon="el-icon-edit"
                    @click="handleUpdate1(scope.row)"
                    v-hasPermi="['familymodel:economy:info']"
                  >修改</el-button>
                  <el-button
                    size="mini"
                    type="text"
                    icon="el-icon-delete"
                    @click="handleDelete(scope.row)"
                    v-hasPermi="['system:role:remove']"
                  >删除</el-button>
                  <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck1(scope.row)">查看详情</el-button>

                </template>
              </el-table-column>
            </el-table>
          </div>


        </template>
      </el-table-column>
      <!-- <el-table-column type="selection" width="55"  align="center" /> -->
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60px"/>
      <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="totalDay" sortable width="85px" />
      <el-table-column label="旅游名称" prop="tableName" sortable width="100" />
      <el-table-column label="标题" prop="title" sortable width="130px" />
      <el-table-column label="去向" prop="destination" sortable width="70px" />
      <el-table-column label="旅游性质" prop="property" sortable width="100" />
      <el-table-column label="旅游方式" prop="type" 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="80" />
      <el-table-column label="餐费" prop="eat" sortable width="70px" />
      <el-table-column label="住宿" prop="stay" sortable width="70px" />
      <el-table-column label="交通" prop="traffic" sortable width="70px" />
      <el-table-column label="门票" prop="entrance" sortable width="70px" />
      <el-table-column label="购物" prop="shopping" sortable width="70px" />


      <el-table-column label="操作" align="center" sortable width="200" >
      <el-table-column fixed label="操作" align="center" sortable width="180" >
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">

          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['familymodel:economy:info']"
            v-hasPermi="['person:travel:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            class="button_delete"
            icon="el-icon-circle-plus"
            @click="handleAdd1(scope.row)"

            v-hasPermi="['person:travel:edit']"
          >新增</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"

            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          > <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
          > 删除</el-button>
          <!-- <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 class="button" size="mini" type="text"  @click="handleShow"  v-hasPermi="['system:role:add']">
            <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
          </el-dropdown> -->
          <!-- <el-button class="button" size="mini" type="text"  @click="handleShow"  v-hasPermi="['system:role:add']">
            <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button> -->

        </template>

      </el-table-column>
    </el-table>
    <div style="background-color: #FEF7FC;">
      <el-dialog :title="title" :visible.sync="openDataScope" width="1300px" append-to-body >
        <div style="background-color: #FEF7FC;">
          <el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"  >
            <el-table-column type="selection" width="50"  align="center" />
            <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
            <el-table-column label="时间" prop="happenTime" sortable width="150" align="center">
              <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
            </el-table-column>
            <el-table-column label="内容" prop="content" sortable :show-overflow-tooltip="true" width="100px" />
            <el-table-column label="总金额" prop="totalCost" sortable :show-overflow-tooltip="true" width="100px" />
            <el-table-column label="餐费" prop="eat" sortable :show-overflow-tooltip="true" width="100px" />
            <el-table-column label="住宿" prop="stay" sortable :show-overflow-tooltip="true" width="100px" />
            <el-table-column label="交通" prop="traffic" sortable :show-overflow-tooltip="true" width="100px" />
            <el-table-column label="门票" prop="entrance" sortable :show-overflow-tooltip="true" width="100px" />
            <el-table-column label="购物" prop="shopping" sortable :show-overflow-tooltip="true" width="100px" />

    <el-dialog :title="title" :visible.sync="openDataScope" width="1500px" append-to-body >
      <div style="background-color: #FEF7FC;">
        <el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"  >
          <el-table-column type="selection" width="50"  align="center" />
          <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
          <el-table-column label="时间" prop="happenTime" sortable width="150" align="center">
            <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
          </el-table-column>
          <el-table-column label="内容" prop="content" sortable :show-overflow-tooltip="true" width="160" />
          <el-table-column label="总金额" prop="totalCost" sortable :show-overflow-tooltip="true" width="160" />
          <el-table-column label="餐费" prop="eat" sortable :show-overflow-tooltip="true" width="160" />
          <el-table-column label="住宿" prop="stay" sortable :show-overflow-tooltip="true" width="160" />
          <el-table-column label="交通" prop="traffic" sortable :show-overflow-tooltip="true" width="150" />
          <el-table-column label="门票" prop="entrance" sortable :show-overflow-tooltip="true" width="150" />
          <el-table-column label="购物" prop="shopping" sortable :show-overflow-tooltip="true" width="150" />
            <el-table-column label="操作" align="center" sortable class-name="small-padding fixed-width">
              <template slot-scope="scope" v-if="scope.row.roleId !== 1">

        </el-table>
        <pagination
          v-show="total>0"
          :total="total"
          :page.sync="queryParams.pageNum"
          :limit.sync="queryParams.pageSize"
          @pagination="getList"
          style="background: #FEF7FC;"
        />
      </div>
                <el-button
                  size="mini"
                  type="text"
                  icon="el-icon-edit"
                  @click="handleUpdate1(scope.row)"
                  v-hasPermi="['familymodel:economy:info']"
                >修改</el-button>

    </el-dialog>
              </template>
            </el-table-column>

          </el-table>
          <pagination
            v-show="total>0"
            :total="total"
            :page.sync="queryParams.pageNum"
            :limit.sync="queryParams.pageSize"
            @pagination="getList"
            style="background: #FEF7FC;"
          />
        </div>

      </el-dialog>
    </div>
    <pagination
      v-show="total>0"
      :total="total"
@@ -179,12 +244,59 @@

    <!-- 添加或修改资产信息配置对话框 -->

    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
        <el-form-item label="台账" prop="type">
          <el-input v-model="formDat.type" placeholder="请输入内容" clearable :style="{width: '100%'}" ></el-input>
    <el-dialog :title="title" :visible.sync="dialog1Visible" width="800px" append-to-body>
      <el-form ref="elForm2" :model="formDat4" :rules="rules2" size="medium" label-width="100px">

        <el-form-item label="标题" prop="title">
          <el-input v-model="formDat4.title" placeholder="请输入标题" clearable :style="{width: '80%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="起始时间" prop="startTime">
          <el-input type="date" v-model="formDat4.startTime" placeholder="请选择起始时间" style="width: 80%;"></el-input>
        </el-form-item>
        <el-form-item label="结束时间" prop="endTime">
          <el-input type="date" v-model="formDat4.endTime" placeholder="请选择结束时间" style="width: 80%;"></el-input>
        </el-form-item>
        <el-form-item label="去向" prop="destination">
          <el-select v-model="formDat4.destination" placeholder="请选择去向" clearable :style="{width: '80%'}" >
            <el-option label="国内" value="国内"></el-option>
            <el-option label="国外" value="国外"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="旅游名称" prop="tableName">
          <el-input v-model="formDat4.tableName" placeholder="请输入旅游名称" clearable :style="{width: '80%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="旅游性质" prop="property">
          <el-select v-model="formDat4.property" placeholder="请选择性质" clearable :style="{width: '80%'}" >
            <el-option label="自费" value="自费"></el-option>
            <el-option label="公费" value="公费"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="旅游方式" prop="type">
          <el-select v-model="formDat4.type" placeholder="请选择旅游方式" clearable :style="{width: '80%'}" >
            <el-option label="自驾游" value="自驾游"></el-option>
            <el-option label="跟团游" value="跟团游"></el-option>
            <el-option label="自助游" value="自助游"></el-option>
          </el-select>
        </el-form-item>

      </el-form>
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">确 定</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>

    <el-dialog title="添加每日行程内容" :visible.sync="centerDialogVisible" width="60%" center append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
        <h4 class="form-header">行程内容 </h4>
        <el-form-item label="标题" prop="title">
          <el-input v-model="formDat.title" placeholder="请输入标题" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="时间" prop="happenTime">
          <el-input
            v-model='formDat.happenTime'
@@ -192,31 +304,41 @@
            placeholder='选择日期'
          ></el-input>
        </el-form-item>
        <el-form-item label="收入/支出" prop="price">
          <el-select v-model="formDat.price" placeholder="请选择收入/支出" clearable :style="{width: '100%'}"  >
        <el-form-item label="地点" prop="address">
          <el-input v-model="formDat.address" placeholder="请输入地点" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="人物" prop="people">
          <el-input v-model="formDat.people" placeholder="请输入人物" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="旅期" prop="travelPeriod">
          <el-input v-model="formDat.travelPeriod" placeholder="请输入旅期" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="持证旅游" prop="certificate">
          <el-select v-model="formDat.certificate" placeholder="请选择证件" clearable :style="{width: '80%'}" >
            <el-option label="居民身份证" value="居民身份证"></el-option>
            <el-option label="临时身份证" value="临时身份证"></el-option>
            <el-option label="户口本" value="户口本"></el-option>
            <el-option label="护照" value="护照"></el-option>
            <el-option label="学生证" value="学生证"></el-option>
          </el-select>
        </el-form-item>
        <!-- <el-form-item label="费用" prop="totalPrice">
          <el-input v-model="formDat.totalPrice" placeholder="请输入总共费用" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item> -->
        <el-form-item label="公费/自费" prop="self">
          <el-select v-model="formDat.self" placeholder="请选择自费/公费" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="金额" prop="balance">
          <el-input v-model="formDat.balance" placeholder="请输入余额" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="用途" prop="useFor">
          <el-input v-model="formDat.useFor" placeholder="请输入用途" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="使用人" prop="usePeople">
          <el-input v-model="formDat.usePeople" placeholder="请输入使用人" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="支付方式" prop="kind">
          <el-input v-model="formDat.kind" placeholder="请输入支付方式" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>


        <h4 class="form-header">相关图片 </h4>
        <el-upload
@@ -275,14 +397,41 @@
        </el-upload>

      </el-form>
      <el-form ref="elForm1" :model="formDat1" :rules="rules1" size="medium" label-width="100px">
        <h4 class="form-header">费用明细 </h4>
        <el-form-item label="内容" prop="content">
          <el-input v-model="formDat1.content" placeholder="请输入内容" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="住宿费用" prop="stay">
          <el-input v-model="formDat1.stay" placeholder="请输入住宿费用" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="交通费用" prop="traffic">
          <el-input v-model="formDat1.traffic" placeholder="请输入交通费用" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="餐费" prop="eat">
          <el-input v-model="formDat1.eat" placeholder="请输入餐费用" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="购物费用" prop="shopping">
          <el-input v-model="formDat1.shopping" placeholder="请输入购物费用" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="门票费用" prop="entrance">
          <el-input v-model="formDat1.entrance" placeholder="请输入门票费用" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

      </el-form>
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">确 定</el-button>
        <el-button @click="cancelData">取 消</el-button>
        <el-button type="primary" @click="submitDataScope1">确 定</el-button>
        <el-button @click="centerDialogVisible = false">取 消</el-button>
      </div>
    </el-dialog>


  </div>
</template>
@@ -294,7 +443,7 @@


//在system/note/index.js中导入接口函数  --接好了
import {listTravelPrice,enload,getTravelPriceInfo,delTravelPrice, addTravelPrice, uploadPic} from "@/api/travel/index";
import {listTravelPrice,enload,listTravelBase,delTravelPrice, addTravelPrice, uploadPic,updateTravelPrice,addTravelBase} from "@/api/travel/index";

export default {
  name: "Role",
@@ -305,7 +454,6 @@
      disabled: false,
      loading: true,
      formData:[],
      detailList:[],
      // 选中数组
      ids: [],
      // 非单个禁用
@@ -316,12 +464,19 @@
      showSearch: true,
      // 总条数
      total: 0,
      // 家大事记表格数据
      //
      travelpriceList: [],
      travelBase:[],
      baseData:[],
      detailList:[],
      // 弹出层标题
      title: "",
      title1:"",
      // 是否显示弹出层
      open: false,
      centerDialogVisible: false,
      dialog1Visible: false,
      dialog2Visible: false,
      // 是否显示弹出层（数据权限）
      openDataScope: false,
      menuExpand: false,
@@ -340,13 +495,37 @@
      dsb:true,
      btn:false,
      formDat: {
        type: undefined,
        createTime: undefined,
        useFor: undefined,
        usePeople: undefined,
        kind:undefined,
        people: undefined,
        address: undefined,
        happenTime: undefined,
        title: undefined,
        travelPeriod:undefined,
        certificate: undefined,
        totalPrice: undefined,
        self: undefined,
        remark: undefined,
        url: undefined,
      },
      formDat1: {
        eat: undefined,
        stay: undefined,
        traffic: undefined,
        entrance: undefined,
        shopping:undefined,
        content: undefined,
      },
      formDat2: {
        id: undefined,
        detailList: undefined,
      },
      formDat4: {
        type: undefined,
        startTime: undefined,
        title: undefined,
        endTime: undefined,
        property:undefined,
        tableName: undefined,
        destination: undefined,
        detailList:undefined,
      },
      // 菜单列表
@@ -369,53 +548,131 @@
        children: "children",
        label: "label"
      },
      // 表单校验
      //表单校验
      rules: {
        usePeople: [{
        people: [{
          required: true,
          message: '请输入使用人',
          message: '请输入人物',
          trigger: 'blur'
        }],

        useFor: [{
        address: [{
          required: true,
          message: '请输入用途',
          message: '请输入地点',
          trigger: 'blur'
        }],
        type: [{
        title: [{
          required: true,
          message: '请输入台账内容',
          message: '请输入标题',
          trigger: 'blur'
        }],
        balance: [{
        travelPeriod: [{
          required: true,
          message: '请输入金额',
          message: '请输入旅期',
          trigger: 'blur'
        }],
        kind: [{
          // required: true,
          message: '请输入支付方式',
        certificate: [{
          required: true,
          message: '请输入证件',
          trigger: 'blur'
        }],
        createTime: [{
        happenTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'change'
        }],
        price: [{
        totalPrice: [{
          required: true,
          message: '请选择事项内容',
          message: '请选择费用',
          trigger: 'blur'
        }],
        self: [{
          required: true,
          message: '请选择公费/自费',
          trigger: 'change'
        }],

      },
      rules1: {
        stay: [{
          required: true,
          message: '请输入人物',
          trigger: 'blur'
        }],

        content: [{
          required: true,
          message: '请输入地点',
          trigger: 'blur'
        }],
        traffic: [{
          required: true,
          message: '请输入标题',
          trigger: 'blur'
        }],
        entrance: [{
          required: true,
          message: '请输入旅期',
          trigger: 'blur'
        }],
        eat: [{
          required: true,
          message: '请输入证件',
          trigger: 'blur'
        }],
        shopping: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'change'
        }],

      },
      rules2: {
        type: [{
          required: true,
          message: '请输入旅游方式',
          trigger: 'blur'
        }],
        property: [{
          required: true,
          message: '请输入旅游性质',
          trigger: 'change'
        }],
        destination: [{
          required: true,
          message: '请选择去向',
          trigger: 'change'
        }],
        tableName: [{
          required: true,
          message: '请输入旅游名称',
          trigger: 'blur'
        }],
        startTime: [{
          required: true,
          message: '请选择日期',
          trigger: 'change'
        }],
        endTime: [{
          required: true,
          message: '请选择日期',
          trigger: 'change'
        }],
        title: [{
          required: true,
          message: '请选择标题',
          trigger: 'blur'
        }],
      },

      typeOptions: [
        {
          value: '收入',
          label: '收入',
          value: '0',
          label: '自费',
        },
        {
          value: '支出',
          label: '支出',
          value: '1',
          label: '公费',
        }],
      typeOptions1: [
        {
@@ -431,27 +688,20 @@
  },
  created() {
    this.getList();

  },
  methods: {

    //基金/台账的选择
    getSrc1(type) {
      if (type === 0) {
        return '基金'
      }else {
        return '台账'
      }
    //展开行
    expandRowClassName({ row, rowIndex }) {
      // 返回对应行的样式配置对象
      return {
        'expand-row': true, // 添加自定义样式类名
        'expand-row-height': '40px' // 设置展开行的高度
      };
    },

    getSrc2(kind) {
      if (kind == 0) {
        return '现金'
      }else  {
        return '自动扣划'
      }
    //首行样式
    tableHeaderRowClassName() {
      return 'custom-header-row';
    },

    // 取消按钮
    cancelData() {
      this.open = false;
@@ -466,7 +716,14 @@
        return "statistics-warning-row";
      }
    },

    //隔行变色
    tableRowClassName1({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
        return "statistics-warning-row3";
      } else {
        return "statistics-warning-row2";
      }
    },
    /** 查询角色列表 */
    //列表显示家大事记

@@ -478,16 +735,67 @@
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {

      listTravelPrice(this.queryParams).then(response => {
      listTravelPrice(this.queryParams).then(async response => {
          //  alert(123)
          //   console.log(response.data)
          this.travelpriceList = response.data.data;
          console.log(this.travelpriceList[0])
          // const targetId = row.id
          //   const detailList = filteredData.detailList;
          // console.log("detailList" );
          // console.log(detailList);
          // resolve(detailList);
          // console.log(this.detailList)
          // console.log(this.travelpriceList);
          this.total = response.data.total;

          for (let item of this.travelpriceList) {
            this.queryParams.fid = item.id
            this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
            this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
            const baseResponse = await listTravelBase(this.queryParams);
            const baseData = baseResponse.data.data;
            this.$set(this.travelBase, item.id, baseData);
            // debugger
            this.total = response.data.total;

            for(let item1 of item.detailList){
              console.log(item1);

              const targetDate = item1.happenTime; // 要查找的目标日期
              // console.log("targetDate" + targetDate);
              const keys = Object.keys(baseData);
              for (let i = 0; i < keys.length; i++) {
                const key = keys[i];
                const baseItem = baseData[key];
                // console.log("baseItem" + baseItem);
                if (baseItem.happenTime === targetDate) {
                  // 找到了符合条件的数据
                  const baseItem = baseData[key];
                  delete item1.id;
                  const mergedItem = { ...baseItem, ...item1 };

                  this.$set(baseData, key, mergedItem);
                  // console.log(baseData);

                  break;

                }

              }

            }


          }

          // console.log("打印完毕");

          this.loading = false;
        }
      );

    },

    handleRemove(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
@@ -504,6 +812,7 @@
    getRowId(row)
    {
      return row.id

    },
    // 取消按钮（数据权限）
    cancelDataScope() {
@@ -555,20 +864,134 @@
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加家庭收支台账";
      this.dialog1Visible = true;
      this.dialog2Visible = false;
      this.title = "添加旅游内容";
    },
    /** 新增按钮操作 */
    handleAdd1(row) {
      const id = row.id
      this.row = row;
      this.reset();
      this.centerDialogVisible = true;
      this.title1 = "添加每日行程内容";

    },

    /** 提交按钮（数据权限） */
    submitDataScope1: async function() {
      const id = this.row.id

      this.formDat2.detailList = [];
      console.log("调试");
      // console.log(this.formDat2.detailList);
      // await this.getList().then(detailList => {
      // this.formDat2.detailList = detailList;
      // console.log(this.formDat2.detailList);
      // });

      //   async function getData() {

      //    listTravelPrice(this.queryParams).then(async response => {

      //     this.travelpriceList = response.data.data;

      //     const filteredData = this.travelpriceList.filter(item => item.id === id);
      //     this.total = response.data.total;
      //     console.log( filteredData[0].detailList);


      //   //  this.formDat2.detailList =filteredData[0].detailList
      //   this.formDat2.detailList = filteredData[0].detailList;
      //   // console.log(this.formDat2.detailList );
      //   //  console.log(this.formDat2.detailList);
      //    return this.formDat2
      //   }).catch(error => {
      //     console.error("请求错误:", error);
      //   });
      // }

      async function getData() {
        try {
          const response = await listTravelPrice(this.queryParams);
          this.travelpriceList = response.data.data;

          const filteredData = this.travelpriceList.filter(item => item.id === id);
          console.log(filteredData[0].detailList);
          this.total = response.data.total;

          return filteredData[0].detailList;
        } catch (error) {
          console.error("请求错误:", error);
        }
      }
      this.formDat2.detailList = await getData();  // 调用async函数来获取数据并赋值给detailList

      console.log(" this.formDat2.detailList");
      console.log( this.formDat2.detailList);


      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.formDat.url = ul+","+uls
      // const fid = this.$route.params && this.$route.params.id;
      // this.formDat.feeId = this.$route.params && this.$route.params.id;
      this.formDat.feeId = id;
      this.formDat1.happenTime = this.formDat.happenTime;
      this.formDat2.detailList.push(this.formDat1);
      this.formDat2.id = id;
      const stay = parseFloat(this.formDat1.stay);
      const traffic = parseFloat(this.formDat1.traffic);
      const eat = parseFloat(this.formDat1.eat);
      const shopping = parseFloat(this.formDat1.shopping);
      const entrance = parseFloat(this.formDat1.entrance);

      const totalPrice = stay + traffic + eat + shopping + entrance;
      console.log("总费用");
      console.log(totalPrice);
      this.formDat.totalPrice=totalPrice;

      console.log(this.formDat2)
      console.log(this.formDat);

      this.$refs["elForm"].validate(valid => {
        if (valid) {

          addTravelBase(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.centerDialogVisible = false;
            this.getList();
          });

        }
      });
      this.$refs["elForm1"].validate(valid => {
        if (valid) {


          updateTravelPrice(this.formDat2).then(response => {
            // this.$modal.msgSuccess("费用新增成功");
            this.centerDialogVisible = false;
          });

        }
      });
    },
    //  弹窗
    handleShow(row){
      const id = row.id;

      this.openDataScope = true
      //   this.getList()
      //alert(123)
      this.detailList = row.detailList
      // alert(row.index)
      this.title = "展示详情";

      this.title = "每日费用详情";
      this.getList1()
    },

    /** 查看详细信息 */
@@ -578,18 +1001,29 @@
      //  alert(row.fee_id)
      this.$router.push("/self/travel/Info/" + id);
    },
    handleCheck1(row){
      const id = row.id;
      this.$router.push("/self/travel/travelInfo/" + id);
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      const id = row.id;
      // let jd = true

      // this.$router.push({
      //   path:"/self/travel/edit/" + id,
      //   query:{
      //     detail:jd
      //   }
      // });
      const id = row.id;
      // console.log(id);
      this.$router.push("/self/travel/edit/" + id);

    },
    /** 修改按钮操作 */
    handleUpdate1(row) {
      const id = row.id;
      let jd = true

      this.$router.push({
        path:"/self/travel/travelInfo/" + id,
        query:{
          detail:jd
        }
      });
    },


@@ -600,21 +1034,22 @@
    /** 提交按钮（数据权限） */
    submitDataScope: function() {

      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.formDat.url = ul+","+uls
      this.$refs["elForm"].validate(valid => {
      this.formDat4.detailList = [];
      this.$refs["elForm2"].validate(valid => {
        if (valid) {

          addEconomy(this.formDat).then(response => {
          console.log(this.formDat4);
          addTravelPrice(this.formDat4).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;

            this.dialog1Visible = false;
            this.getList();
          });
          // 清空formDat对象的数据
          Object.keys(this.formDat4).forEach(key => {
            this.formDat4[key] = '';
          });
          this.handleRemove(this.fileList[0]);
          this.handleRemoveFile(this.fileListOther[0]);
        }
      });
    },
@@ -702,7 +1137,13 @@
}
.el-table__row.statistics-warning-row1 {
  background: #FFEFF2;
}

.el-table__row.statistics-warning-row2 {
  background: #EBFFF2;
}
.el-table__row.statistics-warning-row3 {
  background: #f8f8dc;
}
.button {
  background: center no-repeat url('../../assets/images/弹窗 1.png') ;
@@ -713,4 +1154,8 @@

  /* margin-left: 66vw; */
}
.custom-header-row {
  background-color: #EBAFB4 /* 更改为你想要的背景颜色 */
  /* color: #FFF; 更改为你想要的文字颜色 */
}
</style>