From 49bf04d7865d999463a024b82a6cd7608bb89507 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 08 八月 2023 19:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/api/collection/index.js | 9
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 10
ruoyi-ui/src/views/collection/collectionInfo.vue | 85 ++++--
ruoyi-ui/src/views/self/memoInfo.vue | 8
ruoyi-ui/src/views/doctor/doctorInfo.vue | 73 ++++-
ruoyi-ui/src/views/wish/index.vue | 9
ruoyi-ui/src/views/collection/index.vue | 120 +++++----
ruoyi-ui/src/views/wish/wishInfo.vue | 12
ruoyi-ui/src/views/doctor/index.vue | 81 +++---
ruoyi-ui/src/views/honor/index.vue | 111 +++++---
ruoyi-ui/src/api/doctor/index.js | 8
ruoyi-ui/src/api/honor/index.js | 8
ruoyi-ui/src/views/healthy/healthyInfo.vue | 8
ruoyi-ui/src/views/honor/honorInfo.vue | 145 +++++++----
14 files changed, 408 insertions(+), 279 deletions(-)
diff --git a/ruoyi-ui/src/api/collection/index.js b/ruoyi-ui/src/api/collection/index.js
index 5784693..609f1d7 100644
--- a/ruoyi-ui/src/api/collection/index.js
+++ b/ruoyi-ui/src/api/collection/index.js
@@ -9,6 +9,15 @@
})
}
+//绫诲埆鏁版嵁
+export function listType(query) {
+ return request({
+ url: '/zfCollection/type',
+ method: 'get',
+ params: query
+ })
+}
+
// 鏍规嵁id鏌ヨ鏀惰棌鍜岃崳瑾�
export function getCollection(id) {
return request({
diff --git a/ruoyi-ui/src/api/doctor/index.js b/ruoyi-ui/src/api/doctor/index.js
index 1e50dff..274d823 100644
--- a/ruoyi-ui/src/api/doctor/index.js
+++ b/ruoyi-ui/src/api/doctor/index.js
@@ -8,6 +8,14 @@
params: query
})
}
+//绫诲埆鏁版嵁
+export function listType(query) {
+ return request({
+ url: '/zfDoctor/type',
+ method: 'get',
+ params: query
+ })
+}
// 鏍规嵁id鏌ヨ璁板綍
export function getDoctor(id) {
diff --git a/ruoyi-ui/src/api/honor/index.js b/ruoyi-ui/src/api/honor/index.js
index d2567e5..51db79b 100644
--- a/ruoyi-ui/src/api/honor/index.js
+++ b/ruoyi-ui/src/api/honor/index.js
@@ -8,6 +8,14 @@
params: query
})
}
+//鍚嶇О鏁版嵁
+export function listType(query) {
+ return request({
+ url: '/zHonor/type',
+ method: 'get',
+ params: query
+ })
+}
// 鏍规嵁id鏌ヨ璁板綍
export function getHonor(query) {
return request({
diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 8756a7e..77800ff 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -21,16 +21,15 @@
</el-input>
</el-form-item>
-<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime" label-width="78px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">-->
-<!-- <el-date-picker v-model='formData.happenTime' type='date' placeholder='璇烽�夋嫨鏃ユ湡'></el-date-picker>-->
-<!-- </el-form-item>-->
+
</el-cow>
<el-cow >
<el-form-item label="绫诲埆" prop="type" label-width="40px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
+ <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" :disabled="dsb">
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
+ <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍒紝璇峰湪姝よ緭鍏ユ柊鐨勭被鍒�" @change="addNewOption"></el-input>
</el-form-item>
</el-cow>
<el-cow >
@@ -90,14 +89,14 @@
>
<span class="el-upload-list__item-actions" >
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -139,14 +138,14 @@
fit="cover"
>
<span class="el-upload-list__item-actions">
- <span v-if="isShow"
+ <span
class="el-upload-list__item-preview"
@click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -186,7 +185,8 @@
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
-import {getCollection, updateCollection,download,uploadPic} from "@/api/collection/index";
+import {getCollection, updateCollection,download,uploadPic,listType} from "@/api/collection/index";
+
export default {
components: {},
@@ -195,7 +195,8 @@
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:[
@@ -206,7 +207,7 @@
isShow:true,
// 鏀惰棌涓庤崳瑾夎〃鏍兼暟鎹�
collectionList: [],
-
+ typeList:[],
formData: {
//鏀惰棌涓庤崳瑾夎褰�
id:undefined,
@@ -267,30 +268,9 @@
}],
},
- typeOptions: [
- {
- value: '閭エ',
- label: '閭エ'
- }, {
- value: '鏃ユ湰鍐涘垁',
- label: '鏃ユ湰鍐涘垁'
- }, {
- value: '鑼呭彴閰�',
- label: '鑼呭彴閰�'
- }, {
- value: '绾㈡湪',
- label: '绾㈡湪'
- }, {
- value: '绾康鍝�',
- label: '绾康鍝�'
- }, {
- value: '鐡峰櫒',
- label: '鐡峰櫒'
- }, {
- value: '涔︾睄',
- label: '涔︾睄'
- }
- ],
+ typeOptions: [],
+ newOption: undefined,
+ showInput: false
}
},
computed: {},
@@ -303,6 +283,7 @@
jd = this.$route.query.detail
this.btn= jd
this.dsb = !jd
+ this.showInput=true
document.title = "淇敼鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";
this.$route.meta.title = "淇敼鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
}
@@ -336,6 +317,15 @@
}
this.loading = false;
});
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
// this.getCateInfor()
}
@@ -353,6 +343,31 @@
// })
// })
// },
+ //绫诲埆
+ addNewOption() {
+ const newOption = this.newOption.trim();
+ if (newOption && !this.typeOptions.includes(newOption)) {
+ this.typeOptions.push(newOption);
+ this.$set(this.formData, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+ }
+ },
+ getTypeOptions() {
+ const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
+ // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」
+ const uniqueOptions = {};
+ // 鏋勫缓涓嬫媺閫夐」鍒楄〃
+ this.typeOptions = filteredOptions.reduce((options, option) => {
+ if (!uniqueOptions[option]) {
+ uniqueOptions[option] = true;
+ options.push({
+ label: option,
+ value: option
+ });
+ }
+ return options;
+ }, []);
+
+ },
submitForm() {
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 4d1973b..ae204e5 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -69,22 +69,13 @@
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
- <el-select
- v-model="queryParams.type"
- placeholder="鎵�鏈夌被鍒�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- >
- <el-option
- v-for="item in typeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
-
- />
+ <el-select v-model="queryParams.type" placeholder="鎵�鏈夌被鍒�" clearable
+ style="width: 240px" @keyup.enter.native="handleQuery">
+ <el-option v-for="item in typeOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
+
<el-cntainer>
<el-col :span="9" >
<el-form-item>
@@ -195,8 +186,8 @@
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="绫诲埆" prop="type" sortable width="120" align="center">
- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>
-<!-- <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>-->
+<!-- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>-->
+ <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
@@ -297,6 +288,7 @@
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
+ <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍒紝璇峰湪姝よ緭鍏ユ柊鐨勭被鍒�" @change="addNewOption"></el-input>
</el-form-item>
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" >
@@ -403,7 +395,7 @@
//瀵煎叆鎺ュ彛鍑芥暟
-import {listCollection, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel} from "@/api/collection/index";
+import {listCollection,listType, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel} from "@/api/collection/index";
import {enload} from "@/api/doctor";
import {Message} from "element-ui";
@@ -430,6 +422,7 @@
total: 0,
// 鏀惰棌涓庤崳瑾夎〃鏍兼暟鎹�
collectionList: [],
+ typeList:[],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -443,12 +436,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
- 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'],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
@@ -533,35 +524,15 @@
trigger: 'blur'
}],
},
- typeOptions: [
- {
- value: '閭エ',
- label: '閭エ'
- }, {
- value: '鏃ユ湰鍐涘垁',
- label: '鏃ユ湰鍐涘垁'
- }, {
- value: '鑼呭彴閰�',
- label: '鑼呭彴閰�'
- }, {
- value: '绾㈡湪',
- label: '绾㈡湪'
- }, {
- value: '绾康鍝�',
- label: '绾康鍝�'
- }, {
- value: '鐡峰櫒',
- label: '鐡峰櫒'
- }, {
- value: '涔︾睄',
- label: '涔︾睄'
- }
- ],
+ typeOptions: [],
+ newOption: undefined,
+ showInput: true
};
},
created() {
this.getList();
- this.getCateInfor()
+ this.getTypeOptions();
+ // this.getCateInfor()
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
@@ -584,6 +555,14 @@
return "statistics-warning-row";
}
},
+ //绫诲埆
+ addNewOption() {
+ const newOption = this.newOption.trim();
+ if (newOption && !this.typeOptions.includes(newOption)) {
+ this.typeOptions.push(newOption);
+ this.$set(this.formDat, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+ }
+ },
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
@@ -596,23 +575,48 @@
// alert(123)
// console.log(response.data)
this.collectionList = response.data.data;
-
this.total = response.data.total;
this.loading = false;
}
);
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
},
- /** 鏌ヨ绫诲埆淇℃伅 */
- getCateInfor()
- {
- let _this = this
- getCategory().then(response=>{
+ getTypeOptions() {
+ const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
+ // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」
+ const uniqueOptions = {};
+ // 鏋勫缓涓嬫媺閫夐」鍒楄〃
+ this.typeOptions = filteredOptions.reduce((options, option) => {
+ if (!uniqueOptions[option]) {
+ uniqueOptions[option] = true;
+ options.push({
+ label: option,
+ value: option
+ });
+ }
+ return options;
+ }, []);
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- })
- })
},
+ // /** 鏌ヨ绫诲埆淇℃伅 */
+ // 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]})
+ // })
+ // })
+ // },
//绫诲埆閫夋嫨
getSrc(type) {
if (type === '閭エ') {
diff --git a/ruoyi-ui/src/views/doctor/doctorInfo.vue b/ruoyi-ui/src/views/doctor/doctorInfo.vue
index 04fa9f8..4b247f8 100644
--- a/ruoyi-ui/src/views/doctor/doctorInfo.vue
+++ b/ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -18,12 +18,13 @@
<el-container>
<el-row>
<el-cow :span="8">
- <el-form-item label="绫诲瀷" prop="type" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
+ <el-form-item label="绫诲埆" prop="type" label-width="55px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" :disabled="dsb">
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
- </el-form-item>
+ <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍒紝璇峰湪姝よ緭鍏ユ柊鐨勭被鍒�" @change="addNewOption"></el-input>
+ </el-form-item>
</el-cow>
<el-cow :span="8">
<el-form-item label="鐥囩姸" prop="symptom" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
@@ -190,7 +191,7 @@
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
-import { getDoctor, updateDoctor,download,uploadPic} from "@/api/doctor/index";
+import {getDoctor, updateDoctor, download, uploadPic, listType} from "@/api/doctor/index";
export default {
components: {},
@@ -199,18 +200,16 @@
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'],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
isShow:true,
// 灏卞尰璁板綍琛ㄦ牸鏁版嵁
doctorList: [],
-
+ typeList:[],
formData: {
//灏卞尰璁板綍
id:undefined,
@@ -230,7 +229,7 @@
rules: {
type: [{
required: true,
- message: '璇疯緭鍏ョ被鍨�',
+ message: '璇疯緭鍏ョ被鍒�',
trigger: 'blur'
}],
symptom: [{
@@ -271,16 +270,9 @@
}],
},
- typeOptions: [{
- value:'绁炵粡绉�',
- label:'绁炵粡绉�'
- },{
- value:'鐗欑',
- label:'鐗欑'
- },{
- value:'鍐呯',
- label:'鍐呯'
- }],
+ typeOptions: [],
+ newOption: undefined,
+ showInput: false
}
},
computed: {},
@@ -294,6 +286,7 @@
this.btn= jd
this.dsb = !jd
this.isShow=true
+ this.showInput=true
document.title = "淇敼灏卞尰璁板綍璇︾粏淇℃伅";
this.$route.meta.title = "淇敼灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
@@ -327,7 +320,16 @@
}
this.loading = false;
});
- this.getCateInfor()
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
+ // this.getCateInfor()
}
},
@@ -344,6 +346,31 @@
// })
// })
// },
+ //绫诲埆
+ addNewOption() {
+ const newOption = this.newOption.trim();
+ if (newOption && !this.typeOptions.includes(newOption)) {
+ this.typeOptions.push(newOption);
+ this.$set(this.formData, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+ }
+ },
+ getTypeOptions() {
+ const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
+ // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」
+ const uniqueOptions = {};
+ // 鏋勫缓涓嬫媺閫夐」鍒楄〃
+ this.typeOptions = filteredOptions.reduce((options, option) => {
+ if (!uniqueOptions[option]) {
+ uniqueOptions[option] = true;
+ options.push({
+ label: option,
+ value: option
+ });
+ }
+ return options;
+ }, []);
+
+ },
submitForm() {
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index f413210..7efd297 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -52,27 +52,10 @@
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
-<!-- <el-input-->
-<!-- v-model="queryParams.type"-->
-<!-- placeholder="璇疯緭鍏ョ棁鐘�"-->
-<!-- clearable-->
-<!-- style="width: 240px"-->
-<!-- @keyup.enter.native="handleQuery">-->
-<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
-<!-- </el-input>-->
- <el-select
- v-model="queryParams.type"
- placeholder="鎵�鏈夌被鍒�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- >
- <el-option
- v-for="item in typeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
+ <el-select v-model="queryParams.type" placeholder="鎵�鏈夌被鍒�" clearable
+ style="width: 240px" @keyup.enter.native="handleQuery">
+ <el-option v-for="item in typeOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
@@ -202,11 +185,11 @@
<el-table v-loading="loading" :data="doctorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="25" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
- <el-table-column label="绫诲瀷" prop="type" sortable width="80" align="center">
+ <el-table-column label="绫诲埆" prop="type" sortable width="80" align="center">
<!-- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>-->
<template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鐥囩姸" prop="symptom" sortable :show-overflow-tooltip="true" width="120" align="center" >
+ <el-table-column label="鐥囩姸" prop="symptom" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.symptom? scope.row.symptom: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鎸佺画鏃堕棿" prop="duration" sortable :show-overflow-tooltip="true" width="160" align="center" >
@@ -293,7 +276,7 @@
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
- <el-form-item label="绫诲瀷" prop="type">
+ <el-form-item label="绫诲埆" prop="type">
<el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
@@ -409,7 +392,7 @@
//瀵煎叆鎺ュ彛鍑芥暟
-import {listDoctor,enload,getDoctor, addDoctor,updateDoctor, delDoctor,uploadPic} from "@/api/doctor/index";
+import {listDoctor,enload,getDoctor, addDoctor,updateDoctor, delDoctor,uploadPic,listType} from "@/api/doctor/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
@@ -434,6 +417,7 @@
total: 0,
// 灏忓尰鐢熻〃鏍兼暟鎹�
doctorList: [],
+ typeList:[],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -447,7 +431,8 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- 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:[],
dsb:true,
@@ -496,7 +481,7 @@
type: [{
// required: true,
- message: '璇疯緭鍏ョ被鍨�',
+ message: '璇疯緭鍏ョ被鍒�',
trigger: 'blur'
}],
symptom: [{
@@ -536,23 +521,15 @@
trigger: 'blur'
}],
},
- typeOptions: [{
- value:'绁炵粡绉�',
- label:'绁炵粡绉�'
- },{
- value:'鐗欑',
- label:'鐗欑'
- },{
- value:'鍐呯',
- label:'鍐呯'
- }],
+ typeOptions: [],
newOption: undefined,
showInput: true
};
},
created() {
this.getList();
- this.getCateInfor()
+ // this.getCateInfor();
+ this.getTypeOptions();
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
@@ -580,6 +557,7 @@
this.$set(this.formDat, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
}
},
+
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
@@ -589,12 +567,37 @@
// alert(123)
// console.log(response.data)
this.doctorList = response.data.data;
-
this.total = response.data.total;
this.loading = false;
}
);
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
},
+ getTypeOptions() {
+ const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
+ // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」
+ const uniqueOptions = {};
+ // 鏋勫缓涓嬫媺閫夐」鍒楄〃
+ this.typeOptions = filteredOptions.reduce((options, option) => {
+ if (!uniqueOptions[option]) {
+ uniqueOptions[option] = true;
+ options.push({
+ label: option,
+ value: option
+ });
+ }
+ return options;
+ }, []);
+
+ },
/** 鏌ヨ绫诲埆淇℃伅 */
// getCateInfor()
// {
diff --git a/ruoyi-ui/src/views/healthy/healthyInfo.vue b/ruoyi-ui/src/views/healthy/healthyInfo.vue
index dcf5cf2..d2d4afd 100644
--- a/ruoyi-ui/src/views/healthy/healthyInfo.vue
+++ b/ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -51,14 +51,14 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -101,14 +101,14 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
diff --git a/ruoyi-ui/src/views/honor/honorInfo.vue b/ruoyi-ui/src/views/honor/honorInfo.vue
index 63737c6..9ba7329 100644
--- a/ruoyi-ui/src/views/honor/honorInfo.vue
+++ b/ruoyi-ui/src/views/honor/honorInfo.vue
@@ -24,30 +24,29 @@
<!-- </el-form-item>-->
<!-- </el-cow>-->
<el-cow :span="8">
- <el-form-item label="绫诲埆" prop="type" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable style="width: 300px">
- <el-option v-for="dict in typeOption" :key="dict.value"
- :label="dict.label" :value="dict.value"/>
+ <el-form-item label="绫诲埆" prop="type" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;" :disabled="dsb">
+ <template v-if="!isEditing" >
+ <el-input v-if="formData.type===0" placeholder="璇佷欢"></el-input>
+ <el-input v-if="formData.type===1" placeholder="鑽ｈ獕"></el-input>
+ <el-input v-if="formData.type===2" placeholder="璧勮川"></el-input>
+ </template>
+ <template v-else>
+ <el-select v-model="types" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
+ <el-option label="璇佷欢" value='0'></el-option>
+ <el-option label="鑽ｈ獕" value='1'></el-option>
+ <el-option label="璧勮川" value='2'></el-option>
</el-select>
+ </template>
</el-form-item>
</el-cow>
<el-cow :span="8">
<el-form-item label="鍚嶇О" prop="name" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-select v-model="formData.name" placeholder="璇烽�夋嫨绫诲埆" clearable style="width: 300px">
- <el-option v-for="dict in typeOptions" :key="dict.value"
- :label="dict.label" :value="dict.value"/>
+ <el-select v-model="formData.name" placeholder="璇烽�夋嫨鍚嶇О" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
</el-select>
-<!-- <template v-if="dsb" >-->
-<!-- <el-input v-if="formData.name==0" placeholder="鏈"></el-input>-->
-<!-- <el-input v-if="formData.name==1" placeholder="宸插"></el-input>-->
-<!-- <el-input v-if="formData.name==2" placeholder="瀛︾敓璇�"></el-input>-->
-<!-- </template>-->
-<!-- <template v-else>-->
-<!-- <el-select v-model="formData.name" placeholder="璇烽�夋嫨绫诲埆" clearable style="width: 300px" :disabled="dsb">-->
-<!-- <el-option v-for="dict in typeOptions" :key="dict.value"-->
-<!-- :label="dict.label" :value="dict.value"/>-->
-<!-- </el-select>-->
-<!-- </template>-->
+ <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴斿悕绉帮紝璇峰湪姝よ緭鍏ユ柊鐨勫悕绉�" @change="addNewOption"></el-input>
+
</el-form-item>
</el-cow>
<el-cow :span="8">
@@ -115,14 +114,14 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -165,14 +164,14 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -210,7 +209,7 @@
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
import { download,uploadPic} from "@/api/doctor/index";
-import {updateHonor,getHonor,getCategory} from "@/api/honor/index";
+import {updateHonor,getHonor,getCategory, listType} from "@/api/honor/index";
export default {
components: {},
@@ -219,18 +218,17 @@
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'],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
isShow:true,
+ isEditing: false,
// 鑽ｈ獕琛ㄦ牸鏁版嵁
honorList: [],
-
+ typeList:[],
formData: {
//鑽ｈ獕璇佷功璁板綍
id:undefined,
@@ -296,10 +294,13 @@
}],
},
typeOptions: [],
+ newOption: undefined,
+ showInput: false,
typeOption:[
- {value:'1',label:'鑽ｈ獕'},
{value:'0',label:'璇佷欢'},
- {value:'2',label:'璧勮川'},]
+ {value:'1',label:'鑽ｈ獕'},
+ {value:'2',label:'璧勮川'},],
+ types:undefined
}
},
computed: {},
@@ -307,12 +308,20 @@
created() {
const id = this.$route.params && this.$route.params.id;
let jd;
+ if(this.formData.type == 0)
+ this.types = '璇佷欢'
+ else if(this.formData.type== 1)
+ this.types = '鑽ｈ獕'
+ else
+ this.types = '璧勮川'
if(this.$route.query.detail!=undefined)
{
jd = this.$route.query.detail
this.btn= jd
this.dsb = !jd
this.isShow=true
+ this.showInput=true
+ this.isEditing=true
document.title = "淇敼鑽ｈ獕璇佷功璇︾粏淇℃伅";
this.$route.meta.title = "淇敼鑽ｈ獕璇佷功璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
@@ -346,9 +355,17 @@
}
this.loading = false;
});
-
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
this.fetchData()
- this.getCateInfor()
+ // this.getCateInfor()
}
@@ -367,28 +384,39 @@
console.error('Error:', error); // 澶勭悊閿欒
});
},
+ //绫诲埆
+ addNewOption() {
+ const newOption = this.newOption.trim();
+ if (newOption && !this.typeOptions.includes(newOption)) {
+ this.typeOptions.push(newOption);
+ this.$set(this.formData, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+ }
+ },
+ getTypeOptions() {
+ const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
+ // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」
+ const uniqueOptions = {};
+ // 鏋勫缓涓嬫媺閫夐」鍒楄〃
+ this.typeOptions = filteredOptions.reduce((options, option) => {
+ if (!uniqueOptions[option]) {
+ uniqueOptions[option] = true;
+ options.push({
+ label: option,
+ value: option
+ });
+ }
+ return options;
+ }, []);
+
+ },
//绫诲埆閫夋嫨
- getSrc(type) {
- if (type === 1){
- return '鍑虹敓璇�'
- }else if(type === 2){
- return '瀛︾敓璇�'
- }else if(type === 3){
- return '姣曚笟璇�'
- }else if(type === 4){
- return '缁撳璇�'
- }else if(type === 5){
- return '鎴峰彛绨�'
- }else if(type === 6){
- return '鐙敓瀛愬コ璇�'
- }else if(type === 7){
- return '楂樼骇鑱岀О'
- }else if(type === 8){
- return '鎶ょ収'
- }else if(type === 9){
- return '閫氳璇�'
- }else {
- return '鍏跺畠'
+ getSrc1(type){
+ if(type===0){
+ return '璇佷欢'
+ }else if(type===1){
+ return '鑽ｈ獕'
+ }else if(type===2){
+ return '璧勮川'
}
},
/** 鏌ヨ绫诲埆淇℃伅 */
@@ -408,6 +436,13 @@
})
},
submitForm() {
+ if(this.types=='0')
+ this.formData.type = 0
+ else if(this.types == '1')
+ this.formData.type = 1
+ else if(this.types == '2')
+ this.formData.type = 2
+
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index b1d5240..94df49c 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -50,27 +50,11 @@
-->
</el-form-item>
<el-form-item label="鍚嶇О" prop="name">
-<!-- <el-input-->
-<!-- v-model="queryParams.name"-->
-<!-- placeholder="璇疯緭鍏ュ悕绉�"-->
-<!-- clearable-->
-<!-- style="width: 240px"-->
-<!-- @keyup.enter.native="handleQuery">-->
-<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
-<!-- </el-input>-->
- <el-select
- v-model="queryParams.name"
- placeholder="鎵�鏈夌被鍒�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- >
- <el-option
- v-for="dic in typeOptions"
- :key="dic.value"
- :label="dic.label"
- :value="dic.value"
- />
+
+ <el-select v-model="queryParams.name" placeholder="鎵�鏈夊悕绉�" clearable
+ style="width: 240px" @keyup.enter.native="handleQuery">
+ <el-option v-for="item in typeOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="绫诲埆" prop="type" >
@@ -203,19 +187,20 @@
</el-table-column>
<el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
<!-- <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>-->
- <template slot-scope="scope">
+<!-- <template slot-scope="scope">-->
<!-- <template v-if="formDat.name===1">{{ getSrc(scope.row.name) }}</template>-->
- <template v-if="scope.row.name == 1">鍑虹敓璇�</template>
- <template v-else-if="scope.row.name == 2">瀛︾敓璇�</template>
- <template v-else-if="scope.row.name == 3">姣曚笟璇�</template>
- <template v-else-if="scope.row.name == 4">缁撳璇�</template>
- <template v-else-if="scope.row.name == 5">鎴峰彛绨�</template>
- <template v-else-if="scope.row.name == 6">鐙敓瀛愬コ璇�</template>
- <template v-else-if="scope.row.name == 7">楂樼骇鑱岀О</template>
- <template v-else-if="scope.row.name == 8">鎶ょ収</template>
- <template v-else-if="scope.row.name == 9">閫氳璇�</template>
- <template v-else>{{ scope.row.name }}</template>
- </template>
+<!-- <template v-if="scope.row.name == 1">鍑虹敓璇�</template>-->
+<!-- <template v-else-if="scope.row.name == 2">瀛︾敓璇�</template>-->
+<!-- <template v-else-if="scope.row.name == 3">姣曚笟璇�</template>-->
+<!-- <template v-else-if="scope.row.name == 4">缁撳璇�</template>-->
+<!-- <template v-else-if="scope.row.name == 5">鎴峰彛绨�</template>-->
+<!-- <template v-else-if="scope.row.name == 6">鐙敓瀛愬コ璇�</template>-->
+<!-- <template v-else-if="scope.row.name == 7">楂樼骇鑱岀О</template>-->
+<!-- <template v-else-if="scope.row.name == 8">鎶ょ収</template>-->
+<!-- <template v-else-if="scope.row.name == 9">閫氳璇�</template>-->
+<!-- <template v-else>{{ scope.row.name }}</template>-->
+<!-- </template>-->
+ <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="璇佸彿/涓撲笟" prop="idNo" sortable width="170" align="center" >
<template slot-scope="scope">{{scope.row.idNo? scope.row.idNo: '鈥斺�斺�斺��'}}</template>
@@ -306,7 +291,7 @@
<!-- <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="绫诲埆" prop="type">
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨鍚嶇О" clearable :style="{width: '100%'}" >
+ <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -316,6 +301,8 @@
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
+ <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴斿悕绉帮紝璇峰湪姝よ緭鍏ユ柊鐨勫悕绉�" @change="addNewOption"></el-input>
+
</el-form-item>
<el-form-item label="璇佷欢鍙�/涓撲笟" prop="idNo">
<el-input v-model="formDat.idNo" placeholder="璇疯緭鍏ヨ瘉浠跺彿/涓撲笟" clearable :style="{width: '100%'}" >
@@ -423,7 +410,7 @@
//瀵煎叆鎺ュ彛鍑芥暟
-import {listHonor,enload, addHonor,updateHonor, delHonor,uploadPic,getCategory} from "@/api/honor/index";
+import {listHonor,listType,enload, addHonor,updateHonor, delHonor,uploadPic,getCategory} from "@/api/honor/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
@@ -448,6 +435,7 @@
total: 0,
// 鑽ｈ獕琛ㄦ牸鏁版嵁
honorList: [],
+ typeList:[],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -461,12 +449,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
- 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'],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
@@ -519,7 +505,7 @@
trigger: 'blur'
}],
name: [{
- required: true,
+ // required: true,
message: '璇疯緭鍏ュ悕绉�',
trigger: 'blur'
}],
@@ -556,16 +542,18 @@
},
selected:'',
typeOptions: [],
+ newOption: undefined,
+ showInput: true,
typeOption:[
- {value:'1',label:'鑽ｈ獕'},
{value:'0',label:'璇佷欢'},
+ {value:'1',label:'鑽ｈ獕'},
{value:'2',label:'璧勮川'},]
};
},
created() {
this.getList();
- this.getCateInfor()
+ this.getTypeOptions();
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
@@ -585,6 +573,14 @@
return "statistics-warning-row";
}
},
+ //鍚嶇О
+ addNewOption() {
+ const newOption = this.newOption.trim();
+ if (newOption && !this.typeOptions.includes(newOption)) {
+ this.typeOptions.push(newOption);
+ this.$set(this.formDat, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+ }
+ },
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
@@ -601,6 +597,32 @@
this.loading = false;
}
);
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
+ },
+ getTypeOptions() {
+ const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
+
+ const uniqueOptions = {};
+
+ this.typeOptions = filteredOptions.reduce((options, option) => {
+ if (!uniqueOptions[option]) {
+ uniqueOptions[option] = true;
+ options.push({
+ label: option,
+ value: option
+ });
+ }
+ return options;
+ }, []);
+
},
/** 鏌ヨ绫诲埆淇℃伅 */
getCateInfor()
@@ -763,6 +785,7 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
+
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
index 85d6e21..f11e5e8 100644
--- a/ruoyi-ui/src/views/self/memoInfo.vue
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -65,14 +65,14 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -115,14 +115,14 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index f9f874c..cef1b24 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -101,14 +101,14 @@
>
<span class="el-upload-list__item-actions" >
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -170,14 +170,14 @@
fit="cover"
>
<span class="el-upload-list__item-actions">
- <span v-if="isShow"
+ <span
class="el-upload-list__item-preview"
@click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -334,7 +334,7 @@
else{
document.title = "涓汉璐骇璇︾粏淇℃伅";
this.$route.meta.title = "涓汉璐骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
- this.isShow=true
+ this.isShow=false
}
let _this = this
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 5ab5bfc..603e8e9 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -437,13 +437,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:['.bmp','.jpg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ 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:[
-
- ],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
diff --git a/ruoyi-ui/src/views/wish/wishInfo.vue b/ruoyi-ui/src/views/wish/wishInfo.vue
index db76db6..5845e05 100644
--- a/ruoyi-ui/src/views/wish/wishInfo.vue
+++ b/ruoyi-ui/src/views/wish/wishInfo.vue
@@ -58,7 +58,7 @@
</el-cow>
<el-cow >
<el-form-item label="鏄惁渚濇棫鏈夋晥" prop="isEffective" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-select v-model="formData.isEffective" placeholder="璇烽�夋嫨鏄惁渚濇棫鏈夋晥" clearable :style="{width: '100%'}" >
+ <el-select v-model="formData.isEffective" placeholder="璇烽�夋嫨鏄惁渚濇棫鏈夋晥" clearable :style="{width: '100%'}" :disabled="dsb">
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -91,14 +91,14 @@
>
<span class="el-upload-list__item-actions" >
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -140,14 +140,14 @@
fit="cover"
>
<span class="el-upload-list__item-actions">
- <span v-if="isShow"
+ <span
class="el-upload-list__item-preview"
@click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -288,7 +288,7 @@
else{
document.title = "鐧惧勾蹇冩効璇︾粏淇℃伅";
this.$route.meta.title = "鐧惧勾蹇冩効璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
- this.isShow=true
+ this.isShow=false
}
let _this = this
--
Gitblit v1.9.1