From 66d3843fc802fd6e223739ce8f78bf38eb0c8c3a Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期二, 02 七月 2024 09:18:19 +0800
Subject: [PATCH] qxtj
---
src/views/system/tijian/index.vue | 499 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 414 insertions(+), 85 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index abe176a..a77240f 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">
@@ -551,8 +659,7 @@
椤圭洰鍒楄〃
</div>
<!-- @input="gaibian" -->
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
- v-model="filterText">
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
</el-input>
<div class="tab3">
<el-tree
@@ -647,7 +754,7 @@
</template>
</el-table-column>
</el-table>
- <h3 style="font-weight: bold;">鍚堣锛歿{ marryall }}鍏�</h3>
+ <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
<!-- <el-collapse v-model="activeName" accordion v-if="list1">
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
@@ -906,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
@@ -1290,6 +1402,7 @@
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: [
@@ -1313,7 +1426,15 @@
},
data() {
return {
- pname:"",
+ filterage: "",
+ checkedkeys: [],
+ DataLists: [],
+ marryalls: 0,
+ packagedataList: [],
+ packageList: [],
+ zhxqList: [],
+ zhList: [],
+ pname: "",
filterText: "",
proIdList: [],
tableDatas: [],
@@ -1322,7 +1443,7 @@
table: false,
HistoryList: {},
index: 0,
- names:"",
+ names: "",
dictType: [
{
value: 0,
@@ -1443,10 +1564,19 @@
// 鏍戠姸褰㈢姸
Treedata: [],
TreedataList: [],
+ TreedataLists: [],
treedataList: [],
checkedkey: [],
checkedListkey: [],
defaultProps: {
+ children: [],
+ label: "proName",
+ },
+ defaultProp: {
+ children: [],
+ label: "zhmc",
+ },
+ defaultpackProps: {
children: [],
label: "proName",
},
@@ -1519,6 +1649,9 @@
filterText(val) {
this.$refs.tree.filter(val);
},
+ filterage(val) {
+ this.$refs.treas.filter(val);
+ },
},
created() {
this.getCurrentDateTime();
@@ -1560,10 +1693,18 @@
filterNode(value, data) {
if (!value) return true;
// return data.proName.indexOf(value) !== -1;
- if(data.proName.indexOf(value) !== -1){
+ if (data.proName.indexOf(value) !== -1) {
return data.proName.indexOf(value) !== -1;
- }else{
+ } 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() {
@@ -2094,6 +2235,7 @@
} else {
_this.tcShow = true;
this.$message.warning("鏆傛棤棰勭害淇℃伅");
+ _this.resetpackage();
}
_this.isDisabled = true;
} else {
@@ -2264,6 +2406,7 @@
this.taocan = false;
this.malldisble = false;
this.defaultKeys = [];
+ this.DataLists = [];
},
cancell() {
@@ -2347,7 +2490,7 @@
let _this = this;
_this.pacId = "";
this.proIds = [];
- this.tjCategory ="12"
+ this.tjCategory = "12";
let data = {
cusId,
pacId: _this.pacId,
@@ -2412,47 +2555,121 @@
}
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) => {
+ console.log(item1)
+ if (item2.proId == item1.proPrantId && item1.pacName == "鍗曢」") {
+ 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;
}
},
handleClick(tab, event) {
- if (tab.label == "鍗曢」") {
+ if (this.activeNames == "second") {
this.DataList = [];
+ this.checkedkey= [];
this.getDataList();
+ } else if (this.activeNames == "third") {
+ this.DataLists = [];
+ this.checkedkeys= [];
+ 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){
@@ -2464,9 +2681,7 @@
// })
// },
getDataList() {
- console.log(111);
this.loading = true;
- // this.pname = "null";
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
if (this.tableData[0]) {
@@ -2478,34 +2693,119 @@
});
});
}
- this.checkedkey.push("1735504273274236929");
- let proId = "1735504273274236929";
- this.Treedata.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.DataList.push(item);
- this.DataList.forEach((item) => {
- item.propinName = this.names;
- });
- });
- this.TotalPrice1 = 0;
- this.marryall = 0;
- if (this.DataList.length != 0) {
- this.list1 = false;
- this.DataList.forEach((item) => {
- this.TotalPrice1 = item.proPrice + this.TotalPrice1;
- this.marryall += item.proPrice;
+ // 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.Treedata[0].proName;
+ // });
+ // });
+ // this.TotalPrice1 = 0;
+ // this.marryall = 0;
+ // if (this.DataList.length != 0) {
+ // this.list1 = false;
+ // this.DataList.forEach((item) => {
+ // this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+ // this.marryall += item.proPrice;
+ // });
+ // }
+ // });
+ this.loading = false;
+ });
+ },
+ 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;
+ }
+ });
+ });
+ }
+ });
});
}
});
- this.loading = false;
- });
+ } 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];
+ // }
},
// 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
@@ -2566,6 +2866,14 @@
</span>
);
},
+ renderContents(h, { node, data, store }) {
+ return (
+ <span class="custom-tree-node">
+ <span>{node.label}</span>
+ <span>({data.price}鍏�)</span>
+ </span>
+ );
+ },
// 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
handleCurrentChecked1(data, checked, checkedNodes) {
if (checked == false) {
@@ -2601,6 +2909,17 @@
this.marryall = 0;
this.DataList.forEach((item1) => {
this.marryall += item1.proPrice;
+ });
+ }
+ });
+ },
+ handleDel(row) {
+ this.DataLists.forEach((item, index) => {
+ if (item.proId == row.proId) {
+ this.DataLists.splice(index, 1);
+ this.marryalls = 0;
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice;
});
}
});
@@ -2648,13 +2967,18 @@
this.proIds.push(item.proId);
});
}
+ if (this.DataLists.length != 0) {
+ this.DataLists.forEach((item) => {
+ this.proIds.push(item.proId);
+ });
+ }
let data = {
cusId,
pacId: _this.pacId,
proIds: this.proIds,
};
getaddtTransition(data).then((response) => {
- if(response.code==200 ){
+ if (response.code == 200) {
let cusId = this.form.cusIdcard;
this.proIds = [];
getTransitionList(cusId).then((response) => {
@@ -2663,8 +2987,8 @@
if (this.tableData1) {
this.tableData1.forEach((item) => {
this.TotalPrice1 += item.nowPrice;
- if (item.tjCategory!=null ) {
- this.tjCategory = item.tjCategory
+ if (item.tjCategory != null) {
+ this.tjCategory = item.tjCategory;
}
if (item.pacName == "鍗曢」") {
item.list.forEach((item9) => {
@@ -2692,6 +3016,7 @@
});
this.taocan = false;
this.defaultKeys = [];
+ this.DataLists = [];
},
// changeCategoryKeys(val) {
// this.proIds = [];
@@ -3092,7 +3417,7 @@
}
.tab3 {
- max-height: 390px;
+ max-height: 400px;
overflow-y: auto;
border: 1px solid #d9d9d9;
}
@@ -3192,4 +3517,8 @@
.content {
margin-bottom: 25px;
}
+.tab8 {
+ width: 100%;
+ display: flex;
+}
</style>
--
Gitblit v1.8.0