From aa5806c27f2e9af6600a2fce871ebe6a28cc183b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 01 五月 2024 10:14:31 +0800
Subject: [PATCH] 费用统计增加时间段搜索；检验单增加搜索条件
---
src/components/view/b2-standard.vue | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 6dbb881..20262ee 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -142,8 +142,8 @@
<!-- </el-col> -->
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
- <el-table class="el-table" :data="standardList" style="width: 100%;" height="220px" tooltip-effect="dark"
- :highlight-current-row="true" @row-click="rowClick" ref="standard">
+ <el-table class="el-table" :data="standardList" style="width: 100%;height: 220px !important;overflow-y: auto;" tooltip-effect="dark"
+ highlight-current-row @row-click="rowClick" ref="standard">
<el-table-column prop="code" label="鏍囧噯缂栧彿" show-overflow-tooltip width="180">
<template slot-scope="scope">
<span style="color: red;font-size: 14px;">{{scope.row['code']}}</span>
@@ -201,7 +201,6 @@
<el-table-column prop="price" label="鍗曚环(鍏�)" width="90" show-overflow-tooltip></el-table-column>
<el-table-column prop="manHour" label="宸ユ椂(H)" width="90" 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="璁惧缁�" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="section" label="鍖洪棿" width="120" show-overflow-tooltip></el-table-column>
</el-table>
</el-row>
@@ -407,7 +406,7 @@
this.$confirm("鏄惁鍒犻櫎璇ュ眰绾�", "鎻愮ず", {
type: "error"
}).then(() => {
- this.treeLoad = true
+ // this.treeLoad = true
this.selectTree = ''
this.getNodeParent(node)
this.selectTree = this.selectTree.replace(' - ', '')
@@ -422,12 +421,23 @@
}).then(res => {
if (res.code == 201) return
this.$message.success('宸插垹闄�')
- this.selectStandardTreeList()
+ let arr = this.selectTree.split(' - ');
+ this.deleteStandard(this.list, arr[arr.length - 1])
+ // this.selectStandardTreeList()
this.selectTree = ''
this.standardList = []
this.productList = []
})
}).catch(e => {})
+ },
+ deleteStandard(arr, label) {
+ arr.forEach((item, index) => {
+ if(item.label == label){
+ arr.splice(index, 1);
+ }else{
+ item.children&&this.deleteStandard(item.children, label);
+ }
+ })
},
nodeOpen(data, node, el) {
$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
@@ -581,7 +591,15 @@
}
this.$message.success('娣诲姞鎴愬姛')
this.addDia = false
- this.selectStandardTreeList()
+ this.list
+ .find(a => a.label == this.addOb.factory).children
+ .find(a => a.label == this.addOb.laboratory).children
+ .find(a => a.label == this.addOb.sampleType).children
+ .find(a => a.label == this.addOb.sample).children.push({
+ code:'[5]',
+ label: this.addOb.model,
+ value: this.addOb.model,
+ })
this.addLoad = false
}).catch(e => {
this.addDia = false
--
Gitblit v1.9.3