feige
2024-02-20 8251d3ac36429c3522b589518b60cecbd1d3ec5b
修改了文件
5个文件已修改
26 ■■■■■ 已修改文件
ruoyi-ui/src/views/bignote/familyeventInfo.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/equipmentInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/secretInfo.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -101,6 +101,7 @@
                  style="margin-left: 10px"
                  size="small"
                  type="success"
                  v-if="btn"
                  @click="picUpload"
                >上传到服务器</el-button>
      <h4 class="form-header">其他附件 </h4>
@@ -186,6 +187,7 @@
                  style="margin-left: 10px"
                  size="small"
                  type="success"
                  v-if="btn"
                  @click="fileUpload"
                >上传到服务器</el-button>
                      <h4 class="form-header"> </h4>
@@ -478,7 +480,7 @@
        var formData = new FormData();
        this.$refs.upload1.submit();
        // formData.append('uploadFile', file);
    //    if(this.uploadFileList1.length==0)
        
        this.uploadFileList1.forEach((elem)=>{
            formData.append("files", elem)
ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -24,7 +24,7 @@
        <el-input v-model="formData.name" placeholder="请输入设备名称" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="时间" prop="happenTime">
        <el-input v-model="formData.happenTime" placeholder="请输入时间" clearable :style="{width: '100%'}" :disabled="dsb">
        <el-input v-model="formData.happenTime" placeholder="请输入时间" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="购买人" prop="buyer">
ruoyi-ui/src/views/secret/index.vue
@@ -117,7 +117,7 @@
      </el-row>
      <el-table v-loading="loading" :data="secretList"  :row-key="getRowId" ref="multipleTable" @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="secretList"  :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
        <el-table-column type="selection"  :reserve-selection="true" width="55"  align="center" />
        <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
        <el-table-column label="发生时间" prop="happenTime" sortable width="150" align="center">
@@ -136,7 +136,7 @@
            <template slot-scope="scope">{{scope.row.isFace===1 ?'是': '否'}}</template>
        </el-table-column>
        <el-table-column label="私有/公有" prop="isPrivate" sortable width="100" >
          <template slot-scope="scope">{{scope.row.isFace===1 ?'私有': '公有'}}</template>
          <template slot-scope="scope">{{scope.row.isPrivate===1 ?'私有': '公有'}}</template>
        </el-table-column>
        <el-table-column label="存放位置" prop="location" sortable width="100" >
          <template slot-scope="scope">{{scope.row.location? scope.row.location: '————'}}</template>
ruoyi-ui/src/views/secret/secretInfo.vue
@@ -336,7 +336,7 @@
            this.formData.isFace = '是'
          else
          this.formData.isFace = '否'
          if(this.formData.isPrivate==1)
          if(this.formData.isPrivate==0)
                 this.formData.isPrivate = '公有'
               else
               this.formData.isPrivate = '私有'
@@ -399,9 +399,9 @@
          else
          this.formData.isFace = 0
          if(this.formData.isPrivate== '公有')
                 this.formData.isPrivate =1
                 this.formData.isPrivate =0
               else
               this.formData.isPrivate = 0
               this.formData.isPrivate = 1
        this.$refs['elForm'].validate(valid => {
@@ -417,7 +417,7 @@
                       this.formData.isFace = '是'
                     else
                     this.formData.isFace = '否'
                     if(this.formData.isPrivate==1)
                     if(this.formData.isPrivate==0)
                            this.formData.isPrivate = '公有'
                          else
                          this.formData.isPrivate = '私有'
@@ -433,7 +433,7 @@
                     this.formData.isFace = '是'
                   else
                   this.formData.isFace = '否'
                   if(this.formData.isPrivate==1)
                   if(this.formData.isPrivate==0)
                          this.formData.isPrivate = '公有'
                        else
                        this.formData.isPrivate = '私有'
ruoyi-ui/src/views/travel/index.vue
@@ -108,7 +108,9 @@
              <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="shopping" sortable width="70px" />-->
             <el-table-column label="其它费用" prop="entrance" sortable width="120px" />
             <el-table-column label="备注" prop="entrance" sortable width="120px" />
              <el-table-column label="电子文件" prop="url" width="160" >
                <template slot-scope="scope" >
                  <img
@@ -170,6 +172,7 @@
      <el-table-column label="旅游名称" prop="name" sortable width="200px" />
      <el-table-column label="去向" prop="destination" sortable width="150px" />
      <el-table-column label="旅游性质" prop="property" sortable width="100" />
           <el-table-column label="感言" prop="groupTotal" sortable width="120px" />
      <el-table-column label="旅游方式" prop="manner" sortable width="100" />
      <el-table-column label="总金额" prop="totalPrice" sortable width="100" />
      <el-table-column label="餐费" prop="eatTotal" sortable width="70px" />
@@ -177,6 +180,7 @@
      <el-table-column label="交通" prop="travelTotal" sortable width="70px" />
      <el-table-column label="门票" prop="entranceTotal" sortable width="70px" />
      <el-table-column label="团费" prop="groupTotal" sortable width="70px" />
      <el-table-column  label="操作" align="center" sortable width="180" >