From 1aa5be564d5df56297355a2e71ae4ff6c7df0042 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 09 十月 2023 10:03:23 +0800
Subject: [PATCH] ss
---
ruoyi-ui/src/views/honor/index.vue | 240 ++++++++++++++++++++---------------------------------------
1 files changed, 83 insertions(+), 157 deletions(-)
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 7dfa5f6..7ff7ffc 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -1,76 +1,25 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
- <el-input
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- placeholder="鍦ㄢ�滆瘉浠躲�佽崳瑾夈�佽祫璐ㄢ�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <!-- <el-input
- v-model="searchVal"
- placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @input="inputChange">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <div class="outer-table">
- 姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax
- <tablemax label="myLabel" :tableData="contactList">
- <template v-slot:table>
- <el-table-column label="鎿嶄綔" width="180">
- <template slot-scope="scope">
- <el-button @click="handleCheck(scope.row)" type="text" size="small"
- >璋冪敤</el-button
- >
- </template>
- </el-table-column>
- </template>
- </tablemax>
- </div>-->
-
- <!-- v-model="queryParams.id"
-
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- @keyup.enter.native="handleQuery"
- -->
- </el-form-item>
<el-form-item label="鍚嶇О" prop="name">
-
<el-select v-model="queryParams.name" placeholder="鎵�鏈夊悕绉�" clearable
- style="width: 240px" @keyup.enter.native="handleQuery">
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;" @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" >
-<!-- <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"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
>
<el-option
@@ -89,7 +38,10 @@
v-model="queryParams.grade"
placeholder="璇疯緭鍏ョ骇鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
@@ -103,15 +55,6 @@
</el-form-item>
</el-form>
<div>
-<!-- <div style="width: 171px;-->
-<!-- height: 28px;-->
-<!-- font-size: 21px;-->
-<!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
-<!-- font-weight: 400;-->
-<!-- color: #000000;-->
-<!-- line-height: 25px;-->
-<!-- ">璇佷欢銆佽崳瑾夈�佽祫璐�</div>-->
-
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -177,29 +120,11 @@
<el-table v-loading="loading" :data="honorList" :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="55" 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="createTime" sortable width="120" align="center">-->
-
-<!-- <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>-->
-<!-- </el-table-column>-->
<el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center" >
-<!-- <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>-->
- <template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template>
+ <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
+<!-- <template slot-scope="scope">{{ getSrc1(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>-->
-<!-- <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>-->
+ <el-table-column label="鍚嶇О" prop="name" sortable width="120" align="center" >
<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" >
@@ -282,14 +207,6 @@
<!-- 娣诲姞璇佷功銆佽崳瑾夈�佽祫璐ㄩ厤缃璇濇 -->
<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="createTime">-->
-<!-- <el-input v-model="formDat.createTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >-->
-<!-- </el-input>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
-<!-- <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-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
@@ -313,13 +230,15 @@
</el-input>
</el-form-item>
<el-form-item label="鏈夋晥鏃堕棿" prop="validityDate">
- <el-input v-model="formDat.validityDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
- </el-input>
+ <el-date-picker v-model="formDat.validityDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="鑾峰緱鏃堕棿" prop="getDate">
- <el-input v-model="formDat.getDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
- </el-input>
+ <el-date-picker v-model="formDat.getDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="瀛樻斁浣嶇疆" prop="location">
<el-input v-model="formDat.location" placeholder="璇疯緭鍏ュ瓨鏀句綅缃�" clearable :style="{width: '100%'}" >
@@ -330,24 +249,27 @@
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
- <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
+ accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
list-type="picture-card"
multiple
:http-request="requestUpload"
:file-list="fileList"
>
- <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: 126px; height: 126px"
- fit="cover"
- :preview-src-list="[file.url]"
- >
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{ file }">
+ <template v-if="fileList">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 100%; height: 100%; object-fit: cover;"
+ fit="cover"
+ :preview-src-list="[file.url]"
+ >
+ </template>
<span class="el-upload-list__item-actions">
<span
class="el-upload-list__item-preview"
@@ -376,10 +298,11 @@
multiple
:on-remove="handleRemoveFile"
- :http-request="requestUpload"
+ :http-request="requestUpload1"
:show-file-list="true"
>
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -456,7 +379,8 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
+ uploading1: false,
formDat: {
//鑽ｈ獕璇佷功璁板綍
id:undefined,
@@ -545,18 +469,15 @@
newOption: undefined,
showInput: true,
typeOption:[
- {value:'0',label:'璇佷欢'},
- {value:'1',label:'鑽ｈ獕'},
- {value:'2',label:'璧勮川'},]
+ {value:'璇佷欢',label:'璇佷欢'},
+ {value:'鑽ｈ獕',label:'鑽ｈ獕'},
+ {value:'璧勮川',label:'璧勮川'},]
};
},
created() {
this.getList();
this.getTypeOptions();
- // for (let i = 0; i < this.contactList.length; i++) {
- // this.formDat[i] = this.contactList[i];
- // }
},
methods: {
// 鍙栨秷鎸夐挳
@@ -578,7 +499,7 @@
const newOption = this.newOption.trim();
if (newOption && !this.typeOptions.includes(newOption)) {
this.typeOptions.push(newOption);
- this.$set(this.formDat, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+ this.$set(this.formDat, 'name', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
}
},
/** 鏌ヨ璁板綍鍒楄〃 */
@@ -623,21 +544,6 @@
return options;
}, []);
- },
- /** 鏌ヨ绫诲埆淇℃伅 */
- 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]})
- response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
- const label = elem.split(":")[0].trim();
- const value = parseInt(elem.split(":")[1].trim());
- _this.typeOptions.push({ "label": label, "value": value });
- })
- })
},
//绫诲埆閫夋嫨
getSrc1(type){
@@ -799,21 +705,21 @@
addHonor(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
this.getList();
});
}
});
- // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
- for(let i = 0; i <= this.fileList.length; i++)
- {
- this.handleRemove(this.fileList[0]);
- }
- for(let i = 0; i < this.fileListOther.length; i++){
- this.handleRemoveFile(this.fileListOther[0]);
- }
},
requestUpload(params)
{
@@ -821,22 +727,33 @@
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})
-
- }
-
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
}
})
-
+ },
+ requestUpload1(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;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
+ if(_this.fot.includes(pth) !== true)
+ {
+ _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ }
+ })
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -883,6 +800,15 @@
}).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
}
+ },
+ watch: {
+ type(value) {
+ if (value === '') {
+ this.showInput = true;
+ } else {
+ this.showInput = false;
+ }
+ }
}
};
</script>
--
Gitblit v1.9.1