From 86b6ecee0111eeccf11ab5e440b0bac161fa65c4 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 12 九月 2023 19:48:08 +0800
Subject: [PATCH] 家庭模块的打印
---
ruoyi-ui/src/views/honor/index.vue | 244 ++++++++++++++++++++----------------------------
1 files changed, 103 insertions(+), 141 deletions(-)
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index b1d5240..f5d1839 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -15,73 +15,16 @@
@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-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" >
-<!-- <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="鎵�鏈夌被鍒�"
@@ -119,15 +62,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
@@ -191,31 +125,14 @@
</div>
<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="25" align="center" />
+ <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" >
<template slot-scope="scope">{{scope.row.idNo? scope.row.idNo: '鈥斺�斺�斺��'}}</template>
@@ -297,16 +214,8 @@
<!-- 娣诲姞璇佷功銆佽崳瑾夈�佽祫璐ㄩ厤缃璇濇 -->
<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-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 +225,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%'}" >
@@ -326,13 +237,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%'}" >
@@ -343,7 +256,7 @@
<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="#"
list-type="picture-card"
@@ -351,7 +264,7 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -393,6 +306,7 @@
:show-file-list="true"
>
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -423,7 +337,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 +362,7 @@
total: 0,
// 鑽ｈ獕琛ㄦ牸鏁版嵁
honorList: [],
+ typeList:[],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -461,16 +376,14 @@
// 鏃ユ湡鑼冨洿
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'],
-
+ uploading: false,
formDat: {
//鑽ｈ獕璇佷功璁板綍
id:undefined,
@@ -519,7 +432,7 @@
trigger: 'blur'
}],
name: [{
- required: true,
+ // required: true,
message: '璇疯緭鍏ュ悕绉�',
trigger: 'blur'
}],
@@ -556,19 +469,18 @@
},
selected:'',
typeOptions: [],
+ newOption: undefined,
+ showInput: true,
typeOption:[
- {value:'1',label:'鑽ｈ獕'},
- {value:'0',label:'璇佷欢'},
- {value:'2',label:'璧勮川'},]
+ {value:'璇佷欢',label:'璇佷欢'},
+ {value:'鑽ｈ獕',label:'鑽ｈ獕'},
+ {value:'璧勮川',label:'璧勮川'},]
};
},
created() {
this.getList();
- this.getCateInfor()
- // for (let i = 0; i < this.contactList.length; i++) {
- // this.formDat[i] = this.contactList[i];
- // }
+ this.getTypeOptions();
},
methods: {
// 鍙栨秷鎸夐挳
@@ -583,6 +495,14 @@
return "statistics-warning-row1";
} else {
return "statistics-warning-row";
+ }
+ },
+ //鍚嶇О
+ addNewOption() {
+ const newOption = this.newOption.trim();
+ if (newOption && !this.typeOptions.includes(newOption)) {
+ this.typeOptions.push(newOption);
+ this.$set(this.formDat, 'name', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
}
},
/** 鏌ヨ璁板綍鍒楄〃 */
@@ -601,22 +521,48 @@
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()
- {
- 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 });
- })
- })
- },
+ // 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){
if(type===0){
@@ -763,6 +709,7 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
+
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
@@ -784,8 +731,13 @@
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
- this.handleRemove(this.fileList[0]);
- this.handleRemoveFile(this.fileListOther[0]);
+ 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)
{
@@ -793,10 +745,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})
@@ -855,6 +808,15 @@
}).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
}
+ },
+ watch: {
+ type(value) {
+ if (value === '') {
+ this.showInput = true;
+ } else {
+ this.showInput = false;
+ }
+ }
}
};
</script>
--
Gitblit v1.9.1