From b54b3c4662338ca0897b8dbc9172f7f00306a09d Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期二, 25 六月 2024 17:42:04 +0800
Subject: [PATCH] qxtj
---
src/views/hosp/order/index.vue | 93 ++++++++++++++++++++++++++++++++++------------
1 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index c1f5c39..52abbda 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -787,7 +787,7 @@
<!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� -->
<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-tab-pane label="璁㈠崟娴佹按" name="first">
<el-table :data="numberList" style="width: 100%">
<el-table-column prop="proName" label="椤圭洰/鑰楁潗" width="300">
</el-table-column>
@@ -821,26 +821,34 @@
</template>
</el-table-column>
</el-table>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="椤圭洰姹囨��" name="second">
- <el-table :data="huizongList" style="width: 100%">
- <el-table-column prop="newID" label="搴忓彿"> </el-table-column>
- <el-table-column prop="parent_pro_name" label="椤圭洰">
+ <el-table :data="huizongList" style="width: 100%" max-height="280">
+ <el-table-column align="center" prop="newID" label="搴忓彿" width="50"> </el-table-column>
+ <el-table-column align="center" prop="parent_pro_name" label="椤圭洰">
</el-table-column>
- <el-table-column prop="ks" label="绉戝"> </el-table-column>
- <el-table-column prop="price" label="璐圭敤鍚堣"> </el-table-column>
+ <el-table-column align="center" prop="ks" label="绉戝"> </el-table-column>
+ <el-table-column align="center" prop="price" label="璐圭敤鍚堣"> </el-table-column>
+ </el-table>
+ <el-table :data="bill" style="width: 100%;margin-top: 10px;">
+ <el-table-column align="center" prop="copeWith" label="搴斾粯">
+ </el-table-column>
+ <el-table-column align="center" prop="discount" label="鎶樻墸">
+ </el-table-column>
+ <el-table-column align="center" prop="paidIn" label="瀹炰粯" >
+ </el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="鏄庣粏椤圭洰" name="third">
- <el-table :data="infoList" style="width: 100%">
- <el-table-column prop="newID" label="搴忓彿"> </el-table-column>
- <el-table-column prop="parent_pro_name" label="鐖堕」">
+ <el-table :data="infoList" style="width: 100%" max-height ="300" :span-method="objectSpanMethod1">
+ <el-table-column align="center" prop="newID" label="搴忓彿" width="50"> </el-table-column>
+ <el-table-column align="center" prop="parent_pro_name" label="鐖堕」">
</el-table-column>
- <el-table-column prop="proName" label="瀛愰」"> </el-table-column>
- <el-table-column prop="danjia" label="鍗曚环"> </el-table-column>
- <el-table-column prop="num" label="鏁伴噺"> </el-table-column>
- <el-table-column prop="zongjia" label="鎬讳环"> </el-table-column>
- <el-table-column prop="time" label="寮�鍗曟椂闂�"> </el-table-column>
+ <el-table-column align="center" prop="pro_name" label="瀛愰」"> </el-table-column>
+ <el-table-column align="center" prop="danjia" label="鍗曚环"> </el-table-column>
+ <el-table-column align="center" prop="num" label="鏁伴噺"> </el-table-column>
+ <el-table-column align="center" prop="zongjia" label="鎬讳环"> </el-table-column>
+ <el-table-column align="center" prop="time" label="寮�鍗曟椂闂�" width="180"> </el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
@@ -880,7 +888,7 @@
return {
huizongList: [],
infoList: [],
- activeName1: "first",
+ activeName1: "second",
filterText: "",
orderIds: "",
tjnumbers: "",
@@ -1023,12 +1031,12 @@
},
filterNode(value, data) {
if (!value) return true;
- return data.proName.indexOf(value) !== -1;
- // if (value == data.proName) {
- // return data.proName.indexOf(value) !== -1;
- // } else {
- // return data.proEngName.indexOf(value) !== -1;
- // }
+ // return data.proName.indexOf(value) !== -1;
+ if(data.proName.indexOf(value) !== -1){
+ return data.proName.indexOf(value) !== -1;
+ }else{
+ return data.proEngName.indexOf(value) !== -1;
+ }
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
// getNowTime() {
@@ -1287,8 +1295,6 @@
this.title = "璁㈠崟娴佹按";
});
getTransitionInfo(tjNumber).then((res) => {
- console.log(111);
- console.log(res);
this.huizongList = res.data.huizong;
this.infoList = res.data.info;
this.huizongList.forEach((item, index) => {
@@ -1314,6 +1320,22 @@
this.numberList = response.data.charging;
this.bill = response.data.water;
this.title = "璁㈠崟娴佹按";
+ });
+ getTransitionInfo(tjNumber).then((res) => {
+ this.huizongList = res.data.huizong;
+ this.infoList = res.data.info;
+ this.huizongList.forEach((item, index) => {
+ item.newID =
+ (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
+ index +
+ 1;
+ });
+ this.infoList.forEach((item, index) => {
+ item.newID =
+ (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
+ index +
+ 1;
+ });
});
},
@@ -1485,7 +1507,7 @@
// // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
- console.log(row, column, rowIndex, columnIndex);
+ // console.log(row, column, rowIndex, columnIndex);
let fields = ["propinName"];
let cellValue = row[column.property];
if (cellValue && fields.includes(column.property)) {
@@ -1505,6 +1527,27 @@
}
},
+ objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
+ // console.log(row, column, rowIndex, columnIndex);
+ let fields = ["parent_pro_name"];
+ let cellValue = row[column.property];
+ if (cellValue && fields.includes(column.property)) {
+ let prevRow = this.infoList[rowIndex - 1];
+ let nextRow = this.infoList[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.infoList[++countRowspan + rowIndex];
+ }
+ if (countRowspan > 1) {
+ return { rowspan: countRowspan, colspan: 1 };
+ }
+ }
+ }
+ },
+
// 鏀惰垂鎸夐挳
submitPrice() {
this.proIds = [];
--
Gitblit v1.8.0