1022 修正时间

linwenling

2023-10-22 1660e0f0083d1a682bf0dca9dcaf2e8ba2502f38

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

@@ -5,7 +5,10 @@
      <el-form-item label="时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width: 240px;"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
@@ -18,7 +21,10 @@
          v-model="queryParams.name"
          placeholder="请输入设备名称"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
@@ -27,7 +33,10 @@
          v-model="queryParams.buyer"
          placeholder="请输入购买人"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
@@ -36,7 +45,10 @@
          v-model="queryParams.location"
          placeholder="请输入存放地点"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />

@@ -47,7 +59,10 @@
          v-model="queryParams.content"
          placeholder="请输入事项内容"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
@@ -126,25 +141,29 @@
    <el-table v-loading="loading" :data="equipmentList"  :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
      <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="设备名称" prop="name" sortable width="150" />

      <el-table-column label="时间" align="happenTime" sortable prop="happenTime" width="150">
      <el-table-column label="时间" align="happenTime" sortable prop="happenTime" width="140">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="是否注销" align="center" sortable prop="status" width="120">
      <el-table-column label="是否注销" align="center" sortable prop="status" width="140">
        <template slot-scope="scope">
          {{ getSrc1(scope.row.status) }}
        </template>
      </el-table-column>
      <el-table-column label="购买人" prop="buyer" sortable width="100" />
      <el-table-column label="购买人" prop="buyer" sortable width="140" />
      <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="location" sortable width="120" />

      <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="ownData" sortable width="150px" >
        <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
      </el-table-column>
      <el-table-column label="电子文件" prop="url" width="120" align="center">

        <template slot-scope="scope" >
@@ -211,11 +230,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>


@@ -249,7 +266,7 @@
          :http-request="requestUpload"
          :file-list="fileList"
        >
          <i slot="default" class="el-icon-plus"></i>
          <i  slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
@@ -290,7 +307,8 @@
          :http-request="requestUpload"
          :show-file-list="true"
        >
          <el-button type="primary">上传</el-button>
          <el-button type="primary">点击上传</el-button>
          <div v-if="uploading" class="upload-status">正在上传...</div>
          <template #tip>
            <div class="el-upload__tip">
            </div>
@@ -365,6 +383,7 @@
      ],
      dsb:true,
      btn:false,
      uploading: false,
      formDat: {
        // type: undefined,
        content: undefined,
@@ -636,10 +655,11 @@
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this

      this.uploading = true;
      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

        this.uploading = false;
        this.$modal.msgSuccess("上传成功");
        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})