From a6a4092ce1899bd020bc15cff43f0977c87e6be8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 九月 2023 16:20:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/Technicalindex.vue | 86 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 37 deletions(-)
diff --git a/src/components/view/Technicalindex.vue b/src/components/view/Technicalindex.vue
index 9d33124..f1c5750 100644
--- a/src/components/view/Technicalindex.vue
+++ b/src/components/view/Technicalindex.vue
@@ -95,6 +95,7 @@
<div class="right">
<el-table :data="tableData" style="width: 100%;overflow-y: auto;min-height: 100%"
max-height="100%" row-key="name" border
+ @select-all="selectAll"
@select="selectTr"
ref="multipleTable"
@selection-change="handleSelectionChange"
@@ -222,7 +223,7 @@
<el-col :span="11" :offset="2">
<el-form-item label="宸ヨ壓">
<template>
- <el-select v-model="form.name" placeholder="璇烽�夋嫨" allow-create filterable>
+ <el-select v-model="form.name" placeholder="璇烽�夋嫨" @change="craftrow" allow-create filterable>
<el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -309,6 +310,7 @@
modifyevent:false,
dialogVisible:false,
tableData: [],
+ crafval:'',
typeselect:0,
upData:{},
upDia:false,
@@ -331,26 +333,43 @@
this.selectAllright()
},
methods:{
- // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
- // 鍏ㄩ��/鍙栨秷閫夋搷浣�
- selectAll(val) {
- this.isAllSelect = !this.isAllSelect;
- let data = this.tableData;
- this.toggleSelect(data, this.isAllSelect, "all");
- },
+ handleSelectionChange(val) {
+ this.selects = val;
+ this.deleteList = [];
+ val.forEach((v) => {
+ if (v.id !== undefined) {
+ this.deleteList.push(v.id);
+ }
+ });
+ },
+ // 鍏ㄩ��/鍙栨秷閫夋搷浣�
+ selectAll(val) {
+ this.isAllSelect = !this.isAllSelect;
+ let data = this.tableData;
+ this.toggleSelect(data, this.isAllSelect, "all");
+ },
//閫夋嫨鏌愯
selectTr(selection, row) {
- console.log(selection,row);
this.$set(row, "isChecked", !row.isChecked);
this.$nextTick(() => {
this.isAllSelect = row.isChecked;
this.toggleSelect(row, row.isChecked, "tr");
});
},
+ toggleSelection(row, flag) {
+ this.$set(row, "isChecked", flag);
+ this.$nextTick(() => {
+ if (flag) {
+ this.$refs.multipleTable.toggleRowSelection(row, flag);
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
+ });
+ },
//閫掑綊瀛愮骇
toggleSelect(data, flag, type) {
+ // console.log('222');
if (type === "all") {
- console.log('222');
if (data.length > 0) {
data.forEach((item) => {
this.toggleSelection(item, flag);
@@ -369,9 +388,8 @@
}
}
},
- handleClose(){
-
- },
+//---------------------------------------------------------------------------------------------------------------------------------------
+ handleClose(){},
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -451,19 +469,18 @@
})
},
dels() {
- this.selects.forEach(a => {
- for (var b = 0; b < this.tableData.length; b++) {
- if (this.tableData[b].id == a.id) {
- this.tableData.splice(b, 1)
- b--
- }
- }
- })
- let cc = this.selects.map(el => {
- return el.id
- })
- cc.splice(0,1)
- this.delete = cc.join(',')
+
+ let ee = []
+ console.log(this.selects);
+ this.selects.forEach(el =>{
+ if(el.children){
+ el.children.forEach(ele =>{
+ ee.push(ele.id)
+ })
+ }
+ })
+ // cc.splice(0,1)
+ this.delete = ee.join(',')
console.log(this.delete);
this.delAllTechskill()
this.$message.success('鍒犻櫎瀹屾垚')
@@ -522,6 +539,7 @@
})[0]
console.log(one);
let name = one.children[0].id
+ this.checkTreeNode.id = name
console.log(name);
this.selectAllrightStart(name)
this.selectDataList();
@@ -553,12 +571,16 @@
console.log(this.tableData);
});
},
+ craftrow(val){
+ this.crafval = val
+ this.chooseProFath()
+ },
//涓婄骇
chooseProFath() {
console.log(this.checkTreeNode.id);
this.$axios.get(this.$api.url.chooseProFath, {
params: {
- techTemId: this.checkTreeNode.id
+ techTemId:this.crafval
}
}).then(res => {
this.higherlevel = res.data;
@@ -602,16 +624,6 @@
},
modify() {
this.modifyevent = true
- },
-
- handleSelectionChange(val) {
- this.selects = val;
- this.deleteList = [];
- val.forEach((v) => {
- if (v.id !== undefined) {
- this.deleteList.push(v.id);
- }
- });
},
//缂栬緫
--
Gitblit v1.9.3