提交了修改

feige

2024-02-02 bd40473c9c634005bc7e62e7fc901bcd8b598fa0

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

@@ -51,7 +51,7 @@
      <el-form-item label="时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width:  197px;
          style="width:  240px;
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
@@ -124,7 +124,7 @@
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
      <el-col :span="1.2">
      <el-col :span="1.5">

        <el-upload
          action=""
@@ -135,7 +135,7 @@
        >
          <el-button size="mini"   type="primary"
                     plain
                     icon="el-icon-plus" >导入</el-button>
                     icon="el-icon-top">导入</el-button>

        </el-upload>
      </el-col>
@@ -147,7 +147,7 @@
    <el-table v-loading="loading"  :data="familyList" :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-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
      <el-table-column label="发生时间" prop="happenTime" sortable width="200px" align="center">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
@@ -185,12 +185,14 @@
            ></div>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
          <div class="button-container">
            <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            :disabled="!scope.row.ownData"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['familymodel:bignote:list']"
          >修改</el-button>
@@ -198,6 +200,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
            :disabled="!scope.row.ownData"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
@@ -205,6 +208,7 @@
            <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>

          </el-dropdown>
          </div>
        </template>
      </el-table-column>
    </el-table>
@@ -237,11 +241,9 @@
        </el-form-item>

        <el-form-item label="发生时间" prop="happenTime">
          <el-input
            v-model='formDat.happenTime'
            type='date'
            placeholder='选择日期'
          ></el-input>
          <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></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>
@@ -431,8 +433,8 @@
        }],
        happenTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'change'
          message: '请选择日期',
          trigger: 'blur'
        }],
      },
      typeOptions: [],
@@ -478,16 +480,21 @@
      console.log(this.queryParams)
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

      let _this = this
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listFamilyevent(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data.data)
          // alert(response.data.data[1].url)
          this.familyList = response.data.data;
          if(response.msg=="您没加入到对应的家庭，请联系管理员")
          {
              _this.$modal.msgSuccess("您没加入到对应的家庭，请联系管理员");
              _this.loading = false;
          }else{
          _this.familyList = response.data.data;

          this.total = response.data.total;
          this.loading = false;
          _this.total = response.data.total;
          _this.loading = false;
          }
        }
      );
    },
@@ -560,7 +567,7 @@
    /** 修改按钮操作 */
    handleUpdate(row) {
      const id = row.id;
      let jd = true
      let jd = true;

      this.$router.push({
        path:"/familymodel/bignote/familyeventInfo/" + id,
@@ -724,7 +731,7 @@
  }
};
</script>
<style>
<style scoped="">
.el-table__row.statistics-warning-row {
  background: #E0EEFE;

@@ -733,4 +740,10 @@
  background: #FFEFF2;

}
.el-table__cell {
  font-size: 14px; /* 设置字体大小 */
}
.button-container {
  display: inline-flex; /* 设置按钮容器为行内元素 */
}
</style>