From 872968a2f26c884d174b08cba25edaaf7356b2d8 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期一, 12 六月 2023 16:20:05 +0800
Subject: [PATCH] 修改旅游

---
 ruoyi-ui/src/views/travel/travelInfo.vue |  410 +++++++
 ruoyi-ui/src/views/travel/Info.vue       | 1242 +++++++++++-----------
 ruoyi-ui/src/assets/images/弹窗 1.png      |    0 
 ruoyi-ui/src/views/travel/edit.vue       |  292 +++++
 ruoyi-ui/src/views/travel/index.vue      | 1224 +++++++++++-----------
 ruoyi-ui/src/assets/images/删除2.png       |    0 
 6 files changed, 1,943 insertions(+), 1,225 deletions(-)

diff --git "a/ruoyi-ui/src/assets/images/\345\210\240\351\231\2442.png" "b/ruoyi-ui/src/assets/images/\345\210\240\351\231\2442.png"
new file mode 100644
index 0000000..73c9fe2
--- /dev/null
+++ "b/ruoyi-ui/src/assets/images/\345\210\240\351\231\2442.png"
Binary files differ
diff --git "a/ruoyi-ui/src/assets/images/\345\274\271\347\252\227 1.png" "b/ruoyi-ui/src/assets/images/\345\274\271\347\252\227 1.png"
new file mode 100644
index 0000000..2871b59
--- /dev/null
+++ "b/ruoyi-ui/src/assets/images/\345\274\271\347\252\227 1.png"
Binary files differ
diff --git a/ruoyi-ui/src/views/travel/Info.vue b/ruoyi-ui/src/views/travel/Info.vue
index 43b449e..1067e9f 100644
--- a/ruoyi-ui/src/views/travel/Info.vue
+++ b/ruoyi-ui/src/views/travel/Info.vue
@@ -1,112 +1,172 @@
 <template>
-    <div class="app-container" style="opacity: 1;">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+  <div class="app-container" style="opacity: 1;">
+    <h2>鏃呮父缁忓巻琛�</h2>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-        <el-form-item label="鏃堕棿" >
-          <el-date-picker
-            v-model="dateRange"
-            style="width: 240px;"
-            value-format="yyyy-MM-dd HH-MM"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="寮�濮嬫棩鏈�"
-            end-placeholder="缁撴潫鏃ユ湡"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="鎬诲ぉ鏁�" prop="usePeople" >
-          <el-input
-            v-model="queryParams.usePeople"
-            placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+      <el-form-item label="鏃堕棿" >
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd HH-MM"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="鎬诲ぉ鏁�" prop="usePeople" >
+        <el-input
+          v-model="queryParams.usePeople"
+          placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
-        <el-form-item>
-          <el-button  size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;border-radius:6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
-          <el-button  size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">閲嶇疆</el-button>
-        </el-form-item>
-      </el-form>
+      <el-form-item>
+        <el-button  size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;border-radius:6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
+        <el-button  size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">閲嶇疆</el-button>
+      </el-form-item>
+    </el-form>
 
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:role:add']"
+        >鏂板</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:role:remove']"
+        >鍒犻櫎</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['family:note:export']"
+        >瀵煎嚭</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExportTemplate"
+          v-hasPermi="['family:note:export']"
+        >瀵煎叆妯℃澘涓嬭浇</el-button>
+      </el-col>
+      <el-col :span="1.2">
+        <el-upload
+          action=""
+          class="upload-demo"
+          :show-file-list="false"
+          :http-request="handleEnport"
+        >
+          <el-button size="mini"   type="primary"
+                     plain
+                     icon="el-icon-plus" >瀵煎叆</el-button>
+
+        </el-upload>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="travelBase"  @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+      <el-table-column type="selection" width="55"  align="center" />
+      <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+
+      <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>
+
+      <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" >
+        <template slot-scope="scope">{{scope.row.self==0?'鍏垂':'鑷垂'}}</template>
+      </el-table-column>
+      <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
+        <template slot-scope="scope" >
+          <img
+            class="el-upload-list__item-thumbnail"
+            src="../../assets/images/deviceLis.png"
+            alt=""
+            style="width: 35px; height: 35px;"
+            fit="cover"
+            v-if="scope.row.url !== ','"
+          >
+          <img
+            class="el-upload-list__item-thumbnail"
+            src="../../assets/images/deviceA.png"
+            alt=""
+            style="width: 35px; height: 35px;"
+            fit="cover"
+            v-if="scope.row.url === ','"
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="澶囨敞" prop="remark" sortable width="100" />
+
+
+      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
             size="mini"
-            @click="handleAdd"
-            v-hasPermi="['system:role:add']"
-          >鏂板</el-button>
-        </el-col>
-
-        <el-col :span="1.5">
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['familymodel:economy:info']"
+          >淇敼</el-button>
           <el-button
-            type="danger"
-            plain
+            size="mini"
+            type="text"
             icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
+            @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >鍒犻櫎</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['family:note:export']"
-          >瀵煎嚭</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExportTemplate"
-            v-hasPermi="['family:note:export']"
-          >瀵煎叆妯℃澘涓嬭浇</el-button>
-        </el-col>
-        <el-col :span="1.2">
-          <el-upload
-            action=""
-            class="upload-demo"
-            :show-file-list="false"
-            :http-request="handleEnport"
-          >
-            <el-button size="mini"   type="primary"
-                       plain
-                       icon="el-icon-plus" >瀵煎叆</el-button>
 
-          </el-upload>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-      <!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵e垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
-      <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
-      <el-table v-loading="loading" :data="travelBase"  @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog :title="title" :visible.sync="openDataScope" width="1000px"  append-to-body>
+
+      <el-table v-loading="loading" :data="travelpriceList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" >
         <el-table-column type="selection" width="55"  align="center" />
+
         <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
-
-        <el-table-column label="鏃堕棿" prop="address" sortable width="100" />
-
-        <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="travel_period" sortable width="100" />
-        <el-table-column label="鎸佽瘉鏃呮父" prop="certificate" sortable width="100" />
-        <el-table-column label="璐圭敤" prop="total_price" sortable width="100" />
-        <el-table-column label="鍏垂/鑷垂" prop="self" sortable width="100" />
-          <el-table-column label="鐢靛瓙鏂囦欢" prop="remark" sortable width="100" />
-        <el-table-column label="澶囨敞" prop="remark" sortable width="100" />
-
-
+        <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>
+        <el-table-column label="鍐呭" prop="content" sortable :show-overflow-tooltip="true" width="150" />
+        <el-table-column label="鎬婚噾棰�" prop="totalcost" sortable :show-overflow-tooltip="true" width="150" />
+        <el-table-column label="椁愯垂" prop="eat" sortable :show-overflow-tooltip="true" width="150" />
+        <el-table-column label="浣忓" prop="stay" sortable :show-overflow-tooltip="true" width="150" />
+        <el-table-column label="浜ら��" prop="traffic" sortable :show-overflow-tooltip="true" width="150" />
+        <el-table-column label="闂ㄧエ" prop="entrance" sortable :show-overflow-tooltip="true" width="150" />
+        <el-table-column label="璐墿" prop="shopping" sortable :show-overflow-tooltip="true" width="150" />
         <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope" v-if="scope.row.roleId !== 1">
             <el-button
@@ -114,7 +174,7 @@
               type="text"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
-              v-hasPermi="['familymodel:economy:info']"
+              v-hasPermi="['familymodel:property:info']"
             >淇敼</el-button>
             <el-button
               size="mini"
@@ -123,62 +183,10 @@
               @click="handleDelete(scope.row)"
               v-hasPermi="['system:role:remove']"
             >鍒犻櫎</el-button>
-            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
-              <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
-            </el-dropdown>
-       
           </template>
         </el-table-column>
       </el-table>
 
-      <el-dialog :title="title" :visible.sync="openDataScope" width="1000px"  append-to-body>
-
-        <el-table v-loading="loading" :data="travelpriceList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" >
-          <el-table-column type="selection" width="55"  align="center" />
-
-          <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
-          <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>
-          <el-table-column label="鍐呭" prop="content" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="鎬婚噾棰�" prop="totalcost" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="椁愯垂" prop="eat" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="浣忓" prop="stay" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="浜ら��" prop="traffic" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="闂ㄧエ" prop="entrance" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="璐墿" prop="shopping" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['familymodel:property:info']"
-              >淇敼</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:role:remove']"
-              >鍒犻櫎</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-
-        />
-
-
-    </el-dialog>
 
       <pagination
         v-show="total>0"
@@ -186,492 +194,504 @@
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
-        style="background: #FEF7FC;"
+
       />
 
-      <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
 
-      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
-          <el-form-item label="鍙拌处" prop="type">
-            <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
-          </el-form-item>
+    </el-dialog>
 
