elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature

xiaowang-featrue
mk 10 months ago
parent
11ab3fd4c4 61df6f58d3
commit
b45242132f
9 changed files with 150 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/components/checkBox.vue
  2. 3
      src/views/modules/base/diyInfo.vue
  3. 16
      src/views/modules/base/smartExport/exset.vue
  4. 12
      src/views/modules/volunteer/LifeCircleManagement/add.vue
  5. 72
      src/views/modules/volunteer/LifeCircleManagement/index.vue
  6. 3
      src/views/modules/volunteer/Venuemanagement/add.vue
  7. 17
      src/views/modules/volunteer/Venuemanagement/info.vue
  8. 4
      src/views/modules/volunteer/pointsRedemption/add.vue
  9. 22
      src/views/modules/volunteer/pointsRedemption/update.vue

2
src/views/components/checkBox.vue
View File

@ -45,9 +45,7 @@ export default {
} }
}, },
created() { created() {
console.log(this.leftList,"sfsdfd");
this.boxList = this.list.filter(item => item.itemType != 'inputRange') this.boxList = this.list.filter(item => item.itemType != 'inputRange')
console.log(this.boxList,"kdsflkljf");
this.pid = this.list[0].itemGroupId this.pid = this.list[0].itemGroupId
}, },
methods: { methods: {

3
src/views/modules/base/diyInfo.vue
View File

@ -303,10 +303,13 @@ export default {
this.$emit('close') this.$emit('close')
}, },
handleExportTemplate(id) { handleExportTemplate(id) {
console.log(id,"sdl;fkldsf");
this.exportTemplate(id) this.exportTemplate(id)
this.$emit('close') this.$emit('close')
}, },
async exportTemplate(id) { async exportTemplate(id) {
console.log(id,"dsofspdjf");
let url = "/actual/base/residentBaseInfo/exportExcelCustom" let url = "/actual/base/residentBaseInfo/exportExcelCustom"
let params = { let params = {
templateId: id || '', templateId: id || '',

16
src/views/modules/base/smartExport/exset.vue
View File

@ -4,7 +4,7 @@
<h4>智能导出/导出设置</h4> <h4>智能导出/导出设置</h4>
<el-form ref="form" > <el-form ref="form" >
<el-form-item required label="报表名称" autocomplete="off" > <el-form-item required label="报表名称" autocomplete="off" >
<el-input v-model="form.name" size="mini" style="width: 40%; margin-left: 30px"></el-input> <el-input v-model="search.name" size="mini" style="width: 40%; margin-left: 30px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="筛选条件"> <el-form-item label="筛选条件">
<el-form :inline="true" class="header_form_box" :model="form" size="mini" <el-form :inline="true" class="header_form_box" :model="form" size="mini"
@ -225,6 +225,7 @@ export default {
name: "set", name: "set",
data() { data() {
let orgOptionProps = { let orgOptionProps = {
multiple: false, multiple: false,
value: 'agencyId', value: 'agencyId',
@ -233,6 +234,11 @@ export default {
checkStrictly: true checkStrictly: true
} }
return { return {
search: {
isSaveTemp: false,
name: '',
itemList: []
},
orgOptionProps, orgOptionProps,
household: [], household: [],
projectStaffList: [ projectStaffList: [
@ -784,7 +790,7 @@ specialCategoryList: [
item.id=item.itemId item.id=item.itemId
}) })
console.log( this.form,"this.form"); console.log(this.form,"this.form");
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -918,16 +924,16 @@ specialCategoryList: [
}, },
//导出数据 //导出数据
async exportTemplate() { async exportTemplate() {
if(!this.form.name){ if(!this.search.name){
return this.$message.error("请输入模板名称") return this.$message.error("请输入模板名称")
} }
let url = "/actual/base/residentBaseInfo/exportExcelCustom" let url = "/actual/base/residentBaseInfo/exportExcelCustom"
let params = { let params = {
// templateId: this.originId, templateId: "",
searchForm: {...this.form}, searchForm: {...this.form},
formCode: 'resident_base_info', formCode: 'resident_base_info',
exportConfig: { exportConfig: {
...this.form, ...this.search,
formCode: 'resident_base_info', formCode: 'resident_base_info',
originId:this.originId, originId:this.originId,
itemList: this.rightList.map(item => { itemList: this.rightList.map(item => {

12
src/views/modules/volunteer/LifeCircleManagement/add.vue
View File

@ -592,10 +592,10 @@
// console.log(this.formData.tags.map(item => item.tab).join(', ')," this.formData"); // console.log(this.formData.tags.map(item => item.tab).join(', ')," this.formData");
// if (!this.formData.type) { if (!this.formData.type) {
// this.$message.error('请选择类型'); this.$message.error('请选择类型');
// return; return;
// } }
if (!this.formData.name) { if (!this.formData.name) {
this.$message.error('请输入组织介绍'); this.$message.error('请输入组织介绍');
return; return;
@ -756,8 +756,8 @@
computed: { computed: {
dataRule() { dataRule() {
return { return {
typeName: [ type: [
{ required: true, message: '请选择组织类型', trigger: 'blur' } { required: true, message: '请选择类型', trigger: 'blur' }
], ],
name: [ name: [
{ required: true, message: '请填写名称', trigger: 'blur' } { required: true, message: '请填写名称', trigger: 'blur' }

72
src/views/modules/volunteer/LifeCircleManagement/index.vue
View File

@ -4,25 +4,22 @@
<el-form :inline="true" ref="ref_searchform" :label-width="'100px'"> <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
<div> <div>
<el-form-item label="类型"> <el-form-item label="类型">
<el-select v-model="formData.tyep" placeholder="请选择" clearable> <el-cascader v-model="this.formData.type" @change="handleChangeAgency" :options="options1"
<el-option v-for="item in formData.optionstype" :key="item.value" :label="item.label" :disabled="showdisabled" :props="{
:value="item.value"> emitPath: false,
</el-option> multiple: false,
</el-select> }"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="名称"> <el-form-item label="名称">
<el-input v-model.trim="formData.name" size="small" class="item_width_1" clearable <el-input v-model.trim="formData.name" size="small" class="item_width_1" clearable placeholder="请输入">
placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="位置"> <el-form-item label="位置">
<el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable <el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable placeholder="请输入">
placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="标签"> <el-form-item label="标签">
<el-input v-model.trim="formData.tags" size="small" class="item_width_1" clearable <el-input v-model.trim="formData.tags" size="small" class="item_width_1" clearable placeholder="请输入">
placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -41,57 +38,47 @@
<el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button> <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
<el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button> <el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button>
<el-button class="diy-button--white" size="small"> <el-button class="diy-button--white" size="small">
<el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1"
:limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"
:auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess" :on-progress="handleProgress" :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
:before-upload="beforeExcelUpload" :http-request="uploadHttpRequest"> :http-request="uploadHttpRequest">
导入 导入
</el-upload> </el-upload>
</el-button> </el-button>
<el-table class="table" :data="tableData" border style="width: 100%"> <el-table class="table" :data="tableData" border style="width: 100%">
<el-table-column label="序号" header-align="center" align="center" type="index" <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
width="80"></el-table-column>
<el-table-column prop="agencyName" header-align="center" align="center" label="所属组织" <el-table-column prop="agencyName" header-align="center" align="center" label="所属组织"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="typeName" header-align="center" align="center" label="类型" <el-table-column prop="typeName" header-align="center" align="center" label="类型" :show-overflow-tooltip="true">
:show-overflow-tooltip="true">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span> <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="名称" <el-table-column prop="name" header-align="center" align="center" label="名称" :show-overflow-tooltip="true">
:show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="address" header-align="center" align="center" label="位置" <el-table-column prop="address" header-align="center" align="center" label="位置" :show-overflow-tooltip="true">
:show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="linkman" header-align="center" align="center" label="联系人" <el-table-column prop="linkman" header-align="center" align="center" label="联系人" :show-overflow-tooltip="true">
:show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="linkPhone" header-align="center" align="center" label="联系电话" <el-table-column prop="linkPhone" header-align="center" align="center" label="联系电话"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="tags" header-align="center" align="center" label="标签" :show-overflow-tooltip="true"> <el-table-column prop="tags" header-align="center" align="center" label="标签" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="remark" header-align="center" align="center" label="备注":show-overflow-tooltip="true"> <el-table-column prop="remark" header-align="center" align="center" label="备注" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" style="color:#1C6AFD;" size="small" <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
@click="handleDetail(scope.row)">查看</el-button> <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDel(scope.row)">删除</el-button>
@click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small"
@click="handleDel(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
:current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize" :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
layout="sizes, prev, pager, next, total" :total="total">
</el-pagination> </el-pagination>
</div> </div>
<el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle" <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
@ -127,7 +114,7 @@ export default {
data() { data() {
return { return {
options:[ options1:[
{ {
"children": [ "children": [
@ -306,7 +293,7 @@ export default {
formTitle:"", formTitle:"",
formData: { formData: {
name:"", name:"",
tyep:"", type:"",
tags:"", tags:"",
address:"", address:"",
@ -350,6 +337,11 @@ export default {
this.getTableData(); this.getTableData();
}, },
methods: { methods: {
//获取类型
handleChangeAgency(val) {
console.log(val);
this.formData.type = val;
},
// 获取生活圈类型 // 获取生活圈类型
async getLifeType () { async getLifeType () {
const url = "/sys/dict/data/dictlist" const url = "/sys/dict/data/dictlist"
@ -450,7 +442,7 @@ if (code === 0) {
this.tableData = data.list; this.tableData = data.list;
this.tableData.forEach(item => { this.tableData.forEach(item => {
this.options.forEach(item1 => { this.options1.forEach(item1 => {
if (Array.isArray(item1.children)) { if (Array.isArray(item1.children)) {

3
src/views/modules/volunteer/Venuemanagement/add.vue
View File

@ -523,6 +523,9 @@
address: [ address: [
{ required: true, message: '请选择位置', trigger: 'blur' } { required: true, message: '请选择位置', trigger: 'blur' }
], ],
typeName: [
{ required: true, message: '请选择阵地', trigger: 'blur' }
],
} }
}, },

17
src/views/modules/volunteer/Venuemanagement/info.vue
View File

@ -9,15 +9,9 @@
:disabled="true" class="u-item-width-normal"></el-input> :disabled="true" class="u-item-width-normal"></el-input>
</el-form-item> </el-form-item>
--> -->
<el-form-item label="挂靠阵地" prop="type" label-width="100px"> <!-- <el-form-item label="挂靠阵地" prop="type" label-width="100px">
<!-- <el-select :disabled="showdisabled" v-model="formData.type" placeholder="请选择" clearable class="u-item-width-normal">
<el-option :disabled="showdisabled" class="u-item-width-normal" v-for="item in formData.optionstype" :key="item.value" :label="item.label"
:value="item.value">typeName
<div>{{ formData.typeName }}</div>
</el-option>
</el-select> -->
<div>{{ formData.positionName }}</div> <div>{{ formData.positionName }}</div>
</el-form-item> </el-form-item> -->
<el-form-item label="名称" label-width="100px" prop="name"> <el-form-item label="名称" label-width="100px" prop="name">
<!-- <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入名称" <!-- <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入名称"
:disabled="showdisabled" class="u-item-width-normal"></el-input> --> :disabled="showdisabled" class="u-item-width-normal"></el-input> -->
@ -87,7 +81,7 @@
import util from '@js/util.js'; import util from '@js/util.js';
// import UploadImage from './upload-image.vue' // import UploadImage from './upload-image.vue'
import UploadImage from '@/views/modules/plugins/rent/upload-image.vue' import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
import dayjs from 'dayjs';
var map var map
var search var search
var markers var markers
@ -185,8 +179,9 @@
console.log(res); console.log(res);
if (res.code == 0) { if (res.code == 0) {
this.tableData1 = res.data.list this.tableData1 = res.data.list
l this.tableData1.forEach(item => {
item.time = dayjs(item.time).format('YYYY-MM-DD')
})
} else { } else {
this.$message.error(res.msg) this.$message.error(res.msg)
} }

4
src/views/modules/volunteer/pointsRedemption/add.vue
View File

@ -87,13 +87,13 @@
</el-col> </el-col>
<el-form-item :inline="true" required v-if="formData.classKey == 'zkq'" label="折扣" label-width="150px"> <!-- <el-form-item :inline="true" required v-if="formData.classKey == 'zkq'" label="折扣" label-width="150px">
<div class="item_width_2" style="display: flex;"> <div class="item_width_2" style="display: flex;">
<el-input v-model="formData.worthAmount" placeholder="请输入折扣"></el-input> <el-input v-model="formData.worthAmount" placeholder="请输入折扣"></el-input>
<div>折</div> <div>折</div>
</div> </div>
</el-form-item> </el-form-item> -->
<el-form-item :inline="true" required v-if="formData.classKey == 'mjq'|| formData.classKey == 'cxdjq'" label="金额" label-width="150px"> <el-form-item :inline="true" required v-if="formData.classKey == 'mjq'|| formData.classKey == 'cxdjq'" label="金额" label-width="150px">
<div class="item_width_2" style="display: flex;"> <div class="item_width_2" style="display: flex;">
<div>￥</div> <div>￥</div>

22
src/views/modules/volunteer/pointsRedemption/update.vue
View File

@ -183,6 +183,7 @@ import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
], ],
formData:{ formData:{
imgAttachments:[],
Servicelevel:"", Servicelevel:"",
starLevel:"", starLevel:"",
redeemTimesEveryone:'', redeemTimesEveryone:'',
@ -246,6 +247,27 @@ import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
}, },
methods: { methods: {
onChangeFileList(e) {
console.log(e, 'sssssb');
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
type:'image',
fileType: '0',
name:item.response.data.fileName,
fileUrl: item.response.data.url,
format: item.response.data.fileName.split('.').pop(),
url: item.response.data.url
})) : []; // 当e为空时清空fileList
if (e.length > 0) {
console.log(this.fileList,"this.fileList");
this.formData.imgAttachments=this.fileList;
console.log(this.formData.imgAttachments,"this.fileList");
} else {
this.formData.coverPic = '';
}
},
//获取详情 //获取详情
getTableData() { getTableData() {
const url = "/voluntary/pointsAward/admin/detail"; const url = "/voluntary/pointsAward/admin/detail";

Write Preview
Loading…
Cancel
Save