From ffe87c674684be8ce417b20ecaf64a0a3273e675 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期一, 01 七月 2024 14:38:30 +0800
Subject: [PATCH] qxtj
---
src/views/system/tijian/index.vue | 334 +++++++++++++++++++++++++++++++------------------------
1 files changed, 188 insertions(+), 146 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index a1e3fbf..fe73944 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -525,10 +525,62 @@
></el-button> -->
</div>
</el-tab-pane>
- <el-tab-pane label="缁勫悎" name="third">
+ <el-tab-pane label="缁勫悎" name="third">
<!-- <div class="tab3"> -->
- <el-row :gutter="20" style="width: 100%">
- <el-col :span="6">
+ <el-row :gutter="20" style="width: 100%">
+ <el-col :span="6">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 椤圭洰鍒楄〃
+ </div>
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
+ </el-input>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="packageList"
+ :props="defaultProp"
+ show-checkbox
+ node-key="id"
+ @check="handlepackage"
+ :default-checked-keys="checkedkeys"
+ :filter-node-method="filterpackage"
+ ref="treas"
+ :render-content="renderContents"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 鏄庣粏椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="packagedataList"
+ node-key="proId"
+ :props="defaultpackProps"
+ :render-content="renderContent"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <div class="grid-content bg-purple">
<div
style="
text-align: center;
@@ -536,101 +588,49 @@
margin-top: 10px;
"
>
- 椤圭洰鍒楄〃
+ 宸查�夐」鐩垪琛�
</div>
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
- </el-input>
- <div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="packageList"
- :props="defaultProp"
- show-checkbox
- node-key="id"
- @check="handlepackage"
- :default-checked-keys="checkedkeys"
- :filter-node-method="filterpackage"
- ref="treas"
- :render-content="renderContents"
- >
- </el-tree>
- </div>
- </el-col>
- <el-col :span="6">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
+ <el-table
+ :data="DataLists"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectspanmethod"
>
- 鏄庣粏椤圭洰鍒楄〃
- </div>
- <div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="packagedataList"
- node-key="proId"
- :props="defaultpackProps"
- :render-content="renderContent"
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="260px"
>
- </el-tree>
- </div>
- </el-col>
- <el-col :span="11">
- <div class="grid-content bg-purple">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 宸查�夐」鐩垪琛�
- </div>
- <el-table
- :data="DataLists"
- border
- style="width: 100%"
- height="400"
- :span-method="objectspanmethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
- </el-table-column>
- <el-table-column
- prop="proName"
- label="鏄庣粏椤圭洰"
- width="260px"
- >
- </el-table-column>
- <el-table-column prop="proPrice" label="鍘熶环" width="56px">
- </el-table-column>
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDel(scope.row)"
- title="鍒犻櫎"
- ></el-button>
- </template>
- </el-table-column>
- </el-table>
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ fixed="right"
+ class-name="small-padding fixed-width"
+ width="50px"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDel(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
- <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
- </div>
- </el-col>
- </el-row>
+ <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
+ </div>
+ </el-col>
+ </el-row>
<!-- </div> -->
</el-tab-pane>
<el-tab-pane label="鍗曢」" name="second">
@@ -782,7 +782,6 @@
</el-row>
</div>
</el-tab-pane>
-
</el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
@@ -1014,23 +1013,28 @@
>
<el-collapse-item :name="index">
<template slot="title">
- {{
- item.pacName +
- ":" +
- item.parentName +
- " (搴旀敹閲戦:" +
- item.ordPrice +
- "鍏� / 瀹炴敹閲戦:" +
- item.nowPrice +
- "鍏�)"
- }}
+ <div style="width: 70%">
+ {{
+ item.pacName +
+ ":" +
+ item.parentName +
+ " (搴旀敹閲戦:" +
+ item.ordPrice +
+ "鍏� / 瀹炴敹閲戦:" +
+ item.nowPrice +
+ "鍏�)"
+ }}
+ </div>
+
+ <div style="width: 20%">
+ <el-button
+ type="primary"
+ @click="candelete(item)"
+ style="float: right"
+ >鍒� 闄�</el-button
+ >
+ </div>
</template>
- <el-button
- type="primary"
- @click="candelete(item)"
- style="margin: 5px"
- >鍒� 闄�</el-button
- >
<el-table
:data="item.list"
border
@@ -2231,6 +2235,7 @@
} else {
_this.tcShow = true;
this.$message.warning("鏆傛棤棰勭害淇℃伅");
+ _this.resetpackage();
}
_this.isDisabled = true;
} else {
@@ -2401,6 +2406,7 @@
this.taocan = false;
this.malldisble = false;
this.defaultKeys = [];
+ this.DataLists = [];
},
cancell() {
@@ -2542,46 +2548,83 @@
// 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
handleSelectionChange(selection, row) {
- console.log(666);
this.tableData = selection;
+ console.log(this.tableData);
+ console.log(this.tableData1);
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
this.single = selection.length !== 1;
this.multiple = !selection.length;
+ if (this.tableData1.length != 0) {
+ this.tableData.forEach((item) => {
+ this.tableData1.forEach((item1) => {
+ item.tjProjectList.forEach((item2) => {
+ if (item2.proId == item1.proPrantId) {
+ this.$confirm(
+ "璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鏄惁纭閫夋嫨璇ュ椁愶紵",
+ "纭淇℃伅",
+ {
+ distinguishCancelAndClose: true,
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ }
+ )
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "璇锋敞鎰忔煡鐪嬩环鏍�",
+ });
+ })
+ .catch((action) => {
+ if (action === "cancel") {
+ let del_row = selection.shift();
+ this.$refs.tb.toggleRowSelection(del_row, false);
+ this.$message({
+ type: "warning",
+ message: "宸插彇娑�",
+ });
+ }
+ });
+ // this.$message.warning("璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鑻ラ�夋嫨璇ュ椁愶紝璇峰厛鍒犻櫎鍗曢」");
+ }
+ });
+ });
+ });
+ }
if (selection[0]) {
// this.DataList = [];
// this.data = JSON.parse(JSON.stringify(this.dXData));
- selection[0].tjProjectList.forEach((selectionitem) => {
- this.Treedata.forEach((item) => {
- if (selectionitem.proName == item.proName) {
- item.disabled = true;
- item.tjProjectList = [];
- }
- // if (item.tjProjectList) {
- // item.tjProjectList.forEach((item1) => {
- // if (selectionitem.proName == item1.proName) {
- // item1.disabled = true;
- // item1.tjProjectList = [];
- // }
- // if (item1.tjProjectList) {
- // item1.tjProjectList.forEach((item2) => {
- // if (selectionitem.proName == item2.proName) {
- // item2.disabled = true;
- // item2.tjProjectList = [];
- // }
- // });
- // }
- // });
- // }
- });
- this.TreedataList.forEach((item3) => {
- if (item3.proParentId == selectionitem.proId) {
- item.disabled = true;
- }
- });
- });
+ // selection[0].tjProjectList.forEach((selectionitem) => {
+ // this.Treedata.forEach((item) => {
+ // if (selectionitem.proName == item.proName) {
+ // item.disabled = true;
+ // item.tjProjectList = [];
+ // }
+ // if (item.tjProjectList) {
+ // item.tjProjectList.forEach((item1) => {
+ // if (selectionitem.proName == item1.proName) {
+ // item1.disabled = true;
+ // item1.tjProjectList = [];
+ // }
+ // if (item1.tjProjectList) {
+ // item1.tjProjectList.forEach((item2) => {
+ // if (selectionitem.proName == item2.proName) {
+ // item2.disabled = true;
+ // item2.tjProjectList = [];
+ // }
+ // });
+ // }
+ // });
+ // }
+ // });
+ // this.TreedataList.forEach((item3) => {
+ // if (item3.proParentId == selectionitem.proId) {
+ // item.disabled = true;
+ // }
+ // });
+ // });
} else {
this.treedataList = JSON.parse(JSON.stringify(this.dXData));
return;
@@ -2636,7 +2679,7 @@
// this.Treedata = response.data.list;
// })
// },
- getDataList() {
+ getDataList() {
this.loading = true;
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
@@ -2720,7 +2763,6 @@
// this.DataLists.forEach((item1, index) => {
// if (item.proId == item1.proId) {
// this.DataLists.splice(index, 1);
-
// }
// });
// });
@@ -2734,7 +2776,7 @@
// }
}
},
- objectspanmethod({ row, column, rowIndex, columnIndex }) {
+ objectspanmethod({ row, column, rowIndex, columnIndex }) {
let fields = ["propinName"];
let cellValue = row[column.property];
if (cellValue && fields.includes(column.property)) {
@@ -2764,7 +2806,7 @@
// return [rowspan, 1];
// }
},
-
+
// 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
handleCurrentChecked(data, checked, checkedNodes) {
this.dataObj = data;
@@ -2802,7 +2844,6 @@
}
},
-
spliceData() {
for (var i = 0; i < this.DataList.length; i++) {
for (var j = i + 1; j < this.DataList.length; j++) {
@@ -2925,7 +2966,7 @@
this.proIds.push(item.proId);
});
}
- if (this.DataLists.length != 0) {
+ if (this.DataLists.length != 0) {
this.DataLists.forEach((item) => {
this.proIds.push(item.proId);
});
@@ -2974,6 +3015,7 @@
});
this.taocan = false;
this.defaultKeys = [];
+ this.DataLists = [];
},
// changeCategoryKeys(val) {
// this.proIds = [];
--
Gitblit v1.8.0