-          <el-form-item label="鏃堕棿" prop="happenTime">
-            <el-date-picker
-              v-model='formDat.happenTime'
-              type='date'
-              placeholder='閫夋嫨鏃ユ湡'
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="鏀跺叆/鏀嚭" prop="price">
-            <el-select v-model="formDat.price" 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>
-          <el-form-item label="閲戦" prop="balance">
-            <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="鐢ㄩ��" prop="useFor">
-            <el-input v-model="formDat.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="浣跨敤浜�" prop="usePeople">
-            <el-input v-model="formDat.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="鏀粯鏂瑰紡" prop="kind">
-            <el-input v-model="formDat.kind" 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>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+      style="background: #FEF7FC;"
+    />
 
-          <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
-          <el-upload
-            action="#"
-            list-type="picture-card"
-            multiple
-            :http-request="requestUpload"
-            :file-list="fileList"
+    <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
+
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+        <el-form-item label="鍙拌处" prop="type">
+          <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
+        </el-form-item>
+
+        <el-form-item label="鏃堕棿" prop="happenTime">
+          <el-date-picker
+            v-model='formDat.happenTime'
+            type='date'
+            placeholder='閫夋嫨鏃ユ湡'
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="鏀跺叆/鏀嚭" prop="price">
+          <el-select v-model="formDat.price" 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>
+        <el-form-item label="閲戦" prop="balance">
+          <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="鐢ㄩ��" prop="useFor">
+          <el-input v-model="formDat.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="浣跨敤浜�" prop="usePeople">
+          <el-input v-model="formDat.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="鏀粯鏂瑰紡" prop="kind">
+          <el-input v-model="formDat.kind" 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>
+        <el-upload
+          action="#"
+          list-type="picture-card"
+          multiple
+          :http-request="requestUpload"
+          :file-list="fileList"
+        >
+          <i slot="default" class="el-icon-plus"></i>
+          <div slot="file" slot-scope="{file}">
+            <img
+              class="el-upload-list__item-thumbnail"
+              :src="file.url"
+              alt=""
+              style="width: 126px; height: 126px"
+              fit="cover"
+              :preview-src-list="[file.url]"
+            >
+            <span class="el-upload-list__item-actions">
+          <span
+            class="el-upload-list__item-preview"
+            @click="handlePictureCardPreview(file)"
           >
-            <i slot="default" class="el-icon-plus"></i>
-            <div slot="file" slot-scope="{file}">
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="file.url"
-                alt=""
-                style="width: 126px; height: 126px"
-                fit="cover"
-                :preview-src-list="[file.url]"
-              >
-              <span class="el-upload-list__item-actions">
-            <span
-              class="el-upload-list__item-preview"
-              @click="handlePictureCardPreview(file)"
-            >
-              <i class="el-icon-zoom-in"></i>
-            </span>
-
-            <span
-              v-if="!disabled"
-              class="el-upload-list__item-delete"
-              @click="handleRemove(file)"
-            >
-              <i class="el-icon-delete"></i>
-            </span>
+            <i class="el-icon-zoom-in"></i>
           </span>
 
-
-            </div>
-          </el-upload>
-          <h4 class="form-header">鍏朵粬闄勪欢 </h4>
-          <el-upload
-            action=""
-            :file-list="fileListOther"
-            class="upload-demo"
-            multiple
-
-            :on-remove="handleRemove"
-            :http-request="requestUpload"
-            :show-file-list="true"
+          <span
+            v-if="!disabled"
+            class="el-upload-list__item-delete"
+            @click="handleRemove(file)"
           >
-            <el-button type="primary">涓婁紶</el-button>
-            <template #tip>
-              <div class="el-upload__tip">
-              </div>
-            </template>
-          </el-upload>
+            <i class="el-icon-delete"></i>
+          </span>
+        </span>
 
-        </el-form>
-        <h4 class="form-header"> </h4>
 
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
-          <el-button @click="cancelData">鍙� 娑�</el-button>
-        </div>
-      </el-dialog>
+          </div>
+        </el-upload>
+        <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+        <el-upload
+          action=""
+          :file-list="fileListOther"
+          class="upload-demo"
+          multiple
 
-      <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
-      <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+          :on-remove="handleRemove"
+          :http-request="requestUpload"
+          :show-file-list="true"
+        >
+          <el-button type="primary">涓婁紶</el-button>
+          <template #tip>
+            <div class="el-upload__tip">
+            </div>
+          </template>
+        </el-upload>
 
-      </el-dialog>
+      </el-form>
+      <h4 class="form-header"> </h4>
 
-    </div>
-  </template>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
+        <el-button @click="cancelData">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
 
-  <script>
-  import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-  import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+    <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
 
 
 
-  //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
-  import {listTravelPrice,listTravelBase,enload,getTravelPriceInfo,delTravelPrice, addTravelPrice, uploadPic} from "@/api/travel/index";
+//鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
+import {listTravelPrice,listTravelBase,enload,getTravelPriceInfo,delTravelPrice, addTravelPrice, uploadPic} from "@/api/travel/index";
 
