From 2a42ed8d4536ea97c464a12ca55f6a37107c14aa Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期日, 13 八月 2023 21:17:33 +0800
Subject: [PATCH] 婚姻
---
ruoyi-ui/src/views/honor/index.vue | 122 +++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 47 deletions(-)
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index b1d5240..7dfa5f6 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" >
@@ -191,7 +175,7 @@
</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">-->
@@ -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(",")
@@ -784,8 +807,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)
{
--
Gitblit v1.9.1