From 5ebcabde1dc951e512c7a58c24f08d58ab0679c8 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期四, 27 六月 2024 16:05:04 +0800
Subject: [PATCH] su
---
src/views/system/tijian/index.vue | 530 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 268 insertions(+), 262 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 40c5ca4..12df251 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -525,6 +525,114 @@
></el-button> -->
</div>
</el-tab-pane>
+ <el-tab-pane label="缁勫悎" name="third">
+ <div class="tab3">
+ <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;
+ 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
+ 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>
+ </div>
+ </el-tab-pane>
<el-tab-pane label="鍗曢」" name="second">
<div class="tab8">
<!-- <div class="tab7">
@@ -673,152 +781,7 @@
</el-row>
</div>
</el-tab-pane>
- <el-tab-pane label="缁勫悎" name="third">
- <div class="tab8">
- <!-- <div class="tab7">
- <v-tree-transfer
- :treeData="treedataList"
- :defaultProps="{ children: 'tjProjectList', label: 'proName' }"
- :defaultKeys="defaultKeys"
- @changeKeys="changeCategoryKeys"
- :key="datekey"
- ></v-tree-transfer> -->
- <!-- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps" :default-checked-keys="treeList"
- @check-change="handleCurrentChecked">
- </el-tree> -->
- <!-- </div> -->
- <el-row :gutter="20">
- <el-col :span="6">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 缁勫悎椤圭洰
- </div>
- <!-- @input="gaibian" -->
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
- </el-input>
- <div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="Treedata"
- :props="defaultProps1"
- show-checkbox
- node-key="id"
- @check="handleCurrentCheckeds"
- :default-checked-keys="checkedkey"
- :filter-node-method="filterNode"
- ref="trees"
- :render-content="renderContent1"
- >
- </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="zhxqList"
- node-key="id"
- :props="defaultProps2"
- :filter-node-method="filterNode"
- :render-content="renderContent"
- >
- </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="DataList"
- border
- style="width: 100%"
- height="400"
- :span-method="objectSpanMethod"
- >
- <el-table-column prop="hisXmmc" label="妫�鏌ラ」鐩�">
- </el-table-column>
- <el-table-column
- prop="proPrice"
- label="鍘熶环"
- width="56px"
- ></el-table-column>
- <el-table-column
- prop="proName"
- label="鏄庣粏椤圭洰"
- width="260px"
- >
- </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="handleDelete1(scope.row)"
- title="鍒犻櫎"
- ></el-button>
- </template>
- </el-table-column>
- </el-table>
- <h3 style="font-weight: bold">鍚堣锛歿{ marryall }}鍏�</h3>
- <!-- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table
- :data="DataList"
- border
- style="width: 100%"
- height="400"
- :span-method="objectSpanMethod"
- >
- <el-table-column
- prop="proName"
- label="椤圭洰"
- width="180"
- >
- </el-table-column>
- <el-table-column prop="ordPrice" label="鍘熶环">
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse> -->
- </div>
- </el-col>
- </el-row>
- </div>
- </el-tab-pane>
+
</el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
@@ -1430,12 +1393,11 @@
getIsRequired,
getconfigKey,
getHistryTjOrderProByCusIdCard,
- getZhList,
- listByZhId,
} from "@/api/system/tijian";
import Packages from "@/components/Packages";
import { MessageBox } from "element-ui";
import VTreeTransfer from "./TreeTransfer.vue";
+import { getZhList, getlistByZhId } from "@/api/system/package";
import historyTj from "@/components/historyTj/index";
export default {
dicts: [
@@ -1459,6 +1421,12 @@
},
data() {
return {
+ filterage: "",
+ checkedkeys: [],
+ DataLists: [],
+ marryalls: 0,
+ packagedataList: [],
+ packageList: [],
zhxqList: [],
zhList: [],
pname: "",
@@ -1599,11 +1567,11 @@
children: [],
label: "proName",
},
- defaultProps1: {
+ defaultProp: {
children: [],
label: "zhmc",
},
- defaultProps2: {
+ defaultpackProps: {
children: [],
label: "proName",
},
@@ -1676,6 +1644,9 @@
filterText(val) {
this.$refs.tree.filter(val);
},
+ filterage(val) {
+ this.$refs.treas.filter(val);
+ },
},
created() {
this.getCurrentDateTime();
@@ -1721,6 +1692,14 @@
return data.proName.indexOf(value) !== -1;
} else {
return data.proEngName.indexOf(value) !== -1;
+ }
+ },
+ filterpackage(value, data) {
+ if (!value) return true;
+ if (data.zhmc.indexOf(value) !== -1) {
+ return data.zhmc.indexOf(value) !== -1;
+ } else {
+ return data.pym.indexOf(value) !== -1;
}
},
beforeDestroy() {
@@ -2607,13 +2586,44 @@
}
},
handleClick(tab, event) {
- if (tab.label == "鍗曢」") {
+ if (this.activeNames == "second") {
this.DataList = [];
this.getDataList();
- }
- if (tab.label == "缁勫悎") {
- this.DataList = [];
- this.getzhList();
+ } else if (this.activeNames == "third") {
+ this.DataLists = [];
+ getZhList().then((response) => {
+ if (response.data) {
+ this.packageList = response.data;
+ this.checkedkeys.push(this.packageList[0].id);
+ let datas = {
+ zhId: this.packageList[0].id,
+ };
+ getlistByZhId(datas).then((res) => {
+ this.packagedataList = res.data.tjProjectList;
+ for (var i = 0; i < this.packagedataList.length; i++) {
+ let proId = this.packagedataList[i].proId;
+ getProSonDxList(proId).then((res) => {
+ this.TreedataList = res.data.list;
+ this.TreedataList.forEach((item) => {
+ this.DataLists.push(item);
+ if (this.DataLists.length >= 1) {
+ this.marryalls = 0;
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice;
+ this.packagedataList.forEach((item3) => {
+ if (item1.proParentId == item3.proId) {
+ item1.propinName = item3.proName;
+ }
+ });
+ });
+ }
+ });
+ });
+ }
+ });
+ }
+ this.loading = false;
+ });
}
},
// gaibian(val){
@@ -2624,9 +2634,8 @@
// this.Treedata = response.data.list;
// })
// },
- getDataList() {
+ getDataList() {
this.loading = true;
- // this.pname = "null";
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
if (this.tableData[0]) {
@@ -2638,20 +2647,24 @@
});
});
}
- this.checkedkey.push("1735504273274236929");
- let proId = "1735504273274236929";
- this.Treedata.forEach((item) => {
- if (proId == item.proId) {
- this.names = item.proName;
- }
- });
+ // if (this.DataLists.length != 0) {
+ // this.DataLists.forEach((selectionitem) => {
+ // this.Treedata.forEach((item) => {
+ // if (selectionitem.propinName == item.proName) {
+ // item.disabled = true;
+ // }
+ // });
+ // });
+ // }
+ this.checkedkey.push(this.Treedata[0].proId);
+ let proId = this.Treedata[0].proId;
getProSonDxList(proId).then((res) => {
this.TreedataList = res.data.list;
this.TreedataList.forEach((item) => {
this.checkedListkey.push(item.proId);
this.DataList.push(item);
this.DataList.forEach((item) => {
- item.propinName = this.names;
+ item.propinName = this.Treedata[0].proName;
});
});
this.TotalPrice1 = 0;
@@ -2667,51 +2680,89 @@
this.loading = false;
});
},
- getzhList() {
- // getZhList().then((res) => {
- // console.log(res);
- // this.zhList = res.data;
- // });
- // this.pname = "null";
- getZhList().then((response) => {
- this.Treedata = response.data;
- if (this.tableData[0]) {
- this.tableData[0].tjProjectList.forEach((selectionitem) => {
- this.Treedata.forEach((item) => {
- if (selectionitem.proId == item.proId) {
- item.disabled = true;
- }
- });
- });
- }
- this.checkedkey.push("1735504273274236929");
- let proId = "1735504273274236929";
- this.Treedata.tjProjectList.forEach((item) => {
- if (proId == item.proId) {
- this.names = item.proName;
- }
- });
- getProSonDxList(proId).then((res) => {
- this.TreedataList = res.data.list;
- this.TreedataList.forEach((item) => {
- this.checkedListkey.push(item.proId);
- this.DataLists.push(item);
- this.DataLists.forEach((item) => {
- item.propinName = this.names;
- });
- });
- this.TotalPrice1 = 0;
- this.marryall = 0;
- if (this.DataLists.length != 0) {
- this.list1 = false;
- this.DataLists.forEach((item) => {
- this.TotalPrice1 = item.proPrice + this.TotalPrice1;
- this.marryall += item.proPrice;
+ handlepackage(data, checked, checkedNodes) {
+ if (checked.checkedNodes.length != 0) {
+ this.$refs.treas.setCheckedKeys([data.id]);
+ let datas = {
+ zhId: data.id,
+ };
+ getlistByZhId(datas).then((res) => {
+ this.packagedataList = res.data.tjProjectList;
+ for (var i = 0; i < this.packagedataList.length; i++) {
+ let proId = this.packagedataList[i].proId;
+ getProSonDxList(proId).then((res) => {
+ this.TreedataList = res.data.list;
+ this.TreedataList.forEach((item) => {
+ this.DataLists.push(item);
+ if (this.DataLists.length >= 1) {
+ this.marryalls = 0;
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice;
+ this.packagedataList.forEach((item3) => {
+ if (item1.proParentId == item3.proId) {
+ item1.propinName = item3.proName;
+ }
+ });
+ });
+ }
+ });
});
}
});
- });
+ } else if (checked.checkedNodes.length == 0) {
+ // for (var i = 0; i < data.tjProjectList.length; i++) {
+ // let proId = data.tjProjectList[i].proId;
+ // getProSonDxList(proId).then((res) => {
+ // this.TreedataList = res.data.list;
+ // this.TreedataList.forEach((item) => {
+ // this.DataLists.forEach((item1, index) => {
+ // if (item.proId == item1.proId) {
+ // this.DataLists.splice(index, 1);
+
+ // }
+ // });
+ // });
+ // this.marryalls = 0
+ // if(this.DataLists.length != 0){
+ // this.DataLists.forEach((item1, index) => {
+ // this.marryalls += item1.proPrice;
+ // })
+ // }
+ // });
+ // }
+ }
},
+ objectspanmethod({ row, column, rowIndex, columnIndex }) {
+ let fields = ["propinName"];
+ let cellValue = row[column.property];
+ if (cellValue && fields.includes(column.property)) {
+ let prevRow = this.DataLists[rowIndex - 1];
+ let nextRow = this.DataLists[rowIndex + 1];
+ if (prevRow && prevRow[column.property] === cellValue) {
+ return { rowspan: 0, colspan: 0 };
+ } else {
+ let countRowspan = 1;
+ while (nextRow && nextRow[column.property] === cellValue) {
+ nextRow = this.DataLists[++countRowspan + rowIndex];
+ }
+
+ if (countRowspan > 1) {
+ return { rowspan: countRowspan, colspan: 1 };
+ }
+ }
+ }
+
+ // if (columnIndex == 3) {
+ // let rowspan = 0;
+ // this.DataLists.forEach((element) => {
+ // if (element.propinName === row.propinName) {
+ // rowspan++;
+ // }
+ // });
+ // return [rowspan, 1];
+ // }
+ },
+
// 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
handleCurrentChecked(data, checked, checkedNodes) {
this.dataObj = data;
@@ -2749,51 +2800,7 @@
}
},
- handleCurrentCheckeds(data, checked, checkedNodes) {
- console.log(data,222);
- let zhId = data.id;
- listByZhId(zhId).then((res) => {
- this.zhxqList = res.data.tjProjectList;
- this.dataObj = data;
- if (checked.checkedNodes.length != 0) {
- this.zhxqList.forEach((element) => {
- this.$refs.trees.setCheckedKeys([data.id]);
- let proId = element.proId;
- getProSonDxList(proId).then((rese) => {
- this.TreedataLists = rese.data.list;
- this.TreedataLists.forEach((item) => {
- this.checkedListkey.push(item.proId);
- this.DataLists.push(item);
- console.log(this.DataLists,333);
- this.spliceData();
- this.DataLists.forEach((item1) => {
- if (item1.proParentId == data.proId) {
- item1.propinName = data.proName;
- }
- });
- });
- this.TotalPrice1 = 0;
- this.marryall = 0;
- if (this.DataLists.length != 0) {
- this.list1 = false;
- this.DataLists.forEach((item) => {
- // this.TotalPrice1 = item.proPrice + this.TotalPrice1;
- this.marryall += item.proPrice;
- });
- }
- });
- });
- } else if (checked.checkedNodes.length == 0) {
- this.zhxqList.forEach((element) => {
- let proId = element.proId;
- getProSonDxList(proId).then((res) => {
- this.TreedataLists = res.data.list;
- this.checkedListkey = [];
- });
- });
- }
- });
- },
+
spliceData() {
for (var i = 0; i < this.DataList.length; i++) {
for (var j = i + 1; j < this.DataList.length; j++) {
@@ -2815,10 +2822,10 @@
</span>
);
},
- renderContent1(h, { node, data, store }) {
+ renderContents(h, { node, data, store }) {
return (
<span class="custom-tree-node">
- 聽 <span>{node.label}</span>
+ <span>{node.label}</span>
<span>({data.price}鍏�)</span>
</span>
);
@@ -2862,14 +2869,13 @@
}
});
},
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete1(row) {
- this.DataList.forEach((item, index) => {
+ handleDel(row) {
+ this.DataLists.forEach((item, index) => {
if (item.proId == row.proId) {
- this.DataList.splice(index, 1);
- this.marryall = 0;
- this.DataList.forEach((item1) => {
- this.marryall += item1.proPrice;
+ this.DataLists.splice(index, 1);
+ this.marryalls = 0;
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice;
});
}
});
@@ -2918,7 +2924,7 @@
});
}
if (this.DataLists.length != 0) {
- this.DataList.forEach((item) => {
+ this.DataLists.forEach((item) => {
this.proIds.push(item.proId);
});
}
@@ -3366,7 +3372,7 @@
}
.tab3 {
- max-height: 390px;
+ max-height: 400;
overflow-y: auto;
border: 1px solid #d9d9d9;
}
--
Gitblit v1.8.0