From 53b7cfd8589201ec728c68a08b4ea07d94e66258 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期一, 08 七月 2024 17:16:48 +0800
Subject: [PATCH] qxtj
---
src/views/hosp/order/index.vue | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index ca262cf..cf5ca05 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -802,7 +802,7 @@
</el-dialog>
<!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body >
<el-tabs v-model="activeName1" type="card">
<!-- <el-tab-pane label="璁㈠崟娴佹按" name="first">
<el-table :data="numberList" style="width: 100%">
@@ -839,8 +839,8 @@
</el-table-column>
</el-table>
</el-tab-pane> -->
- <el-tab-pane label="椤圭洰姹囨��" name="second">
- <el-table :data="huizongList" style="width: 100%" max-height="280">
+ <el-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px;">
+ <el-table :data="huizongList" style="width: 100%" max-height="200">
<el-table-column
align="center"
prop="newID"
@@ -855,6 +855,7 @@
<el-table-column align="center" prop="price" label="璐圭敤鍚堣">
</el-table-column>
</el-table>
+ <h3>浠樻璇︽儏</h3>
<el-table :data="bill" style="width: 100%; margin-top: 10px">
<el-table-column align="center" prop="copeWith" label="搴斾粯">
</el-table-column>
@@ -864,11 +865,11 @@
</el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="鏄庣粏椤圭洰" name="third">
+ <el-tab-pane label="鏄庣粏椤圭洰" name="third" style="height: 350px;">
<el-table
:data="infoList"
style="width: 100%"
- max-height="300"
+ max-height="330"
:span-method="objectSpanMethod1"
>
<el-table-column
@@ -922,10 +923,17 @@
<el-table :data="DataLists" border style="width: 100%" height="400" @selection-change="handleProjectssChange" >
<el-table-column type="selection" width="40" align="center" />
<el-table-column
- prop="id"
+ type="index"
label="搴忓彿"
align="center"
width="49px"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="blje"
+ label="琛ュ綍閲戦"
+ align="center"
+ width="74px"
>
</el-table-column>
<el-table-column
@@ -949,13 +957,7 @@
width="96px"
>
</el-table-column>
- <el-table-column
- prop="blje"
- label="琛ュ綍閲戦"
- align="center"
- width="74px"
- >
- </el-table-column>
+
</el-table>
</div>
</el-col>
@@ -1047,7 +1049,7 @@
src: "",
url: "",
flag: true,
- bill: null,
+ bill: [],
Treedata: [],
DataListss:[],
checkedkey: [],
@@ -1430,7 +1432,17 @@
getNumber(tjNumber).then((response) => {
// this.form = response.data;
this.numberList = response.data.charging;
- this.bill = response.data.water;
+ this.bill =[]
+ var copeWith = 0;
+ var paidIn = 0;
+ var discount = ""
+ response.data.water.forEach(item => {
+ copeWith += item.copeWith;
+ paidIn+= item.copeWith;
+ discount= item.discount
+ })
+ this.bill.push({copeWith:copeWith,paidIn:paidIn,discount:discount});
+
this.title = "璁㈠崟娴佹按";
});
getTransitionInfo(tjNumber).then((res) => {
@@ -1457,7 +1469,18 @@
getNumber(tjNumber).then((response) => {
// this.form = response.data;
this.numberList = response.data.charging;
- this.bill = response.data.water;
+ this.bill =[]
+ var copeWith = 0;
+ var paidIn = 0;
+ var discount = ""
+ response.data.water.forEach(item => {
+ copeWith += item.copeWith;
+ paidIn+= item.copeWith;
+ discount= item.discount
+ })
+ this.bill.push({copeWith:copeWith,paidIn:paidIn,discount:discount});
+
+ console.log(this.bill)
this.title = "璁㈠崟娴佹按";
});
getTransitionInfo(tjNumber).then((res) => {
--
Gitblit v1.8.0