From 8e85533ae6269e2a224b5fcf593ad12a9ccf9aaf Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 29 八月 2023 13:20:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/inspectionManagement/commissionInspection/addCommision.vue | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index ce5d9d4..58c57c0 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -177,12 +177,11 @@
<el-col :span="11">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
<el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О">
- <el-option v-for="options in model_spe_options" :value="options.value"
+ <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">
@@ -191,13 +190,11 @@
<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-row>
<el-row :gutter="50">
<el-col :span="9">
@@ -210,7 +207,8 @@
</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-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>
@@ -288,6 +286,8 @@
value: ''
}],
model_spe_options: [],
+ model_sta_options: [],
+ model_options: [],
sampleDeliveryMode: [{
key: '1',
value: '閫佹牱'
@@ -298,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() {
@@ -338,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,
@@ -351,7 +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
@@ -424,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