Merge remote-tracking branch 'origin/master'

linwenling

2023-08-08 b29f1588f2bb8b46df38a52cbae07ea8590f099a

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

@@ -121,22 +121,24 @@
      <el-table-column label="注意事项" prop="notice" sortable width="150" />
      <el-table-column label="体检报告(电子文件)" prop="url" align="center" sortable  width="200" >
        <template slot-scope="scope" >
          <img
            class="el-upload-list__item-thumbnail"
            src="../../assets/images/deviceLis.png"
            alt=""
            style="width: 35px; height: 35px;"
            fit="cover"
            v-if="scope.row.url !== ','"
          >
          <img
            class="el-upload-list__item-thumbnail"
            src="../../assets/images/deviceA.png"
            alt=""
            style="width: 35px; height: 35px;"
            fit="cover"
            v-if="scope.row.url === ','"
          >
          <div  @click="handleCheck(scope.row)">
            <img
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceLis.png"
              alt=""
              style="width: 35px; height: 35px;"
              fit="cover"
              v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
            >
            <img
              v-else
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceA.png"
              alt=""
              style="width: 35px; height: 35px;"
              fit="cover"

            ></div>
        </template>
      </el-table-column>

@@ -182,11 +184,11 @@


        <el-form-item label="体检时间" prop="checkTime">
          <el-date-picker
          <el-input
            v-model='formDat.checkTime'
            type='date'
            placeholder='选择日期'
          ></el-date-picker>
          ></el-input>
        </el-form-item>

        <el-form-item label="类别" prop="type">