-  export default {
-    name: "Role",
-    dicts: ['sys_normal_disable'],
-    data() {
-      return {
-        // 閬僵灞�
-        disabled: false,
-        loading: true,
-        formData:[],
-        // 閫変腑鏁扮粍
-        ids: [],
-        // 闈炲崟涓鐢�
-        single: true,
-        // 闈炲涓鐢�
-        multiple: true,
-        // 鏄剧ず鎼滅储鏉′欢
-        showSearch: true,
-        // 鎬绘潯鏁�
-        total: 0,
-        // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
-        travelBase: [],
-        // 寮瑰嚭灞傛爣棰�
-        title: "",
-        // 鏄惁鏄剧ず寮瑰嚭灞�
-        open: false,
-        // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
-        openDataScope: false,
-        menuExpand: false,
-        menuNodeAll: false,
-        deptExpand: true,
-        deptNodeAll: false,
-        // 鏃ユ湡鑼冨洿
-        dateRange: [],
-        // 鏁版嵁鑼冨洿閫夐」
-        fot:[".jpg",".jif"],
-        fileList:[
-        ],
-        fileListOther:[
+export default {
+  name: "Role",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 閬僵灞�
+      disabled: false,
+      loading: true,
+      formData:[],
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
+      travelBase: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+      openDataScope: false,
+      menuExpand: false,
+      menuNodeAll: false,
+      deptExpand: true,
+      deptNodeAll: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏁版嵁鑼冨洿閫夐」
+      fot:[".jpg",".jif"],
+      fileList:[
+      ],
+      fileListOther:[
 
-        ],
-        dsb:true,
-        btn:false,
-        formDat: {
-          type: undefined,
-          createTime: undefined,
-          useFor: undefined,
-          usePeople: undefined,
-          kind:undefined,
-          remark: undefined,
-          url: undefined,
-        },
-        // 鑿滃崟鍒楄〃
-        menuOptions: [],
-        // 閮ㄩ棬鍒楄〃
-        deptOptions: [],
-        // 鏌ヨ鍙傛暟
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          type:undefined,
-          useFor:undefined,
-          usePeople:undefined,
-          createTime:undefined,
-          fid:undefined
-        },
-        // 琛ㄥ崟鍙傛暟
-        form: {},
-        defaultProps: {
-          children: "children",
-          label: "label"
-        },
-        // 琛ㄥ崟鏍¢獙
-        rules: {
-          usePeople: [{
-            required: true,
-            message: '璇疯緭鍏ヤ娇鐢ㄤ汉',
-            trigger: 'blur'
-          }],
-
-          useFor: [{
-            required: true,
-            message: '璇疯緭鍏ョ敤閫�',
-            trigger: 'blur'
-          }],
-          type: [{
-            required: true,
-            message: '璇疯緭鍏ュ彴璐﹀唴瀹�',
-            trigger: 'blur'
-          }],
-          balance: [{
-            required: true,
-            message: '璇疯緭鍏ラ噾棰�',
-            trigger: 'blur'
-          }],
-          kind: [{
-            // required: true,
-            message: '璇疯緭鍏ユ敮浠樻柟寮�',
-            trigger: 'blur'
-          }],
-          createTime: [{
-            required: true,
-            message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
-            trigger: 'change'
-          }],
-          price: [{
-            required: true,
-            message: '璇烽�夋嫨浜嬮」鍐呭',
-            trigger: 'blur'
-          }],
-        },
-        typeOptions: [
-          {
-            value: '鏀跺叆',
-            label: '鏀跺叆',
-          },
-          {
-            value: '鏀嚭',
-            label: '鏀嚭',
-          }],
-        typeOptions1: [
-          {
-            value: '0',
-            label: '鐜伴噾',
-          },
-          {
-            value: '1',
-            label: '鑷姩鎵e垝',
-          }
-        ],
-      };
-    },
-    created() {
-         const id = this.$route.params && this.$route.params.id;
-      this.getList(id);
-
-    },
-    methods: {
-
-      //鍩洪噾/鍙拌处鐨勯�夋嫨
-      getSrc1(type) {
-        if (type === 0) {
-          return '鍩洪噾'
-        }else {
-          return '鍙拌处'
-        }
+      ],
+      dsb:true,
+      btn:false,
+      formDat: {
+        type: undefined,
+        createTime: undefined,
+        useFor: undefined,
+        usePeople: undefined,
+        kind:undefined,
+        remark: undefined,
+        url: undefined,
       },
-
-      getSrc2(kind) {
-        if (kind == 0) {
-          return '鐜伴噾'
-        }else  {
-          return '鑷姩鎵e垝'
-        }
+      // 鑿滃崟鍒楄〃
+      menuOptions: [],
+      // 閮ㄩ棬鍒楄〃
+      deptOptions: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type:undefined,
+        useFor:undefined,
+        usePeople:undefined,
+        createTime:undefined,
+        fid:undefined
       },
-
-      // 鍙栨秷鎸夐挳
-      cancelData() {
-        this.open = false;
-        this.reset();
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
       },
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        usePeople: [{
+          required: true,
+          message: '璇疯緭鍏ヤ娇鐢ㄤ汉',
+          trigger: 'blur'
+        }],
 
-      //闅旇鍙樿壊
-      tableRowClassName({ row, rowIndex }) {
-        if (rowIndex % 2 == 0) {
-          return "statistics-warning-row1";
-        } else {
-          return "statistics-warning-row";
-        }
+        useFor: [{
+          required: true,
+          message: '璇疯緭鍏ョ敤閫�',
+          trigger: 'blur'
+        }],
+        type: [{
+          required: true,
+          message: '璇疯緭鍏ュ彴璐﹀唴瀹�',
+          trigger: 'blur'
+        }],
+        balance: [{
+          required: true,
+          message: '璇疯緭鍏ラ噾棰�',
+          trigger: 'blur'
+        }],
+        kind: [{
+          // required: true,
+          message: '璇疯緭鍏ユ敮浠樻柟寮�',
+          trigger: 'blur'
+        }],
+        createTime: [{
+          required: true,
+          message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
+          trigger: 'change'
+        }],
+        price: [{
+          required: true,
+          message: '璇烽�夋嫨浜嬮」鍐呭',
+          trigger: 'blur'
+        }],
       },
-
-      /** 鏌ヨ瑙掕壊鍒楄〃 */
-      //鍒楄〃鏄剧ず瀹跺ぇ浜嬭
-
-
-      getList(fid) {
-        this.loading = true;
-       this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
-       this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-          this.queryParams.fid = fid
-        console.log(this.queryParams)
-        //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          listTravelBase(this.queryParams).then(response => {
-            //  alert(123)
-            //   console.log(response.data)
-            this.travelBase = response.data.data;
-            console.log(this.travelBase)
-            this.total = response.data.total;
-            this.loading = false;
-          }
-        );
-      },
-      handleRemove(file) {
-        for(let i = 0; i < this.fileListOther.length; i++)
+      typeOptions: [
         {
-          if(this.fileListOther[i].url==file.url)
-            this.$delete(this.fileListOther,i);
+          value: '鏀跺叆',
+          label: '鏀跺叆',
+        },
+        {
+          value: '鏀嚭',
+          label: '鏀嚭',
+        }],
+      typeOptions1: [
+        {
+          value: '0',
+          label: '鐜伴噾',
+        },
+        {
+          value: '1',
+          label: '鑷姩鎵e垝',
         }
-      },
+      ],
+    };
+  },
+  created() {
+    const id = this.$route.params && this.$route.params.id;
+    this.getList(id);
 
-      // 鍙栨秷鎸夐挳
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      getRowId(row)
-      {
-        return row.id
-      },
-      // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
-      cancelDataScope() {
-        this.openDataScope = false;
-        this.reset();
-      },
-      // 琛ㄥ崟閲嶇疆
-      reset() {
-        if (this.$refs.menu != undefined) {
-          this.$refs.menu.setCheckedKeys([]);
+  },
+  methods: {
+
+    //鍩洪噾/鍙拌处鐨勯�夋嫨
+    getSrc1(type) {
+      if (type === 0) {
+        return '鍩洪噾'
+      }else {
+        return '鍙拌处'
+      }
+    },
+
+    getSrc2(kind) {
+      if (kind == 0) {
+        return '鐜伴噾'
+      }else  {
+        return '鑷姩鎵e垝'
+      }
+    },
+
+    // 鍙栨秷鎸夐挳
+    cancelData() {
+      this.open = false;
+      this.reset();
+    },
+
+    //闅旇鍙樿壊
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 0) {
+        return "statistics-warning-row1";
+      } else {
+        return "statistics-warning-row";
+      }
+    },
+
+    /** 鏌ヨ瑙掕壊鍒楄〃 */
+    //鍒楄〃鏄剧ず瀹跺ぇ浜嬭
+
+
+    getList(fid) {
+      this.loading = true;
+      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+      this.queryParams.fid = fid
+      console.log(this.queryParams)
+      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listTravelBase(this.queryParams).then(response => {
+          //  alert(123)
+          //   console.log(response.data)
+          this.travelBase = response.data.data;
+          console.log(this.travelBase)
+          this.total = response.data.total;
+          this.loading = false;
         }
-        this.menuExpand = false,
-          this.menuNodeAll = false,
-          this.deptExpand = true,
-          this.deptNodeAll = false,
-          this.form = {
-            roleId: undefined,
-            roleName: undefined,
-            roleKey: undefined,
-            roleSort: 0,
-            status: "0",
-            menuIds: [],
-            deptIds: [],
-            menuCheckStrictly: true,
-            deptCheckStrictly: true,
-            remark: undefined
-          };
-        this.resetForm("form");
-      },
-      /** 鎼滅储鎸夐挳鎿嶄綔 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
+      );
+    },
+    handleRemove(file) {
+      for(let i = 0; i < this.fileListOther.length; i++)
+      {
+        if(this.fileListOther[i].url==file.url)
+          this.$delete(this.fileListOther,i);
+      }
+    },
+
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    getRowId(row)
+    {
+      return row.id
+    },
+    // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
+    cancelDataScope() {
+      this.openDataScope = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false,
+        this.menuNodeAll = false,
+        this.deptExpand = true,
+        this.deptNodeAll = false,
+        this.form = {
+          roleId: undefined,
+          roleName: undefined,
+          roleKey: undefined,
+          roleSort: 0,
+          status: "0",
+          menuIds: [],
+          deptIds: [],
+          menuCheckStrictly: true,
+          deptCheckStrictly: true,
+          remark: undefined
+        };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      console.log(this.ids)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞瀹跺涵鏀舵敮鍙拌处";
+    },
+
+
+    /** 鏌ョ湅璇︾粏淇℃伅 */
+    handleCheck(row){
+      const id = row.id;
+      this.$router.push("/self/travel/travelInfo/" + id);
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      const id = row.id;
+      let jd = true
+
+      this.$router.push({
+        path:"/self/travel/travelInfo/" + id,
+        query:{
+          detail:jd
+        }
+      });
+    },
+
+
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+    submitDataScope: function() {
+
+      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.formDat.url = ul+","+uls
+      this.$refs["elForm"].validate(valid => {
+        if (valid) {
+
+          addEconomy(this.formDat).then(response => {
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    requestUpload(params)
+    {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('uploadFile', file);
+      let _this = this
+
+      uploadPic(formData).then(response => {
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+
+        if(_this.fot.includes(pth) === true)
+        {
+          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+        }
+
+        else{
+          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+        }
+      })
+
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const Ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+        return delEconomy(Ids);
+      }).then(() => {
         this.getList();
-      },
-      /** 閲嶇疆鎸夐挳鎿嶄綔 */
-      resetQuery() {
-        this.dateRange = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 澶氶�夋閫変腑鏁版嵁
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        console.log(this.ids)
-        this.single = selection.length!=1
-        this.multiple = !selection.length
-      },
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      const Ids = this.ids;
 
-      /** 鏂板鎸夐挳鎿嶄綔 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "娣诲姞瀹跺涵鏀舵敮鍙拌处";
-      },
-
-
-      /** 鏌ョ湅璇︾粏淇℃伅 */
-      handleCheck(row){
-        const id = row.id;
-        this.$router.push("/familymodel/economy/economyInfo/" + id);
-      },
-      /** 淇敼鎸夐挳鎿嶄綔 */
-      handleUpdate(row) {
-        const id = row.id;
-        let jd = true
-
-        this.$router.push({
-          path:"/familymodel/economy/economyInfo/" + id,
-          query:{
-            detail:jd
-          }
-        });
-      },
-
-
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      },
-      /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
-      submitDataScope: function() {
-
-        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.formDat.url = ul+","+uls
-        this.$refs["elForm"].validate(valid => {
-          if (valid) {
-
-            addEconomy(this.formDat).then(response => {
-              this.$modal.msgSuccess("鏂板鎴愬姛");
-              this.open = false;
-              this.getList();
-            });
-          }
-        });
-      },
-      requestUpload(params)
+      if(Ids.length==0)
       {
-        var file = params.file;
-        var formData = new FormData();
-        formData.append('uploadFile', file);
-        let _this = this
-
-        uploadPic(formData).then(response => {
-          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
-          if(_this.fot.includes(pth) === true)
-          {
-            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
-          }
-
-          else{
-            _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
-          }
-        })
-
-      },
-      /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-      handleDelete(row) {
-        const Ids = row.id || this.ids;
-        this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
-          return delEconomy(Ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        }).catch(() => {});
-      },
-      /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-      handleExport() {
-        const Ids = this.ids;
-
-        if(Ids.length==0)
-        {
         this.download('/zfEconomy/export', {
           ...this.queryParams
         }, `zfEconomy_${new Date().getTime()}.xlsx`)
-        }else
-        {
-          this.download('/zfEconomy/export1/'+Ids, {
-          }, `zfEconomy_${new Date().getTime()}.xlsx`)
-        }
+      }else
+      {
+        this.download('/zfEconomy/export1/'+Ids, {
+        }, `zfEconomy_${new Date().getTime()}.xlsx`)
       }
+    }
     ,
     handleExportTemplate(){
-        this.download('/zfEconomy/model', {
+      this.download('/zfEconomy/model', {
 
-        }, `zfEconomy_${new Date().getTime()}.xlsx`)
+      }, `zfEconomy_${new Date().getTime()}.xlsx`)
     },
     /** 瀵煎叆鎿嶄綔*/
     handleEnport(params){
@@ -690,25 +710,25 @@
       }
 
     }
-    },
+  },
 
-  //  寮圭獥
+//  寮圭獥
   handleShow(scope){
 
     this.openDataScope = true
     this.getList()
-                        }
-
-  };
-  </script>
-
-  <style>
-  .el-table__row.statistics-warning-row {
-    background: #E0EEFE;
-
   }
-  .el-table__row.statistics-warning-row1 {
-    background: #FFEFF2;
 
-  }
-  </style>
+};
+</script>
+
+<style>
+.el-table__row.statistics-warning-row {
+  background: #E0EEFE;
+
+}
+.el-table__row.statistics-warning-row1 {
+  background: #FFEFF2;
+
+}
+</style>
diff --git a/ruoyi-ui/src/views/travel/edit.vue b/ruoyi-ui/src/views/travel/edit.vue
index e69de29..084b4e4 100644
--- a/ruoyi-ui/src/views/travel/edit.vue
+++ b/ruoyi-ui/src/views/travel/edit.vue
@@ -0,0 +1,292 @@
+<template>
+  <div class="app-container">
+    <div class="form-header mt">
+      <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-form-item label="缁撴潫鏃堕棿" prop="endTime">
+        <el-input v-model="formData.endTime" 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-input>
+      </el-form-item>
+
+
+      <el-form-item size="large">
+        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-dialog  :visible.sync="dialogVisible">
+      <img w-full :src="dialogImageUrl"    style="width: 700px; height: 700px" alt="Preview Image" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {addRole, updateRole} from "@/api/system/role";
+import {blobValidate} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import {Message} from "element-ui";
+import { getTravelPriceInfo,updateTravelPrice, uploadPic, download} from "@/api/travel/index";
+
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      cdi:"鏃呮父璐圭敤淇℃伅",
+      udi:"鏃呮父璐圭敤淇敼",
+      fot:[".jpg",".jif","png"],
+      fileList:[
+      ],
+      fileListOther:[
+
+      ],
+      dsb:true,
+      btn:false,
+      isShow:true,
+
+      travelpriceList: [],
+
+      formData: {
+        id: undefined,
+        title: undefined,
+        startTime:undefined,
+        endTime:undefined,
+        url: undefined,
+      },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      disabled: false,
+      rules: {
+        title: [{
+          required: true,
+          message: '璇疯緭鍏ュぇ浜嬫爣棰�',
+          trigger: 'blur'
+        }],
+        familyId: [{
+          required: true,
+          message: '璇疯緭鍏ュ搴彿',
+          trigger: 'blur'
+        }],
+        people: [{
+          required: true,
+          message: '璇疯緭鍏ヤ汉鐗�',
+          trigger: 'blur'
+        }],
+        address: [{
+          required: true,
+          message: '璇疯緭鍏ュ湴鐐�',
+          trigger: 'blur'
+        }],
+        remark: [{
+          // required: true,
+          message: '璇疯緭鍏ュ娉�',
+          trigger: 'blur'
+        }],
+
+      },
+      typeOptions: [],
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
+    const id = this.$route.params && this.$route.params.id;
+    let jd;
+    if(this.$route.query.detail!=undefined)
+    {
+      jd =  this.$route.query.detail
+      this.btn= jd
+      this.dsb = !jd
+      this.isShow=true
+      document.title = "淇敼鏃呰璐圭敤璇︾粏淇℃伅";
+      this.$route.meta.title = "淇敼鏃呰璐圭敤璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+    }
+    else{
+      document.title = "鏃呰璐圭敤璇︾粏淇℃伅";
+      this.$route.meta.title = "鏃呰璐圭敤璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+      this.isShow=true
+    }
+
+    let _this = this
+    if (id) {
+      this.loading = true;
+      getTravelPriceInfo(id).then((response) => {
+        this.formData = response.data;
+        let paths = response.data.url.split(",");
+        for(let i = 0; i < paths.length; i++)
+        {
+          if(paths[i]!="") {
+
+            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+
+            if (_this.fot.includes(pth) === true)
+              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+            else {
+              // alert(paths[i])
+              let nms = paths[i].split("\/")
+              let nm = nms[nms.length - 1]
+              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+            }
+          }
+        }
+        this.loading = false;
+      });
+      this.getCateInfor()
+
+    }
+  },
+  mounted() {},
+  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 => {
+
+
+        if (valid) {
+          if (this.formData.id != undefined) {
+            updateTravelPrice(this.formData).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              // this.open = false;
+              this.btn=false
+            });
+          } else {
+            this.$modal.msgSuccess("淇敼澶辫触");
+
+          }
+        }
+      })
+    },
+    resetForm() {
+      this.$refs['elForm'].resetFields()
+    },
+    handlePreview(file)
+    {
+      let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+      let lens = formData.path.split(".")
+      let suffix = lens[lens.length-1]
+      download(formData).then(async (response) => {
+        const isLogin = await blobValidate(response);
+        let nt = new Date().getTime()
+        let filename = 'familyevent_'+nt+'.'+suffix
+        const blob = new Blob([response])
+        saveAs(blob, filename)
+      })
+    },
+    handleRemoveFile(file) {
+      for(let i = 0; i < this.fileListOther.length; i++)
+      {
+        if(this.fileListOther[i].url==file.url)
+          this.$delete(this.fileListOther,i);
+      }
+    },
+    handleRemove(file) {
+      for(let i = 0; i < this.fileList.length; i++)
+      {
+        if(this.fileList[i].url==file.url)
+          this.$delete(this.fileList,i);
+      }
+    },
+    handleFileCardPreview(file){
+      this.dialogFileUrl = file.url;
+      const Base64 = require('js-base64').Base64
+      this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+      myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    handleDownload(url) {
+      var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+
+      let lens = formData.path.split(".")
+      let suffix = lens[lens.length-1]
+      download(formData).then(async (response) => {
+        const isLogin = await blobValidate(response);
+        let nt = new Date().getTime()
+        let filename = 'familyevent_'+nt+'.'+suffix
+        const blob = new Blob([response])
+        saveAs(blob, filename)
+      })
+    },
+    handleEdit()
+    {
+      this.dsb = false
+      // this.btn = true
+      this.isShow=false
+    },
+    requestUpload(params)
+    {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('uploadFile', file);
+      let _this = this
+
+      uploadPic(formData).then(response => {
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+
+        if(_this.fot.includes(pth) === true)
+        {
+          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+        }
+
+        else{
+          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+        }
+      })
+
+    },
+
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('/zfEvent/export', {
+        ...this.queryParams
+      }, `zfEvent_${new Date().getTime()}.xlsx`)
+    }
+
+  }
+}
+
+</script>
+
+<style scoped>
+.app-container{
+  background-color: #FEF7FC;
+}
+.mt
+{
+  position: relative;
+}
+.dt{
+  display: block;
+
+}
+.pt{
+  right: 10px;
+  top:-3px;
+  display: block;
+  position: absolute;
+}
+</style>
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index b7510ee..11072fa 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -1,171 +1,157 @@
 <template>
