Merge remote-tracking branch 'origin/master'

吴羡

5 小时以前 9862248787934f4242ac9636e0c4d5b8ee0870b8

 src/views/CNAS/systemManagement/documentControl/components/FileList.vue

@@ -21,10 +21,7 @@
        </el-form>
      </div>
      <div>
        <el-upload :action="action" :multiple="false" accept='.xls,.xlsx' :headers="uploadHeader"
                   :on-change="beforeUpload" :on-error="onError" ref='upload' :on-success="handleSuccessUp"
                   :show-file-list="false">
          <el-button size="small" type="primary" :loading="upLoading">导入</el-button></el-upload>
        <el-button size="small" type="primary" @click="$refs.importDialog.open()">导入</el-button>
      </div>
    </div>
    <div class="table">
@@ -84,6 +81,16 @@
        <el-button :loading="uploading" type="primary" @click="submitProduct('currentInfoForm')">确 认</el-button>
      </span></template>
    </el-dialog>
    <import-dialog
      ref="importDialog"
      title="导入文件清单"
      :action="action"
      accept=".xls,.xlsx"
      template-url="/import-templates/文件清单导入模板.xlsx?v=2"
      template-name="文件清单导入模板.xlsx"
      :tips="['表头必须与模板完全一致，不能增删列或修改列名', '生效日期格式：YYYY-MM-DD']"
      @success="refreshTable"
    />
  </div>
</template>

@@ -91,6 +98,7 @@
import UpPdfStamp from '@/components/UpPdfStamp/index.vue'
import filePreview from '@/components/Preview/filePreview.vue'
import limsTable from "@/components/Table/lims-table.vue";
import ImportDialog from '@/components/ImportDialog/index.vue'
import {
  uploadFileManageDocumentList,
  pageManageDocumentList,
@@ -102,6 +110,7 @@
    UpPdfStamp,
    filePreview,
    limsTable,
    ImportDialog,
  },
  data() {
    return {
@@ -205,7 +214,7 @@
      page: {
        total: 0,
        size: 10,
        current: 0,
        current: 1,
      },
      tableLoading: false,
      addDia: false,