From de1ecd434ef51cf7aa43850d2d648162bfe86289 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 06 十二月 2024 11:57:58 +0800
Subject: [PATCH] 12.06

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

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index faca2d3..b1f4f3f 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1014,6 +1014,7 @@
                 v-for="(item, index) in tableData1"
                 :key="'info1-' + index"
               >
+
                 <el-collapse-item :name="index">
                   <template slot="title">
                     <div style="width: 70%">
@@ -1044,7 +1045,7 @@
                     style="width: 100%"
                     height="270"
                   >
-                    <el-table-column prop="proName" label="椤圭洰" width="180">
+                    <el-table-column prop="s" label="椤圭洰" width="180">
                     </el-table-column>
                     <el-table-column prop="proType" label="鎬у埆" width="180">
                       <template
@@ -1695,6 +1696,9 @@
   },
   mounted() {
     console.log(this.dict.type.dict_user_marry, 555);
+    console.log(this.dict.type.dict_user_national, 666);
+
+    
   },
 
   methods: {
@@ -2203,6 +2207,12 @@
             }
             if (this.form.tjType === null) {
               this.form.tjType = "3";
+            }
+            if (this.form.cusMarryStatus === "null") {
+              this.form.cusMarryStatus = "5";
+            }
+            if (this.form.cusNational === "null") {
+              this.form.cusNational = "1";
             }
             if (this.form.reservationId != null) {
               if (this.form.groupingId) {
@@ -3309,6 +3319,9 @@
               }
               this.list1 = false;
               this.list3 = true;
+              this.list2 = false;
+              console.log(this.list1)
+              console.log(this.list3)
             } else {
               this.list1 = true;
               this.TotalPrice = "0.00";

--
Gitblit v1.8.0