修改家庭设备bug

linwenling

2023-05-16 579fcaaeb4f3d55b3137445055f4a27af0773c8c

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

@@ -13,6 +13,15 @@
          end-placeholder="结束日期"
        ></el-date-picker>
      </el-form-item>
      <el-form-item label="设备名称" prop="name" >
        <el-input
          v-model="queryParams.name"
          placeholder="请输入设备名称"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="购买人" prop="buyer" >
        <el-input
          v-model="queryParams.buyer"
@@ -33,10 +42,10 @@

      </el-form-item>

      <el-form-item label="事项内容" prop="content">
      <el-form-item label="标题" prop="content">
        <el-input
          v-model="queryParams.content"
          placeholder="请输入事项内容"
          placeholder="请输入标题"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
@@ -120,16 +129,22 @@
      <el-table-column label="设备名称" prop="name" sortable width="120" />

      <el-table-column label="时间" align="center" sortable prop="happenTime" width="180">
        <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">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.happenTime) }}</span>
          {{ getSrc1(scope.row.status) }}
        </template>
      </el-table-column>

      <el-table-column label="购买人" prop="buyer" sortable width="100" />
      <el-table-column label="事项内容" prop="content" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="标题" prop="content" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="存放地点" prop="location" 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="备注" prop="remark" sortable width="100" >
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>


      <el-table-column label="电子文件" prop="url" width="160" >
           <template slot-scope="scope" >
             <img
@@ -138,7 +153,7 @@
               alt=""
               style="width: 35px; height: 35px;"
               fit="cover"
                v-if="scope.row.url !== null"
            v-if="scope.row.url !== ','"
             >
      <img
               class="el-upload-list__item-thumbnail"
@@ -146,7 +161,7 @@
               alt=""
               style="width: 35px; height: 35px;"
               fit="cover"
                v-if="scope.row.url === null"
            v-if="scope.row.url === ','"
             >
           </template>
        </el-table-column>
@@ -192,17 +207,12 @@
          <el-input v-model="formDat.name" placeholder="请输入设备名称" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>

        <!-- <el-form-item label="时间" prop="createDate">
          <el-input v-model="formDat.createDate" placeholder="请输入时间" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
         -->
        <el-form-item label="时间" prop="createDate">
        <el-form-item label="发生时间" prop="happenTime">
          <el-date-picker
            v-model='formDat.createDate'
            v-model='formDat.happenTime'
            type='date'
            placeholder='选择日期'
          ></el-date-picker>

        </el-form-item>


@@ -211,16 +221,18 @@
          <el-input v-model="formDat.buyer" placeholder="请输入购买人" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="事项内容" prop="content">
        <el-form-item label="标题" prop="content">
          <el-input v-model="formDat.content" 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="familyId">
          <el-input v-model="formDat.familyId" placeholder="请输入家庭号" clearable :style="{width: '100%'}" >
          </el-input>
        <el-form-item label="是否注销" prop="status">
          <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="remark">
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
@@ -359,6 +371,7 @@
        remark: undefined,
        familyId:undefined,
        url: undefined,
        status:undefined,
      },
      // 菜单列表
      menuOptions: [],
@@ -386,6 +399,12 @@
          message: '请输入设备名称',
          trigger: 'blur'
        }],
        status: [{
          required: true,
          message: '是否注销',
          trigger: 'change'
        }],


        buyer: [{
          required: true,
@@ -397,28 +416,31 @@
          message: '请输入存放地点',
          trigger: 'blur'
        }],
        // remark: [{
        remark: [{
        //   required: true,
        //   message: '请输入备注',
        //   trigger: 'blur'
        // }],
        familyId: [{
          required: true,
          message: '请输入家庭号',
          message: '请输入备注',
          trigger: 'blur'
        }],
        // createDate: [{
        //   required: true,
        //   message: '请选择日期选择',
        //   trigger: 'change'
        // }],

        happenTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'change'
        }],
        content: [{
          required: true,
          message: '请选择事项内容',
          message: '请输入标题',
          trigger: 'blur'
        }],
      },
      typeOptions: [],
      typeOptions: [{
        value: '1',
        label: '是',
      },
        {
          value: '0',
          label: '否',
        }],
    };
  },
  created() {
@@ -427,6 +449,15 @@

  },
  methods: {

    getSrc1(status) {
      if (status === 1) {
        return '是'
      }else {
        return '否'
      }
    },

    // 取消按钮
    cancelData() {
      this.open = false;