From 155a30a172e4cf04838dcf7c8bb73ce6b200e574 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 26 三月 2025 14:52:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/hosp/order/index.vue | 212 +++++++++++++---------------------------------------
1 files changed, 54 insertions(+), 158 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 2056b76..1711183 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -804,13 +804,20 @@
<el-table
:data="DataList3"
border
- style="width: 100%"
+ style="width: 100%; table-layout: fixed"
height="560"
- :span-method="objectspanmethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ :span-method="objectspanmethod">
+ <el-table-column
+ prop="propinName"
+ label="妫�鏌ラ」鐩�"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="200px">
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -953,15 +960,7 @@
<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"
@@ -984,29 +983,6 @@
</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>
@@ -1014,15 +990,6 @@
<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;
- margin-top: 10px;
- "
- >
- 椤圭洰鍒楄〃
- </div> -->
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
v-model="filterText"
@@ -1045,106 +1012,6 @@
</el-tree>
</div>
</el-col>
- <!-- <el-col :span="11">
- <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">
- <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-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- title="鍒犻櫎"
- ></el-button>
- </template>
- </el-table-column>
- </el-table> -->
- <!-- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
- <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="鍘熶环">
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse> -->
- <!-- </div>
- </el-col> -->
</el-row>
</div>
</el-tab-pane>
@@ -1158,13 +1025,20 @@
<el-table
:data="DataList3"
border
- style="width: 100%"
+ style="width: 100%; table-layout: fixed"
height="560"
- :span-method="objectspanmethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ :span-method="objectspanmethod">
+ <el-table-column
+ prop="propinName"
+ label="妫�鏌ラ」鐩�"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="200px">
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -1682,6 +1556,7 @@
import { getwater } from "@/api/hosp/customer";
import { getInfo } from "@/api/login";
import ViewPdf from "@/components/ViewPdf";
+import { getDicts } from "@/api/system/dict/data";
import {
shijianzhou,
getaddtTransition,
@@ -1743,8 +1618,8 @@
createTimeList: "",
packagedataList: [],
cusId: "",
- payType: "0",
- jsType: "0",
+ payType: "",
+ jsType: "",
packageList: [],
checkedkeys: [],
dialogVisible: false,
@@ -2686,7 +2561,7 @@
renderContent(h, { node, data, store }) {
return (
<span class="custom-tree-node">
- 聽 <span>{node.label}</span>
+ <span>{node.label}</span>
<span>({data.proPrice}鍏�)</span>
</span>
);
@@ -2694,7 +2569,19 @@
// 琛ュ綍椤圭洰
handleProject(row) {
- this.payType = "0";
+ let dictType = "reservation_pay_type";
+ getDicts(dictType).then((res) => {
+ if (res.code == 200) {
+ this.jsType = res.data[0].dictValue;
+ }
+ })
+ let dictTypes = "dict_pay_type";
+ getDicts(dictTypes).then((res) => {
+ if (res.code == 200) {
+ this.payType = res.data[0].dictValue;
+ }
+ })
+
this.loading = true;
this.DataList = [];
this.DataList3 = [];
@@ -2703,8 +2590,6 @@
this.orderId = row.orderId;
this.cusId = row.tjCusIdCard;
this.userId = row.userId;
- console.log(row, 666);
-
this.customer = {
cusIdcard: row.tjCusIdCard,
cusName: row.tjCustomerName,
@@ -2766,7 +2651,18 @@
},
// 琛ュ綍椤圭洰
handleProject1() {
- this.payType = "0";
+ let dictType = "reservation_pay_type";
+ getDicts(dictType).then((res) => {
+ if (res.code == 200) {
+ this.jsType = res.data[0].dictValue;
+ }
+ })
+ let dictTypes = "dict_pay_type";
+ getDicts(dictTypes).then((res) => {
+ if (res.code == 200) {
+ this.payType = res.data[0].dictValue;
+ }
+ })
this.loading = true;
this.DataList = [];
this.DataList3 = [];
--
Gitblit v1.8.0