From 3ef19c59f59bb1b5a43434b8d14ec12e06d505b0 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 19 三月 2024 13:07:19 +0800
Subject: [PATCH] 检验下单-下发功能更新
---
src/components/view/b2-standard.vue | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 42eb543..463a9d3 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -97,9 +97,9 @@
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addDia = true"></el-button>
</el-col>
</el-row>
- <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'label' }"
- node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current
- @node-expand="nodeOpen" @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false">
+ <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }"
+ node-key="label" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current
+ @node-expand="nodeOpen" @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false" :default-expanded-keys="expandedKeys">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row>
<el-col :span="21">
@@ -151,20 +151,20 @@
<el-table :data="productList" style="width: 100%;" height="100%" tooltip-effect="dark" stripe :fit="true" border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="65"></el-table-column>
- <el-table-column prop="inspectionItem" label="妫�楠岄」" show-overflow-tooltip></el-table-column>
- <el-table-column prop="inspectionItemClassify" label="妫�楠岄」绫诲瀷" width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」灏忕被" width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="laboratory" label="瀹為獙瀹�" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip></el-table-column>
+ <!-- <el-table-column prop="inspectionItemClassify" label="妫�楠岄」绫诲瀷" width="120" show-overflow-tooltip></el-table-column> -->
+ <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip></el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="price" label="鍗曚环" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="manHour" label="宸ユ椂" width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="manHourGroup" label="宸ユ椂鍒嗙粍" width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="deviceGroup" label="璁惧缁�" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="deviceGroup" label="璁惧缁�" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="section" label="鍖洪棿" width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="ask" label="瑕佹眰鍊�" width="220px">
+ <el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px">
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable
- @change="(value)=>upStandardProductList(value,scope.row.id)" v-if="upStandardProduct"></el-input>
+ @change="(value)=>upStandardProductList(value,scope.row.id)" v-if="upStandardProduct" type="textarea" :autosize="{ minRows: 1, maxRows: 3}"></el-input>
<span v-else>{{scope.row.ask}}</span>
</template>
</el-table-column>
@@ -208,9 +208,7 @@
<span class="required-span">* </span>鏍峰搧鍚嶇О锛�
</el-col>
<el-col :span="16" :offset="1">
- <el-select v-model="addOb.sample" size="small" style="width: 100%;" clearable>
- <el-option v-for="(a, ai) in sample" :key="ai" :value="a.value" :label="a.label"></el-option>
- </el-select>
+ <el-input v-model="addOb.sample" placeholder="璇疯緭鍏ユ牱鍝佸悕绉�" clearable size="small"></el-input>
</el-col>
</el-row>
<el-row style="line-height: 50px;">
@@ -327,7 +325,8 @@
deviceGroup:{select:[]}
},
selectField: {},
- }
+ },
+ expandedKeys:[]
}
},
mounted() {
@@ -335,7 +334,7 @@
this.selectEnumByCategoryForFactory()
this.selectStandardTreeList()
this.obtainItemParameterList()
- this.selectEnumByCategoryForsampleType()
+ // this.selectEnumByCategoryForsampleType()
this.selectTestObjectByName()
this.selectStandardMethods()
this.selectEnumByCategoryForDevice()
@@ -366,6 +365,11 @@
}
this.selectTree = data2.replace(' - ', '')
this.selectsStandardMethodByFLSSM()
+ let trees = this.selectTree.split(" - ")
+ this.addOb.factory = trees[0]
+ this.addOb.laboratory = trees[1]
+ this.addOb.sampleType = trees[2]
+ this.addOb.sample = trees[3]
},
getNodeParent(val) {
if (val.parent != null) {
@@ -443,7 +447,7 @@
},
selectEnumByCategoryForSpecial() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "鐗规畩鏍囪瘑"
+ category: "鏄惁"
}).then(res => {
this.componentData.tagField.bsm.select = res.data
})
@@ -459,6 +463,13 @@
this.treeLoad = true
this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
this.list = res.data
+ this.list.forEach(a=>{
+ a.children.forEach(b=>{
+ b.children.forEach(c=>{
+ this.expandedKeys.push(c.label)
+ })
+ })
+ })
this.treeLoad = false
})
},
@@ -483,7 +494,7 @@
value: a.specimenName
})
})
- this.sample = data
+ this.sampleType = data
})
},
selectStandardMethods() {
--
Gitblit v1.9.3