linwenling
2023-07-18 32076631dd56059c12422c8ca62def50264369fc
家庭资产管理 (修改图片 正常)
2个文件已修改
84 ■■■■ 已修改文件
ruoyi-ui/src/views/note/index.vue 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/propertyInfo.vue 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/index.vue
@@ -10,6 +10,7 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
        <el-form-item label="标题" prop="title">
          <el-input
            v-model="queryParams.title"
@@ -46,7 +47,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
      <!-- </el-form-item> -->
      <el-form-item label="发生时间">
        <el-date-picker
          v-model="dateRange"
@@ -106,7 +107,7 @@
            plain
            icon="el-icon-download"
            size="mini"
            @click="handleExportTemplate"
          @click="handleExport"
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
@@ -127,10 +128,10 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
    <el-table v-loading="loading" :data="propertyList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <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="120"/>
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
      <el-table-column label="类型" prop="type" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="标题" prop="title" sortable :show-overflow-tooltip="true" width="150" />
@@ -140,13 +141,12 @@
      <el-table-column label="备注" prop="remark" sortable width="100" >
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>
      <!-- <el-table-column label="家庭号" prop="familyId" sortable width="100" /> -->
      <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="url" width="160" >
           <template slot-scope="scope" >
             <div  @click="handleCheck(scope.row)">
             <img
               class="el-upload-list__item-thumbnail"
               src="../../assets/images/deviceLis.png"
@@ -162,7 +162,7 @@
               style="width: 35px; height: 35px;"
               fit="cover"
                v-if="scope.row.url === ','"
      ></div>
          >
           </template>
        </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -201,23 +201,21 @@
    <!-- 添加或修改资产信息配置对话框 -->
    <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-form-item>
        <!-- <el-form-item label="类别" prop="type">
          <el-select v-model="formDat.type" 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="title">
          <el-input v-model="formDat.title" placeholder="请输入标题" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="存储地址" prop="location">
          <el-input v-model="formDat.location" placeholder="请输入存储地址" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="发生时间" prop="happenTime">
          <el-date-picker
            v-model='formDat.happenTime'
            type='date'
            placeholder='选择日期'
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="持有人" prop="holder">
          <el-input v-model="formDat.holder" placeholder="请输入持有人" clearable :style="{width: '100%'}" >
@@ -227,7 +225,13 @@
          <el-input v-model="formDat.address" placeholder="请输入具体位置" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="发生时间" prop="happenTime">
          <el-date-picker
            v-model='formDat.happenTime'
            type='date'
            placeholder='选择日期'
          ></el-date-picker>
        </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>
@@ -363,6 +367,7 @@
        holder: undefined,
        address: undefined,
        remark: undefined,
        happenTime:undefined,
        url: undefined,
      },
@@ -392,8 +397,8 @@
      rules: {
        type: [{
          required: true,
          message: '请选择类别',
          trigger: 'change'
          message: '请输入类型',
          trigger: 'blur'
        }],
        title: [{
          required: true,
@@ -415,12 +420,8 @@
          message: '请输入具体位置',
          trigger: 'blur'
        }],
        familyId: [{
          required: true,
          message: '请输入familyId',
          trigger: 'blur'
        }],
        createTime: [{
        happenTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'change'
@@ -440,10 +441,7 @@
      this.open = false;
      this.reset();
    },
    getRowId(row)
    {
      return row.id
    },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
@@ -484,7 +482,11 @@
    },
    handleRemove(file) {
      alert(323)
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
          this.$delete(this.fileListOther,i);
      }
    },
    // 取消按钮
    cancel() {
@@ -587,6 +589,10 @@
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
    },
    requestUpload(params)
    {
@@ -614,7 +620,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除所选数据项?').then(function() {
      this.$modal.confirm('是否确认删除资产编号为"' + Ids + '"的数据项?').then(function() {
        return delProperty(Ids);
      }).then(() => {
        this.getList();
@@ -623,22 +629,8 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      const Ids = this.ids;
      if(Ids.length==0)
      {
      this.download('family/property/export', {
        ...this.queryParams
      }, `property_${new Date().getTime()}.xlsx`)
      }else{
        this.download('family/property/export1/'+Ids, {
          ...this.queryParams
        }, `property_${new Date().getTime()}.xlsx`)
      }
    },
    handleExportTemplate(){
      this.download('family/property/model', {
      }, `property_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
@@ -647,7 +639,7 @@
    var formData = new FormData();
    formData.append('excelImport', file);
    let _this = this
      alert(file)
    enload(formData).then(response => {
       _this.getList();
      Message({ message: "导入成功", type: 'warning' })
ruoyi-ui/src/views/note/propertyInfo.vue