家谱中配偶的第几代不显示

Tcsm

2023-08-05 60ae08e4437faa2c881bda539d57921b837cc8df

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

@@ -6,7 +6,7 @@
        <el-date-picker
          v-model="dateRange"
          style="width: 240px;"
          value-format="yyyy-MM-dd HH-MM"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
@@ -128,10 +128,10 @@
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
      <el-table-column label="设备名称" prop="name" sortable width="120" />

      <el-table-column label="时间" align="happenTime" sortable prop="happenTime" width="180">
      <el-table-column label="时间" align="happenTime" sortable prop="happenTime" width="150">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="是否注销" align="center" sortable prop="status" width="180">
      <el-table-column label="是否注销" align="center" sortable prop="status" width="120">
        <template slot-scope="scope">
          {{ getSrc1(scope.row.status) }}
        </template>
@@ -145,7 +145,7 @@
      </el-table-column>


      <el-table-column label="电子文件" prop="url" width="180" align="center">
      <el-table-column label="电子文件" prop="url" width="120" align="center">

        <template slot-scope="scope" >
          <div  @click="handleCheck(scope.row)">
@@ -210,11 +210,11 @@
        </el-form-item>

        <el-form-item label="发生时间" prop="happenTime">
          <el-date-picker
          <el-input
            v-model='formDat.happenTime'
            type='date'
            placeholder='选择日期'
          ></el-date-picker>
          ></el-input>
        </el-form-item>


@@ -285,7 +285,7 @@
          class="upload-demo"
          multiple

          :on-remove="handleRemove"
          :on-remove="handleRemoveFile"
          :http-request="requestUpload"
          :show-file-list="true"
        >
@@ -403,7 +403,7 @@
          trigger: 'blur'
        }],
        status: [{
          required: true,
          // required: true,
          message: '是否注销',
          trigger: 'change'
        }],
@@ -482,6 +482,8 @@

    getList() {
      this.loading = true;
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listEquipment(this.queryParams).then(response => {
@@ -581,6 +583,20 @@
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
    },
    handleRemove(file) {
      for(let i = 0; i < this.fileList.length; i++)
      {
        if(this.fileList[i].url==file.url)
          this.$delete(this.fileList,i);
      }
    },
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
          this.$delete(this.fileListOther,i);
      }
    },
    /** 提交按钮（数据权限） */
    submitDataScope: function() {

@@ -601,6 +617,12 @@
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
      this.handleRemove(this.fileList[0]);
      this.handleRemoveFile(this.fileListOther[0]);
    },
    requestUpload(params)
    {