Merge remote-tracking branch 'origin/master'

linwenling

2023-08-08 b29f1588f2bb8b46df38a52cbae07ea8590f099a

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

@@ -11,7 +11,7 @@
        <el-input v-model="formData.name" placeholder="请输入设备名称" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="时间" prop="happenTime">
        <el-input v-model="formData.happenTime" placeholder="请输入时间" clearable :style="{width: '100%'}" :disabled="dsb">
        <el-input v-model="formData.happenTime" placeholder="请输入时间" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="购买人" prop="buyer">
@@ -94,7 +94,7 @@
        multiple
        list-type="picture-card"
        :on-preview="handleFileCardPreview"
        :on-remove="handleRemove"
        :on-remove="handleRemoveFile"
        :http-request="requestUpload"
        :show-file-list="true"
      >
@@ -118,12 +118,11 @@
                </span>
                <span
                  v-if="isShow"
                  @click="handleRemove(file)"
                  class="el-upload-list__item-delete"

                  @click="handleDownload(file.url)"
                >
                  <i class="el-icon-download"></i>
                </span>
                 <i class="el-icon-download"></i>
                 </span>
                <span
                  v-if="isShow"
                  class="el-upload-list__item-delete"
@@ -195,7 +194,7 @@
          trigger: 'change'
        }],
        status: [{
          required: true,
          // required: true,
          message: '请选择是否注销',
          trigger: 'change'
        }],