-    <div class="app-container" style="opacity: 1;">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+  <div class="app-container" style="opacity: 1;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-        <el-form-item label="鏃堕棿" >
-          <el-date-picker
-            v-model="dateRange"
-            style="width: 240px;"
-            value-format="yyyy-MM-dd HH-MM"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="寮�濮嬫棩鏈�"
-            end-placeholder="缁撴潫鏃ユ湡"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="鎬诲ぉ鏁�" prop="usePeople" >
-          <el-input
-            v-model="queryParams.usePeople"
-            placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+      <el-form-item label="鏃堕棿" >
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px;"
+          value-format="yyyy-MM-dd HH-MM"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="鎬诲ぉ鏁�" prop="usePeople" >
+        <el-input
+          v-model="queryParams.usePeople"
+          placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
-        <el-form-item>
-          <el-button  size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;border-radius:6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
-          <el-button  size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">閲嶇疆</el-button>
-        </el-form-item>
-      </el-form>
+      <el-form-item>
+        <el-button  size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;border-radius:6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
+        <el-button  size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">閲嶇疆</el-button>
+      </el-form-item>
+    </el-form>
 
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:role:add']"
+        >鏂板</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:role:remove']"
+        >鍒犻櫎</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['family:note:export']"
+        >瀵煎嚭</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExportTemplate"
+          v-hasPermi="['family:note:export']"
+        >瀵煎叆妯℃澘涓嬭浇</el-button>
+      </el-col>
+      <el-col :span="1.2">
+        <el-upload
+          action=""
+          class="upload-demo"
+          :show-file-list="false"
+          :http-request="handleEnport"
+        >
+          <el-button size="mini"   type="primary"
+                     plain
+                     icon="el-icon-plus" >瀵煎叆</el-button>
+
+        </el-upload>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵e垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
+    <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
+    <el-table v-loading="loading" :data="travelpriceList"  @selection-change="handleSelectionChange" @row-click="handleShow" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+      <el-table-column type="selection" width="55"  align="center" />
+      <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+
+      <el-table-column label="璧�" prop="startTime" sortable width="100" align="center">
+        <template slot-scope="scope">{{scope.row.startTime? scope.row.startTime: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <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="100" />
+      <el-table-column label="鏍囬" prop="title" sortable width="100" />
+
+      <el-table-column label="鎬婚噾棰�" prop="totalCost" sortable width="100" />
+      <el-table-column label="椁愯垂" prop="eat" sortable width="100" />
+      <el-table-column label="浣忓" prop="stay" sortable width="100" />
+      <el-table-column label="浜ら��" prop="traffic" sortable width="100" />
+      <el-table-column label="闂ㄧエ" prop="entrance" sortable width="100" />
+      <el-table-column label="璐墿" prop="shopping" sortable width="80" />
+
+
+      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+
           <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
             size="mini"
-            @click="handleAdd"
-            v-hasPermi="['system:role:add']"
-          >鏂板</el-button>
-        </el-col>
-
-        <el-col :span="1.5">
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['familymodel:economy:info']"
+          >淇敼</el-button>
           <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
             size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
+            type="text"
+            class="button_delete"
+            @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
-          >鍒犻櫎</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['family:note:export']"
-          >瀵煎嚭</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExportTemplate"
-            v-hasPermi="['family:note:export']"
-          >瀵煎叆妯℃澘涓嬭浇</el-button>
-        </el-col>
-        <el-col :span="1.2">
-          <el-upload
-            action=""
-            class="upload-demo"
-            :show-file-list="false"
-            :http-request="handleEnport"
-          >
-            <el-button size="mini"   type="primary"
-                       plain
-                       icon="el-icon-plus" >瀵煎叆</el-button>
+          > <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
+            <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
+          </el-dropdown>
+          <el-button class="button" size="mini" type="text"  @click="handleShow">
+            <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-          </el-upload>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-      <!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵e垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
-      <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
-      <el-table v-loading="loading" :data="travelpriceList"  @selection-change="handleSelectionChange" @row-click="handleShow" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
-        <el-table-column type="selection" width="55"  align="center" />
-        <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
-
-        <el-table-column label="璧�" prop="startTime" sortable width="100" align="center">
-          <template slot-scope="scope">{{scope.row.startTime? scope.row.startTime: '鈥斺�斺�斺��'}}</template>
-        </el-table-column>
-        <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="100" />
-        <el-table-column label="鏍囬" prop="title" sortable width="100" />
-
-        <el-table-column label="鎬婚噾棰�" prop="totalCost" sortable width="100" />
-        <el-table-column label="椁愯垂" prop="eat" sortable width="100" />
-        <el-table-column label="浣忓" prop="stay" sortable width="100" />
-        <el-table-column label="浜ら��" prop="traffic" sortable width="100" />
-        <el-table-column label="闂ㄧエ" prop="entrance" sortable width="100" />
-        <el-table-column label="璐墿" prop="shopping" sortable width="100" />
-
-
-        <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['familymodel:economy:info']"
-            >淇敼</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:role:remove']"
-            >鍒犻櫎</el-button>
-            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
-              <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
-            </el-dropdown>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <el-dialog :title="title" :visible.sync="openDataScope" width="1500px" append-to-body >
-       <div style="background-color: #FEF7FC;">
+    <el-dialog :title="title" :visible.sync="openDataScope" width="1500px" append-to-body >
+      <div style="background-color: #FEF7FC;">
         <el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"  >
-          <el-table-column type="selection" width="55"  align="center" />
-          <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
-          <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 type="selection" width="50"  align="center" />
+          <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
+          <el-table-column label="鏃堕棿" prop="happenTime" sortable width="150" align="center">
+            <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
           </el-table-column>
-          <el-table-column label="鍐呭" prop="content" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="鎬婚噾棰�" prop="totalcost" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="椁愯垂" prop="eat" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="浣忓" prop="stay" sortable :show-overflow-tooltip="true" width="150" />
+          <el-table-column label="鍐呭" prop="content" sortable :show-overflow-tooltip="true" width="160" />
+          <el-table-column label="鎬婚噾棰�" prop="totalCost" sortable :show-overflow-tooltip="true" width="160" />
+          <el-table-column label="椁愯垂" prop="eat" sortable :show-overflow-tooltip="true" width="160" />
+          <el-table-column label="浣忓" prop="stay" sortable :show-overflow-tooltip="true" width="160" />
           <el-table-column label="浜ら��" prop="traffic" sortable :show-overflow-tooltip="true" width="150" />
           <el-table-column label="闂ㄧエ" prop="entrance" sortable :show-overflow-tooltip="true" width="150" />
           <el-table-column label="璐墿" prop="shopping" sortable :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['familymodel:property:info']"
-              >淇敼</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:role:remove']"
-              >鍒犻櫎</el-button>
-            </template>
-          </el-table-column>
+
         </el-table>
         <pagination
           v-show="total>0"
@@ -179,508 +165,509 @@
 
     </el-dialog>
 
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-        style="background: #FEF7FC;"
-      />
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+      style="background: #FEF7FC;"
+    />
 
-      <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
+    <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
 
-      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
-          <el-form-item label="鍙拌处" prop="type">
-            <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
-          </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+        <el-form-item label="鍙拌处" prop="type">
+          <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
+        </el-form-item>
 
-          <el-form-item label="鏃堕棿" prop="happenTime">
-            <el-date-picker
-              v-model='formDat.happenTime'
-              type='date'
-              placeholder='閫夋嫨鏃ユ湡'
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="鏀跺叆/鏀嚭" prop="price">
-            <el-select v-model="formDat.price" 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>
-          <el-form-item label="閲戦" prop="balance">
-            <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="鐢ㄩ��" prop="useFor">
-            <el-input v-model="formDat.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="浣跨敤浜�" prop="usePeople">
-            <el-input v-model="formDat.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="鏀粯鏂瑰紡" prop="kind">
-            <el-input v-model="formDat.kind" 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="happenTime">
+          <el-date-picker
+            v-model='formDat.happenTime'
+            type='date'
+            placeholder='閫夋嫨鏃ユ湡'
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="鏀跺叆/鏀嚭" prop="price">
+          <el-select v-model="formDat.price" 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>
+        <el-form-item label="閲戦" prop="balance">
+          <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="鐢ㄩ��" prop="useFor">
+          <el-input v-model="formDat.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="浣跨敤浜�" prop="usePeople">
+          <el-input v-model="formDat.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="鏀粯鏂瑰紡" prop="kind">
+          <el-input v-model="formDat.kind" 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>
-          <el-upload
-            action="#"
-            list-type="picture-card"
-            multiple
-            :http-request="requestUpload"
-            :file-list="fileList"
+        <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+        <el-upload
+          action="#"
+          list-type="picture-card"
+          multiple
+          :http-request="requestUpload"
+          :file-list="fileList"
+        >
+          <i slot="default" class="el-icon-plus"></i>
+          <div slot="file" slot-scope="{file}">
+            <img
+              class="el-upload-list__item-thumbnail"
+              :src="file.url"
+              alt=""
+              style="width: 126px; height: 126px"
+              fit="cover"
+              :preview-src-list="[file.url]"
+            >
+            <span class="el-upload-list__item-actions">
+          <span
+            class="el-upload-list__item-preview"
+            @click="handlePictureCardPreview(file)"
           >
-            <i slot="default" class="el-icon-plus"></i>
-            <div slot="file" slot-scope="{file}">
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="file.url"
-                alt=""
-                style="width: 126px; height: 126px"
-                fit="cover"
-                :preview-src-list="[file.url]"
-              >
-              <span class="el-upload-list__item-actions">
-            <span
-              class="el-upload-list__item-preview"
-              @click="handlePictureCardPreview(file)"
-            >
-              <i class="el-icon-zoom-in"></i>
-            </span>
-
-            <span
-              v-if="!disabled"
-              class="el-upload-list__item-delete"
-              @click="handleRemove(file)"
-            >
-              <i class="el-icon-delete"></i>
-            </span>
+            <i class="el-icon-zoom-in"></i>
           </span>
 
-
-            </div>
-          </el-upload>
-          <h4 class="form-header">鍏朵粬闄勪欢 </h4>
-          <el-upload
-            action=""
-            :file-list="fileListOther"
-            class="upload-demo"
-            multiple
-
-            :on-remove="handleRemove"
-            :http-request="requestUpload"
-            :show-file-list="true"
+          <span
+            v-if="!disabled"
+            class="el-upload-list__item-delete"
+            @click="handleRemove(file)"
           >
-            <el-button type="primary">涓婁紶</el-button>
-            <template #tip>
-              <div class="el-upload__tip">
-              </div>
-            </template>
-          </el-upload>
-
-        </el-form>
-        <h4 class="form-header"> </h4>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
-          <el-button @click="cancelData">鍙� 娑�</el-button>
-        </div>
-      </el-dialog>
+            <i class="el-icon-delete"></i>
+          </span>
+        </span>
 
 
-    </div>
-  </template>
+          </div>
+        </el-upload>
+        <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+        <el-upload
+          action=""
+          :file-list="fileListOther"
+          class="upload-demo"
+          multiple
 
-  <script>
-  import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-  import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+          :on-remove="handleRemove"
+          :http-request="requestUpload"
+          :show-file-list="true"
+        >
+          <el-button type="primary">涓婁紶</el-button>
+          <template #tip>
+            <div class="el-upload__tip">
+            </div>
+          </template>
+        </el-upload>
+
+      </el-form>
+      <h4 class="form-header"> </h4>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
+        <el-button @click="cancelData">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
 
 
 
-  //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
-  import {listTravelPrice,enload,delTravelPrice, addTravelPrice, uploadPic} from "@/api/travel/index";
+//鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
+import {listTravelPrice,enload,getTravelPriceInfo,delTravelPrice, addTravelPrice, uploadPic} from "@/api/travel/index";
 
-  export default {
-    name: "Role",
-    dicts: ['sys_normal_disable'],
-    data() {
-      return {
-        // 閬僵灞�
-        disabled: false,
-        loading: true,
-        formData:[],
-        detailList:[],
-        // 閫変腑鏁扮粍
-        ids: [],
-        // 闈炲崟涓鐢�
-        single: true,
-        // 闈炲涓鐢�
-        multiple: true,
-        // 鏄剧ず鎼滅储鏉′欢
-        showSearch: true,
-        // 鎬绘潯鏁�
-        total: 0,
-        // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
-        travelpriceList: [],
-        // 寮瑰嚭灞傛爣棰�
-        title: "",
-        // 鏄惁鏄剧ず寮瑰嚭灞�
-        open: false,
-        // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
-        openDataScope: false,
-        menuExpand: false,
-        menuNodeAll: false,
-        deptExpand: true,
-        deptNodeAll: false,
-        // 鏃ユ湡鑼冨洿
-        dateRange: [],
-        // 鏁版嵁鑼冨洿閫夐」
-        fot:[".jpg",".jif"],
-        fileList:[
-        ],
-        fileListOther:[
+export default {
+  name: "Role",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 閬僵灞�
+      disabled: false,
+      loading: true,
+      formData:[],
+      detailList:[],
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
+      travelpriceList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+      openDataScope: false,
+      menuExpand: false,
+      menuNodeAll: false,
+      deptExpand: true,
+      deptNodeAll: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏁版嵁鑼冨洿閫夐」
+      fot:[".jpg",".jif"],
+      fileList:[
+      ],
+      fileListOther:[
 
-        ],
-        dsb:true,
-        btn:false,
-        formDat: {
-          type: undefined,
-          createTime: undefined,
-          useFor: undefined,
-          usePeople: undefined,
-          kind:undefined,
-          remark: undefined,
-          url: undefined,
-          detailList:undefined,
-        },
-        // 鑿滃崟鍒楄〃
-        menuOptions: [],
-        // 閮ㄩ棬鍒楄〃
-        deptOptions: [],
-        // 鏌ヨ鍙傛暟
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          type:undefined,
-          useFor:undefined,
-          usePeople:undefined,
-          createTime:undefined,
-
-        },
-        // 琛ㄥ崟鍙傛暟
-        form: {},
-        defaultProps: {
-          children: "children",
-          label: "label"
-        },
-        // 琛ㄥ崟鏍¢獙
-        rules: {
-          usePeople: [{
-            required: true,
-            message: '璇疯緭鍏ヤ娇鐢ㄤ汉',
-            trigger: 'blur'
-          }],
-
-          useFor: [{
-            required: true,
-            message: '璇疯緭鍏ョ敤閫�',
-            trigger: 'blur'
-          }],
-          type: [{
-            required: true,
-            message: '璇疯緭鍏ュ彴璐﹀唴瀹�',
-            trigger: 'blur'
-          }],
-          balance: [{
-            required: true,
-            message: '璇疯緭鍏ラ噾棰�',
-            trigger: 'blur'
-          }],
-          kind: [{
-            // required: true,
-            message: '璇疯緭鍏ユ敮浠樻柟寮�',
-            trigger: 'blur'
-          }],
-          createTime: [{
-            required: true,
-            message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
-            trigger: 'change'
-          }],
-          price: [{
-            required: true,
-            message: '璇烽�夋嫨浜嬮」鍐呭',
-            trigger: 'blur'
-          }],
-        },
-        typeOptions: [
-          {
-            value: '鏀跺叆',
-            label: '鏀跺叆',
-          },
-          {
-            value: '鏀嚭',
-            label: '鏀嚭',
-          }],
-        typeOptions1: [
-          {
-            value: '0',
-            label: '鐜伴噾',
-          },
-          {
-            value: '1',
-            label: '鑷姩鎵e垝',
-          }
-        ],
-      };
-    },
-    created() {
-      this.getList();
-
-    },
-    methods: {
-
-      //鍩洪噾/鍙拌处鐨勯�夋嫨
-      getSrc1(type) {
-        if (type === 0) {
-          return '鍩洪噾'
-        }else {
-          return '鍙拌处'
-        }
+      ],
+      dsb:true,
+      btn:false,
+      formDat: {
+        type: undefined,
+        createTime: undefined,
+        useFor: undefined,
+        usePeople: undefined,
+        kind:undefined,
+        remark: undefined,
+        url: undefined,
+        detailList:undefined,
       },
+      // 鑿滃崟鍒楄〃
+      menuOptions: [],
+      // 閮ㄩ棬鍒楄〃
+      deptOptions: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type:undefined,
+        useFor:undefined,
+        usePeople:undefined,
+        createTime:undefined,
 
-      getSrc2(kind) {
-        if (kind == 0) {
-          return '鐜伴噾'
-        }else  {
-          return '鑷姩鎵e垝'
-        }
       },
-
-      // 鍙栨秷鎸夐挳
-      cancelData() {
-        this.open = false;
-        this.reset();
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
       },
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        usePeople: [{
+          required: true,
+          message: '璇疯緭鍏ヤ娇鐢ㄤ汉',
+          trigger: 'blur'
+        }],
 
-      //闅旇鍙樿壊
-      tableRowClassName({ row, rowIndex }) {
-        if (rowIndex % 2 == 0) {
-          return "statistics-warning-row1";
-        } else {
-          return "statistics-warning-row";
-        }
+        useFor: [{
+          required: true,
+          message: '璇疯緭鍏ョ敤閫�',
+          trigger: 'blur'
+        }],
+        type: [{
+          required: true,
+          message: '璇疯緭鍏ュ彴璐﹀唴瀹�',
+          trigger: 'blur'
+        }],
+        balance: [{
+          required: true,
+          message: '璇疯緭鍏ラ噾棰�',
+          trigger: 'blur'
+        }],
+        kind: [{
+          // required: true,
+          message: '璇疯緭鍏ユ敮浠樻柟寮�',
+          trigger: 'blur'
+        }],
+        createTime: [{
+          required: true,
+          message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
+          trigger: 'change'
+        }],
+        price: [{
+          required: true,
+          message: '璇烽�夋嫨浜嬮」鍐呭',
+          trigger: 'blur'
+        }],
       },
-
-      /** 鏌ヨ瑙掕壊鍒楄〃 */
-      //鍒楄〃鏄剧ず瀹跺ぇ浜嬭
-
-
-      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(response => {
-            //  alert(123)
-            //   console.log(response.data)
-            this.travelpriceList = response.data.data;
-            console.log(this.travelpriceList[0])
-            this.total = response.data.total;
-            this.loading = false;
-          }
-        );
-      },
-      handleRemove(file) {
-        for(let i = 0; i < this.fileListOther.length; i++)
+      typeOptions: [
         {
-          if(this.fileListOther[i].url==file.url)
-            this.$delete(this.fileListOther,i);
+          value: '鏀跺叆',
+          label: '鏀跺叆',
+        },
+        {
+          value: '鏀嚭',
+          label: '鏀嚭',
+        }],
+      typeOptions1: [
+        {
+          value: '0',
+          label: '鐜伴噾',
+        },
+        {
+          value: '1',
+          label: '鑷姩鎵e垝',
         }
-      },
+      ],
+    };
+  },
+  created() {
+    this.getList();
 
-      // 鍙栨秷鎸夐挳
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      getRowId(row)
+  },
+  methods: {
+
+    //鍩洪噾/鍙拌处鐨勯�夋嫨
+    getSrc1(type) {
+      if (type === 0) {
+        return '鍩洪噾'
+      }else {
+        return '鍙拌处'
+      }
+    },
+
+    getSrc2(kind) {
+      if (kind == 0) {
+        return '鐜伴噾'
+      }else  {
+        return '鑷姩鎵e垝'
+      }
+    },
+
+    // 鍙栨秷鎸夐挳
+    cancelData() {
+      this.open = false;
+      this.reset();
+    },
+
+    //闅旇鍙樿壊
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 0) {
+        return "statistics-warning-row1";
+      } else {
+        return "statistics-warning-row";
+      }
+    },
+
+    /** 鏌ヨ瑙掕壊鍒楄〃 */
+    //鍒楄〃鏄剧ず瀹跺ぇ浜嬭
+
+
+    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(response => {
+          //  alert(123)
+          //   console.log(response.data)
+          this.travelpriceList = response.data.data;
+          console.log(this.travelpriceList[0])
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    handleRemove(file) {
+      for(let i = 0; i < this.fileListOther.length; i++)
       {
-        return row.id
-      },
-      // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
-      cancelDataScope() {
-        this.openDataScope = false;
-        this.reset();
-      },
-      // 琛ㄥ崟閲嶇疆
-      reset() {
-        if (this.$refs.menu != undefined) {
-          this.$refs.menu.setCheckedKeys([]);
-        }
-        this.menuExpand = false,
-          this.menuNodeAll = false,
-          this.deptExpand = true,
-          this.deptNodeAll = false,
-          this.form = {
-            roleId: undefined,
-            roleName: undefined,
-            roleKey: undefined,
-            roleSort: 0,
-            status: "0",
-            menuIds: [],
-            deptIds: [],
-            menuCheckStrictly: true,
-            deptCheckStrictly: true,
-            remark: undefined
-          };
-        this.resetForm("form");
-      },
-      /** 鎼滅储鎸夐挳鎿嶄綔 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 閲嶇疆鎸夐挳鎿嶄綔 */
-      resetQuery() {
-        this.dateRange = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 澶氶�夋閫変腑鏁版嵁
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        console.log(this.ids)
-        this.single = selection.length!=1
-        this.multiple = !selection.length
-      },
+        if(this.fileListOther[i].url==file.url)
+          this.$delete(this.fileListOther,i);
+      }
+    },
 
-      /** 鏂板鎸夐挳鎿嶄綔 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "娣诲姞瀹跺涵鏀舵敮鍙拌处";
-      },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    getRowId(row)
+    {
+      return row.id
+    },
+    // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
+    cancelDataScope() {
+      this.openDataScope = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false,
+        this.menuNodeAll = false,
+        this.deptExpand = true,
+        this.deptNodeAll = false,
+        this.form = {
+          roleId: undefined,
+          roleName: undefined,
+          roleKey: undefined,
+          roleSort: 0,
+          status: "0",
+          menuIds: [],
+          deptIds: [],
+          menuCheckStrictly: true,
+          deptCheckStrictly: true,
+          remark: undefined
+        };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      console.log(this.ids)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
 
-      //  寮圭獥
-      handleShow(row){
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞瀹跺涵鏀舵敮鍙拌处";
+    },
+
+    //  寮圭獥
+    handleShow(row){
       const id = row.id;
       this.openDataScope = true
-   //   this.getList()
+      //   this.getList()
       //alert(123)
       this.detailList = row.detailList
       // alert(row.index)
       this.title = "灞曠ず璇︽儏";
 
-     },
+    },
 
-      /** 鏌ョ湅璇︾粏淇℃伅 */
-      handleCheck(row){
-        const id = row.id;
-       // alert(id)
+    /** 鏌ョ湅璇︾粏淇℃伅 */
+    handleCheck(row){
+      const id = row.id;
+      // alert(id)
       //  alert(row.fee_id)
-        this.$router.push("/self/travel/Info/" + id);
-      },
-      /** 淇敼鎸夐挳鎿嶄綔 */
-      handleUpdate(row) {
-        const id = row.id;
-        let jd = true
+      this.$router.push("/self/travel/Info/" + id);
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      const id = row.id;
+      // let jd = true
 
-        this.$router.push({
-          path:"/self/travel/edit/" + id,
-          query:{
-            detail:jd
-          }
-        });
-      },
+      // this.$router.push({
+      //   path:"/self/travel/edit/" + id,
+      //   query:{
+      //     detail:jd
+      //   }
+      // });
+      this.$router.push("/self/travel/edit/" + id);
+    },
 
 
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      },
-      /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
-      submitDataScope: function() {
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+    submitDataScope: function() {
 
-        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.formDat.url = ul+","+uls
-        this.$refs["elForm"].validate(valid => {
-          if (valid) {
+      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.formDat.url = ul+","+uls
+      this.$refs["elForm"].validate(valid => {
+        if (valid) {
 
-            addEconomy(this.formDat).then(response => {
-              this.$modal.msgSuccess("鏂板鎴愬姛");
-              this.open = false;
-              this.getList();
-            });
-          }
-        });
-      },
-      requestUpload(params)
-      {
-        var file = params.file;
-        var formData = new FormData();
-        formData.append('uploadFile', file);
-        let _this = this
+          addEconomy(this.formDat).then(response => {
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    requestUpload(params)
+    {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('uploadFile', file);
+      let _this = this
 
-        uploadPic(formData).then(response => {
-          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+      uploadPic(formData).then(response => {
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
 
-          if(_this.fot.includes(pth) === true)
-          {
-            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
-          }
-
-          else{
-            _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
-          }
-        })
-
-      },
-      /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-      handleDelete(row) {
-        const Ids = row.id || this.ids;
-        this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
-          return delEconomy(Ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        }).catch(() => {});
-      },
-      /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-      handleExport() {
-        const Ids = this.ids;
-
-        if(Ids.length==0)
+        if(_this.fot.includes(pth) === true)
         {
+          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+        }
+
+        else{
+          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+        }
+      })
+
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const Ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+        return delEconomy(Ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      const Ids = this.ids;
+
+      if(Ids.length==0)
+      {
         this.download('/zfEconomy/export', {
           ...this.queryParams
         }, `zfEconomy_${new Date().getTime()}.xlsx`)
-        }else
-        {
-          this.download('/zfEconomy/export1/'+Ids, {
-          }, `zfEconomy_${new Date().getTime()}.xlsx`)
-        }
+      }else
+      {
+        this.download('/zfEconomy/export1/'+Ids, {
+        }, `zfEconomy_${new Date().getTime()}.xlsx`)
       }
+    }
     ,
     handleExportTemplate(){
-        this.download('/zfEconomy/model', {
+      this.download('/zfEconomy/model', {
 
-        }, `zfEconomy_${new Date().getTime()}.xlsx`)
+      }, `zfEconomy_${new Date().getTime()}.xlsx`)
     },
     /** 瀵煎叆鎿嶄綔*/
     handleEnport(params){
@@ -699,19 +686,28 @@
       }
 
     }
-    },
-  };
+  },
+};
 
 
-  </script>
+</script>
 
-  <style>
-  .el-table__row.statistics-warning-row {
-    background: #E0EEFE;
+<style>
+.el-table__row.statistics-warning-row {
+  background: #E0EEFE;
 
-  }
-  .el-table__row.statistics-warning-row1 {
-    background: #FFEFF2;
+}
+.el-table__row.statistics-warning-row1 {
+  background: #FFEFF2;
 
-  }
-  </style>
+}
+.button {
+  background: center no-repeat url('../../assets/images/寮圭獥 1.png') ;
+  /* margin-left: 66vw; */
+}
+.button_delete {
+  background: center no-repeat url('../../assets/images/鍒犻櫎2.png') ;
+
+  /* margin-left: 66vw; */
+}
+</style>
diff --git a/ruoyi-ui/src/views/travel/travelInfo.vue b/ruoyi-ui/src/views/travel/travelInfo.vue
new file mode 100644
index 0000000..6b0ed50
--- /dev/null
+++ b/ruoyi-ui/src/views/travel/travelInfo.vue
@@ -0,0 +1,410 @@
+<template>
+  <div class="app-container">
+    <div class="form-header mt">
+      <h4 class="dt h4">鏃呮父缁忓巻璇︾粏淇℃伅 </h4>
+
+    </div>
+
+    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+      <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
+        <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ュ彂鐢熸椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input>
+      </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-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>
+      <el-form-item label="鏃呮湡" prop="travelPeriod">
+        <el-input v-model="formData.travelPeriod" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+      </el-form-item>
+      <el-form-item label="鎸佽瘉鏃呮父" prop="certificate">
+        <el-input v-model="formData.certificate" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+      </el-form-item>
+      <el-form-item label="璐圭敤" prop="totalPrice">
+        <el-input v-model="formData.totalPrice" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+      </el-form-item>
+
+      <el-form-item label="鏄惁鍏垂鏃呮父" prop="self">
+        <el-select v-model="formData.self=== 1 ? '鑷垂':'鍏垂'" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼" clearable :style="{width: '100%'}" :disabled="dsb" ></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>
+
+      <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+      <el-upload
+        action="#"
+        list-type="picture-card"
+        multiple
+        :http-request="requestUpload"
+        :file-list="fileList"
+      >
+        <i slot="default" class="el-icon-plus"></i>
+        <div slot="file" slot-scope="{file}">
+          <img
+            class="el-upload-list__item-thumbnail"
+            :src="file.url"
+            alt=""
+            style="width: 147px; height: 147px"
+            fit="cover"
+            :preview-src-list="[file.url]"
+          >
+          <span class="el-upload-list__item-actions">
+          <span
+            v-if="isShow"
+            class="el-upload-list__item-preview"
+            @click="handlePictureCardPreview(file)"
+          >
+            <i class="el-icon-zoom-in"></i>
+          </span>
+          <span
+            v-if="isShow"
+            class="el-upload-list__item-delete"
+            @click="handleDownload(file.url)"
+          >
+            <i class="el-icon-download"></i>
+          </span>
+          <span
+            v-if="isShow"
+            class="el-upload-list__item-delete"
+            @click="handleRemove(file)"
+          >
+            <i class="el-icon-delete"></i>
+          </span>
+        </span>
+
+
+        </div>
+      </el-upload>
+
+      <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+      <el-upload
+        action=""
+        :file-list="fileListOther"
+        class="upload-demo"
+        multiple
+        list-type="picture-card"
+        :on-preview="handleFileCardPreview"
+        :on-remove="handleRemove"
+        :http-request="requestUpload"
+        :show-file-list="true"
+      >
+
+        <i slot="default" class="el-icon-plus"></i>
+        <div slot="file" slot-scope="{file}">
+          <img
+            class="el-upload-list__item-thumbnail"
+            src="../../assets/401_images/401.gif"
+            alt=""
+            style="width: 147px; height: 147px"
+            fit="cover"
+          >
+          <span class="el-upload-list__item-actions">
+                  <span
+                    v-if="isShow"
+                    class="el-upload-list__item-preview"
+                    @click="handleFileCardPreview(file)"
+                  >
+                    <i class="el-icon-zoom-in"></i>
+                  </span>
+                  <span
+                    v-if="isShow"
+                    @click="handleRemove(file)"
+                    class="el-upload-list__item-delete"
+
+                  >
+                    <i class="el-icon-download"></i>
+                  </span>
+                  <span
+                    v-if="isShow"
+                    class="el-upload-list__item-delete"
+                    @click="handleRemoveFile(file)"
+                  >
+                    <i class="el-icon-delete"></i>
+                  </span>
+                </span>
+
+
+        </div>
+
+
+      </el-upload>
+
+      <el-form-item size="large">
+        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-dialog  :visible.sync="dialogVisible">
+      <img w-full :src="dialogImageUrl"    style="width: 700px; height: 700px" alt="Preview Image" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {addRole, updateRole} from "@/api/system/role";
+import {blobValidate} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import {Message} from "element-ui";
+import { getTravelBaseInfo, updateTravelBase, uploadPic, download} from "@/api/travel/index";
+
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      cdi:"瀹跺涵澶т簨璁颁俊鎭�",
+      udi:"瀹跺涵澶т簨璁颁慨鏀�",
+      fot:[".jpg",".jif","png"],
+      fileList:[
+      ],
+      fileListOther:[
+
+      ],
+      dsb:true,
+      btn:false,
+      isShow:true,
+
+      doctorList: [],
+
+      formData: {
+        id: undefined,
+        title: undefined,
+        people: undefined,
+        address: undefined,
+        remark: undefined,
+        url: undefined,
+      },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      disabled: false,
+      rules: {
+        title: [{
+          required: true,
+          message: '璇疯緭鍏ュぇ浜嬫爣棰�',
+          trigger: 'blur'
+        }],
+        familyId: [{
+          required: true,
+          message: '璇疯緭鍏ュ搴彿',
+          trigger: 'blur'
+        }],
+        people: [{
+          required: true,
+          message: '璇疯緭鍏ヤ汉鐗�',
+          trigger: 'blur'
+        }],
+        address: [{
+          required: true,
+          message: '璇疯緭鍏ュ湴鐐�',
+          trigger: 'blur'
+        }],
+        remark: [{
+          // required: true,
+          message: '璇疯緭鍏ュ娉�',
+          trigger: 'blur'
+        }],
+
+      },
+      typeOptions: [],
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
+    const id = this.$route.params && this.$route.params.id;
+    let jd;
+    if(this.$route.query.detail!=undefined)
+    {
+      jd =  this.$route.query.detail
+      this.btn= jd
+      this.dsb = !jd
+      this.isShow=true
+      document.title = "淇敼鏃呮父缁忓巻璇︾粏淇℃伅";
+      this.$route.meta.title = "淇敼鏃呮父缁忓巻璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+    }
+    else{
+      document.title = "鏃呮父缁忓巻璇︾粏淇℃伅";
+      this.$route.meta.title = "鏃呮父缁忓巻璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+      this.isShow=true
+    }
+
+    let _this = this
+    if (id) {
+      this.loading = true;
+      getTravelBaseInfo(id).then((response) => {
+        this.formData = response.data;
+        let paths = response.data.url.split(",");
+        for(let i = 0; i < paths.length; i++)
+        {
+          if(paths[i]!="") {
+
+            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+
+            if (_this.fot.includes(pth) === true)
+              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+            else {
+              // alert(paths[i])
+              let nms = paths[i].split("\/")
+              let nm = nms[nms.length - 1]
+              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+            }
+          }
+        }
+        this.loading = false;
+      });
+      this.getCateInfor()
+
+    }
+  },
+  mounted() {},
+  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 => {
+
+
+        if (valid) {
+          if (this.formData.id != undefined) {
+            updateTravelBase(this.formData).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              // this.open = false;
+              this.btn=false
+            });
+          } else {
+            this.$modal.msgSuccess("淇敼澶辫触");
+
+          }
+        }
+      })
+    },
+    resetForm() {
+      this.$refs['elForm'].resetFields()
+    },
+    handlePreview(file)
+    {
+      let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+      let lens = formData.path.split(".")
+      let suffix = lens[lens.length-1]
+      download(formData).then(async (response) => {
+        const isLogin = await blobValidate(response);
+        let nt = new Date().getTime()
+        let filename = 'familyevent_'+nt+'.'+suffix
+        const blob = new Blob([response])
+        saveAs(blob, filename)
+      })
+    },
+    handleRemoveFile(file) {
+      for(let i = 0; i < this.fileListOther.length; i++)
+      {
+        if(this.fileListOther[i].url==file.url)
+          this.$delete(this.fileListOther,i);
+      }
+    },
+    handleRemove(file) {
+      for(let i = 0; i < this.fileList.length; i++)
+      {
+        if(this.fileList[i].url==file.url)
+          this.$delete(this.fileList,i);
+      }
+    },
+    handleFileCardPreview(file){
+      this.dialogFileUrl = file.url;
+      const Base64 = require('js-base64').Base64
+      this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+      myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    handleDownload(url) {
+      var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+
+      let lens = formData.path.split(".")
+      let suffix = lens[lens.length-1]
+      download(formData).then(async (response) => {
+        const isLogin = await blobValidate(response);
+        let nt = new Date().getTime()
+        let filename = 'familyevent_'+nt+'.'+suffix
+        const blob = new Blob([response])
+        saveAs(blob, filename)
+      })
+    },
+    handleEdit()
+    {
+      this.dsb = false
+      // this.btn = true
+      this.isShow=false
+    },
+    requestUpload(params)
+    {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('uploadFile', file);
+      let _this = this
+
+      uploadPic(formData).then(response => {
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+
+        if(_this.fot.includes(pth) === true)
+        {
+          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+        }
+
+        else{
+          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+        }
+      })
+
+    },
+
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('/zfEvent/export', {
+        ...this.queryParams
+      }, `zfEvent_${new Date().getTime()}.xlsx`)
+    }
+
+  }
+}
+
+</script>
+
+<style scoped>
+.app-container{
+  background-color: #FEF7FC;
+}
+.mt
+{
+  position: relative;
+}
+.dt{
+  display: block;
+
+}
+.pt{
+  right: 10px;
+  top:-3px;
+  display: block;
+  position: absolute;
+}
+</style>

--
Gitblit v1.9.1