From 33e4ee0ff4b02f4d6eef7f0e5260ed9fa745597a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 11:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/inspectionManagement/commissionInspection/addCommision.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index 8fe270d..306bafb 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -22,7 +22,11 @@
<el-table-column type="index" label="搴忓彿" min-width="10%" />
<el-table-column prop="sampleNumber" label="鏍峰搧缂栧彿" min-width="8%" />
<el-table-column prop="sampleName" label="鏍峰搧鍚嶇О" min-width="10%" />
- <el-table-column prop="specificationsModels" label="瑙勬牸鍨嬪彿" min-width="10%" />
+ <el-table-column prop="specificationsModels" label="瑙勬牸鍨嬪彿" min-width="10%" >
+ <template slot-scope="scope">
+
+ </template>
+ </el-table-column>
<el-table-column prop="unit" label="鍗曚綅" min-width="8%" />
<el-table-column prop="samplesNumber" label="鏁伴噺" min-width="8%" />
<!-- <el-table-column prop="addway" label="娣诲姞鏂瑰紡" min-width="8%">
@@ -338,9 +342,10 @@
}
})
},
- async getContractsSampleInfo(viewId){
- let res=await getContractsSampleInfo({viewId})
- console.log(res.data);
+ async getContractsSampleInfo(viewId) {
+ let res = await getContractsSampleInfo({
+ viewId
+ })
},
async getSampleName() {
const res = await getSampleName()
@@ -447,6 +452,7 @@
getContractsSampleInfo({
viewId: this.viewId
}).then(res => {
+ if (res.data == null) return
this.infoForm = {
commisioncode: res.data.entrustCoding,
deadline: res.data.completionDeadline,
@@ -464,6 +470,9 @@
}
this.detectionInfo = res.data.linkDetectionList
})
+ },
+ getSpeName(id){
+ return name
}
}
}
--
Gitblit v1.9.3