From 5416279140524175b03a4d45c0ed85341e90d6eb Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期一, 06 一月 2025 12:00:02 +0800 Subject: [PATCH] 修改旅游模块 --- ruoyi-ui/src/views/travel/travelInfo.vue | 539 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 426 insertions(+), 113 deletions(-) diff --git a/ruoyi-ui/src/views/travel/travelInfo.vue b/ruoyi-ui/src/views/travel/travelInfo.vue index a2a9121..70326d7 100644 --- a/ruoyi-ui/src/views/travel/travelInfo.vue +++ b/ruoyi-ui/src/views/travel/travelInfo.vue @@ -13,26 +13,53 @@ </div> <div > <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" style="width: 60%;"> - <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime"> - <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ュ彂鐢熸椂闂�" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> + <el-form-item label="鍙戠敓鏃堕棿" prop="happenDate"> + <el-date-picker v-model="formData.happenDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd" + ></el-date-picker> </el-form-item> <el-form-item label="鍦扮偣" prop="address"> <el-input v-model="formData.address" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> - <el-form-item label="浜虹墿" prop="people"> - <el-input v-model="formData.people" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-form-item label="寤虹瓚" prop="scenic"> + <el-input v-model="formData.scenic" placeholder="璇疯緭鍏ュ缓绛�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> + </el-form-item> + + + <el-form-item label="闂ㄧエ" prop="entrance"> + <el-input v-model="formData.entrance" placeholder="璇疯緭鍏ラ棬绁�" type="number" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> - <el-form-item label="鏍囬" prop="title"> - <el-input v-model="formData.title" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> + <el-form-item label="浣忓閰掑簵" prop="hotel"> + <el-input v-model="formData.hotel" placeholder="璇疯緭鍏ヤ綇瀹块厭搴�" clearable :style="{width: '100%'}" :disabled="dsb"> + </el-input> </el-form-item> - <el-form-item label="鏃呮湡" prop="travelPeriod"> - <el-input v-model="formData.travelPeriod" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> + <el-form-item label="浣忓璐圭敤" prop="stay"> + <el-input v-model="formData.stay" placeholder="璇疯緭鍏ヤ綇瀹胯垂鐢�" type="number" clearable :style="{width: '100%'}" :disabled="dsb"> + </el-input> + <el-form-item label="璐墿璐圭敤" prop="shop"> + <el-input v-model="formData.shop" placeholder="璇疯緭鍏ヨ喘鐗╄垂鐢�" type="number" clearable :style="{width: '100%'}" :disabled="dsb"> + </el-input> + </el-form-item> + <el-form-item label="椁愯垂" prop="eat"> + <el-input v-model="formData.eat" placeholder="璇疯緭鍏ュ湴鐐�" type="number" clearable :style="{width: '100%'}" :disabled="dsb"> + </el-input> + </el-form-item> + <el-form-item label="浜ら�氳垂" prop="travel"> + <el-input v-model="formData.travel" placeholder="璇疯緭鍏ヤ氦閫氳垂" type="number" clearable :style="{width: '100%'}" :disabled="dsb"> + </el-input> </el-form-item> - <el-form-item label="鎸佽瘉鏃呮父" prop="certificate"> - <el-select v-model="formData.certificate" placeholder="璇烽�夋嫨璇佷欢" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-form-item label="鍑鸿鏂瑰紡" prop="travelMode"> + <el-input v-model="formData.travelMode" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" :disabled="dsb"> + </el-input> + </el-form-item> + <el-form-item label="杞︽/鑸彮" prop="flight"> + <el-input v-model="formData.flight" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" :disabled="dsb"> + </el-input> + </el-form-item> + <el-form-item label="鎸佽瘉鏃呮父" prop="document"> + <el-select v-model="formData.document" placeholder="璇烽�夋嫨璇佷欢" clearable :style="{width: '100%'}" :disabled="dsb"> <el-option label="灞呮皯韬唤璇�" value="灞呮皯韬唤璇�"></el-option> <el-option label="涓存椂韬唤璇�" value="涓存椂韬唤璇�"></el-option> <el-option label="鎴峰彛鏈�" value="鎴峰彛鏈�"></el-option> @@ -40,20 +67,10 @@ <el-option label="瀛︾敓璇�" value="瀛︾敓璇�"></el-option> </el-select> </el-form-item> - <el-form-item label="璐圭敤" prop="totalPrice"> - <el-input v-model="formData.totalPrice" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" :disabled="true"></el-input> - </el-form-item> - <el-form-item label="鏄惁鍏垂鏃呮父" prop="self"> - <el-select v-model="formData.self" placeholder="璇烽�夋嫨鏄惁" clearable :style="{width: '100%'}" :disabled="dsb"> - <el-option label="鏄�" value="1"></el-option> - <el-option label="鍚�" value="0"></el-option> - </el-select> - </el-form-item> - - <el-form-item label="澶囨敞" prop="remark"> - <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> - </el-form-item> +<!-- <el-form-item label="澶囨敞" prop="remark">--> +<!-- <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>--> +<!-- </el-form-item>--> <h4 class="form-header">鐢靛瓙鏂囦欢 </h4> @@ -61,8 +78,15 @@ action="#" list-type="picture-card" multiple - :http-request="requestUpload" - :file-list="fileList" + + + + ref="upload" + :show-file-list="true" + :http-request="requestUpload" + :file-list="fileList" + :on-change="handleChange" + :auto-upload="false" :disabled="!btn" :class="{ hide: !btn }" > @@ -104,7 +128,13 @@ </div> </el-upload> - + <el-button + style="margin-left: 10px" + size="small" + type="success" + v-if="btn" + @click="picUpload" + >涓婁紶鍒版湇鍔″櫒</el-button> <h4 class="form-header">鍏朵粬闄勪欢 </h4> <el-upload action="" @@ -113,59 +143,81 @@ multiple list-type="picture-card" :on-preview="handleFileCardPreview" - :on-remove="handleRemoveFile" - :http-request="requestUpload" + + :show-file-list="true" + + + ref="upload1" + :on-remove="handleRemoveFile" + :http-request="requestUpload1" + + :on-change="handleChange1" + :auto-upload="false" :disabled="!btn" :class="{ hide: !btn }" > <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 + <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 --> + <video + v-if="file.url.includes('.mp4')" class="el-upload-list__item-thumbnail" - src="../../assets/401_images/401.gif" - alt="" + :src="file.url" style="width: 147px; height: 147px" fit="cover" - > + ></video> + <img v-else + class="el-upload-list__item-thumbnail" + src="../../assets/images/deviceLis.png" + alt="" + style="width: 147px; height: 147px" + fit="cover"> + <span class="el-upload-list__item-actions"> - <span + <span class="el-upload-list__item-name">{{ file.name }}</span> + <span + class="el-upload-list__item-preview" + @click="handleFileCardPreview(file)" + > + <i class="el-icon-zoom-in"></i> + </span> + <span - class="el-upload-list__item-preview" - @click="handleFileCardPreview(file)" - > - <i class="el-icon-zoom-in"></i> - </span> - <span - - class="el-upload-list__item-delete" - @click="handleDownload(file.url)" - > + 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="handleRemoveFile(file)" - > - <i class="el-icon-delete"></i> - </span> - </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-button + style="margin-left: 10px" + size="small" + type="success" + v-if="btn" + @click="fileUpload" + >涓婁紶鍒版湇鍔″櫒</el-button> + <h4 class="form-header"> </h4> <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" /> + <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" /> </el-dialog> </div> </template> @@ -184,12 +236,17 @@ return { cdi:"瀹跺涵澶т簨璁颁俊鎭�", udi:"瀹跺涵澶т簨璁颁慨鏀�", - fot:[".jpg",".jif","png"], + // 鏁版嵁鑼冨洿閫夐」 + fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', + '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'], + fileList:[ ], - fileListOther:[ - - ], + fileList1:[], + uploadFileList:[], + uploadFileList1:[], + fileListOther:[], + fileListOther1:[], dsb:true, btn:false, isShow:true, @@ -198,19 +255,25 @@ formData: { id: undefined, - title: undefined, + happenDate:undefined, + entrance:undefined, + hotel: undefined, people: undefined, address: undefined, remark: undefined, - url: undefined, + travelMode:undefined, + stay:undefined, + flight:undefined, + document:undefined, + url: "", }, dialogImageUrl: '', dialogVisible: false, disabled: false, rules: { - title: [{ - required: true, - message: '璇疯緭鍏ュぇ浜嬫爣棰�', + flight: [{ + // required: true, + message: '璇疯緭鍏ヨ溅娆�/鑸彮', trigger: 'blur' }], familyId: [{ @@ -249,11 +312,11 @@ this.btn= jd this.dsb = !jd this.isShow=true - document.title = "淇敼鏃呮父缁忓巻璇︾粏淇℃伅"; + // document.title = "淇敼鏃呮父缁忓巻璇︾粏淇℃伅"; this.$route.meta.title = "淇敼鏃呮父缁忓巻璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉� } else{ - document.title = "鏃呮父缁忓巻璇︾粏淇℃伅"; + // document.title = "鏃呮父缁忓巻璇︾粏淇℃伅"; this.$route.meta.title = "鏃呮父缁忓巻璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉� this.isShow=true this.btn = false; @@ -267,19 +330,42 @@ let paths = response.data.url.split(","); for(let i = 0; i < paths.length; i++) { - if(paths[i]!="") { + if(paths[i]!="") { - let pth = paths[i].substr(paths[i].length - 4, paths[i].length) + let pth = paths[i].substr(paths[i].length - 4, paths[i].length) + // alert(pth) + if (_this.fot.includes(pth) === true) + { + if(paths[i].includes("https")) + _this.fileList.push({name:paths[i],url: paths[i],res:false}) + else + { + if(paths[i][0]=="/") + _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false}) + else + _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false}) + } + } + else { + // alert(paths[i]) + // alert() + if(paths[i].includes("https")) + _this.fileListOther.push({name:paths[i],url: paths[i],res:false}) + else{ + let nms = paths[i].split("\/") + let nm = nms[nms.length - 1] + if(paths[i][0]=="/") + _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false}) + else + _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false}) - 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; }); @@ -287,6 +373,53 @@ }, mounted() {}, methods: { + getData(){ + const id = this.$route.params && this.$route.params.id; + 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) + // alert(pth) + if (_this.fot.includes(pth) === true) + { + if(paths[i].includes("https")) + _this.fileList.push({name:paths[i],url: paths[i],res:false}) + else + { + console.log() + } + } + else { + // alert(paths[i]) + // alert() + if(paths[i].includes("https")) + _this.fileListOther.push({name:paths[i],url: paths[i],res:false}) + else{ + let nms = paths[i].split("\/") + let nm = nms[nms.length - 1] + if(paths[i][0]=="/") + _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false}) + else + _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false}) + + } + } + } + + } + _this.fileListOther = _this.fileListOther1 + this.loading = false; + }); + } + }, + submitForm() { let ul = this.fileList.map(function (elem){ @@ -295,8 +428,10 @@ let uls = this.fileListOther.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") + this.formData.id = this.$route.params && this.$route.params.id; this.formData.url = ul+","+uls + console.log(this.formData) this.$refs['elForm'].validate(valid => { @@ -331,25 +466,97 @@ 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); - } - }, + handleRemoveFile(file) { + //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖 + let res = false + for(let i = 0; i < this.fileListOther.length; i++) + { + if(this.fileListOther[i].url==file.url) + { + if(this.fileListOther[i].res==false) + res = true + else + { + this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1)) + } + this.$delete(this.fileListOther,i); + + } + } + + let ul = "" + this.fileList.map(function (elem){ + if(elem.res==false) + ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + }) + let uls = "" + this.fileListOther.map(function (elem){ + if(elem.res==false) + uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + }) + this.formData.url = ul+","+uls; + // alert(this.formData.url) + if(res==true){ + updateTravelBase(this.formData).then(response => { + this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); + // this.open = false; + + }); + } + }, + handleRemove(file) { + //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖 + let res = false + // alert(this.fileList.length) + for(let i = 0; i < this.fileList.length; i++) + { + if(this.fileList[i].url==file.url) + { + //鍘熸潵鍥惧儚鏍囪涓篺alse + //alert(this.fileList[i].res) + if(this.fileList[i].res==false) + res = true + else + { + // alert(this.uploadFileList.length) + // alert(87) + this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1)) + // alert(this.uploadFileList.length) + } + this.$delete(this.fileList,i); + + } + } + let ul = "" + this.fileList.map(function (elem){ + if(elem.res==false) + ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + }) + let uls = "" + this.fileListOther.map(function (elem){ + if(elem.res==false) + uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + }) + this.formData.url = ul+","+uls; + if(res==true){ + updateTravelBase(this.formData).then(response => { + this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); + }); + } + + }, handleFileCardPreview(file){ this.dialogFileUrl = file.url; + // alert(file.url) + // this.dialogFileUrl = 'https://www.bendudu.com:8080/profile/upload/2023/10/18/20231018214647A011.doc' + // this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg' + if(this.dialogFileUrl.includes("47.93.189.255")==true) + this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com") + //alert(this.dialogFileUrl) 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'); + + this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl)); + let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300'); }, handlePictureCardPreview(file) { this.dialogImageUrl = file.url; @@ -374,30 +581,128 @@ this.btn = true this.isShow=false }, - requestUpload(params) - { - var file = params.file; - var formData = new FormData(); - formData.append('uploadFile', file); - let _this = this - this.uploading = true; - uploadPic(formData).then(response => { - let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) - this.uploading = false; - this.$modal.msgSuccess("涓婁紶鎴愬姛"); - if(_this.fot.includes(pth) === true) + + //鑷畾涔変笂浼犳柟娉� + handleChange(file, fileList1) { + //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍 + + // this.uploadFileList.push(file.raw); + console.log("=========5555=========") + this.uploadFileList.push(file.raw); + this.fileList.push({name:file.name,url:file.url,res:true}) + }, + //鑷畾涔変笂浼犳柟娉� + handleChange1(file, fileListOther12) { + //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍 + + // this.uploadFileList.push(file.raw); + this.uploadFileList1.push(file.raw); + this.fileListOther.push({name:file.name,url:file.url,res:true}) + console.log("=========5555=========") + //console.log(file) + // console.log(this.uploadFileList) + // this.fileList = fileList + }, + fileUpload(){ + // var file = params.file; + + var formData = new FormData(); + //this.$refs.upload1.submit(); + // alert(this.uploadFileList1.length) + // formData.append('uploadFile', file); + if(this.uploadFileList1.length==0){ + this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�"); + return} + + this.uploadFileList1.forEach((elem)=>{ + formData.append("files", elem) + + }) + console.log(this.uploadFileList1) + let _this = this + + this.uploading = true; + uploadPic(formData).then(response => { + _this.uploadFileList1 = [] + _this.formData.url = _this.formData.url+","+response.fileNames + updateTravelBase(_this.formData).then(response => { + this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛"); + // this.open = false; + this.getData() + this.fileListOther1=[] + }); + }) + + }, + picUpload() + { + + var formData = new FormData(); + //this.$refs.upload.submit(); + //alert(this.uploadFileList.length) + if(this.uploadFileList.length==0){ + this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�"); + return} + + this.uploadFileList.forEach((elem)=>{ + formData.append("files", elem) + + }) + let _this = this + + + uploadPic(formData).then(response => { + // console.log(response.originalFilenames) + // console.log(response.urls) + // console.log(response.fileNames) + // console.log(response.newFileNames) + // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) + // _this.uploading1= false; + // console.log(_this.fot.includes(pth)) + // // debugger + // if(_this.fot.includes(pth) === true) + // { + // _this.fileList.push({name:response.data.fileName, "url":response.data.url}) + // 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(",") + //console.log(_this.fileList) + // alert(response.fileNames) + _this.formData.url = _this.formData.url+","+response.fileNames + _this.uploadFileList = [] + // alert(87) + updateTravelBase(_this.formData).then(response => { + _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛"); + // this.open = false; + + }); + // } + // else{ + // _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) + + // } + }); + }, + requestUpload(params) { - _this.fileList.push({name:response.data.fileName, "url":response.data.url}) + // alert(124) + // this.uploadFileList.push(params.file); - } + //alert(34) - else{ - _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) - } - }) + }, + requestUpload1(params) + { + // alert(123) + // this.uploadFileList1.push(params.file); + // console.log("-----------") + //console.log(this.uploadFileList1) + }, - }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -412,6 +717,14 @@ </script> <style scoped> + .el-table__row.statistics-warning-row { + background: #E0EEFE; + + } + .el-table__row.statistics-warning-row1 { + background: #FFEFF2; + + } .app-container{ background-color: #FEF7FC; } @@ -429,7 +742,7 @@ display: block; position: absolute; } -.hide .el-upload--picture-card { +.hide /deep/ .el-upload--picture-card { display: none; } .form{ -- Gitblit v1.9.1