From 683b2620e0fbfba24787046e2630cbfed0337484 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 04 七月 2024 17:32:44 +0800
Subject: [PATCH] qxtj
---
src/views/hosp/order/index.vue | 186 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 158 insertions(+), 28 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index da428a4..2c3440a 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -116,6 +116,16 @@
>琛ュ綍椤圭洰</el-button
>
</el-col>
+ <!-- <el-col :span="1.5">
+ <el-button
+ type="primary"
+ size="mini"
+ @click="revokeProject"
+ :disabled="single"
+ v-hasPermi="['hosp:order:export']"
+ >鎾ら攢琛ュ綍</el-button
+ >
+ </el-col> -->
<el-col :span="1.5">
<el-button
@@ -227,11 +237,19 @@
:show-overflow-tooltip="true"
width="160px"
/>
+ <el-table-column
+ label="闂ㄨ瘖鍙�"
+ align="center"
+ prop="cardId"
+ :show-overflow-tooltip="true"
+ width="160px"
+ />
<!-- <el-table-column label="娴佹按鍙�" align="center" prop="tjSerialNumber" /> -->
<el-table-column
label="鎵�閫夊椁�"
align="center"
prop="pacName"
+ :formatter="driver"
:show-overflow-tooltip="true"
/>
<el-table-column
@@ -456,7 +474,7 @@
:default-checked-keys="checkedkey"
:filter-node-method="filterNode"
ref="tree"
- :render-content="renderContent"
+ :render-content="renderContent"
>
</el-tree>
</div>
@@ -478,7 +496,7 @@
show-checkbox
@check-change="handleCurrentChecked1"
:default-checked-keys="checkedListkey"
- :render-content="renderContent"
+ :render-content="renderContent"
>
</el-tree>
</div>
@@ -503,7 +521,6 @@
</el-table-column>
<el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
</el-table-column>
-
<el-table-column
label="鎿嶄綔"
@@ -630,7 +647,7 @@
:default-checked-keys="checkedkey"
:filter-node-method="filterNode"
ref="tree"
- :render-content="renderContent"
+ :render-content="renderContent"
>
</el-tree>
</div>
@@ -653,7 +670,7 @@
show-checkbox
@check-change="handleCurrentChecked1"
:default-checked-keys="checkedListkey"
- :render-content="renderContent"
+ :render-content="renderContent"
>
</el-tree>
</div>
@@ -680,7 +697,6 @@
</el-table-column>
<el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
</el-table-column>
-
<el-table-column
label="鎿嶄綔"
@@ -788,7 +804,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>
@@ -822,26 +838,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>
@@ -849,6 +873,70 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- <el-dialog
+ :title="title"
+ :visible.sync="Projectopen"
+ width="1100px"
+ style="height: 860px"
+ append-to-body
+ >
+ <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-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </el-table-column>
+
+
+ </el-table>
+ </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="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </el-table-column>
+
+
+ </el-table>
+ </div>
+ </el-col>
+ </el-row>
+ </el-dialog> -->
</div>
</template>
@@ -879,9 +967,9 @@
name: "Order",
data() {
return {
- huizongList:[],
- infoList:[],
- activeName1: "first",
+ huizongList: [],
+ infoList: [],
+ activeName1: "second",
filterText: "",
orderIds: "",
tjnumbers: "",
@@ -1024,7 +1112,8 @@
},
filterNode(value, data) {
if (!value) return true;
- if(value == data.proName){
+ // 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;
@@ -1098,6 +1187,9 @@
this.total = response.data.total;
this.loading = false;
});
+ },
+ driver(row) {
+ return row.pacName == null ? "鏅�氫綋妫�" : row.pacName;
},
/** 鐐瑰嚮鏄剧ず瀵兼鍗曟姤琛�*/ //lige 寮�濮�
handleReport(row) {
@@ -1284,8 +1376,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) => {
@@ -1311,6 +1401,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;
+ });
});
},
@@ -1372,6 +1478,9 @@
});
this.loading = false;
});
+ },
+ revokeProject(){
+
},
// 琛ュ綍椤圭洰
handleProject1() {
@@ -1482,7 +1591,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)) {
@@ -1502,6 +1611,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