From ba911169712067ed25e6c757cc5a2b5b4e0ea670 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期四, 24 八月 2023 22:37:48 +0800
Subject: [PATCH] 魅宠
---
ruoyi-ui/src/views/pet/index.vue | 145 ++++++++++++++++++++++++++++--------------------
1 files changed, 85 insertions(+), 60 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 9b5ea7e..d374cd3 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -223,11 +223,10 @@
<el-upload
action="#"
list-type="picture-card"
- multiple
+ :limit="1"
:http-request="requestUpload"
- :file-list="fileList"
+ :file-list="fileList1"
>
-<!-- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>-->
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
@@ -262,11 +261,10 @@
<el-upload
action="#"
list-type="picture-card"
- multiple
- :http-request="requestUpload"
- :file-list="fileListOther"
+ :limit="1"
+ :http-request="requestUpload2"
+ :file-list="fileList2"
>
-<!-- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>-->
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
@@ -293,8 +291,6 @@
<i class="el-icon-delete"></i>
</span>
</span>
-
-
</div>
</el-upload>
</el-form>
@@ -343,7 +339,7 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- // 璧勪骇琛ㄦ牸鏁版嵁
+
petList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
@@ -359,14 +355,11 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fileList1:[ ],
+ fileList2:[ ],
+ fileListOther:[ ],
dsb:true,
btn:false,
- uploading: false,
formDat: {
type: undefined,
name: undefined,
@@ -389,7 +382,8 @@
diseatHabit: undefined,
LifeHabit: undefined,
disLifeHabit: undefined,
- url: undefined,
+ headPicture:undefined,
+ fullPicture:undefined,
},
petList: {
@@ -408,6 +402,8 @@
LifeHabit: undefined,
disLifeHabit: undefined,
url: undefined,
+ headPicture:undefined,
+ fullPicture:undefined,
},
// 鑿滃崟鍒楄〃
@@ -445,7 +441,7 @@
trigger: 'blue'
}],
securityCode: [{
- required: true,
+ // required: true,
message: '璇疯緭鍏ラ槻浼爜',
trigger: 'blue'
}],
@@ -465,7 +461,7 @@
trigger: 'blue'
}],
properties: [{
- required: true,
+ // required: true,
message: '璇疯緭鍏ユ�ц川',
trigger: 'blue'
}],
@@ -476,13 +472,13 @@
}],
LifeHabit: [{
- required: true,
+ // required: true,
message: '璇疯緭鍏ョ敓娲讳範鎯�(鍠�)',
trigger: 'blur'
}],
disLifeHabit: [{
- required: true,
+ // required: true,
message: '璇疯緭鍏ョ敓娲讳範鎯�(鎭�)',
trigger: 'blur'
}],
@@ -498,6 +494,27 @@
message: '璇疯緭鍏ラギ椋熶範鎯�(鍠�)',
trigger: 'blur'
}],
+ masterName: [{
+ required: true,
+ message: '璇疯緭鍏ヤ富浜哄鍚�',
+ trigger: 'blur'
+ }],
+ masterIdNum: [{
+ required: true,
+ message: '璇疯緭鍏ヤ富浜鸿韩浠借瘉鍙风爜',
+ trigger: 'blur'
+ }],
+ phone: [{
+ required: true,
+ message: '璇疯緭鍏ユ墜鏈哄彿',
+ trigger: 'blur'
+ }],
+ masterAddress: [{
+ required: true,
+ message: '璇疯緭鍏ヤ富浜哄湴鍧�',
+ trigger: 'blur'
+ }],
+
},
@@ -516,6 +533,8 @@
},
methods: {
+
+
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
@@ -660,31 +679,33 @@
});
},
-
+ //鏀惧ぇ
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
+
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
- let ul = this.fileList.map(function (elem){
+ let ul = this.fileList1.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
- let uls = this.fileListOther.map(function (elem){
+ let uls = this.fileList2.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) {
+ this.formDat.headPicture = ul,
+ this.formDat.fullPicture = uls,
+ this.$refs["elForm"].validate(valid => {
+ if (valid) {
- addPet(this.formDat).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- });
+ addPet(this.formDat).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ });
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
@@ -696,23 +717,31 @@
{
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)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ _this.fileList1.push({name:response.data.fileName, url:response.data.url})
+ // _this.fileList2.push({name:response.data.fileName, url:response.data.url})
+ console("ok")
+ })
- }
+ },
+ requestUpload2(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ 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)
+ // _this.fileList1.push({name:response.data.fileName, url:response.data.url})
+ _this.fileList2.push({name:response.data.fileName, url:response.data.url})
+ console("ok")
})
},
@@ -726,29 +755,15 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
+
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
this.download('family/pet/export', {
...this.queryParams
}, `pet_${new Date().getTime()}.xlsx`)
},
- /** 瀵煎叆鎿嶄綔*/
- handleEnport(params){
- var file = params.file;
- var formData = new FormData();
- formData.append('excelImport', file);
- let _this = this
- alert(file)
- enload(formData).then(response => {
- _this.getList();
- Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- }).catch(err)
- {
- Message({ message: "瀵煎叆澶辫触", type: 'error' })
- }
-
- }
}
};
</script>
@@ -761,4 +776,14 @@
background: #FFEFF2;
}
+.upload-demo .el-upload-list__item-thumbnail img {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+}
+.upload-demo .el-icon-plus {
+ font-size: 28px;
+ color: #999;
+ border: 1px dashed #999;
+}
</style>
--
Gitblit v1.9.1