linwenling
2023-05-16 64bd3e7c7ee91e5249d2b03f58700277c328f11d
修改家庭资产bug
2个文件已修改
1个文件已删除
532 ■■■■ 已修改文件
ruoyi-ui/src/views/note/index.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/propertyInfo.vue 127 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/propertylnfo.vue 366 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/index.vue
@@ -2,19 +2,14 @@
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="类型" prop="type">
        <el-select
        <el-input
          v-model="queryParams.type"
          placeholder="所有类型"
          placeholder="请输入类型"
          clearable
          style="width: 240px"
        >
          <el-option
            v-for="dict in typeOptions"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
        <el-form-item label="标题" prop="title">
          <el-input
            v-model="queryParams.title"
@@ -51,7 +46,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
      </el-form-item>
      <el-form-item label="发生时间">
        <el-date-picker
          v-model="dateRange"
@@ -142,13 +137,12 @@
      <el-table-column label="存储地址" prop="location" sortable width="100" />
      <el-table-column label="持有人" prop="holder" sortable width="100" />
      <el-table-column label="具体位置" prop="address" sortable width="100" />
      <el-table-column label="备注信息" prop="remark" sortable width="100" />
      <el-table-column label="家庭号" prop="familyId" sortable width="100" />
      <el-table-column label="发生时间" align="center" sortable prop="happenTime" width="180">
      <el-table-column label="备注" prop="remark" sortable width="100" >
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.happenTime) }}</span>
        </template>
      <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" >
@@ -208,10 +202,7 @@
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
        <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-input v-model="formDat.type" placeholder="请输入类别" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="标题" prop="title">
          <el-input v-model="formDat.title" placeholder="请输入标题" clearable :style="{width: '100%'}" ></el-input>
@@ -226,10 +217,6 @@
        </el-form-item>
        <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="familyId">
          <el-input v-model="formDat.familyId" placeholder="请输入家庭号" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
@@ -286,7 +273,7 @@
          :http-request="requestUpload"
          :show-file-list="true"
        >
          <el-button type="primary">Click to upload</el-button>
          <el-button type="primary">点击上传</el-button>
          <template #tip>
            <div class="el-upload__tip">
            </div>
ruoyi-ui/src/views/note/propertyInfo.vue
@@ -2,19 +2,13 @@
  <div class="app-container">
    <div class="form-header mt">
      <h4 class="dt h4">资产详细信息 </h4>
      <el-button type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" :disabled="btn">编辑</el-button>
    </div>
    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
      <el-form-item label="id" prop="id">
        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"
          clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
      </el-form-item>
      <el-form-item label="类别" prop="type">
        <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}" :disabled="dsb" >
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            :disabled="item.disabled"></el-option>
        </el-select>
      <el-form-item label="类型" prop="type">
        <el-input v-model="formData.type" placeholder="请输入类型" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="标题" prop="title">
        <el-input v-model="formData.title" placeholder="请输入标题" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -37,38 +31,39 @@
      <h4 class="form-header">相关图片 </h4>
      <el-upload
      action="#"
      list-type="picture-card"
      multiple
      :http-request="requestUpload"
      :file-list="fileList"
        action="#"
        list-type="picture-card"
        multiple
        :http-request="requestUpload"
        :file-list="fileList"
      >
      <i slot="default" class="el-icon-plus"></i>
      <div slot="file" slot-scope="{file}">
        <img
          class="el-upload-list__item-thumbnail"
          :src="file.url"
          alt=""
          style="width: 147px; height: 147px"
          fit="cover"
          :preview-src-list="[file.url]"
        >
       <span class="el-upload-list__item-actions">
        <i slot="default" class="el-icon-plus"></i>
        <div slot="file" slot-scope="{file}">
          <img
            class="el-upload-list__item-thumbnail"
            :src="file.url"
            alt=""
            style="width: 147px; height: 147px"
            fit="cover"
            :preview-src-list="[file.url]"
          >
          <span class="el-upload-list__item-actions">
        <span
          v-if="isShow"
          class="el-upload-list__item-preview"
          @click="handlePictureCardPreview(file)"
        >
          <i class="el-icon-zoom-in"></i>
        </span>
        <span
          v-if="!disabled"
          v-if="isShow"
          class="el-upload-list__item-delete"
          @click="handleDownload(file.url)"
        >
          <i class="el-icon-download"></i>
        </span>
        <span
          v-if="!disabled"
          v-if="isShow"
          class="el-upload-list__item-delete"
          @click="handleRemove(file)"
        >
