From 2a38384f5761b7d39e35fac74efcfcaa3e414251 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期四, 15 八月 2024 18:37:59 +0800
Subject: [PATCH] su
---
src/views/hosp/order/index.vue | 429 +++++++++++++++++++++++++++++++---------------------
1 files changed, 255 insertions(+), 174 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 5313cd4..5ea424e 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -581,7 +581,7 @@
</el-table-column>
</el-table>
- <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
+ <!-- <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3> -->
</div>
</el-col>
</el-row>
@@ -780,17 +780,85 @@
append-to-body
:close-on-click-modal="false"
>
- <el-tabs
- type="border-card"
- style="height: 560px; margin: 0 10px; width: 100%"
- @tab-click="handleClick"
- v-model="activeNames"
- >
- <el-tab-pane label="缁勫悎" name="first">
- <div class="tab8">
- <el-row :gutter="20" style="width: 100%">
- <el-col :span="6">
- <div
+ <div class="box">
+ <div class="box1">
+ <div
+ style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+ >
+ 椤圭洰閫夋嫨
+ </div>
+ <el-tabs
+ type="border-card"
+ style="height: 560px; margin: 0 10px; width: 100%"
+ @tab-click="handleClick"
+ v-model="activeNames"
+ >
+ <el-tab-pane label="缁勫悎" name="first">
+ <div class="tab8">
+ <el-row :gutter="20" style="width: 100%">
+ <el-col :span="22">
+ <!-- <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="11">
+ <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"> </el-col> -->
+ </el-row>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="鍗曢」" name="third">
+ <div class="tab8">
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="22">
+ <!-- <div
style="
text-align: center;
margin-bottom: 10px;
@@ -798,27 +866,30 @@
"
>
椤圭洰鍒楄〃
- </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"
+ </div> -->
+ <el-input
+ placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+ v-model="filterText"
>
- </el-tree>
- </div>
- </el-col>
- <el-col :span="6">
+ </el-input>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="Treedata"
+ :props="defaultProps"
+ show-checkbox
+ node-key="proId"
+ @check="handleCurrentChecked"
+ :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode"
+ ref="tree"
+ :render-content="renderContent"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <!-- <el-col :span="11">
<div
style="
text-align: center;
@@ -829,130 +900,24 @@
鏄庣粏椤圭洰鍒楄〃
</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 class="outside1">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="TreedataList"
+ node-key="proId"
+ :props="defaultProps"
+ :filter-node-method="filterNode"
+ show-checkbox
+ @check-change="handleCurrentChecked1"
+ :default-checked-keys="checkedListkey"
+ :render-content="renderContent"
+ >
+ </el-tree>
</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"
- 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="third">
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="6">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 椤圭洰鍒楄〃
- </div>
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
- </el-input>
- <div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="Treedata"
- :props="defaultProps"
- show-checkbox
- node-key="proId"
- @check="handleCurrentChecked"
- :default-checked-keys="checkedkey"
- :filter-node-method="filterNode"
- ref="tree"
- :render-content="renderContent"
- >
- </el-tree>
- </div>
- </el-col>
- <el-col :span="5">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 鏄庣粏椤圭洰鍒楄〃
- </div>
- <div class="tab3">
- <div class="outside1">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="TreedataList"
- node-key="proId"
- :props="defaultProps"
- :filter-node-method="filterNode"
- show-checkbox
- @check-change="handleCurrentChecked1"
- :default-checked-keys="checkedListkey"
- :render-content="renderContent"
- >
- </el-tree>
- </div>
- </div>
- </el-col>
- <el-col :span="11">
+ </el-col> -->
+ <!-- <el-col :span="11">
<div class="grid-content bg-purple">
<div
style="
@@ -999,7 +964,7 @@
></el-button>
</template>
</el-table-column>
- </el-table>
+ </el-table> -->
<!-- <el-collapse v-model="activeName" accordion v-if="list1">
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
@@ -1022,11 +987,54 @@
</el-collapse-item>
</div>
</el-collapse> -->
+ <!-- </div>
+ </el-col> -->
+ </el-row>
</div>
- </el-col>
- </el-row>
- </el-tab-pane>
- </el-tabs>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
+
+ <div class="grid-content bg-purple">
+ <div style="text-align: center; margin-bottom: 10px;margin-top:9px">
+ 宸查�夐」鐩垪琛�
+ </div>
+ <el-table
+ :data="DataList3"
+ border
+ style="width: 100%"
+ height="560"
+ :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"
+ 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>
+ </div>
+
<div class="heji">
<template>
<el-form :model="form" :inline="true">
@@ -1040,7 +1048,7 @@
</template>
<div class="outsides">
- <el-form :inline="true" class="outside2" label-width="80px" >
+ <el-form :inline="true" class="outside2" label-width="80px">
<el-form-item label="鍘熶环" style="display: flex">
<el-input
placeholder="鍘熶环"
@@ -1421,6 +1429,7 @@
name: "Order",
data() {
return {
+ DataList3: [],
bldhid: "",
budadaozhen: false,
huizongList: [],
@@ -1480,6 +1489,8 @@
activeName: "1",
proIds: [],
TotalPrice1: 0,
+ TotalPrice6: 0,
+ TotalPrice7: 0,
numberList: [],
dialogVisible: false,
// 閬僵灞�
@@ -1977,6 +1988,7 @@
},
budadzd() {
this.bldhs = [];
+ this.bldhid = "";
getBlproByTjh(this.tjnumbers).then((res) => {
if (res.data) {
this.DataLists = res.data;
@@ -1991,6 +2003,7 @@
});
},
dayin() {
+ // this.bldhs = [];
console.log(this.bldhs);
this.bldhid.toString(this.bldhs);
this.bldhs.forEach((item) => {
@@ -2016,8 +2029,8 @@
handleClick(tab, event) {
if (this.activeNames == "first") {
- this.marryalls = 0;
- this.Datalists = [];
+ // this.marryalls = 0;
+ // this.Datalists = [];
this.checkedkeys = [];
getZhList().then((response) => {
if (response.data) {
@@ -2026,13 +2039,13 @@
this.loading = false;
});
} else {
- this.TotalPrice1 = 0;
+ // this.TotalPrice1 = 0;
this.checkedkey = [];
- this.DataList = [];
+ // this.DataList = [];
this.getDataList();
- if (this.marryalls != 0) {
- this.TotalPrice1 += this.marryalls;
- }
+ // if (this.marryalls != 0) {
+ // this.TotalPrice1 += this.marryalls;
+ // }
}
},
@@ -2050,10 +2063,20 @@
this.TreedataList = res.data.list;
this.TreedataList.forEach((item) => {
this.Datalists.push(item);
+ this.DataList3 = this.DataList.concat(this.Datalists);
if (this.Datalists.length >= 1) {
this.marryalls = 0;
this.Datalists.forEach((item1) => {
this.marryalls += item1.proPrice;
+ // this.TotalPrice1 = this.marryalls;
+ this.TotalPrice1 = 0;
+ console.log(this.DataList3, 9999999999);
+ if (this.DataList3.length != 0) {
+ this.DataList3.forEach((item) => {
+ console.log(item.proPrice);
+ this.TotalPrice1 += item.proPrice;
+ });
+ }
this.packagedataList.forEach((item3) => {
if (item1.proParentId == item3.proId) {
item1.propinName = item3.proName;
@@ -2082,6 +2105,9 @@
handleProject(row) {
this.loading = true;
this.DataList = [];
+ this.DataList3 = [];
+ this.Datalists = [];
+ this.TotalPrice1 = 0;
this.orderId = row.orderId;
this.cusId = row.tjCusIdCard;
this.userId = row.userId;
@@ -2148,6 +2174,9 @@
handleProject1() {
this.loading = true;
this.DataList = [];
+ this.DataList3 = [];
+ this.Datalists = [];
+ this.TotalPrice1 = 0;
this.orderId = this.ids;
this.cusId = this.cusIds;
this.userId = this.userIds;
@@ -2176,6 +2205,8 @@
this.TreedataList.forEach((item) => {
this.checkedListkey.push(item.proId);
this.DataList.push(item);
+ this.DataList3 = this.DataList.concat(this.Datalists);
+ console.log(this.DataList, 77777);
this.spliceData();
this.DataList.forEach((item1) => {
if (item1.proParentId == data.proId) {
@@ -2184,15 +2215,21 @@
});
});
this.TotalPrice1 = 0;
- if (this.DataList.length != 0) {
- this.list1 = false;
- this.DataList.forEach((item) => {
- this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+ if (this.DataList3.length != 0) {
+ this.DataList3.forEach((item) => {
+ this.TotalPrice1 += item.proPrice;
});
- if (this.marryalls != 0) {
- this.TotalPrice1 += this.marryalls;
- }
}
+ // this.TotalPrice1 = 0;
+ // if (this.DataList.length != 0) {
+ // this.list1 = false;
+ // this.DataList.forEach((item) => {
+ // this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+ // });
+ // if (this.marryalls != 0) {
+ // this.TotalPrice1 += this.marryalls;
+ // }
+ // }
});
} else if (checked.checkedNodes.length == 0) {
let proId = data.proId;
@@ -2233,6 +2270,7 @@
});
} else if (checked == true) {
this.DataList.push(data);
+ console.log(this.DataList, 6666);
this.DataList.forEach((item1) => {
if (item1.proParentId == this.dataObj.proId) {
item1.propinName = this.dataObj.proName;
@@ -2258,6 +2296,31 @@
});
}
});
+ this.DataList3.forEach((item, index) => {
+ if (item.proId == row.proId) {
+ this.DataList3.splice(index, 1);
+ this.marryalls = 0;
+ this.DataList3.forEach((item1) => {
+ this.marryalls += item1.proPrice;
+ });
+ }
+ });
+ this.DataList.forEach((item, index) => {
+ if (item.proId == row.proId) {
+ this.DataList.splice(index, 1);
+ this.TotalPrice1 = 0;
+ this.DataList.forEach((item1) => {
+ this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+ });
+ if (this.marryalls != 0) {
+ this.TotalPrice1 += this.marryalls;
+ }
+ }
+ });
+ this.TotalPrice1 = 0;
+ this.DataList3.forEach(item=>{
+ this.TotalPrice1 += item.proPrice;
+ })
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -2358,6 +2421,10 @@
};
getaddtTransition(data).then((response) => {
if (response.code === 200) {
+ this.DataList = [];
+ this.DataList3 = [];
+ this.DataLists = [];
+ this.TotalPrice1 = 0;
let tjType = this.form.tjType;
let copeWith = this.TotalPrice1;
let paidIn = copeWith * (this.discount / 10);
@@ -2404,6 +2471,9 @@
};
getaddtTransition(data).then((response) => {
if (response.code === 200) {
+ // this.DataList3 = [];
+ // this.DataList = [];
+ // this.DataList3 = [];
let tjType = this.form.tjType;
let copeWith = this.TotalPrice1;
let paidIn = copeWith * (this.discount / 10);
@@ -2434,6 +2504,7 @@
handleProjectssChange(selection) {
this.DataListss = [];
+ this.selection = [];
this.bldhs = selection.map((item) => item.bldh);
selection.forEach((item) => {
item.projectList.forEach((item1) => {
@@ -2574,4 +2645,14 @@
align-items: center;
margin-top: 10px;
}
+.box {
+
+ display: flex;
+ justify-content: space-between;
+}
+.box1{
+ width: 50%;
+ display: flex;
+ flex-direction: column;
+}
</style>
--
Gitblit v1.8.0