From ba753bf8afd9e3da6e5cedca2213e44e03636191 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 17 四月 2025 11:15:18 +0800
Subject: [PATCH] 1

---
 src/views/hosp/order/index.vue |  206 +++++++++++++++++++++++++++++----------------------
 1 files changed, 117 insertions(+), 89 deletions(-)

diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 2d03b88..cc0e9fa 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -156,7 +156,7 @@
         <el-step title="宸插鏍�"></el-step>
         <el-step title="鐢熸垚鎶ュ憡"></el-step>
         <el-step title="鎶ュ憡鏍告敹"></el-step>
-        <el-step title="宸插嚭鎶ュ憡"></el-step>
+        <el-step title="宸叉墦鍗�"></el-step>
       </el-steps>
     </div>
 
@@ -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>
@@ -1238,81 +1244,64 @@
       </div> -->
     </el-dialog>
 
-    <!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� -->
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="950px"
+      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="first">
-          <el-table :data="numberList" style="width: 100%">
-            <el-table-column prop="proName" label="椤圭洰/鑰楁潗" width="300">
-            </el-table-column>
-            <el-table-column prop="price" label="鍗曚环" width="300">
-            </el-table-column>
-            <el-table-column prop="count" label="鏁伴噺" width="300">
-            </el-table-column>
-          </el-table>
-          <el-table :data="bill" style="width: 100%">
-            <el-table-column prop="copeWith" label="搴斾粯" width="180">
-            </el-table-column>
-            <el-table-column prop="discount" label="鎶樻墸" width="180">
-            </el-table-column>
-            <el-table-column prop="paidIn" label="瀹炰粯" width="180">
-            </el-table-column>
-            <el-table-column prop="payType" label="浠樻鏂瑰紡" width="180">
-              <template slot-scope="scope">
-                <span v-if="scope.row.payType == '0'">鐜伴噾鏀粯</span>
-                <span v-if="scope.row.payType == '1'">鍒峰崱鏀粯</span>
-                <span v-if="scope.row.payType == '2'">鏀粯瀹濇敮浠�</span>
-                <span v-if="scope.row.payType == '3'">寰俊鏀粯</span>
-                <span v-if="scope.row.payType == '4'">浜戦棯浠樻敮浠�</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="payStasus" label="浠樻鐘舵��" width="180">
-              <template slot-scope="scope">
-                <span v-if="scope.row.payStasus == '0'">鏈粯娆�</span>
-                <span v-if="scope.row.payStasus == '1'">宸蹭粯娆�</span>
-                <span v-if="scope.row.payStasus == '2'">閫�璐�</span>
-                <span v-if="scope.row.payStasus == '3'">棰勪粯娆�</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane> -->
         <el-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px">
-          <el-table :data="huizongList" style="width: 100%" max-height="200">
+          <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-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-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: 350px">
+        <el-tab-pane label="鏄庣粏椤圭洰" name="third" style="height: 450px">
+          <!-- 绉婚櫎 overflow-y: auto -->
           <el-table
             :data="infoList"
-            style="width: 100%"
-            max-height="330"
+            style="width: 100"
+            max-height="500"
             :span-method="objectSpanMethod1"
           >
             <el-table-column
@@ -1320,25 +1309,38 @@
               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>
+            <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-column>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -1561,7 +1563,7 @@
   getaddtTransition,
   getProParentIdDxList,
   getProSonDxList,
-  getaddtTransition1
+  getaddtTransition1,
 } from "@/api/system/tijian";
 import {
   SubmitCompany,
@@ -1667,7 +1669,7 @@
       activeNames: "first",
       // 闈炲涓鐢�
       multiple: true,
-      tjNUms:[],
+      tjNUms: [],
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
       userId: "",
@@ -2018,7 +2020,7 @@
       });
     },
 
-    ResumeAppointment(){
+    ResumeAppointment() {
       this.isLoading = true;
       this.$confirm("鎮ㄧ‘璁よ鎭㈠棰勭害锛�", "纭淇℃伅", {
         distinguishCancelAndClose: true,
@@ -2561,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>
       );
@@ -2579,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,
@@ -3025,6 +3031,8 @@
         proIds: this.proIds,
       };
       getaddtTransition1(data).then((response) => {
+        console.log(123456789);
+
         if (response.code === 200) {
           // this.DataList3 = [];
           //   this.DataList = [];
@@ -3121,6 +3129,26 @@
 };
 </script>
 <style lang="scss" scoped>
+.custom-dialog {
+  /* 鑷畾涔夊脊鍑烘鐨勬渶灏忛珮搴� */
+  min-height: 600px; /* 浠庨粯璁ら珮搴﹀鍔犲埌 600px锛屽彲浠ユ牴鎹渶瑕佽皟鏁� */
+}
+
+/* 璋冩暣 el-tabs 鐨勫唴瀹瑰尯鍩熼珮搴� */
+::v-deep .el-tabs__content {
+  min-height: 500px; /* 纭繚閫夐」鍗″唴瀹瑰尯鍩熸湁瓒冲楂樺害 */
+}
+
+/* 璋冩暣瀵硅瘽妗嗙殑涓讳綋閮ㄥ垎 */
+::v-deep .el-dialog__body {
+  padding: 20px;
+}
+
+/* 鍙�夛細璋冩暣 footer 鐨勬牱寮� */
+.dialog-footer {
+  padding: 10px 20px;
+  text-align: right;
+}
 .pag {
   width: 100%;
   display: flex;

--
Gitblit v1.8.0