@@ -77,40 +72,41 @@
      </span>
    </div>
    </el-upload>
        </div>
      </el-upload>
      <h4 class="form-header">其他附件 </h4>
    <el-upload
            action=""
            :file-list="fileListOther"
            class="upload-demo"
            multiple
            list-type="picture-card"
            :on-preview="handleFileCardPreview"
            :on-remove="handleRemove"
            :http-request="requestUpload"
            :show-file-list="true"
          >
      <el-upload
        action=""
        :file-list="fileListOther"
        class="upload-demo"
        multiple
        list-type="picture-card"
        :on-preview="handleFileCardPreview"
        :on-remove="handleRemove"
        :http-request="requestUpload"
        :show-file-list="true"
      >
              <i slot="default" class="el-icon-plus"></i>
              <div slot="file" slot-scope="{file}">
                <img
                  class="el-upload-list__item-thumbnail"
                  src="../../assets/401_images/401.gif"
                  alt=""
                  style="width: 147px; height: 147px"
                  fit="cover"
                >
                <span class="el-upload-list__item-actions">
        <i slot="default" class="el-icon-plus"></i>
        <div slot="file" slot-scope="{file}">
          <img
            class="el-upload-list__item-thumbnail"
            src="../../assets/401_images/401.gif"
            alt=""
            style="width: 147px; height: 147px"
            fit="cover"
          >
          <span class="el-upload-list__item-actions">
                <span
                  v-if="isShow"
                  class="el-upload-list__item-preview"
                  @click="handleFileCardPreview(file)"
                >
                  <i class="el-icon-zoom-in"></i>
                </span>
                <span
    v-if="!disabled"
                  v-if="isShow"
                  @click="handleRemove(file)"
                  class="el-upload-list__item-delete"
@@ -118,22 +114,22 @@
                  <i class="el-icon-download"></i>
                </span>
                <span
                  v-if="!disabled"
                  v-if="isShow"
                  class="el-upload-list__item-delete"
                  @click="handleRemove(file)"
                  @click="handleRemoveFile(file)"
                >
                  <i class="el-icon-delete"></i>
                </span>
              </span>
              </div>
        </div>
          </el-upload>
      </el-upload>
      <el-form-item size="large">
        <el-button type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
      </el-form-item>
    </el-form>
@@ -164,8 +160,9 @@
      ],
      dsb:true,
      btn:false,
      isShow:true,
      formData: {
        id: undefined,
        type: undefined,
        title: undefined,
        location: undefined,
@@ -179,11 +176,7 @@
        dialogVisible: false,
        disabled: false,
      rules: {
        id: [{
          required: true,
          message: '请输入id',
          trigger: 'blur'
        }],
        type: [{
          required: true,
          message: '请选择类别',
@@ -209,11 +202,7 @@
          message: '请输入具体位置',
          trigger: 'blur'
        }],
        remark: [{
          required: true,
          message: '请输入备注',
          trigger: 'blur'
        }],
      },
      typeOptions: [],
@@ -229,12 +218,14 @@
      jd =  this.$route.query.detail
      this.btn= jd
      this.dsb = !jd
      this.isShow=true
      document.title = "修改资产详细信息";
      this.$route.meta.title = "修改资产详细信息";//列表的名称
    }
    else{
      document.title = "查看资产详细信息";
      this.$route.meta.title = "查看资产详细信息";//列表的名称
      this.isShow=false
    }
    let _this = this
ruoyi-ui/src/views/note/propertylnfo.vue
File was deleted