From ff7e5f562a45f0d4e13fe8336ee8b290643b3ae4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 20 五月 2024 18:18:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b2-standard.vue | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index a6e46cc..8249df7 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -165,7 +165,7 @@
:class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
{{ data.code }} {{ data.label }}</span>
</el-col>
- <el-col :span="2" style="text-align: right;" v-if="delStandardTree">
+ <el-col :span="2" style="text-align: right;" v-if="delStandardTree&&node.level==5">
<el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
</el-button>
@@ -400,14 +400,14 @@
<el-table-column type="selection" width="50" >
</el-table-column>
<el-table-column prop="model" label="鍨嬪彿" min-width="100" 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="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip :filter-method="filterHandler" :filters="filters0"></el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
- show-overflow-tooltip></el-table-column>
+ show-overflow-tooltip :filter-method="filterHandler" :filters="filters1"></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip :filters="filters"
:filter-method="filterHandler"></el-table-column>
<el-table-column prop="ask" label="瑕佹眰鍊�" min-width="200px"></el-table-column>
<el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px"></el-table-column>
- <el-table-column prop="method" label="璇曢獙鏂规硶" width="200"></el-table-column>
+ <el-table-column prop="methodS" label="璇曢獙鏂规硶" width="200"></el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="price" label="鍗曚环(鍏�)" width="120"></el-table-column>
<el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="120"></el-table-column>
@@ -604,7 +604,35 @@
templateId:''
},
methodList:[],
- productTableLoading0:false
+ productTableLoading0:false,
+ filters0:[
+ {
+ text:'娴嬭瘯',
+ value:0,
+ },
+ {
+ text:'娴嬭瘯1',
+ value:1,
+ },
+ {
+ text:'娴嬭瘯2',
+ value:2,
+ }
+ ],
+ filters1:[
+ {
+ text:'娴嬭瘯',
+ value:0,
+ },
+ {
+ text:'娴嬭瘯1',
+ value:1,
+ },
+ {
+ text:'娴嬭瘯2',
+ value:2,
+ }
+ ]
}
},
watch: {
@@ -1102,6 +1130,7 @@
this.addProductDia = false
},
rowClick(row, column, event) {
+ this.currentPage = 1;
this.tableLoad2 = true
this.standardId = row.id
this.$axios.post(this.$api.standardTree.selectStandardProductListByMethodId, {
@@ -1115,7 +1144,7 @@
this.productList.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
})
- }, 200)
+ }, 300)
this.tableLoad2 = false
})
},
@@ -1154,13 +1183,13 @@
},
handleAll(e) {
if (e.length > 0) {
- this.productList = this.productList.map(m => {
+ this.productList.map(m => {
m.state = 0
this.upProductSelect(null, m)
return m
})
} else {
- this.productList = this.productList.map(m => {
+ this.productList.map(m => {
m.state = 1
this.upProductSelect(null, m)
return m
@@ -1267,6 +1296,7 @@
this.sectionUpDia = false
this.currentPage0 = 1;
this.getList()
+ this.rowClick({id:this.standardId})
})
}
},
@@ -1293,7 +1323,7 @@
})
},
async handleMore(){
- if(!this.standardId&&this.standardId!=0){
+ if((!this.standardId&&this.standardId!=0)||this.standardList.length==0){
return this.$message.error('璇烽�夋嫨瀹為獙瀹ゃ�佹牱鍝�')
}
await this.getList()
@@ -1333,6 +1363,7 @@
this.$message.success('宸蹭繚瀛�')
this.currentPage0 = 1;
this.getList()
+ this.rowClick({id:this.standardId})
// this.moreInfo = {
// ask:'',
// tell:'',
--
Gitblit v1.9.3