完善家庭会议模块

yz3456

2024-04-06 6378fa4ea01c8c6a92bd3bf710686f5deedf99dd

完善家庭会议模块

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

@@ -21,7 +21,7 @@

    <hr>

    <el-form :model="queryParams1">
<!--    <el-form :model="queryParams1">
      <el-row>
        <el-form-item label="" prop="people">
          <el-input v-model="queryParams1.people" placeholder="请输入搜索内容" clearable style="width: 200px;
@@ -33,6 +33,69 @@
          </el-input>
        </el-form-item>
      </el-row>
    </el-form> -->

    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">

      <el-form-item label="时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width: 240px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
      </el-form-item>
      <el-form-item label="地点" prop="address" >
        <el-input
          v-model="queryParams.address"
          placeholder="请输入地点"
          clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="申请部门或家庭" prop="applyOrganization" >
        <el-input
          v-model="queryParams.applyOrganization"
          placeholder="请输入申请部门或家庭"
          clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="申请人" prop="applicant" >
        <el-input
          v-model="queryParams.applicant"
          placeholder="请输入申请人"
          clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />

      </el-form-item>

      <el-form-item>
        <el-button  size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1;">搜索</el-button>
        <el-button  size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;
          opacity: 1;">重置</el-button>
      </el-form-item>
    </el-form>

    <el-table :data="tableData" border :header-cell-style="{ background: 'pink', fontSize: '13px', color: 'black' }"
@@ -114,11 +177,18 @@
    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>

      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
        <el-form-item label="时间" prop="timeSpan">
          <el-date-picker v-model="formDat.timeSpan" type="datetimerange" range-separator="至" start-placeholder="开始日期"
            end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">
          </el-date-picker>

        <el-form-item label="开始时间" prop="happenTime">
          <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="endTime">
          <el-date-picker v-model="formDat.endTime" 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="meetingTitle">
          <el-input v-model="formDat.meetingTitle" placeholder="请输入会议标题" clearable :style="{width: '100%'}">
          </el-input>
@@ -131,7 +201,6 @@
          <el-input v-model="formDat.capacity" placeholder="请输入可容纳人数" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>


        <el-form-item label="参与人数" prop="attendance">
          <el-input v-model="formDat.attendance" placeholder="请输入参与人数" clearable :style="{width: '100%'}">
@@ -146,10 +215,9 @@
          </el-input>
        </el-form-item>
        <el-form-item label="是否拜访水牌" prop="status">
          <el-select v-model="formDat.status" placeholder="请选择 " clearable :style="{width: '100%'}"
            :disabled="dsb">
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label"
              :value="item.value"></el-option>
          <el-select v-model="formDat.status" 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="name">
@@ -176,9 +244,12 @@
  export default {
    data() {
      return {
        // 显示搜索条件
        showSearch: true,
        open: false,
        title: "",
        tableData: [{

            title: '1',
            name: 'asasd',
            address: 'asdadsdasd',
@@ -229,11 +300,9 @@
          },
        ],
        formDat:{
          timeSpan: undefined,
          id: undefined,
          happenTime: undefined,
          endTime: undefined,
          timeSpan: undefined,
          meetingTitle: undefined,
          address: undefined,
          meetingID: undefined,
@@ -246,18 +315,79 @@
          url: "",
          status: undefined
        },
        queryParams1: {
      queryParams: {
          pageNum: 1,
          pageSize: 10,
          happenTime: undefined,
          people: undefined,
          address: undefined,
          title: undefined,
          remark: undefined
        }
        content:undefined,
        buyer:undefined,
        location:undefined,
        createDate:undefined,
        happenTime:undefined
      },
      dateRange: [],
      // 表单校验
      rules: {
        name: [{
          required: true,
          message: '请输入设备名称',
          trigger: 'blur'
        }],
        status: [{
          // required: true,
          message: '是否注销',
          trigger: 'change'
        }],
        buyer: [{
          required: true,
          message: '请输入购买人',
          trigger: 'blur'
        }],
        location: [{
          required: true,
          message: '请输入存放地点',
          trigger: 'blur'
        }],
        remark: [{
          // required: true,
          message: '请输入备注',
          trigger: 'blur'
        }],

        happenTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'blur'
        }],
        content: [{
          required: true,
          message: '请输入标题',
          trigger: 'blur'
        }],
      },
        typeOptions: [{
          value: '1',
          label: '是',
        },
          {
            value: '0',
            label: '否',
          }],

      }
    },
    methods: {
      /** 搜索按钮操作 */
      handleQuery() {
        this.queryParams.pageNum = 1;
        this.getList();
      },
      /** 重置按钮操作 */
      resetQuery() {
        this.dateRange = [];
        this.resetForm("queryForm");
        this.handleQuery();
      },


      newRequest(){
        this.open = true;

 ruoyi-ui/src/views/meeting/statistics.vue

@@ -6,7 +6,26 @@
      </el-backtop>

      <h1 style="font-size:21px;padding-top:30px;display: flex;">
        <span>会议统计</span>
        <p><span >会议统计</span></p>
        <div class="button-container"></div>
        <div style="display: flex; align-items: center;">
          <el-button @click="pictureStatistics" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 10px">
            <div class="form"><el-icon style="padding-right:30px;"></el-icon>
              <span class="text" style="width: 69px;height: 26px;font-size: 16px;
              font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">图标统计</span>
            </div>
          </el-button>
        </div>
        <div style="display: flex; align-items: center;">
          <el-button @click="newRequest" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 10px">
            <div class="form" style="width: 100px;"><el-icon style="padding-right:30px;"></el-icon>
              <span class="text" style="width: 69px;height: 26px;font-size: 16px;
              font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">新建</span>
            </div>
          </el-button>
        </div>


      </h1>

      <hr />
@@ -30,9 +49,19 @@
    font-size: 14px; /* 设置字体大小 */
  }
  .button-container {
    display: inline-flex; /* 设置按钮容器为行内元素 */
    /* display: inline-flex; 设置按钮容器为行内元素 */
    text-align: right;
    display: flex;
    justify-content: flex-end;
    align-items: center;
    flex-grow: 1;
  }
  .app-container {
    background-color: #FEF7FC;
  }
  .form{
    background:left/25% no-repeat url('../../assets/icons/add1.png') ;
    height: 50px;
    line-height: 50px;
  }
  </style>