|
|
@@ -193,7 +193,11 @@
|
|
|
|
|
|
<!--取样记录-->
|
|
|
<HcDialog :show="samplingRecordModal" title="取样记录" widths="60%" :footer="false" isTable @close="samplingRecordModalClose">
|
|
|
- <HcTable :column="samplingTableColumn" :datas="samplingTableData" :loading="samplingTableLoading" :isIndex="false"></HcTable>
|
|
|
+ <HcTable :column="samplingTableColumn" :datas="samplingTableData" :loading="samplingTableLoading" :isIndex="false">
|
|
|
+ <template #isOutsourcing="{row}">
|
|
|
+ <span>{{row.isOutsourcing === 1 ? '是':'否'}}</span>
|
|
|
+ </template>
|
|
|
+ </HcTable>
|
|
|
</HcDialog>
|
|
|
|
|
|
</div>
|
|
|
@@ -656,12 +660,12 @@ const samplingRecordModalClick = async (row) => {
|
|
|
|
|
|
//取样记录数据
|
|
|
const samplingTableColumn = ref([
|
|
|
- {key:'key1', name: '样品编号'},
|
|
|
- {key:'key2', name: '样品名称'},
|
|
|
- {key:'key3', name: '取样时间'},
|
|
|
- {key:'key4', name: '取样人'},
|
|
|
- {key:'key5', name: '试样数量'},
|
|
|
- {key:'key6', name: '是否外委'},
|
|
|
+ {key:'specificationNumber', name: '样品编号'},
|
|
|
+ {key:'materialName', name: '样品名称'},
|
|
|
+ {key:'samplingDate', name: '取样日期'},
|
|
|
+ {key:'userName', name: '取样人'},
|
|
|
+ {key:'materialCount', name: '试样数量'},
|
|
|
+ {key:'isOutsourcing', name: '是否外委'},
|
|
|
])
|
|
|
const samplingTableData = ref([])
|
|
|
const samplingTableLoading = ref(false)
|
