|
@@ -64,15 +64,14 @@
|
|
|
</el-button>
|
|
|
</HcTooltip>
|
|
|
|
|
|
- <!-- <HcTooltip keys="tentative_detect_test_print">
|
|
|
- <el-button
|
|
|
- :disabled="tableCheckedKeys.length <= 0" :loading="printPdfLoading" hc-btn
|
|
|
- color="#567722" @click="printPdfClick"
|
|
|
- >
|
|
|
- <hc-icon name="printer" />
|
|
|
- <span>批量打印</span>
|
|
|
- </el-button>
|
|
|
- </HcTooltip> -->
|
|
|
+
|
|
|
+ <el-button
|
|
|
+ :disabled="tableCheckedKeys.length <= 0" :loading="sortLoading" hc-btn
|
|
|
+ color="#567722" @click="sortClick"
|
|
|
+ >
|
|
|
+ <HcIcon name="arrow-up-down" />
|
|
|
+ <span>排序</span>
|
|
|
+ </el-button>
|
|
|
|
|
|
<!-- <HcTooltip keys="tentative_detect_test_quit">
|
|
|
<el-button
|
|
@@ -92,6 +91,17 @@
|
|
|
<span>打印空表</span>
|
|
|
</el-button>
|
|
|
</HcTooltip> -->
|
|
|
+
|
|
|
+ <HcTooltip keys="tentative_detect_test_del">
|
|
|
+ <el-button
|
|
|
+ :disabled="tableCheckedKeys.length <= 0" :loading="removeLoading" hc-btn
|
|
|
+ color="#e03997" class="ml-2" @click="delModalClick"
|
|
|
+ >
|
|
|
+ <hc-icon name="delete-bin-2" />
|
|
|
+ <span>删除</span>
|
|
|
+ </el-button>
|
|
|
+ </HcTooltip>
|
|
|
+ <el-button class="ml-2" :disabled="tableCheckedKeys.length <= 0" :loading="signLoading" hc-btn type="primary" @click="resignClick">re-sign</el-button>
|
|
|
<el-dropdown trigger="click">
|
|
|
<el-button hc-btn type="success" :loading="dataBtnLoad">
|
|
|
<span>综合功能</span>
|
|
@@ -105,16 +115,6 @@
|
|
|
</el-dropdown-menu>
|
|
|
</template>
|
|
|
</el-dropdown>
|
|
|
- <HcTooltip keys="tentative_detect_test_del">
|
|
|
- <el-button
|
|
|
- :disabled="tableCheckedKeys.length <= 0" :loading="removeLoading" hc-btn
|
|
|
- color="#e03997" class="ml-2" @click="delModalClick"
|
|
|
- >
|
|
|
- <hc-icon name="delete-bin-2" />
|
|
|
- <span>删除</span>
|
|
|
- </el-button>
|
|
|
- </HcTooltip>
|
|
|
- <el-button class="ml-2" :disabled="tableCheckedKeys.length <= 0" :loading="signLoading" hc-btn type="primary" @click="resignClick">re-sign</el-button>
|
|
|
</template>
|
|
|
<template #search>
|
|
|
<div class="w-40">
|
|
@@ -565,22 +565,22 @@ const tableRef = ref(null)
|
|
|
const tableColumn = ref([
|
|
|
{ key: 'recordNo', name: '记录编号', width: 190 },
|
|
|
{ key: 'reportNo', name: '报告编号', width: 190, autoWidth: true },
|
|
|
+ { key: 'entrustNo', name: '委托单编号', autoWidth: true },
|
|
|
+ { key: 'specificationNumber', name: '样品编号', autoWidth: true },
|
|
|
{ key: 'trialProjectName', name: '试验项目名称', width: 100, autoWidth: true },
|
|
|
- { key: 'detectionResult', name: '检测结果', width: 80, autoWidth: true },
|
|
|
{ key: 'taskStatus', name: '任务状态', width: 80, autoWidth: true },
|
|
|
{ key: 'reportDate', name: '报告日期', width: 120, autoWidth: true },
|
|
|
{ key: 'trialUserName', name: '试验人员', width: 80, autoWidth: true },
|
|
|
- { key: 'samplingLocation', name: '取样地点', width: 180, autoWidth: true },
|
|
|
{ key: 'detectionCategory', name: '检测类别', width: 100, autoWidth: true },
|
|
|
+ { key: 'specificationModel', name: '规格类型', width: 200, autoWidth: true },
|
|
|
+ { key: 'projectPositionName', name: '工程部位及用途', width: 160, autoWidth: true },
|
|
|
+ { key: 'samplingLocation', name: '取样地点', width: 180, autoWidth: true },
|
|
|
{ key: 'isUploadCertificate', name: '是否上传合格证', width: 60, autoWidth: true },
|
|
|
+ { key: 'entrustName', name: '委托单名称', autoWidth: true },
|
|
|
{ key: 'contractId', name: '合同段', width: 140, autoWidth: true },
|
|
|
{ key: 'company', name: '单位', width: 60, autoWidth: true },
|
|
|
- { key: 'entrustName', name: '委托单名称', autoWidth: true },
|
|
|
- { key: 'entrustNo', name: '委托单编号', autoWidth: true },
|
|
|
- { key: 'specificationNumber', name: '样品编号', width: 220, autoWidth: true },
|
|
|
- { key: 'specificationModel', name: '规格类型', width: 200, autoWidth: true },
|
|
|
- //{key:'projectPosition', name: '工程部位及用途', width: 160},
|
|
|
- { key: 'projectPositionName', name: '工程部位及用途', width: 160, autoWidth: true },
|
|
|
+ { key: 'detectionResult', name: '检测结果', width: 80, autoWidth: true },
|
|
|
+
|
|
|
|
|
|
{ key: 'action', name: '操作', width: 120, fixed: 'right', align: 'center' },
|
|
|
])
|