From b902771e24bf87e0940d00cea8671d8ba84ede26 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 29 八月 2023 13:20:36 +0800
Subject: [PATCH] bug
---
src/views/inspectionManagement/commissionInspection/addCommision.vue | 74 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index ace97d5..58c57c0 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -22,7 +22,9 @@
:data="detectionInfo" style="width: 100%;margin-bottom: 20px;">
<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="unit" label="鍗曚綅" min-width="8%" />
<el-table-column prop="samplesNumber" label="鏁伴噺" min-width="8%" />
@@ -165,38 +167,48 @@
</el-row>
<el-row :gutter="50">
<el-col :span="11">
- <el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О">
+ <el-form-item label="璇勫畾鏍囧噯锛�">
+ <el-select v-model="addPointerForm.addway" size="small" placeholder="璇烽�夋嫨璇勫畾鏍囧噯">
<el-option v-for="options in model_spe_options" :value="options.value"
:key="options.key">{{ options.value }}</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
- <el-form-item label="鏍峰搧鍗曚綅锛�">
- <el-input type="text" v-model="addPointerForm.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
+ <el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О">
+ <el-option v-for="options in model_sta_options" :value="options.value"
+ :key="options.key">{{ options.value }}</el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="50">
+
+ <el-col :span="11">
+ <el-form-item label="鏍峰搧鍗曚綅锛�">
+ <el-input type="text" v-model="addPointerForm.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
<el-col :span="11">
<el-form-item label="鏍峰搧鏁伴噺锛�">
<el-input type="text" v-model="addPointerForm.samplesNumber" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="11">
- <el-form-item label="澶囨敞锛�">
- <el-input type="text" v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�" autocomplete="off" />
- </el-form-item>
- </el-col>
</el-row>
<el-row :gutter="50">
- <el-col :span="10">
+ <el-col :span="9">
<el-form-item label="娣诲姞椤圭洰锛�">
<el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;">
<el-checkbox v-for="expers in experList" :label="expers.label"
:key="expers.key">{{ expers.label }}</el-checkbox>
</el-checkbox-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="41">
+ <el-form-item label="澶囨敞锛�">
+ <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" style="width: 200px;"
+ v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
@@ -274,6 +286,8 @@
value: ''
}],
model_spe_options: [],
+ model_sta_options: [],
+ model_options: [],
sampleDeliveryMode: [{
key: '1',
value: '閫佹牱'
@@ -284,6 +298,26 @@
dialogueFormVisible: false,
showDetail: false,
viewId: null
+ }
+ },
+ watch: {
+ addPointerForm: {
+ handler: function(val) {
+ if(val.addway!=""){
+ this.model_sta_options = []
+ this.model_options.forEach(a=>{
+ if(a.specificationsName==val.addway){
+ this.model_sta_options = a.children.map(item=>{
+ return{
+ key: item.modelId,
+ value: item.modelName
+ }
+ })
+ }
+ })
+ }
+ },
+ deep: true
}
},
created() {
@@ -324,6 +358,7 @@
const res = await getModelSpecification({
materialId: val
})
+ this.model_options = res.data
this.model_spe_options = res.data.map((item) => {
return {
key: item.specificationsId,
@@ -337,6 +372,7 @@
for (let i = 1; i < this.addPointerForm.experiment.length; i++) {
exper += ',' + this.addPointerForm.experiment[i]
}
+
// console.log(exper)
this.addPointerForm.experiment = exper
let tmp = this.addPointerForm
@@ -409,15 +445,15 @@
</script>
<style lang="scss" scoped>
-.content-main{
- padding: 20px 40px;
- background-color: #f0f2f5;
- width: 100%;
- height: 100vh;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- // align-items: center;
+ .content-main {
+ padding: 20px 40px;
+ background-color: #f0f2f5;
+ width: 100%;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ // align-items: center;
.firstBox {
.title {
--
Gitblit v1.9.3