From 5c5465e7718a84d5b2a39f4e5fae7d220bd4d8ed Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 05 三月 2025 10:13:14 +0800
Subject: [PATCH] 检验任务复核检验任务下载报告，下载的内容以后缀.htm形式出现
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 3b7e31d..713b339 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -33,9 +33,9 @@
v-model="itemParameterForm.inspectionItemSubclass" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
- <el-form-item label="妫�楠屽璞�" prop="sample">
+ <el-form-item label="妫�楠屽璞�" prop="specimenName">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="itemParameterForm.sample" @keyup.enter.native="refreshTable()">
+ v-model="itemParameterForm.specimenName" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
<el-form-item>
@@ -45,13 +45,13 @@
</el-form>
<!-- 妫�楠岄」鐩弬鏁拌〃鏍�-->
<div class="table" v-if="radio===0">
- <lims-table :tableData="tableData" :column="column"
+ <lims-table :tableData="tableData" :column="column" key="tableData"
@pagination="pagination" :height="'calc(100vh - 290px)'"
:page="page" :tableLoading="tableLoading"></lims-table>
</div>
<!-- 妫�楠屽璞¤〃鏍�-->
<div class="table" v-if="radio===1">
- <lims-table :tableData="testObjectTableData" :column="testObjectColumn"
+ <lims-table :tableData="testObjectTableData" :column="testObjectColumn" key="testObjectTableData"
@pagination="pagination" :height="'calc(100vh - 290px)'"
:page="testObjectPage" :tableLoading="tableLoading"></lims-table>
</div>
@@ -123,6 +123,7 @@
import EditForm from "@/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue";
import testObjectEditForm from "@/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue";
import {getToken} from "@/utils/auth";
+import { obtainItemParameterList } from '@/api/structural/laboratoryScope'
export default {
components: {limsTable, EditForm, testObjectEditForm, BindPartDialog, BindSupplierDensityDialog},
@@ -187,17 +188,23 @@
prop: 'laboratoryId',
minWidth: '130',
formatData: (params) => {
- if (params == 1) {
- return '瑁呭鐢电紗璇曢獙瀹�'
- } else if (params == 5) {
- return '閫氫俊浜у搧瀹為獙瀹�'
- } else if (params == 6) {
- return '鐢靛姏浜у搧瀹為獙瀹�'
- } else if (params == 8) {
- return '鍌ㄨ兘浜у搧瀹為獙瀹�'
- } else {
- return '灏勯绾跨紗瀹為獙瀹�'
+ let index = this.laboratoryList.findIndex(item => item.value == params)
+ if(index > -1) {
+ return this.laboratoryList[index].label
+ }else {
+ return null
}
+ // if (params == 1) {
+ // return '瑁呭鐢电紗璇曢獙瀹�'
+ // } else if (params == 5) {
+ // return '閫氫俊浜у搧瀹為獙瀹�'
+ // } else if (params == 6) {
+ // return '鐢靛姏浜у搧瀹為獙瀹�'
+ // } else if (params == 8) {
+ // return '鍌ㄨ兘浜у搧瀹為獙瀹�'
+ // } else {
+ // return '灏勯绾跨紗瀹為獙瀹�'
+ // }
},
formatType: (params) => {
if (params == 1) {
@@ -209,7 +216,7 @@
} else if (params == 8) {
return 'danger'
} else {
- return ''
+ return null
}
}
},
@@ -289,7 +296,7 @@
itemParameterForm: {
inspectionItem: null,
inspectionItemSubclass: null,
- sample: null
+ specimenName: null
},
radio: 0,
productLoad: false,
@@ -361,10 +368,12 @@
currentSupplierDensityRow: {}, // 閫夋嫨闆朵欢缁戝畾鏈潯鏁版嵁鐨勪俊鎭�
bindSupplierDensityDialog: false,
bindPartDialog: false,
- type: null, // 闆朵欢缁戝畾鐨勭被鍨�--0锛氭楠屽璞★紝1锛氫骇鍝佺淮鎶�
+ type: null, // 闆朵欢缁戝畾鐨勭被鍨�--0锛氭楠屽璞★紝1锛氫骇鍝佺淮鎶�,
+ laboratoryList:[]
}
},
created() {
+ this.getItemParameterList()
this.refreshTable()
},
computed: {
@@ -385,8 +394,8 @@
this.$refs.upload.clearFiles()
this.uploadDia = false
this.uploading = false
- if (response.code === 201) {
- this.$message.error(response.message)
+ if (response.code !== 200) {
+ this.$message.error(response.msg)
return
}
this.$message.success('涓婁紶鎴愬姛')
@@ -636,6 +645,18 @@
closeBindSupplierDensityDialog () {
this.bindSupplierDensityDialog = false
},
+ getItemParameterList(){
+ obtainItemParameterList().then(res => {
+ let data = []
+ res.data.forEach(a => {
+ data.push({
+ label: a.laboratoryName,
+ value: a.id
+ })
+ })
+ this.laboratoryList = data
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3