Browse Source

积分记录联调

shibei_prod
jiangyy 4 years ago
parent
commit
79f78e1f44
  1. 11
      src/views/components/scoreRecord.vue
  2. 16
      src/views/modules/communityParty/regionalParty/finishList.vue
  3. 2
      src/views/modules/communityParty/regionalParty/units.vue
  4. 180
      src/views/modules/communityService/shzz/index.vue
  5. 165
      src/views/modules/communityService/sqzzz/index.vue

11
src/views/components/scoreRecord.vue

@ -11,6 +11,7 @@
<el-date-picker v-model="timeRange"
type="daterange"
:clearable="false"
:picker-options="pickerOptions"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@ -150,10 +151,10 @@ export default {
},
methods: {
async initForm (row) {
async initForm (serviceId) {
this.initDate()
this.serviceId = row.id
this.serviceId = serviceId
//
await this.loadTable()
@ -167,8 +168,8 @@ export default {
async loadTable () {
this.tableLoading = true
// const url = "/heart /userdemand/recordList"
const url = "http://yapi.elinkservice.cn/mock/245/heart/userdemand/recordList"
const url = "/heart/userdemand/recordList"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/userdemand/recordList"
let params = {
serviceType: this.serviceType,
serviceId: this.serviceId,
@ -226,6 +227,8 @@ export default {
let t2 = year2 + '-' + month2 + '-' + day2;
let t1 = year + '-' + month + '-' + day;
// let t3 = formate(t2, style);
this.formData.startTime = t2 + ' 00:00:00'
this.formData.endTime = t1 + ' 23:59:59'
this.timeRange = [t2, t1]
},

16
src/views/modules/communityParty/regionalParty/finishList.vue

@ -263,7 +263,7 @@ export default {
m = '0' + m
}
let obj = {
label: i + '月',
label: m + '月',
value: m,
}
@ -298,10 +298,10 @@ export default {
async loadTable () {
this.tableLoading = true
// const url = '/heart/icpartyunitcompletion/list'
const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/list'
const url = '/heart/icpartyunitcompletion/list'
// const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/list'
let params = {
placePatrolRecordId: this.placePatrolRecordId
unitId: this.unitId
}
const { data, code, msg } = await requestPost(url, params)
@ -372,9 +372,9 @@ export default {
},
async addReview (row, tableIndex) {
// let url = "/heart/icpartyunitcompletion/save"
let url = "/heart/icpartyunitcompletion/save"
let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/save"
// let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/save"
let params = JSON.parse(JSON.stringify(row))
@ -456,8 +456,8 @@ export default {
async deleteRecord (row, tableIndex) {
// const url = "/heart/icpartyunitcompletion/delete"
const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/delete"
const url = "/heart/icpartyunitcompletion/delete"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/delete"
let params = {
id: row.id

2
src/views/modules/communityParty/regionalParty/units.vue

@ -463,7 +463,7 @@ export default {
handleScore (row) {
this.scoreDiaShow = true
this.$nextTick(() => {
this.$refs.ref_score.initForm(row)
this.$refs.ref_score.initForm(row.id)
})
},

180
src/views/modules/communityService/shzz/index.vue

@ -2,19 +2,20 @@
<div>
<div class="resi-container">
<el-card class="resi-card">
<el-row class="resi-row-box" :class="openSearch && 'resi-row-more'">
<el-row class="resi-row" :gutter="20">
<el-row class="resi-row-box"
:class="openSearch && 'resi-row-more'">
<el-row class="resi-row"
:gutter="20">
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">组织名称</div>
<div class="resi-cell-value" :class="'resi-cell-value-radio'">
<el-input
v-model="fmData.societyName"
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.societyName"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</div>
</div>
@ -23,14 +24,13 @@
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">负责人</div>
<div class="resi-cell-value" :class="'resi-cell-value-radio'">
<el-input
v-model="fmData.personInCharge"
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.personInCharge"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</div>
</div>
@ -39,14 +39,13 @@
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">联系电话</div>
<div class="resi-cell-value" :class="'resi-cell-value-radio'">
<el-input
v-model="fmData.mobile"
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.mobile"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</div>
</div>
@ -56,15 +55,14 @@
<el-col :span="24">
<div class="resi-cell">
<div class="resi-cell-label">服务时间</div>
<div class="resi-cell-value" :class="'resi-cell-value-radio'">
<el-date-picker
v-model="fmData.serviceTime"
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-date-picker v-model="fmData.serviceTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
value-format="yyyy-MM-dd">
</el-date-picker>
</div>
</div>
@ -73,9 +71,9 @@
</el-row>
<el-row class="resi-search">
<el-col :span="24">
<el-button type="primary" size="small" @click="handleSearch"
>查询</el-button
>
<el-button type="primary"
size="small"
@click="handleSearch">查询</el-button>
</el-col>
</el-row>
</el-card>
@ -83,11 +81,10 @@
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button type="success" size="small" @click="handleAdd"
>新增</el-button
>
<el-upload
ref="upload"
<el-button type="success"
size="small"
@click="handleAdd">新增</el-button>
<el-upload ref="upload"
class="upload-btn"
action="uploadUlr"
:limit="1"
@ -97,95 +94,104 @@
:on-progress="handleProgress"
:on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest"
>
<el-button type="warning" size="small" :loading="importLoading">{{
:http-request="uploadHttpRequest">
<el-button type="warning"
size="small"
:loading="importLoading">{{
importBtnTitle
}}</el-button>
</el-upload>
<el-button @click="handleChu" type="danger" size="small"
>excel导出</el-button
>
<el-button @click="handleChu"
type="danger"
size="small">excel导出</el-button>
</div>
<el-table
:data="tableData"
<el-table :data="tableData"
border
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight"
>
<el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="societyName" label="社会组织名称">
:max-height="maxTableHeight">
<el-table-column label="序号"
type="index"
align="center"
width="50" />
<el-table-column prop="societyName"
label="社会组织名称">
</el-table-column>
<el-table-column prop="serviceMatters" label="服务事项">
<el-table-column prop="serviceMatters"
label="服务事项">
</el-table-column>
<el-table-column prop="personInCharge" label="负责人">
<el-table-column prop="personInCharge"
label="负责人">
</el-table-column>
<el-table-column prop="mobile" label="负责人电话"> </el-table-column>
<el-table-column prop="serviceTime" label="服务时间"> </el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="120">
<el-table-column prop="mobile"
label="负责人电话"> </el-table-column>
<el-table-column prop="serviceTime"
label="服务时间"> </el-table-column>
<el-table-column fixed="right"
label="操作"
align="center"
width="180">
<template slot-scope="scope">
<el-button
@click="handleWatch(scope.$index)"
<el-button @click="handleWatch(scope.$index)"
type="text"
size="small">查看</el-button>
<el-button type="text"
style="color:#00A7A9;"
size="small"
>查看</el-button
>
@click="handleScore(scope.row)">积分记录</el-button>
<el-button
@click="handleEdit(scope.$index)"
<el-button @click="handleEdit(scope.$index)"
type="text"
size="small"
style="margin-right: 10px; color: #00a7a9"
>编辑</el-button
>
style="margin-right: 10px; color: #00a7a9">编辑</el-button>
<el-popconfirm
title="删除之后无法回复,确认删除?"
<el-popconfirm title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row, scope.$index)"
@confirm="handleDel(scope.row, scope.$index)"
>
<el-button
slot="reference"
@confirm="handleDel(scope.row, scope.$index)">
<el-button slot="reference"
type="text"
size="small"
style="color: #d51010"
>删除</el-button
>
style="color: #d51010">删除</el-button>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChange"
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next"
:total="total"
>
:total="total">
</el-pagination>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="formShow"
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
@closed="handleClose"
>
<edit-form
ref="eleEditForm"
@closed="handleClose">
<edit-form ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
@dialogOk="handleEditSuccess"></edit-form>
</el-dialog>
<!-- 积分记录 -->
<el-dialog :visible.sync="scoreDiaShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="scoreDiaTitle"
width="1050px"
top="5vh"
@closed="diaClose">
<score-record ref="ref_score"
:serviceType="'social_org'"></score-record>
</el-dialog>
</div>
</template>
@ -196,9 +202,10 @@ import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import editForm from "./cpts/edit";
import axios from "axios";
import scoreRecord from '../../../components/scoreRecord.vue'
export default {
components: { editForm },
components: { editForm, scoreRecord },
data () {
return {
openSearch: false,
@ -223,6 +230,10 @@ export default {
importBtnTitle: "excel导入",
importLoading: false,
//
scoreDiaTitle: '积分记录',
scoreDiaShow: false,
};
},
computed: {
@ -421,6 +432,19 @@ export default {
} else {
}
},
//
handleScore (row) {
this.scoreDiaShow = true
this.$nextTick(() => {
this.$refs.ref_score.initForm(row.societyId)
})
},
diaClose () {
this.scoreDiaShow = false
},
},
};
</script>

165
src/views/modules/communityService/sqzzz/index.vue

@ -2,19 +2,20 @@
<div>
<div class="resi-container">
<el-card class="resi-card">
<el-row class="resi-row-box" :class="openSearch && 'resi-row-more'">
<el-row class="resi-row" :gutter="20">
<el-row class="resi-row-box"
:class="openSearch && 'resi-row-more'">
<el-row class="resi-row"
:gutter="20">
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">组织名称</div>
<div class="resi-cell-value" :class="'resi-cell-value-radio'">
<el-input
v-model="fmData.organizationName"
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.organizationName"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</div>
</div>
@ -22,15 +23,14 @@
<el-col :span="16">
<div class="resi-cell">
<div class="resi-cell-label">创建时间</div>
<div class="resi-cell-value" :class="'resi-cell-value-radio'">
<el-date-picker
v-model="fmData.createTime"
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-date-picker v-model="fmData.createTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
value-format="yyyy-MM-dd">
</el-date-picker>
</div>
</div>
@ -39,9 +39,9 @@
</el-row>
<el-row class="resi-search">
<el-col :span="24">
<el-button type="primary" size="small" @click="handleSearch"
>查询</el-button
>
<el-button type="primary"
size="small"
@click="handleSearch">查询</el-button>
</el-col>
</el-row>
</el-card>
@ -49,11 +49,10 @@
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button type="success" size="small" @click="handleAdd"
>新增</el-button
>
<el-upload
ref="upload"
<el-button type="success"
size="small"
@click="handleAdd">新增</el-button>
<el-upload ref="upload"
class="upload-btn"
action="uploadUlr"
:limit="1"
@ -63,97 +62,107 @@
:on-progress="handleProgress"
:on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest"
>
<el-button type="warning" size="small" :loading="importLoading">{{
:http-request="uploadHttpRequest">
<el-button type="warning"
size="small"
:loading="importLoading">{{
importBtnTitle
}}</el-button>
</el-upload>
<el-button @click="handleChu" type="danger" size="small"
>excel导出</el-button
>
<el-button @click="handleChu"
type="danger"
size="small">excel导出</el-button>
</div>
<el-table
:data="tableData"
<el-table :data="tableData"
border
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight"
>
<el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="organizationName" label="组织名称">
:max-height="maxTableHeight">
<el-table-column label="序号"
type="index"
align="center"
width="50" />
<el-table-column prop="organizationName"
label="组织名称">
</el-table-column>
<el-table-column prop="organizationPersonCount" label="组织人数">
<el-table-column prop="organizationPersonCount"
label="组织人数">
</el-table-column>
<el-table-column prop="serviceItem" label="服务事项"> </el-table-column>
<el-table-column prop="principalName" label="负责人"> </el-table-column>
<el-table-column prop="principalPhone" label="联系电话">
<el-table-column prop="serviceItem"
label="服务事项"> </el-table-column>
<el-table-column prop="principalName"
label="负责人"> </el-table-column>
<el-table-column prop="principalPhone"
label="联系电话">
</el-table-column>
<el-table-column prop="organizationCreatedTime" label="创建时间">
<el-table-column prop="organizationCreatedTime"
label="创建时间">
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="120">
<el-table-column fixed="right"
label="操作"
align="center"
width="120">
<template slot-scope="scope">
<el-button
@click="handleWatch(scope.$index)"
<el-button @click="handleWatch(scope.$index)"
type="text"
size="small">查看</el-button>
<el-button type="text"
style="color:#1C6AFD;"
size="small"
>查看</el-button
>
@click="handleScore(scope.row)">积分记录</el-button>
<el-button
@click="handleEdit(scope.$index)"
<el-button @click="handleEdit(scope.$index)"
type="text"
size="small"
style="margin-right: 10px; color: #00a7a9"
>编辑</el-button
>
style="margin-right: 10px; color: #00a7a9">编辑</el-button>
<el-popconfirm
title="删除之后无法回复,确认删除?"
<el-popconfirm title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row, scope.$index)"
@confirm="handleDel(scope.row, scope.$index)"
>
<el-button
slot="reference"
@confirm="handleDel(scope.row, scope.$index)">
<el-button slot="reference"
type="text"
size="small"
style="color: #d51010"
>删除</el-button
>
style="color: #d51010">删除</el-button>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChange"
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next"
:total="total"
>
:total="total">
</el-pagination>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="formShow"
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
@closed="handleClose"
>
<edit-form
ref="eleEditForm"
@closed="handleClose">
<edit-form ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
@dialogOk="handleEditSuccess"></edit-form>
</el-dialog>
<!-- 积分记录 -->
<el-dialog :visible.sync="scoreDiaShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="scoreDiaTitle"
width="1050px"
top="5vh"
@closed="diaClose">
<score-record ref="ref_score"
:serviceType="'party_unit'"></score-record>
</el-dialog>
</div>
</template>
@ -164,9 +173,10 @@ import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import editForm from "./cpts/edit";
import axios from "axios";
import scoreRecord from '../../../components/scoreRecord.vue'
export default {
components: { editForm },
components: { editForm, scoreRecord },
data () {
return {
openSearch: false,
@ -189,6 +199,10 @@ export default {
importBtnTitle: "excel导入",
importLoading: false,
//
scoreDiaTitle: '积分记录',
scoreDiaShow: false,
};
},
computed: {
@ -390,6 +404,19 @@ export default {
} else {
}
},
//
handleScore (row) {
this.scoreDiaShow = true
this.$nextTick(() => {
this.$refs.ref_score.initForm(row.orgId)
})
},
diaClose () {
this.scoreDiaShow = false
},
},
};
</script>

Loading…
Cancel
Save