From 942697763a76be6f6e9402d34015c8a94336406c Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 24 六月 2025 16:37:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

---
 src/views/system/tijian/index.vue |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 532944b..3b421a8 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,4 +1,6 @@
 <template>
+   <div v-loading="isLoading" element-loading-text="璇风◢鍊�..." element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative;">
   <div class="app-container">
     <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true">
@@ -562,6 +564,15 @@
             </div>
             宸查�夐」鐩垪琛�
           </div>
+
+          <div v-loading="contentLoading" element-loading-text="鍔犺浇涓�..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.7)" style=" padding: 0px 6px;
+    border: 1px solid #e6ebf5;
+    max-height: 650%;
+    overflow: auto;
+    width: 916px;
+    margin-left: 35px;" >
+
+          
           <div style="
               padding: 0px 6px;
               border: 1px solid #e6ebf5;
@@ -617,6 +628,7 @@
                 </template>
               </el-table-column>
             </el-table>
+          </div>
           </div>
         </div>
       </el-col>
@@ -749,6 +761,7 @@
     <Packages ref="aaa" @add="handleChanges" />
     <selectName ref="bbb" @add="handleChangesName" />
   </div>
+</div>
 </template>
 
 <script>
@@ -815,6 +828,8 @@
   data() {
     return {
       isSubmitting: false,
+      contentLoading: false,
+      isLoading: false,
       open1: false,
       filterage: "",
       checkedkeys: [],
@@ -2910,6 +2925,7 @@
 
     // 椤圭洰鎻愪氦
     submit() {
+    this.isLoading = true;
       if (this.form.cusIdcard) {
         var cusId = this.form.cusIdcard;
       } else {
@@ -2923,6 +2939,8 @@
       this.isSubmitting = true; // 寮�濮嬫彁浜ゆ椂璁剧疆鏍囧織
       this.TotalPrice1 = 0; // 鍒濆鍖栧簲鏀堕噾棰�
       this.TotalPrice = 0; // 鍒濆鍖栧疄鏀堕噾棰�
+
+      this.contentLoading = true; 
       this.discount = 10; // 鍒濆鍖栨姌鎵ｄ负10锛�100%锛�
 
       // 鍒ゆ柇鏄惁鏈夐�変腑鐨勫椁�
@@ -2959,9 +2977,11 @@
               this.processOrderItems(cusId);
             }
             this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+             this.isLoading = false;
           })
           .catch(() => {
             this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+             this.isLoading = false;
           });
       } else {
         getaddtTransition(data)
@@ -2970,9 +2990,13 @@
               this.processOrderItems(cusId);
             }
             this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+             this.isLoading = false;
+            // this.contentLoading = false;
           })
           .catch(() => {
             this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+             this.isLoading = false;
+            // this.contentLoading = false;
           });
       }
 
@@ -2984,6 +3008,7 @@
     // 澶勭悊璁㈠崟椤圭洰
     processOrderItems(cusId) {
       getTransitionList1(cusId).then((response) => {
+        this.contentLoading = false;
         this.tableData1 = response.data;
         let Price = 0;
         if (this.tableData1) {

--
Gitblit v1.8.0