From 7581b6ba685d02fd24ea705e4695026e77198d00 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 10 十月 2023 17:52:21 +0800
Subject: [PATCH] 旅游修改,新接口

---
 ruoyi-ui/src/views/travel/travelInfo.vue |   78 ++++--
 ruoyi-ui/src/api/travel/index.js         |   20 
 ruoyi-ui/src/views/travel/Info.vue       |    3 
 ruoyi-ui/src/views/travel/edit.vue       |   86 ++++---
 ruoyi-ui/src/views/travel/index.vue      |  453 ++++++++++++++--------------------------
 5 files changed, 272 insertions(+), 368 deletions(-)

diff --git a/ruoyi-ui/src/api/travel/index.js b/ruoyi-ui/src/api/travel/index.js
index 0df8f4b..41779f3 100644
--- a/ruoyi-ui/src/api/travel/index.js
+++ b/ruoyi-ui/src/api/travel/index.js
@@ -5,7 +5,7 @@
 // 鏌ヨ鏃呰璐圭敤淇℃伅
 export function listTravelPrice(query) {
   return request({
-    url: '/zTravelPrice/all',
+    url: '/travel/count/all',
     method: 'get',
     params: query
   })
@@ -15,7 +15,7 @@
 // 鏍规嵁id鏌ヨ
 export function getTravelPriceInfo(id) {
   return request({
-    url: '/zTravelPrice/' + id,
+    url: '/travel/count/' + id,
     method: 'get',
 
   })
@@ -25,7 +25,7 @@
 export function addTravelPrice(data)
 {
   return request({
-    url: '/zTravelPrice',
+    url: '/travel/count',
     method: 'post',
     data: data
   })
@@ -34,7 +34,7 @@
 // 鍒犻櫎瀹跺涵璁惧
 export function delTravelPrice(Ids) {
   return request({
-    url: '/zTravelPrice/' + Ids,
+    url: '/travel/count/' + Ids,
     method: 'delete'
   })
 }
@@ -42,7 +42,7 @@
 //淇敼瀹跺涵璁惧
 export function updateTravelPrice(data) {
   return request({
-    url: '/zTravelPrice',
+    url: '/travel/count',
     method: 'put',
     data: data
   })
@@ -76,7 +76,7 @@
 // }
 export function listTravelBase(query) {
   return request({
-    url: '/zTravelBase/all',
+    url: '/travel/detail',
     method: 'get',
     params: query
   })
@@ -86,7 +86,7 @@
 // 鏍规嵁id鏌ヨ鎵�鏈夋敹鏀彴璐︿俊鎭�
 export function getTravelBaseInfo(id) {
   return request({
-    url: '/zTravelBase/' + id,
+    url: '/travel/detail/' + id,
     method: 'get',
 
   })
@@ -96,7 +96,7 @@
 export function addTravelBase(data)
 {
   return request({
-    url: '/zTravelBase',
+    url: '/travel/detail',
     method: 'post',
     data: data
   })
@@ -104,7 +104,7 @@
 //淇敼瀹跺涵璁惧
 export function updateTravelBase(data) {
   return request({
-    url: '/zTravelBase',
+    url: '/travel/detail',
     method: 'put',
     data: data
   })
@@ -112,7 +112,7 @@
 // 鍒犻櫎瀹跺涵璁惧
 export function delTravelBase(Ids) {
   return request({
-    url: '/zTravelBase/' + Ids,
+    url: '/travel/detail/' + Ids,
     method: 'delete'
   })
 }
diff --git a/ruoyi-ui/src/views/travel/Info.vue b/ruoyi-ui/src/views/travel/Info.vue
index 14ae47f..4b856dc 100644
--- a/ruoyi-ui/src/views/travel/Info.vue
+++ b/ruoyi-ui/src/views/travel/Info.vue
@@ -98,10 +98,7 @@
       </el-table-column>
 
       <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
-      <el-table-column label="浜虹墿" prop="people" sortable width="100" />
 
-      <el-table-column label="鏍囬" prop="title" sortable width="100" />
-      <el-table-column label="鏃呮湡" prop="travelPeriod" sortable width="100" />
       <el-table-column label="鎸佽瘉鏃呮父" prop="certificate" sortable width="100" />
       <el-table-column label="璐圭敤" prop="totalPrice" sortable width="100" />
       <el-table-column label="鍏垂/鑷垂" prop="self" sortable width="100" >
diff --git a/ruoyi-ui/src/views/travel/edit.vue b/ruoyi-ui/src/views/travel/edit.vue
index 084b4e4..2db2d43 100644
--- a/ruoyi-ui/src/views/travel/edit.vue
+++ b/ruoyi-ui/src/views/travel/edit.vue
@@ -1,24 +1,43 @@
 <template>
   <div class="app-container">
     <div class="form-header mt">
-      <h4 class="dt h4">鏃呮父璐圭敤璇︾粏璁板綍 </h4>
+      <h4 class="dt h4">鏃呮父璁板綍 </h4>
 
     </div>
 
     <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
 
       <el-form-item label="寮�濮嬫椂闂�" prop="startTime">
-        <el-input v-model="formData.startTime" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
-      </el-form-item>
+        <el-date-picker v-model="formData.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                        :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+        ></el-date-picker></el-form-item>
 
       <el-form-item label="缁撴潫鏃堕棿" prop="endTime">
-        <el-input v-model="formData.endTime" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" :disabled="dsb">
+        <el-date-picker v-model="formData.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                        :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="鏃呮父鍚嶇О" prop="name">
+        <el-input v-model="formData.name" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" :disabled="dsb">
         </el-input>
       </el-form-item>
-      <el-form-item label="鏍囬" prop="title">
-        <el-input v-model="formData.title" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" :disabled="dsb">
+      <el-form-item label="鏃呮父鍘诲悜" prop="destination">
+        <el-input v-model="formData.destination" placeholder="璇疯緭鍏ユ梾娓稿幓鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
         </el-input>
       </el-form-item>
+      <el-form-item label="鏃呮父鎬ц川" prop="property">
+      <el-input v-model="formData.property" placeholder="璇疯緭鍏ユ梾娓告�ц川" clearable :style="{width: '100%'}" :disabled="dsb">
+      </el-input>
+    </el-form-item>
+      <el-form-item label="鏃呮父鏂瑰紡" prop="manner">
+        <el-input v-model="formData.manner" placeholder="璇疯緭鍏ユ梾娓告柟寮�" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="鍥㈣垂" prop="groupTotal">
+        <el-input v-model="formData.groupTotal" placeholder="璇疯緭鍏ュ洟璐�" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+
 
 
       <el-form-item size="large">
@@ -56,44 +75,57 @@
       btn:false,
       isShow:true,
 
-      travelpriceList: [],
-
       formData: {
         id: undefined,
-        title: undefined,
+        name: undefined,
         startTime:undefined,
         endTime:undefined,
-        url: undefined,
+        destination: undefined,
+        property: undefined,
+        manner: undefined,
+        groupTotal: undefined,
+
       },
       dialogImageUrl: '',
       dialogVisible: false,
       disabled: false,
       rules: {
-        title: [{
+        name: [{
           required: true,
-          message: '璇疯緭鍏ュぇ浜嬫爣棰�',
+          message: '璇疯緭鍏ユ梾娓稿悕绉�',
           trigger: 'blur'
         }],
-        familyId: [{
+        destination: [{
           required: true,
-          message: '璇疯緭鍏ュ搴彿',
+          message: '璇疯緭鍏ュ幓鍚�',
           trigger: 'blur'
         }],
-        people: [{
+        property: [{
           required: true,
-          message: '璇疯緭鍏ヤ汉鐗�',
+          message: '璇疯緭鍏ユ梾娓告�ц川',
           trigger: 'blur'
         }],
-        address: [{
+        manner: [{
           required: true,
-          message: '璇疯緭鍏ュ湴鐐�',
+          message: '璇疯緭鍏ユ梾娓告柟寮�',
           trigger: 'blur'
         }],
-        remark: [{
+        groupTotal: [{
           // required: true,
-          message: '璇疯緭鍏ュ娉�',
+          message: '璇疯緭鍏ュ洟璐�',
           trigger: 'blur'
         }],
+        startTime: [{
+          required: true,
+          message: '璇烽�夋嫨鏃堕棿',
+          trigger: 'change'
+        }],
+        endTime: [{
+          required: true,
+          message: '璇烽�夋嫨鏃堕棿',
+          trigger: 'change'
+        }],
+
 
       },
       typeOptions: [],
@@ -112,11 +144,6 @@
       this.isShow=true
       document.title = "淇敼鏃呰璐圭敤璇︾粏淇℃伅";
       this.$route.meta.title = "淇敼鏃呰璐圭敤璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
-    }
-    else{
-      document.title = "鏃呰璐圭敤璇︾粏淇℃伅";
-      this.$route.meta.title = "鏃呰璐圭敤璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
-      this.isShow=true
     }
 
     let _this = this
@@ -143,7 +170,7 @@
         }
         this.loading = false;
       });
-      this.getCateInfor()
+
 
     }
   },
@@ -151,13 +178,6 @@
   methods: {
 
     submitForm() {
-      let ul = this.fileList.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      let uls = this.fileListOther.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      this.formData.url = ul+","+uls
 
       this.$refs['elForm'].validate(valid => {
 
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index c0e5aad..679dfb6 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -16,10 +16,34 @@
           end-placeholder="缁撴潫鏃ユ湡"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="鎬诲ぉ鏁�" prop="usePeople" >
+      <el-form-item label="鍘诲悜" prop="destination" >
         <el-input
-          v-model="queryParams.usePeople"
-          placeholder="璇疯緭鍏ユ�诲ぉ鏁�"
+          v-model="queryParams.destination"
+          placeholder="璇疯緭鍏ュ幓鍚�"
+          clearable
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鏃呮父鍚嶇О" prop="name" >
+        <el-input
+          v-model="queryParams.name"
+          placeholder="璇疯緭鍏ユ梾娓稿悕绉�"
+          clearable
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鏃呮父鏂瑰紡" prop="manner" >
+        <el-input
+          v-model="queryParams.manner"
+          placeholder="璇疯緭鍏ユ梾娓告柟寮�"
           clearable
           style="width: 200px;
                    height: 35px;
@@ -70,25 +94,21 @@
             <el-table  :header-row-class-name="tableHeaderRowClassName"  v-loading="loading" :data="travelBase[props.row.id]"  style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;" :row-class-name="tableRowClassName1" >
               <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="50px"/>
 
-              <el-table-column label="鏃堕棿" prop="happenTime" sortable width="100" align="center" >
-                <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
+              <el-table-column label="鏃堕棿" prop="happenDate" sortable width="100" align="center" >
+                <template slot-scope="scope">{{scope.row.happenDate? scope.row.happenDate: '鈥斺�斺�斺��'}}</template>
               </el-table-column>
 
               <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
-              <el-table-column label="浜虹墿" prop="people" sortable width="100" />
 
-              <el-table-column label="鏍囬" prop="title" sortable width="100" />
+              <el-table-column label="寤虹瓚" prop="scenic" sortable width="100" />
               <!-- <el-table-column label="鏃呮湡" prop="travelPeriod" sortable width="100" /> -->
-              <el-table-column label="鎸佽瘉鏃呮父" prop="certificate" sortable width="100" />
-              <el-table-column label="鎬昏垂鐢�" prop="totalPrice" sortable width="100" />
-              <el-table-column label="鍏垂/鑷垂" prop="self" sortable width="100" >
-                <template slot-scope="scope">{{scope.row.self==0?'鍏垂':'鑷垂'}}</template>
-              </el-table-column>
+              <el-table-column label="浣跨敤璇佷欢" prop="document" sortable width="100" />
+              <el-table-column label="杞︽/鑸彮" prop="flight" sortable width="120px" />
               <el-table-column label="椁愯垂" prop="eat" sortable width="70px" />
-              <el-table-column label="浣忓" prop="stay" sortable width="70px" />
-              <el-table-column label="浜ら��" prop="traffic" sortable width="70px" />
+              <el-table-column label="浣忓璐�" prop="stay" sortable width="100px" />
+              <el-table-column label="浜ら��" prop="travel" sortable width="70px" />
               <el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
-              <el-table-column label="璐墿" prop="shopping" sortable width="70px" />
+<!--              <el-table-column label="璐墿" prop="shopping" sortable width="70px" />-->
               <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
                 <template slot-scope="scope" >
                   <img
@@ -97,7 +117,7 @@
                     alt=""
                     style="width: 35px; height: 35px;"
                     fit="cover"
-                    v-if="scope.row.url !== null"
+                    v-if="!scope.row.url "
                   >
                   <img
                     class="el-upload-list__item-thumbnail"
@@ -105,11 +125,11 @@
                     alt=""
                     style="width: 35px; height: 35px;"
                     fit="cover"
-                    v-if="scope.row.url === null"
+                    v-if="scope.row.url "
                   >
                 </template>
               </el-table-column>
-              <el-table-column label="澶囨敞" prop="remark" sortable width="100" />
+<!--              <el-table-column label="澶囨敞" prop="remark" sortable width="100" />-->
 
 
               <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -118,7 +138,7 @@
                     size="mini"
                     type="text"
                     icon="el-icon-edit"
-                    @click="handleUpdate(scope.row)"
+                    @click="handleUpdate1(scope.row)"
                     v-hasPermi="['familymodel:economy:info']"
                   >淇敼</el-button>
                   <el-button
@@ -146,18 +166,17 @@
       <el-table-column label="姝�" prop="endTime" sortable width="100" align="center">
         <template slot-scope="scope">{{scope.row.endTime? scope.row.endTime: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="鎬诲ぉ鏁�" prop="totalDay" sortable width="85px" />
-      <el-table-column label="鏃呮父鍚嶇О" prop="tableName" sortable width="100" />
-      <el-table-column label="鏍囬" prop="title" sortable width="130px" />
-      <el-table-column label="鍘诲悜" prop="destination" sortable width="70px" />
+<!--      <el-table-column label="鎬诲ぉ鏁�" prop="totalDay" sortable width="85px" />-->
+      <el-table-column label="鏃呮父鍚嶇О" prop="name" sortable width="200px" />
+      <el-table-column label="鍘诲悜" prop="destination" sortable width="150px" />
       <el-table-column label="鏃呮父鎬ц川" prop="property" sortable width="100" />
-      <el-table-column label="鏃呮父鏂瑰紡" prop="type" sortable width="100" />
-      <el-table-column label="鎬婚噾棰�" prop="totalCost" sortable width="100" />
-      <el-table-column label="椁愯垂" prop="eat" sortable width="70px" />
-      <el-table-column label="浣忓" prop="stay" sortable width="70px" />
-      <el-table-column label="浜ら��" prop="traffic" sortable width="70px" />
-      <el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
-      <el-table-column label="璐墿" prop="shopping" sortable width="70px" />
+      <el-table-column label="鏃呮父鏂瑰紡" prop="manner" sortable width="100" />
+      <el-table-column label="鎬婚噾棰�" prop="totalPrice" sortable width="100" />
+      <el-table-column label="椁愯垂" prop="eatTotal" sortable width="70px" />
+      <el-table-column label="浣忓" prop="stayTotal" sortable width="70px" />
+      <el-table-column label="浜ら��" prop="travelTotal" sortable width="70px" />
+      <el-table-column label="闂ㄧエ" prop="entranceTotal" sortable width="70px" />
+      <el-table-column label="鍥㈣垂" prop="groupTotal" sortable width="70px" />
 
 
       <el-table-column  label="鎿嶄綔" align="center" sortable width="180" >
@@ -253,24 +272,24 @@
     <el-dialog :title="title" :visible.sync="dialog1Visible" width="800px" append-to-body>
       <el-form ref="elForm2" :model="formDat4" :rules="rules2" size="medium" label-width="100px">
 
-        <el-form-item label="鏍囬" prop="title">
-          <el-input v-model="formDat4.title" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '80%'}" >
+        <el-form-item label="鏍囬" prop="name">
+          <el-input v-model="formDat4.name" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '80%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="璧峰鏃堕棿" prop="startTime">
-          <el-input type="date" v-model="formDat4.startTime" placeholder="璇烽�夋嫨璧峰鏃堕棿" style="width: 80%;"></el-input>
-        </el-form-item>
+          <el-date-picker v-model="formDat.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
+          ></el-date-picker>   </el-form-item>
         <el-form-item label="缁撴潫鏃堕棿" prop="endTime">
-          <el-input type="date" v-model="formDat4.endTime" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" style="width: 80%;"></el-input>
-        </el-form-item>
+          <el-date-picker v-model="formDat.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
+          ></el-date-picker></el-form-item>
         <el-form-item label="鍘诲悜" prop="destination">
-          <el-select v-model="formDat4.destination" placeholder="璇烽�夋嫨鍘诲悜" clearable :style="{width: '80%'}" >
-            <el-option label="鍥藉唴" value="鍥藉唴"></el-option>
-            <el-option label="鍥藉" value="鍥藉"></el-option>
-          </el-select>
+          <el-input  v-model="formDat4.destination" placeholder="璇疯緭鍏ュ幓鍚�" style="width: 80%;"></el-input>
+
         </el-form-item>
-        <el-form-item label="鏃呮父鍚嶇О" prop="tableName">
-          <el-input v-model="formDat4.tableName" placeholder="璇疯緭鍏ユ梾娓稿悕绉�" clearable :style="{width: '80%'}" >
+        <el-form-item label="鍥㈣垂" prop="groupTotal">
+          <el-input v-model="formDat4.groupTotal" type="number"  placeholder="璇疯緭鍏ュ洟璐�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="鏃呮父鎬ц川" prop="property">
@@ -279,12 +298,9 @@
             <el-option label="鍏垂" value="鍏垂"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="鏃呮父鏂瑰紡" prop="type">
-          <el-select v-model="formDat4.type" placeholder="璇烽�夋嫨鏃呮父鏂瑰紡" clearable :style="{width: '80%'}" >
-            <el-option label="鑷┚娓�" value="鑷┚娓�"></el-option>
-            <el-option label="璺熷洟娓�" value="璺熷洟娓�"></el-option>
-            <el-option label="鑷姪娓�" value="鑷姪娓�"></el-option>
-          </el-select>
+        <el-form-item label="鏃呮父鏂瑰紡" prop="manner">
+          <el-input  v-model="formDat4.manner" placeholder="璇疯緭鍏ユ梾娓告柟寮�" style="width: 80%;"></el-input>
+
         </el-form-item>
 
       </el-form>
@@ -292,34 +308,29 @@
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
-        <el-button @click="cancelData">鍙� 娑�</el-button>
+        <el-button @click="dialog1Visible = false ">鍙� 娑�</el-button>
       </div>
     </el-dialog>
 <!--  鏂板姣忔棩琛岀▼鍐呭-->
     <el-dialog title="娣诲姞姣忔棩琛岀▼鍐呭" :visible.sync="centerDialogVisible" width="60%" center append-to-body>
       <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
         <h4 class="form-header">琛岀▼鍐呭 </h4>
-        <el-form-item label="鏍囬" prop="title">
-          <el-input v-model="formDat.title" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" >
-          </el-input>
-        </el-form-item>
-        <el-form-item label="鏃堕棿" prop="happenTime">
-          <el-input
-            v-model='formDat.happenTime'
-            type='date'
-            placeholder='閫夋嫨鏃ユ湡'
-          ></el-input>
+
+        <el-form-item label="鏃堕棿" prop="happenDate">
+          <el-date-picker v-model="formDat.happenDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="鍦扮偣" prop="address">
           <el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="浜虹墿" prop="people">
-          <el-input v-model="formDat.people" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" >
+        <el-form-item label="寤虹瓚" prop="scenic">
+          <el-input v-model="formDat.scenic" placeholder="璇疯緭鍏ュ缓绛�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="鏃呮湡" prop="travelPeriod">
-          <el-input v-model="formDat.travelPeriod" placeholder="璇疯緭鍏ユ梾鏈�" clearable :style="{width: '100%'}" >
+        <el-form-item label="鍑鸿鏂瑰紡" prop="travelMode">
+          <el-input v-model="formDat.travelMode" placeholder="璇疯緭鍏ュ嚭琛屾柟寮�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="鎸佽瘉鏃呮父" prop="certificate">
@@ -331,19 +342,13 @@
             <el-option label="瀛︾敓璇�" value="瀛︾敓璇�"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="璐圭敤" prop="totalPrice">
-          <el-input v-model="formDat.totalPrice" placeholder="璇疯緭鍏ユ�诲叡璐圭敤" clearable :style="{width: '100%'}" >
-          </el-input>
-        </el-form-item> -->
-        <el-form-item label="鍏垂/鑷垂" prop="self">
-          <el-select v-model="formDat.self" placeholder="璇烽�夋嫨鑷垂/鍏垂" clearable :style="{width: '100%'}"  >
-            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
-            ></el-option>
-          </el-select>
+
+        <el-form-item label="杞︽/鑸彮" prop="flight">
+          <el-input v-model="formDat.flight" placeholder="璇疯緭鍏ヨ溅娆�/鑸彮" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
-        <el-form-item label="澶囨敞" prop="remark">
-          <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
-        </el-form-item>
+<!--        <el-form-item label="澶囨敞" prop="remark">-->
+<!--          <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>-->
+<!--        </el-form-item>-->
 
 
         <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
@@ -403,30 +408,26 @@
         </el-upload>
 
       </el-form>
-      <el-form ref="elForm1" :model="formDat1" :rules="rules1" size="medium" label-width="100px">
+      <el-form ref="elForm" :model="formDat" :rules="rules1" size="medium" label-width="100px">
         <h4 class="form-header">璐圭敤鏄庣粏 </h4>
-        <el-form-item label="鍐呭" prop="content">
-          <el-input v-model="formDat1.content" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" >
+        <el-form-item label="浣忓閰掑簵" prop="hotel">
+          <el-input v-model="formDat.hotel" placeholder="璇疯緭鍏ヤ綇瀹块厭搴�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="浣忓璐圭敤" prop="stay">
-          <el-input v-model="formDat1.stay" placeholder="璇疯緭鍏ヤ綇瀹胯垂鐢�" clearable :style="{width: '100%'}" >
+          <el-input v-model="formDat.stay" type="number"  placeholder="璇疯緭鍏ヤ綇瀹胯垂鐢�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="浜ら�氳垂鐢�" prop="traffic">
-          <el-input v-model="formDat1.traffic" placeholder="璇疯緭鍏ヤ氦閫氳垂鐢�" clearable :style="{width: '100%'}" >
+        <el-form-item label="浜ら�氳垂鐢�" prop="travel">
+          <el-input v-model="formDat.travel" type="number"  placeholder="璇疯緭鍏ヤ氦閫氳垂鐢�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="椁愯垂" prop="eat">
-          <el-input v-model="formDat1.eat" placeholder="璇疯緭鍏ラ璐圭敤" clearable :style="{width: '100%'}" >
-          </el-input>
-        </el-form-item>
-        <el-form-item label="璐墿璐圭敤" prop="shopping">
-          <el-input v-model="formDat1.shopping" placeholder="璇疯緭鍏ヨ喘鐗╄垂鐢�" clearable :style="{width: '100%'}" >
+          <el-input v-model="formDat.eat"  type="number"  placeholder="璇疯緭鍏ラ璐圭敤" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="闂ㄧエ璐圭敤" prop="entrance">
-          <el-input v-model="formDat1.entrance" placeholder="璇疯緭鍏ラ棬绁ㄨ垂鐢�" clearable :style="{width: '100%'}" >
+          <el-input v-model="formDat.entrance" type="number"  placeholder="璇疯緭鍏ラ棬绁ㄨ垂鐢�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
 
@@ -456,11 +457,12 @@
   delTravelPrice,
   addTravelPrice,
   uploadPic,
-  updateTravelPrice,
+  // updateTravelPrice,
   addTravelBase,
-  getTravelBaseInfo, getTravelPriceInfo,
+
 } from "@/api/travel/index";
 import {getSelfEconomyInfo} from "@/api/selfeconomy";
+import {delFamilyevent, listFamilyevent} from "@/api/bignote";
 
 export default {
   name: "Role",
@@ -522,6 +524,7 @@
         totalPrice: undefined,
         self: undefined,
         remark: undefined,
+        groupTotal:undefined,
         url: undefined,
       },
       formDat1: {
@@ -541,14 +544,12 @@
         detailList: undefined,
       },
       formDat4: {
-        type: undefined,
+        manner: undefined,
         startTime: undefined,
-        title: undefined,
         endTime: undefined,
         property:undefined,
-        tableName: undefined,
+        name: undefined,
         destination: undefined,
-        detailList:undefined,
       },
       // 鑿滃崟鍒楄〃
       menuOptions: [],
@@ -558,10 +559,6 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        type:undefined,
-        useFor:undefined,
-        usePeople:undefined,
-        createTime:undefined,
 
       },
       // 琛ㄥ崟鍙傛暟
@@ -572,9 +569,9 @@
       },
       //琛ㄥ崟鏍¢獙
       rules: {
-        people: [{
+        name: [{
           required: true,
-          message: '璇疯緭鍏ヤ汉鐗�',
+          message: '璇疯緭鍏ユ梾娓稿悕绉�',
           trigger: 'blur'
         }],
 
@@ -593,24 +590,24 @@
           message: '璇疯緭鍏ユ梾鏈�',
           trigger: 'blur'
         }],
-        certificate: [{
+        document: [{
           required: true,
           message: '璇疯緭鍏ヨ瘉浠�',
           trigger: 'blur'
         }],
-        happenTime: [{
+        happenDate: [{
           required: true,
           message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
           trigger: 'change'
         }],
-        totalPrice: [{
+        manner: [{
           required: true,
-          message: '璇烽�夋嫨璐圭敤',
+          message: '璇疯緭鍏ュ嚭琛屾柟寮�',
           trigger: 'blur'
         }],
-        self: [{
+        property: [{
           required: true,
-          message: '璇烽�夋嫨鍏垂/鑷垂',
+          message: '璇烽�夋嫨鏃呮父鎬ц川',
           trigger: 'change'
         }],
 
@@ -618,54 +615,50 @@
       rules1: {
         stay: [{
           required: true,
-          message: '璇疯緭鍏ヤ汉鐗�',
+          message: '璇疯緭鍏ヤ綇瀹胯垂',
           trigger: 'blur'
         }],
 
-        content: [{
+        hotel: [{
           required: true,
-          message: '璇疯緭鍏ュ湴鐐�',
+          message: '璇疯緭鍏ヤ綇瀹块厭搴�',
           trigger: 'blur'
         }],
-        traffic: [{
+        travel: [{
           required: true,
-          message: '璇疯緭鍏ユ爣棰�',
+          message: '璇疯緭鍏ヤ氦閫氳垂',
           trigger: 'blur'
         }],
         entrance: [{
           required: true,
-          message: '璇疯緭鍏ユ梾鏈�',
+          message: '璇疯緭鍏ラ棬绁�',
           trigger: 'blur'
         }],
         eat: [{
           required: true,
-          message: '璇疯緭鍏ヨ瘉浠�',
+          message: '璇疯緭鍏ラ璐�',
           trigger: 'blur'
         }],
-        shopping: [{
-          required: true,
-          message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
-          trigger: 'change'
-        }],
+
 
       },
       rules2: {
-        type: [{
+        manner: [{
           required: true,
           message: '璇疯緭鍏ユ梾娓告柟寮�',
           trigger: 'blur'
         }],
-        property: [{
+        groupTotal: [{
           required: true,
-          message: '璇疯緭鍏ユ梾娓告�ц川',
-          trigger: 'change'
+          message: '璇疯緭鍏ュ洟璐�',
+          trigger: 'blur'
         }],
         destination: [{
           required: true,
           message: '璇烽�夋嫨鍘诲悜',
           trigger: 'change'
         }],
-        tableName: [{
+        property: [{
           required: true,
           message: '璇疯緭鍏ユ梾娓稿悕绉�',
           trigger: 'blur'
@@ -680,7 +673,7 @@
           message: '璇烽�夋嫨鏃ユ湡',
           trigger: 'change'
         }],
-        title: [{
+        name: [{
           required: true,
           message: '璇烽�夋嫨鏍囬',
           trigger: 'blur'
@@ -752,64 +745,30 @@
 
     getList() {
       this.loading = true;
-      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
-      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-      // console.log(this.queryParams)
-      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
 
-      listTravelPrice(this.queryParams).then(async response => {
-          //  alert(123)
-          //   console.log(response.data)
-          this.travelpriceList = response.data.data;
+      listTravelPrice(this.queryParams).then(response => {
+        this.travelpriceList = response.data.data;
 
-          this.total = response.data.total;
+        this.total = response.data.total;
+        this.loading = false;
 
-          for (let item of this.travelpriceList) {
-            this.queryParams.fid = item.id
-            this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
-            this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-            const baseResponse = await listTravelBase(this.queryParams);
-            const baseData = baseResponse.data.data;
-            this.$set(this.travelBase, item.id, baseData);
-            // debugger
-            this.total = response.data.total;
+        const travelBaseMap = {};
 
-            for(let item1 of item.detailList){
-              console.log(item1);
-
-              const targetDate = item1.happenTime; // 瑕佹煡鎵剧殑鐩爣鏃ユ湡
-              // console.log("targetDate" + targetDate);
-              const keys = Object.keys(baseData);
-              for (let i = 0; i < keys.length; i++) {
-                const key = keys[i];
-                const baseItem = baseData[key];
-                // console.log("baseItem" + baseItem);
-                if (baseItem.happenTime === targetDate) {
-                  // 鎵惧埌浜嗙鍚堟潯浠剁殑鏁版嵁
-                  const baseItem = baseData[key];
-                  delete item1.id;
-                  delete item1.address;
-                  const mergedItem = { ...baseItem, ...item1 };
-
-                  this.$set(baseData, key, mergedItem);
-                  // console.log(baseData);
-
-                  break;
-
-                }
-
-              }
-
-            }
-
-
-          }
-
-          // console.log("鎵撳嵃瀹屾瘯");
-
-          this.loading = false;
+        // 灏嗘墍鏈夎姹傚瓨鍌ㄨ捣鏉�
+        const promises = [];
+        for (const item of this.travelpriceList) {
+          const promise = listTravelBase({ cid: item.id }).then(result => {
+            travelBaseMap[item.id] = result.data;
+          });
+          promises.push(promise);
         }
-      );
+
+        // 绛夊緟鎵�鏈夋暟鎹兘璇锋眰瀹屾瘯鍚庡啀璁剧疆travelBase
+        Promise.all(promises).then(() => {
+          this.travelBase = travelBaseMap;
+        });
+      });
+
 
     },
 
@@ -899,29 +858,7 @@
     submitDataScope1: async function() {
       const id = this.row.id
 
-      this.formDat2.detailList = [];
-      console.log("璋冭瘯");
-      async function getData() {
-        try {
-          const response = await listTravelPrice(this.queryParams);
-          this.travelpriceList = response.data.data;
-
-          const filteredData = this.travelpriceList.filter(item => item.id === id);
-          console.log(filteredData[0].detailList);
-          this.total = response.data.total;
-
-          return filteredData[0].detailList;
-        } catch (error) {
-          console.error("璇锋眰閿欒:", error);
-        }
-      }
-
-      this.formDat2.detailList = await getData();  // 璋冪敤async鍑芥暟鏉ヨ幏鍙栨暟鎹苟璧嬪�肩粰detailList
-
-      console.log(" this.formDat2.detailList");
-      console.log( this.formDat2.detailList);
-
-
+      this.formDat.cid = id;
       let ul = this.fileList.map(function (elem){
         return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       }).join(",")
@@ -929,26 +866,7 @@
         return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       }).join(",")
       this.formDat.url = ul+","+uls
-      // const fid = this.$route.params && this.$route.params.id;
-      // this.formDat.feeId = this.$route.params && this.$route.params.id;
-      this.formDat.feeId = id;
-      this.formDat1.happenTime = this.formDat.happenTime;
-      this.formDat2.detailList.push(this.formDat1);
-      this.formDat2.id = id;
-      const stay = parseFloat(this.formDat1.stay);
-      const traffic = parseFloat(this.formDat1.traffic);
-      const eat = parseFloat(this.formDat1.eat);
-      const shopping = parseFloat(this.formDat1.shopping);
-      const entrance = parseFloat(this.formDat1.entrance);
-
-      const totalPrice = stay + traffic + eat + shopping + entrance;
-      console.log("鎬昏垂鐢�");
-      console.log(totalPrice);
-      this.formDat.totalPrice=totalPrice;
-
-      console.log(this.formDat2)
-      console.log("?");
-      debugger
+      console.log(this.formDat)
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
@@ -957,35 +875,13 @@
             this.centerDialogVisible = false;
             this.getList();
           });
-          updateTravelPrice(this.formDat2).then(response => {
-            this.$modal.msgSuccess("璐圭敤鏂板鎴愬姛");
-            this.centerDialogVisible = false;
-          });
-          Object.keys(this.formDat2).forEach(key => {
-            this.formDat2[key] = '';
-          });
-          Object.keys(this.formDat).forEach(key => {
-            this.formDat[key] = '';
-          });
-          this.handleRemove(this.fileList[0]);
-          this.handleRemoveFile(this.fileListOther[0]);
         }
       });
-      this.$refs["elForm1"].validate(valid => {
-        console.log(valid)
-        debugger
-        if (valid) {
-          updateTravelPrice(this.formDat2).then(response => {
-            this.$modal.msgSuccess("璐圭敤鏂板鎴愬姛");
-            this.centerDialogVisible = false;
-          });
-          Object.keys(this.formDat2).forEach(key => {
-            this.formDat2[key] = '';
-          });
-          this.handleRemove(this.fileList[0]);
-          this.handleRemoveFile(this.fileListOther[0]);
-        }
+      Object.keys(this.formDat).forEach(key => {
+        this.formDat[key] = '';
       });
+      this.handleRemove(this.fileList[0]);
+      this.handleRemoveFile(this.fileListOther[0]);
     },
     //  寮圭獥
     handleShow(row){
@@ -1016,8 +912,14 @@
 
       const id = row.id;
       // console.log(id);
-      this.$router.push("/self/travel/edit/" + id);
-
+      let jd = true
+      // this.$router.push("/self/travel/edit/" + id);
+      this.$router.push({
+        path:"/self/travel/edit/" + id,
+        query:{
+          detail:jd
+        }
+      });
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate1(row) {
@@ -1040,7 +942,7 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
-      this.formDat4.detailList = [];
+
       this.$refs["elForm2"].validate(valid => {
         if (valid) {
           console.log(this.formDat4);
@@ -1050,14 +952,14 @@
             this.dialog1Visible = false;
             this.getList();
           });
-          // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
-          Object.keys(this.formDat4).forEach(key => {
-            this.formDat4[key] = '';
-          });
-          this.handleRemove(this.fileList[0]);
-          this.handleRemoveFile(this.fileListOther[0]);
         }
       });
+      // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+      Object.keys(this.formDat4).forEach(key => {
+        this.formDat4[key] = '';
+      });
+      this.handleRemove(this.fileList[0]);
+      this.handleRemoveFile(this.fileListOther[0]);
     },
     requestUpload(params)
     {
@@ -1093,51 +995,14 @@
       }).catch(() => {});
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    async handleDelete1(row) {
+     handleDelete1(row) {
       const id = row.id || this.ids;
       console.log(id)
-      const feeid = row.feeId;
-      console.log(feeid)
-      const targetDay = row.happenTime
-      console.log(targetDay)
-      this.formDat7.detailList=[];
-      async function getFilteredData() {
-        try {
-          const response = await listTravelPrice(this.queryParams);
-          this.travelpriceList = response.data.data;
-
-          const filteredData = this.travelpriceList.filter(item => item.id === feeid);
-          console.log(filteredData[0].detailList);
-          this.change = filteredData[0].detailList.filter(item => item.happenTime !== targetDay);
-          console.log(this.change)
-          this.total = response.data.total;
-
-          // return filteredData[0].detailList;
-          return this.change;
-        } catch (error) {
-          console.error("璇锋眰閿欒:", error);
-        }
-      }
-
-      try {
-        this.formDat7.detailList = await getFilteredData();
-        this.formDat7.id = feeid
-        console.log("鎵撳嵃formDat7")
-        console.log(this.formDat7)
-      } catch (error) {
-        console.error(error);
-      }
-      console.log(this.formDat7)
-
-      this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
-
+      this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫変腑鏁版嵁椤癸紵').then(function() {
         return delTravelBase(id);
       }).then(() => {
-        updateTravelPrice(this.formDat7).then(response => {
-          this.$modal.msgSuccess("璐圭敤鍒犻櫎鎴愬姛");
-
-        });
         this.getList();
+        this.ids = []
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
       }).catch(() => {});
     },
diff --git a/ruoyi-ui/src/views/travel/travelInfo.vue b/ruoyi-ui/src/views/travel/travelInfo.vue
index a2a9121..0d3b79a 100644
--- a/ruoyi-ui/src/views/travel/travelInfo.vue
+++ b/ruoyi-ui/src/views/travel/travelInfo.vue
@@ -13,26 +13,50 @@
     </div>
     <div >
       <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" style="width: 60%;">
-        <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
-          <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ュ彂鐢熸椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
-          </el-input>
+        <el-form-item label="鍙戠敓鏃堕棿" prop="happenDate">
+          <el-date-picker v-model="formData.happenDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                          :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="鍦扮偣" prop="address">
           <el-input v-model="formData.address" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" :disabled="dsb">
           </el-input>
         </el-form-item>
-        <el-form-item label="浜虹墿" prop="people">
-          <el-input v-model="formData.people" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" :disabled="dsb">
+        <el-form-item label="寤虹瓚" prop="scenic">
+          <el-input v-model="formData.scenic" placeholder="璇疯緭鍏ュ缓绛�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+        </el-form-item>
+
+
+        <el-form-item label="闂ㄧエ" prop="entrance">
+          <el-input v-model="formData.entrance" placeholder="璇疯緭鍏ラ棬绁�" type="number" clearable :style="{width: '100%'}" :disabled="dsb">
           </el-input>
         </el-form-item>
-        <el-form-item label="鏍囬" prop="title">
-          <el-input v-model="formData.title" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+        <el-form-item label="浣忓閰掑簵" prop="hotel">
+          <el-input v-model="formData.hotel" placeholder="璇疯緭鍏ヤ綇瀹块厭搴�" clearable :style="{width: '100%'}" :disabled="dsb">
+          </el-input>
         </el-form-item>
-        <el-form-item label="鏃呮湡" prop="travelPeriod">
-          <el-input v-model="formData.travelPeriod" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+        <el-form-item label="浣忓璐圭敤" prop="stay">
+        <el-input v-model="formData.stay" placeholder="璇疯緭鍏ュ湴鐐�" type="number" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+        <el-form-item label="椁愯垂" prop="eat">
+        <el-input v-model="formData.eat" placeholder="璇疯緭鍏ュ湴鐐�"  type="number" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </el-form-item>
+        <el-form-item label="浜ら�氳垂" prop="travel">
+          <el-input v-model="formData.travel" placeholder="璇疯緭鍏ヤ氦閫氳垂" type="number" clearable :style="{width: '100%'}" :disabled="dsb">
+          </el-input>
         </el-form-item>
-        <el-form-item label="鎸佽瘉鏃呮父" prop="certificate">
-          <el-select v-model="formData.certificate" placeholder="璇烽�夋嫨璇佷欢" clearable :style="{width: '100%'}"  :disabled="dsb">
+        <el-form-item label="鍑鸿鏂瑰紡" prop="travelMode">
+          <el-input v-model="formData.travelMode" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" :disabled="dsb">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="杞︽/鑸彮" prop="flight">
+          <el-input v-model="formData.flight" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" :disabled="dsb">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="鎸佽瘉鏃呮父" prop="document">
+          <el-select v-model="formData.document" placeholder="璇烽�夋嫨璇佷欢" clearable :style="{width: '100%'}"  :disabled="dsb">
             <el-option label="灞呮皯韬唤璇�" value="灞呮皯韬唤璇�"></el-option>
             <el-option label="涓存椂韬唤璇�" value="涓存椂韬唤璇�"></el-option>
             <el-option label="鎴峰彛鏈�" value="鎴峰彛鏈�"></el-option>
@@ -40,20 +64,10 @@
             <el-option label="瀛︾敓璇�" value="瀛︾敓璇�"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="璐圭敤" prop="totalPrice">
-          <el-input v-model="formData.totalPrice" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="true"></el-input>
-        </el-form-item>
 
-        <el-form-item label="鏄惁鍏垂鏃呮父" prop="self">
-          <el-select v-model="formData.self" placeholder="璇烽�夋嫨鏄惁" clearable :style="{width: '100%'}"  :disabled="dsb">
-            <el-option label="鏄�" value="1"></el-option>
-            <el-option label="鍚�" value="0"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="澶囨敞" prop="remark">
-          <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
-        </el-form-item>
+<!--        <el-form-item label="澶囨敞" prop="remark">-->
+<!--          <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>-->
+<!--        </el-form-item>-->
 
 
         <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
@@ -198,19 +212,25 @@
 
       formData: {
         id: undefined,
-        title: undefined,
+        happenDate:undefined,
+        entrance:undefined,
+        hotel: undefined,
         people: undefined,
         address: undefined,
         remark: undefined,
+        travelMode:undefined,
+        stay:undefined,
+        flight:undefined,
+        document:undefined,
         url: undefined,
       },
       dialogImageUrl: '',
       dialogVisible: false,
       disabled: false,
       rules: {
-        title: [{
-          required: true,
-          message: '璇疯緭鍏ュぇ浜嬫爣棰�',
+        flight: [{
+          // required: true,
+          message: '璇疯緭鍏ヨ溅娆�/鑸彮',
           trigger: 'blur'
         }],
         familyId: [{
@@ -295,8 +315,10 @@
       let uls = this.fileListOther.map(function (elem){
         return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       }).join(",")
+      this.formData.id = this.$route.params && this.$route.params.id;
       this.formData.url = ul+","+uls
 
+      console.log(this.formData)
       this.$refs['elForm'].validate(valid => {
 
 

--
Gitblit v1.9.1