From cf948b62048be5f217623cc31a0d6d2680c72476 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期日, 22 十月 2023 22:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 179 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 143 insertions(+), 36 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 1e3895b..cb007b3 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -1,8 +1,15 @@
<template>
- <div class="app-container">
+ <div class="app-container" id="printable-content">
<div class="form-header mt">
- <h4 class="dt h4">瀹跺ぇ浜嬭璇︾粏淇℃伅 </h4>
-
+ <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">
@@ -20,24 +27,32 @@
</el-input>
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ュ彂鐢熸椂闂�" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
+ <el-date-picker v-model="formData.happenTime" 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="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-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>
<el-upload
action="#"
list-type="picture-card"
multiple
+ accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
:http-request="requestUpload"
:file-list="fileList"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
- <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -84,8 +99,10 @@
list-type="picture-card"
:on-preview="handleFileCardPreview"
:on-remove="handleRemoveFile"
- :http-request="requestUpload"
+ :http-request="requestUpload1"
:show-file-list="true"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -152,18 +169,19 @@
return {
cdi:"瀹跺涵澶т簨璁颁俊鎭�",
udi:"瀹跺涵澶т簨璁颁慨鏀�",
- fot:[".jpg",".jif","png"],
+
fileList:[
],
fileListOther:[
],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
dsb:true,
btn:false,
isShow:true,
uploading: false,
- doctorList: [],
-
+ uploading1:false,
formData: {
id: undefined,
title: undefined,
@@ -173,6 +191,7 @@
url: undefined,
},
dialogImageUrl: '',
+ url1:undefined,
dialogVisible: false,
disabled: false,
rules: {
@@ -181,11 +200,7 @@
message: '璇疯緭鍏ュぇ浜嬫爣棰�',
trigger: 'blur'
}],
- familyId: [{
- required: true,
- message: '璇疯緭鍏ュ搴彿',
- trigger: 'blur'
- }],
+
people: [{
required: true,
message: '璇疯緭鍏ヤ汉鐗�',
@@ -223,6 +238,7 @@
else{
document.title = "瀹跺ぇ浜嬭璇︾粏淇℃伅";
this.$route.meta.title = "瀹跺ぇ浜嬭璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.btn = false;
this.isShow=false
}
@@ -230,28 +246,38 @@
if (id) {
this.loading = true;
getFamilyeventInfo(id).then((response) => {
+ console.log("涓婇潰");
+ console.log(this.btn);
this.formData = response.data;
- let paths = response.data.url.split(",");
- for(let i = 0; i < paths.length; i++)
- {
- if(paths[i]!="") {
+ const url = this.formData.url;
+ // const url1 = url.replace(/^http:/, 'https:');
+ const url1 = url.replace(/http:\/\/47\.93\.189\.255:8080\//g, '');
+ this.formData.url = url1; // 鏇存柊 formData 瀵硅薄涓殑 url 瀛楁
+ console.log(url);
+ console.log(url1); // 杈撳嚭淇敼鍚庣殑 https URL
+ let paths = this.formData.url.split(","); // 淇姝ゅ
+ for (let i = 0; i < paths.length; i++) {
+ if (paths[i] !== "") {
+ let pth = paths[i].substr(paths[i].length - 4);
- let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+ if (this.fot.includes(pth)) {
- 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]})
+ let nms = paths[i].split("/");
+ let nm = nms[nms.length - 1];
+
+ this.fileList.push({ name: nm, url: "http://www.bendudu.com/" + paths[i] });
+ console.log(this.fileList)
+ } 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()
-
+ this.loading = false;
}
},
mounted() {},
@@ -268,7 +294,7 @@
this.$refs['elForm'].validate(valid => {
-
+ console.log(this.formData)
if (valid) {
if (this.formData.id != undefined) {
updateFamilyevent(this.formData).then(response => {
@@ -304,6 +330,18 @@
{
if(this.fileListOther[i].url==file.url)
this.$delete(this.fileListOther,i);
+ 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;
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
}
},
handleRemove(file) {
@@ -311,6 +349,19 @@
{
if(this.fileList[i].url==file.url)
this.$delete(this.fileList,i);
+ 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;
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
+
}
},
handleFileCardPreview(file){
@@ -339,10 +390,48 @@
handleEdit()
{
this.dsb = false
- // this.btn = true
+ this.btn = true
this.isShow=false
},
+
requestUpload(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
+ this.uploading1 = true;
+
+ uploadPic(formData).then(response => {
+ 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(",")
+ this.formData.url = ul+","+uls
+ console.log(this.formData.url)
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
+ }
+ else{
+ _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ }
+ })
+
+ },
+ requestUpload1(params)
{
var file = params.file;
var formData = new FormData();
@@ -352,7 +441,7 @@
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("涓婁紶鎴愬姛");
+ // this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -361,7 +450,19 @@
else{
_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)
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
}
})
@@ -391,10 +492,16 @@
display: block;
}
+.hide .el-upload--picture-card {
+ display: none;
+}
.pt{
right: 10px;
top:-3px;
display: block;
position: absolute;
}
+.form{
+ background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
</style>
--
Gitblit v1.9.1