From a84a399991afc41e97fecdabf35deffa75668761 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 22 一月 2025 16:14:10 +0800
Subject: [PATCH] 111
---
src/views/system/tijian/index.vue | 4 +++-
src/views/doctor/checkAll/index.vue | 4 ++++
src/views/hosp/order/index.vue | 14 ++++++++------
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 75b46f0..40f47b1 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -2634,11 +2634,15 @@
// top: 107px;
// right: 56px;
width: 684px;
+ position: fixed; /* 鍥哄畾瀹氫綅 */
+ right: 60px;
+
.right {
background-color: #fff;
// box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
z-index: 10;
+
max-height: calc(100vh - 100px); /* 鍋囪浣犳兂涓洪《閮ㄥ拰搴曢儴鐣欏嚭涓�浜涚┖闂� */
overflow-y: auto; /* 鍏佽鍨傜洿婊氬姩 */
padding: 0 0 50px; /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛浠ラ伩鍏嶅唴瀹圭揣璐磋竟缂� */
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 31be2bf..0040bc4 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -612,7 +612,7 @@
:props="defaultProp"
show-checkbox
node-key="id"
- @check="handlepackage"
+ @check-change="handlepackage"
:default-checked-keys="checkedkeys"
:filter-node-method="filterpackage"
ref="treas"
@@ -1180,7 +1180,7 @@
</el-table-column>
</el-table>
- <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
+ <!-- <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3> -->
</div>
</div>
@@ -2515,7 +2515,7 @@
},
handlepackage(data, checked, checkedNodes) {
if (checked == true) {
- this.$refs.treas.setCheckedKeys([data.id]);
+ // this.$refs.treas.setCheckedKeys([data.id]);
let datas = {
zhId: data.id,
};
@@ -2541,7 +2541,7 @@
this.DataList3.forEach((item) => {
console.log(item.proPrice);
this.TotalPrice1 += item.proPrice * item.sl;
- this.marryalls += item.proPrice;
+ this.marryalls += item.proPrice * item.sl;
});
// 涓烘瘡涓」鐩坊鍔� propinName
@@ -2659,6 +2659,8 @@
this.orderId = row.orderId;
this.cusId = row.tjCusIdCard;
this.userId = row.userId;
+ console.log(row, 666);
+
this.customer = {
cusIdcard: row.tjCusIdCard,
cusName: row.tjCustomerName,
@@ -2807,12 +2809,12 @@
this.checkedObj = checked;
if (checked === true) {
- this.$refs.tree.setCheckedKeys([data.proId]);
+ // this.$refs.tree.setCheckedKeys([data.proId]);
let proId = data.proId;
getProSonDxList(proId).then((res) => {
this.TreedataList = res.data.list;
this.TreedataList.forEach((item) => {
- item.disabled = true;
+ // item.disabled = true;
this.checkedListkey.push(item.proId);
this.DataList3.push(item);
this.spliceData();
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 7e99913..54d29ea 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -351,6 +351,8 @@
</el-table-column>
<el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
</el-table-column>
+ <el-table-column prop="sl" label="鏁伴噺" width="56px">
+ </el-table-column>
<el-table-column prop="proPrice" label="鍘熶环" width="56px">
</el-table-column>
@@ -2554,7 +2556,7 @@
if (this.DataLists.length >= 1) {
this.marryalls = 0;
this.DataLists.forEach((item1) => {
- this.marryalls += item1.proPrice;
+ this.marryalls += item1.proPrice * item1.sl;
this.packagedataList.forEach((item3) => {
if (item1.proParentId == item3.proId) {
--
Gitblit v1.8.0