修改bug

feige

2024-09-10 598fe738b22d39172b068db5309476e08481e868

修改bug

 ruoyi-ui/src/api/self/index.js

@@ -5,7 +5,6 @@
  return request({
    url: '/self/user' ,
    method: 'get',

  })
}
//更新个人信息

 ruoyi-ui/src/api/travel/index.js

@@ -82,7 +82,13 @@
  })
}

export function getTravelBaseInfoBycid(cid) {
  return request({
    url: '/travel/detail/' + cid,
    method: 'get',

  })
}
// 根据id查询所有收支台账信息
export function getTravelBaseInfo(id) {
  return request({

 ruoyi-ui/src/views/clanManager/ancestor/index.vue

@@ -134,8 +134,7 @@
                <el-dropdown-menu slot="dropdown">
                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
          
                </el-dropdown-menu>
              </el-dropdown>
            </template>
@@ -624,14 +623,16 @@
    },
    /** 重置密码按钮操作 */
    handleResetPwd(row) {
      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
        // alert(333)
        // alert(row.sysId)
      this.$prompt('请输入"' + row.name + '"的新密码', "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        closeOnClickModal: false,
        inputPattern: /^.{5,20}$/,
        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
      }).then(({ value }) => {
          resetUserPwd(row.userId, value).then(response => {
          resetUserPwd(row.sysId, value).then(response => {
            this.$modal.msgSuccess("修改成功，新密码是：" + value);
          });
        }).catch(() => {});

 ruoyi-ui/src/views/clanManager/clan/index.vue

@@ -228,19 +228,19 @@
  methods: {
    chongf(){
      //alert(2)
      if(this.form.name!=""){
      findByFname(this.form.name).then(response => {
          console.log(response.data)
       //   alert(response.data!=null)
          if(response.data!=null)
          {
            this.$set(this.form,'name',"")
            this.$modal.msgSuccess("家庭号已经存在！")
          }
      // if(this.form.name!=""){
      // findByFname(this.form.name).then(response => {
      //     console.log(response.data)
      //  //   alert(response.data!=null)
      //     if(response.data!=null)
      //     {
      //       this.$set(this.form,'name',"")
      //       this.$modal.msgSuccess("家庭号已经存在！")
      //     }
         

      });
      }
      // });
      // }
    },
    handleChange(){
      let _this = this;
@@ -477,14 +477,19 @@
      let _this = this
      this.$refs["form"].validate(valid => {
        if (valid) {
        //  alert(this.form.id)
         //alert(this.form.id)
          if (this.form.clanId != undefined) {
          //  alert(this.form.name)
           // this.form.menuIds = this.getMenuAllCheckedKeys();
            updateClan(this.form).then(response => {
                console.log(response)
              if(response.msg=="家族名称不能重复！")
                this.$modal.msgSuccess("家族名称不能重复")
                else{
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
              }
            });
          } else {
     

 ruoyi-ui/src/views/index.vue

@@ -78,8 +78,12 @@
      getUserProfile().then(response => {
        this.user = response.data;
      });
	  
      let clanId = this.$store.state.user.clanId
    //  alert(clanId)
      if(clanId==null)
      {
        //alert(clanId)
        return}
      listRoot(10,clanId).then(response =>{
        this.rootList =response.data;


 ruoyi-ui/src/views/system/user/index.vue

@@ -581,6 +581,7 @@

    hanldeLoop(){
        let fid = this.form.fid
        alert(fid)
        let _this = this
        if(this.cuid==undefined)
        {
@@ -976,6 +977,8 @@
          }
          fm.fid = this.form.fid
          fm.mid = this.form.mid
          alert(this.form.fid)
          alert(this.form.mid)
    //    alert(this.form.isMyFamily)
          fm.isMyFamily = this.form.isMyFamily=='1'?1:0


 ruoyi-ui/src/views/system/user/profile/index.vue

@@ -64,7 +64,7 @@
    <div style="padding-top: 20px; background-color: #F4FFF8;">

      <el-divider></el-divider>
      <div >
      <div v-if="roleJudge">
          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
       <el-row>
       <el-col :span="10" :xs="24">
@@ -99,7 +99,7 @@
        </el-form>
      </div>
      <el-divider></el-divider>
      <div>
      <div v-if="roleJudge">
        <el-form>
        <el-row>
          <el-col :span="10" :xs="24">
@@ -151,6 +151,7 @@
  components: { userAvatar, userInfo, resetPwd },
  data() {
    return {
        roleJudge:false,
      formDat: {
        familyName: undefined,
        modelName: undefined,
@@ -405,9 +406,12 @@
     //    console.log("打印家庭成员序列"+id)
     //    console.log(this.FaimlyList)
     //  });
    // alert(id)
      getIndividualList().then(response => {
        this.user = response.data;
        // console.log(this.user,'useruseruser')
        console.log(this.user,'useruseruser')
        if(response.data.roleId==3)
            this.roleJudge = true;
       // alert(890)
        this.fid = response.data.familyId
    //    alert(this.fid)
@@ -431,7 +435,8 @@

    let _this = this
        let clanId = this.$store.state.user.clanId

        if(clanId==null)
            return
    getAllInfo(clanId).then(response=>{
      let fams = response.data
      for(let i = 0; i < fams.length; i++)

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

@@ -89,64 +89,70 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" border :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="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="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="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 !== ','"
          >
          <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 === ','"
          >
        </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="handleUpdate(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>

        </template>
      </el-table-column>
    </el-table>
    <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="happenDate" sortable width="100" align="center" >
                    <template slot-scope="scope">{{scope.row.happenDate? scope.row.happenDate: '————'}}</template>
                  </el-table-column>
    
                  <el-table-column label="地点" prop="address" sortable width="100" />
    
                  <el-table-column label="建筑" prop="scenic" sortable width="100" />
                  <!-- <el-table-column label="旅期" prop="travelPeriod" sortable width="100" /> -->
                  <el-table-column label="使用证件" prop="document" sortable width="100" />
                  <el-table-column label="车次/航班" prop="flight" sortable width="120px" />
                  <el-table-column label="餐费" prop="eat" sortable width="70px" />
                  <el-table-column label="住宿费" prop="stay" sortable width="100px" />
                  <el-table-column label="交通" prop="travel" sortable width="70px" />
                  <el-table-column label="门票" prop="entrance" sortable width="70px" />
                 <el-table-column label="其它费用" prop="otherCost" sortable width="120px" />
                 <el-table-column label="备注" prop="backInfo" sortable width="120px" />
    
                  <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 === '' || scope.row.url === ',' || scope.row.url === null)"
                      >
                      <img
                        v-else
                        class="el-upload-list__item-thumbnail"
                        src="../../assets/images/deviceA.png"
                        alt=""
                        style="width: 35px; height: 35px;"
                        fit="cover"
                      >
                    </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" v-if="userId != 2">
                    <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="handleDelete1(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>

    <pagination
      v-show="total>0"
@@ -353,6 +359,11 @@
      deptNodeAll: false,
      // 日期范围
      dateRange: [],
      queryParams: {
        pageNum: 1,
        pageSize: 10,
	  
      },
      // 数据范围选项
    // 数据范围选项
    fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
@@ -513,7 +524,7 @@


    const id = this.$route.params && this.$route.params.id;
    this.getList1();
  //  this.getList1();
    this.getList(id);

  },
@@ -558,14 +569,15 @@
    getList(fid) {
      this.loading = true;
      this.queryParams.fid = fid
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      // this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      // this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

      // console.log(this.queryParams)
      // // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listTravelBase(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          console.log(response.data)
            console.log(response.data.data)
          this.travelBase = response.data.data;
          // console.log(this.travelBase)
          this.total = response.data.total;
@@ -585,7 +597,7 @@
          this.loading = false;
          const detailList = filteredData.detailList;
          // console.log(detailList);
          resolve(detailList);
       //   resolve(detailList);
        }).catch(error => {
          console.error("请求错误:", error);
          reject(error);

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

@@ -1430,6 +1430,7 @@
    },
    handleCheck1(row){
      const id = row.id;
      alert(id)
      this.$router.push("/self/travel/travelInfo/" + id);
    },
    /** 修改按钮操作 */

 ruoyi-ui/vue.config.js

@@ -37,7 +37,7 @@
      // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
      //target: `https://10.39.18.174:8080/`,
    //  target: `https://192.168.1.3:8080/`,
    // target: `https://192.168.1.7:8080/`,
      target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {