From 85379016a73db70585b85e551e105e18bedf108c Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 17 四月 2025 17:29:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/views/hosp/order/index.vue | 196 +++++++++++++++++++++++++++++++++---------------
1 files changed, 134 insertions(+), 62 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 7281f6c..cc0e9fa 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -263,6 +263,7 @@
border
v-loading="loading"
:data="orderList"
+ ref="tableRef"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -806,18 +807,21 @@
border
style="width: 100%; table-layout: fixed"
height="560"
- :span-method="objectspanmethod">
- <el-table-column
- prop="propinName"
+ :span-method="objectspanmethod"
+ >
+ <el-table-column
+ prop="propinName"
label="妫�鏌ラ」鐩�"
width="200px"
- :show-overflow-tooltip="true">
+ :show-overflow-tooltip="true"
+ >
</el-table-column>
- <el-table-column
- prop="proName"
+ <el-table-column
+ prop="proName"
label="鏄庣粏椤圭洰"
width="200px"
- :show-overflow-tooltip="true">
+ :show-overflow-tooltip="true"
+ >
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -960,7 +964,6 @@
<div class="tab8">
<el-row :gutter="20" style="width: 100%">
<el-col :span="22">
-
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
v-model="filterage"
@@ -1027,18 +1030,21 @@
border
style="width: 100%; table-layout: fixed"
height="560"
- :span-method="objectspanmethod">
- <el-table-column
- prop="propinName"
+ :span-method="objectspanmethod"
+ >
+ <el-table-column
+ prop="propinName"
label="妫�鏌ラ」鐩�"
width="200px"
- :show-overflow-tooltip="true">
+ :show-overflow-tooltip="true"
+ >
</el-table-column>
- <el-table-column
- prop="proName"
+ <el-table-column
+ prop="proName"
label="鏄庣粏椤圭洰"
width="200px"
- :show-overflow-tooltip="true">
+ :show-overflow-tooltip="true"
+ >
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -1239,49 +1245,109 @@
</el-dialog>
<el-dialog
- :title="title"
- :visible.sync="open"
- width="1400px"
- append-to-body
- :close-on-click-modal="false"
- class="custom-dialog"
->
- <el-tabs v-model="activeName1" type="card">
- <el-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px">
- <el-table :data="huizongList" style="width: 100%" max-height="350">
- <el-table-column align="center" type="index" label="搴忓彿" width="50"></el-table-column>
- <el-table-column align="center" prop="parent_pro_name" 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>
- <h3>浠樻璇︽儏</h3>
- <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" style="height: 450px;"> <!-- 绉婚櫎 overflow-y: auto -->
- <el-table
- :data="infoList"
- style="width: 100;"
- max-height="500"
- :span-method="objectSpanMethod1"
- >
- <el-table-column align="center" type="index" label="搴忓彿" width="50"></el-table-column>
- <el-table-column align="center" prop="parent_pro_name" 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>
- <div slot="footer" class="dialog-footer">
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
-</el-dialog>
+ :title="title"
+ :visible.sync="open"
+ width="1400px"
+ append-to-body
+ :close-on-click-modal="false"
+ class="custom-dialog"
+ >
+ <el-tabs v-model="activeName1" type="card">
+ <el-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px">
+ <el-table :data="huizongList" style="width: 100%" max-height="350">
+ <el-table-column
+ align="center"
+ type="index"
+ label="搴忓彿"
+ width="50"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="parent_pro_name"
+ 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>
+ <h3>浠樻璇︽儏</h3>
+ <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" style="height: 450px">
+ <!-- 绉婚櫎 overflow-y: auto -->
+ <el-table
+ :data="infoList"
+ style="width: 100"
+ max-height="500"
+ :span-method="objectSpanMethod1"
+ >
+ <el-table-column
+ align="center"
+ type="index"
+ label="搴忓彿"
+ width="50"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="parent_pro_name"
+ 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>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
<el-dialog
:title="title1"
@@ -1497,7 +1563,7 @@
getaddtTransition,
getProParentIdDxList,
getProSonDxList,
- getaddtTransition1
+ getaddtTransition1,
} from "@/api/system/tijian";
import {
SubmitCompany,
@@ -1603,7 +1669,7 @@
activeNames: "first",
// 闈炲涓鐢�
multiple: true,
- tjNUms:[],
+ tjNUms: [],
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
userId: "",
@@ -1954,7 +2020,7 @@
});
},
- ResumeAppointment(){
+ ResumeAppointment() {
this.isLoading = true;
this.$confirm("鎮ㄧ‘璁よ鎭㈠棰勭害锛�", "纭淇℃伅", {
distinguishCancelAndClose: true,
@@ -2497,7 +2563,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>
);
@@ -2515,6 +2581,10 @@
this.cusId = row.tjCusIdCard;
this.userId = row.userId;
console.log(row, 666);
+ this.$nextTick(() => {
+ this.$refs.tableRef.clearSelection(); // 娓呴櫎鎵�鏈夐�変腑
+ this.$refs.tableRef.toggleRowSelection(row, true); // 閫変腑褰撳墠琛�
+ });
this.customer = {
cusIdcard: row.tjCusIdCard,
@@ -2961,6 +3031,8 @@
proIds: this.proIds,
};
getaddtTransition1(data).then((response) => {
+ console.log(123456789);
+
if (response.code === 200) {
// this.DataList3 = [];
// this.DataList = [];
--
Gitblit v1.8.0