From b9f97457e9d8e8a0f784c25b103697fca8fea2e4 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期二, 20 二月 2024 18:00:20 +0800 Subject: [PATCH] 再次修改 --- ruoyi-ui/src/views/economy/economyInfo.vue | 371 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 224 insertions(+), 147 deletions(-) diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue index d91e05f..0026e3d 100644 --- a/ruoyi-ui/src/views/economy/economyInfo.vue +++ b/ruoyi-ui/src/views/economy/economyInfo.vue @@ -1,81 +1,91 @@ <template> - <div class="app-container"> + <div class="app-container" id="printable-content"> <div class="form-header mt"> - <h4 class="dt h4">瀹跺涵鏀舵敮鍙拌处淇℃伅 </h4> - <el-button type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" :disabled="btn">缂栬緫</el-button> + <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;" > + <span>瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅</span> + <div style="display: flex; align-items: center;"> + <el-button size="mini" type="text" v-print="'#printable-content'" v-hasPermi="['person:information:memo']"> + <div class="form" ><el-icon style="padding-right:100px;"></el-icon> + <span class="text" style="width: 69px;height: 26px;font-size: 16px; + font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鎵撳嵃</span></div> + </el-button></div> + </h1> </div> - <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px"> - <!-- <el-form-item label="搴忓彿" prop="id"> - <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true" - clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input> - </el-form-item> --> - <el-form-item label="鍩洪噾/鍙拌处" prop="type"> - <el-select v-model="formData.type" placeholder="璇烽�夋嫨鍩洪噾/鍙拌处" clearable :style="{width: '100%'}" :disabled="dsb" > + <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px"> + + <el-form-item label="鍙拌处" prop="type"> + <el-select v-model="formData.type" placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" > </el-select> </el-form-item> - <el-form-item label="鏃堕棿" prop="createTime"> - <el-input v-model="formData.createTime" placeholder="璇烽�夋嫨鏃堕棿" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> + <el-input v-model="formData.createTime" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> </el-form-item> <el-form-item label="鏀跺叆/鏀嚭" prop="price"> - <el-input v-model="formData.price" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-model="formData.price" placeholder="璇疯緭鍏ラ�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> <el-form-item label="鐢ㄩ��" prop="useFor"> - <el-input v-model="formData.useFor" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-model="formData.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> <el-form-item label="浣跨敤浜�" prop="usePeople"> - <el-input v-model="formData.usePeople" placeholder="璇疯緭鍏ユ寔鏈変汉" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-model="formData.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> - <el-form-item label="鐜伴噾/鑷姩鍒掓墸" prop="kind"> - <el-input v-model="formData.kind" placeholder="璇烽�夋嫨鐜伴噾/鑷姩鍒掓墸" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> + <el-form-item label="浠樻鏂瑰紡" prop="kind"> + <el-input v-model="formData.kind" placeholder="璇疯緭鍏ヤ粯娆炬柟寮�" clearable :style="{width: '100%'}" :disabled="dsb"> + </el-input> </el-form-item> - <el-form-item label="浣欓" prop="balance"> + <el-form-item label="閲戦" prop="balance"> <el-input v-model="formData.balance" 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> + <!-- <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData"> + <el-input v-model="formData.ownData === 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled="true"></el-input> + </el-form-item> --> - <h4 class="form-header">鐩稿叧鍥剧墖 </h4> + <h4 class="form-header">鐩稿叧鍥剧墖</h4> <el-upload - action="#" - list-type="picture-card" - multiple - :http-request="requestUpload" - :file-list="fileList" + action="#" + list-type="picture-card" + multiple + :http-request="requestUpload" + :file-list="fileList" + :disabled="!btn" + :class="{ hide: !btn }" > - <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"> + <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" @click="handlePictureCardPreview(file)" > <i class="el-icon-zoom-in"></i> </span> <span - v-if="!disabled" + class="el-upload-list__item-delete" @click="handleDownload(file.url)" > <i class="el-icon-download"></i> </span> <span - v-if="!disabled" + v-if="isShow" class="el-upload-list__item-delete" @click="handleRemove(file)" > @@ -84,8 +94,8 @@ </span> - </div> - </el-upload> + </div> + </el-upload> <h4 class="form-header">鍏朵粬闄勪欢 </h4> <el-upload @@ -93,33 +103,74 @@ :file-list="fileListOther" class="upload-demo" multiple - :on-preview="handlePreview" - - :on-remove="handleRemove" + list-type="picture-card" + :on-preview="handleFileCardPreview" + :on-remove="handleRemoveFile" :http-request="requestUpload" :show-file-list="true" + :disabled="!btn" + :class="{ hide: !btn }" > - <el-button type="primary">Click to upload</el-button> - <template #tip> - <div class="el-upload__tip"> - </div> - </template> + <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}"> + <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 --> + <video + v-if="file.url.includes('.mp4')" + class="el-upload-list__item-thumbnail" + :src="file.url" + style="width: 147px; height: 147px" + fit="cover" + ></video> + <img v-else + 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-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-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> + + </div> </el-upload> <el-form-item size="large"> - <el-button type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button> + <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" alt="Preview Image" /> + <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" /> </el-dialog> </div> </template> <script> -import {getEconomyInfo, uploadPic, download, getCategory} from "@/api/economy/index"; +import {getEconomyInfo, uploadPic, download, updateEconomy} from "@/api/economy/index"; import {addRole, updateRole} from "@/api/system/role"; import {blobValidate} from "@/utils/ruoyi"; import errorCode from "@/utils/errorCode"; @@ -132,7 +183,10 @@ return { cdi:"璧勪骇璇︾粏淇℃伅", udi:"璧勪骇淇℃伅淇敼", - fot:[".jpg",".jif"], + // 鏁版嵁鑼冨洿閫夐」 + 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:[ @@ -140,6 +194,8 @@ ], dsb:true, btn:false, + isShow:true, + uploading: false, formData: { type: undefined, createTime: undefined, @@ -149,60 +205,55 @@ remark: undefined, url: undefined, }, - dialogImageUrl: '', - dialogVisible: false, - disabled: false, + dialogImageUrl: '', + dialogVisible: false, + disabled: false, rules: { - // id: [{ - // required: true, - // message: '璇疯緭鍏d', - // trigger: 'blur' - // }], - type: [{ - required: true, - message: '璇烽�夋嫨鍩洪噾/鍙拌处', - trigger: 'change' - }], - title: [{ - required: true, - message: '璇疯緭鍏ユ爣棰�', - trigger: 'blur' - }], usePeople: [{ required: true, message: '璇疯緭鍏ヤ娇鐢ㄤ汉', trigger: 'blur' }], + useFor: [{ required: true, message: '璇疯緭鍏ョ敤閫�', trigger: 'blur' }], - price: [{ + type: [{ required: true, - message: '璇疯緭鍏ユ敹鍏�/鏀嚭', + message: '璇疯緭鍏ュ彴璐﹀唴瀹�', + trigger: 'blur' + }], + balance: [{ + required: true, + message: '璇疯緭鍏ラ噾棰�', trigger: 'blur' }], kind: [{ - required: true, - message: '璇烽�夋嫨鐜伴噾/鍒掓墸', + // required: true, + message: '璇疯緭鍏ユ敮浠樻柟寮�', trigger: 'blur' }], createTime: [{ required: true, - message: '璇疯緭鍏ュ娉�', - trigger: 'blur' + message: '璇烽�夋嫨鏃ユ湡閫夋嫨', + trigger: 'change' }], - + price: [{ + required: true, + message: '璇烽�夋嫨鏀跺叆/鏀嚭', + trigger: 'change' + }], }, typeOptions: [{ - value: '0', - label: '鍩洪噾', -}, -{ - value: '1', - label: '鍙拌处', -}], + value: '0', + label: '鍩洪噾', + }, + { + value: '1', + label: '鍙拌处', + }], } }, computed: {}, @@ -212,15 +263,16 @@ let jd; if(this.$route.query.detail!=undefined) { - jd = this.$route.query.detail - this.btn= jd - this.dsb = !jd - document.title = "淇敼璧勪骇璇︾粏淇℃伅"; - this.$route.meta.title = "淇敼璧勪骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉� + jd = this.$route.query.detail; + this.btn= jd; + this.dsb = !jd; + this.isShow=true; + this.$route.meta.title = "淇敼瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉� } else{ - document.title = "鏌ョ湅璧勪骇璇︾粏淇℃伅"; - this.$route.meta.title = "鏌ョ湅璧勪骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉� + this.$route.meta.title = "瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉� + this.isShow=false; + this.btn = false; } let _this = this @@ -228,6 +280,8 @@ this.loading = true; getEconomyInfo(id).then((response) => { this.formData = response.data; + // console.log(this.formData) + //alert(this.formData.ownData) let paths = response.data.url.split(","); for(let i = 0; i < paths.length; i++) { @@ -253,40 +307,22 @@ }, mounted() {}, methods: { - getSrc1(type) { - if (type === 0) { - return '鍩洪噾' - }else { - return '鍙拌处' - } - }, - - getSrc2(kind) { - if (kind == 0) { - return '鐜伴噾' - }else { - return '鑷姩鎵e垝' - } - }, - /** 鏌ヨ绫诲埆淇℃伅 */ - getCateInfor() - { - let _this = this - getCategory().then(response=>{ - - response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ - _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) - }) - }) + getSrc1(price) { + if (price === 鏀跺叆) { + return '鏀跺叆' + }else { + return '鏀嚭' + } }, + 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 + }).join(",") + this.formData.url = ul+","+uls this.$refs['elForm'].validate(valid => { @@ -316,47 +352,60 @@ download(formData).then(async (response) => { const isLogin = await blobValidate(response); let nt = new Date().getTime() - let filename = 'economy_'+nt+'.'+suffix + let filename = 'familyevent_'+nt+'.'+suffix const blob = new Blob([response]) saveAs(blob, filename) }) }, - - - - handlePictureCardPreview(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'); - - }, -//鍒犻櫎鍥剧墖 - handleRemoveFile(file,) { - + handleRemoveFile(file) { for(let i = 0; i < this.fileListOther.length; i++) { if(this.fileListOther[i].url==file.url) this.$delete(this.fileListOther,i); } }, - handleDownload(url) { - var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")}; + 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; + // 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 - 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 = 'property_'+nt+'.'+suffix - const blob = new Blob([response]) - saveAs(blob, filename) - }) - }, + 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; + 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) { @@ -364,10 +413,11 @@ 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) { _this.fileList.push({name:response.data.fileName, "url":response.data.url}) @@ -378,15 +428,36 @@ _this.fileListOther.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(",") + _this.formData.url = ul+","+uls + console.log(_this.formData.url) + // alert(87) + updateEconomy(_this.formData).then(response => { + this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛"); + // this.open = false; + + }); }) + }, + + /** 瀵煎嚭鎸夐挳鎿嶄綔 */ + handleExport() { + this.download('/zfEconomy/export', { + ...this.queryParams + }, `zfEconomy_${new Date().getTime()}.xlsx`) } } } </script> -<style scoped lang="scss"> +<style scoped> .mt { position: relative; @@ -401,4 +472,10 @@ display: block; position: absolute; } +.hide /deep/ .el-upload--picture-card { + display: none; +} +.form{ + background:center/11% no-repeat url('../../assets/icons/form.png') ; +} </style> -- Gitblit v1.9.1