From 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 10 九月 2023 10:08:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/travel/travelInfo.vue |  179 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 94 insertions(+), 85 deletions(-)

diff --git a/ruoyi-ui/src/views/travel/travelInfo.vue b/ruoyi-ui/src/views/travel/travelInfo.vue
index b5e6904..2b38dcd 100644
--- a/ruoyi-ui/src/views/travel/travelInfo.vue
+++ b/ruoyi-ui/src/views/travel/travelInfo.vue
@@ -4,61 +4,71 @@
       <h4 class="dt h4">鏃呮父缁忓巻璇︾粏淇℃伅 </h4>
 
     </div>
+    <div >
+      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" style="width: 60%;">
+        <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
+          <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ュ彂鐢熸椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+          </el-input>
+        </el-form-item>
+        <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-select v-model="formData.certificate" placeholder="璇烽�夋嫨璇佷欢" clearable :style="{width: '100%'}"  :disabled="dsb">
+            <el-option label="灞呮皯韬唤璇�" value="灞呮皯韬唤璇�"></el-option>
+            <el-option label="涓存椂韬唤璇�" value="涓存椂韬唤璇�"></el-option>
+            <el-option label="鎴峰彛鏈�" value="鎴峰彛鏈�"></el-option>
+            <el-option label="鎶ょ収" value="鎶ょ収"></el-option>
+            <el-option label="瀛︾敓璇�" value="瀛︾敓璇�"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="璐圭敤" prop="totalPrice">
+          <el-input v-model="formData.totalPrice" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="true"></el-input>
+        </el-form-item>
 
-    <el-form 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" placeholder="璇烽�夋嫨鏄惁" clearable :style="{width: '100%'}"  :disabled="dsb">
+            <el-option label="鏄�" value="1"></el-option>
+            <el-option label="鍚�" value="0"></el-option>
+          </el-select>
+        </el-form-item>
 
-      <el-form-item label="鏄惁鍏垂鏃呮父" prop="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>
 
-      <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"
-      >
-        <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
-        <i v-if="!uploading" 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">
+        <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+        <el-upload
+          action="#"
+          list-type="picture-card"
+          multiple
+          :http-request="requestUpload"
+          :file-list="fileList"
+        >
+          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
+          <i v-if="!uploading" 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
 
             class="el-upload-list__item-preview"
@@ -83,32 +93,32 @@
         </span>
 
 
-        </div>
-      </el-upload>
+          </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="handleRemoveFile"
-        :http-request="requestUpload"
-        :show-file-list="true"
-      >
-        <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
-        <i v-if="!uploading" 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">
+        <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+        <el-upload
+          action=""
+          :file-list="fileListOther"
+          class="upload-demo"
+          multiple
+          list-type="picture-card"
+          :on-preview="handleFileCardPreview"
+          :on-remove="handleRemoveFile"
+          :http-request="requestUpload"
+          :show-file-list="true"
+        >
+          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
+          <i v-if="!uploading" 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
 
                     class="el-upload-list__item-preview"
@@ -133,16 +143,16 @@
                 </span>
 
 
-        </div>
+          </div>
 
 
-      </el-upload>
+        </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-form-item size="large">
+          <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
     <el-dialog  :visible.sync="dialogVisible">
       <img w-full :src="dialogImageUrl"    style="width: 700px; height: 700px" alt="Preview Image" />
     </el-dialog>
@@ -261,8 +271,6 @@
         }
         this.loading = false;
       });
-      this.getCateInfor()
-
     }
   },
   mounted() {},
@@ -283,6 +291,7 @@
         if (valid) {
           if (this.formData.id != undefined) {
             updateTravelBase(this.formData).then(response => {
+              console.log(this.formData);
               this.$modal.msgSuccess("淇敼鎴愬姛");
               // this.open = false;
               this.btn=false

--
Gitblit v1.9.1