修改家庭设备bug

linwenling

2023-05-16 579fcaaeb4f3d55b3137445055f4a27af0773c8c

修改家庭设备bug

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

@@ -2,20 +2,11 @@
    <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> -->

        <el-form-item label="设备名称" prop="name">
          <el-input v-model="formData.name" placeholder="请输入设备名称" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>
@@ -35,14 +26,17 @@
          <el-input v-model="formData.location" placeholder="请输入存放地址" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
      <el-form-item label="是否注销" prop="status">
        <el-select v-model="formData.status=== 1 ? '是':'否'" placeholder="请选择是否注销" clearable :style="{width: '100%'}" :disabled="dsb" >
        </el-select>
      </el-form-item>


        <el-form-item label="家庭号" prop="familyId">
      <!-- <el-form-item label="家庭号" prop="familyId">
        <el-input v-model="formData.familyId" placeholder="请输入家庭号" :maxlength="11" show-word-limit :disabled="true"
          clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
      </el-form-item>
    </el-form-item> -->
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        <el-input v-model="formData.remark" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>


@@ -66,20 +60,21 @@
            >
            <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)"
          >
@@ -115,13 +110,14 @@
                  >
                  <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"

@@ -129,7 +125,7 @@
                    <i class="el-icon-download"></i>
                  </span>
                  <span
                    v-if="!disabled"
                  v-if="isShow"
                    class="el-upload-list__item-delete"
                    @click="handleRemoveFile(file)"
                  >
@@ -143,9 +139,8 @@

            </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>

@@ -176,15 +171,15 @@
        ],
        dsb:true,
        btn:false,
      isShow:true,
        formData: {
          id: undefined,
          // type: undefined,

          name: undefined,
          location: undefined,
          buyer: undefined,
          content: undefined,
          remark: undefined,
          familyId:undefined,
        status:undefined,
          url: undefined,
          happenTime:undefined
        },
@@ -193,14 +188,15 @@
        dialogVisible: false,
        disabled: false,
        rules: {
          // id: [{
          //   required: true,
          //   message: '请输入id',
          //   trigger: 'blur'
          // }],

          happenTime: [{
            required: true,
            message: '请选择时间',
          trigger: 'change'
        }],
        status: [{
          required: true,
          message: '请选择是否注销',
            trigger: 'change'
          }],
          name: [{
@@ -208,11 +204,7 @@
            message: '请输入设备名称',
            trigger: 'blur'
          }],
          familyId: [{
            required: true,
            message: '请输入家庭号',
            trigger: 'blur'
          }],

          buyer: [{
            required: true,
            message: '请输入购买人',
@@ -223,18 +215,14 @@
            message: '请输入存放地点',
            trigger: 'blur'
          }],
          familyId: [{
            required: true,
            message: '请输入家庭号',
            trigger: 'blur'
          }],

          content:[{
            required: true,
            message: '请输入事项内容',
            trigger: 'blur'
         } ],
          remark: [{
            required: true,
          // required: true,
            message: '请输入备注',
            trigger: 'blur'
          }],
@@ -254,12 +242,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/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;