From 94c40e717c313d91bde25bff7c6938dfc21d9aaf Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 18:14:14 +0800
Subject: [PATCH] qxtj
---
src/views/hosp/order/index.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 3a04bfa..e48c0cf 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -96,6 +96,16 @@
>瀵煎嚭</el-button
>
</el-col>
+
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ size="mini"
+ @click="handleRevoke"
+ :disabled="single"
+ >鎾ら攢绛惧埌</el-button
+ >
+ </el-col>
<el-col :span="1.5">
<el-button
type="primary"
@@ -106,6 +116,7 @@
>琛ュ綍椤圭洰</el-button
>
</el-col>
+
<el-col :span="1.5">
<el-button
type="primary"
@@ -466,14 +477,14 @@
</el-col>
<el-col :span="11">
<div class="grid-content bg-purple">
- <div style="text-align: center; margin-bottom: 10px">
+ <div style="text-align: center; margin-bottom: 10px;margin-top: 10px">
宸查�夐」鐩垪琛�
</div>
<el-table
:data="DataList"
border
style="width: 100%"
- height="250"
+ height="400" :span-method="objectSpanMethod"
>
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�" >
</el-table-column>
@@ -639,7 +650,7 @@
</el-col>
<el-col :span="11">
<div class="grid-content bg-purple">
- <div style="text-align: center; margin-bottom: 10px">
+ <div style="text-align: center; margin-bottom: 10px;margin-top: 10px">
宸查�夐」鐩垪琛�
</div>
@@ -647,7 +658,7 @@
:data="DataList"
border
style="width: 100%"
- height="250"
+ height="400" :span-method="objectSpanMethod"
>
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�" >
</el-table-column>
@@ -677,7 +688,7 @@
<el-collapse v-model="activeName" accordion v-if="list1">
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table :data="DataList" border style="width: 100%">
+ <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="鍘熶环">
@@ -801,7 +812,7 @@
hasReport,
getPdf,
getOrderList,
- getNewDateList,
+ getNewDateList,revokeTjOrderByTjNum,
} from "@/api/hosp/order";
import moment from "moment";
import { getwater } from "@/api/hosp/customer";
@@ -1059,6 +1070,13 @@
}
});
},
+
+ handleRevoke(){
+ revokeTjOrderByTjNum(this.tjnumbers).then(res => {
+ this.$modal.msgSuccess("鎾ら攢鎴愬姛")
+ this.getList();
+ })
+ },
/** 鐐瑰嚮鏄剧ず浣撴鎶ュ憡鎶ヨ〃*/
// viewReport(row) {
// const tjNumber = row.tjNumber;
@@ -1276,6 +1294,7 @@
this.Projectopen1 = true;
this.title = "琛ュ綍椤圭洰";
},
+
// 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
handleCurrentChecked(data, checked, checkedNodes) {
this.dataObj = data
@@ -1365,6 +1384,28 @@
});
},
+ // // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
+ objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+ console.log(row, column, rowIndex, columnIndex)
+ let fields = ["propinName"];
+ let cellValue = row[column.property];
+ if (cellValue && fields.includes(column.property)) {
+ let prevRow = this.DataList[rowIndex - 1];
+ let nextRow = this.DataList[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.DataList[++countRowspan + rowIndex];
+ }
+ if (countRowspan > 1) {
+ return { rowspan: countRowspan, colspan: 1 };
+ }
+ }
+ }
+ },
+
// 鏀惰垂鎸夐挳
submitPrice() {
this.proIds = [];
--
Gitblit v1.8.0