elink-star
/
epmet-oper-gov
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_shehuizuzhi_ljj' into dev

dev-用户反馈
jianjun 3 years ago
parent
b39bdb0bc1 c818dd6114
commit
8b45b47cd8
1 changed files with 163 additions and 120 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. 283
      src/views/modules/communityService/shzz/index.vue

283
src/views/modules/communityService/shzz/index.vue
View File

@ -21,20 +21,20 @@
</div> </div>
</el-col> </el-col>
<!-- <el-col :span="8"> <!-- <el-col :span="8">
<div class="resi-cell"> <div class="resi-cell">
<div class="resi-cell-label">负责人</div> <div class="resi-cell-label">负责人</div>
<div class="resi-cell-value" <div class="resi-cell-value"
:class="'resi-cell-value-radio'"> :class="'resi-cell-value-radio'">
<el-input v-model="fmData.personInCharge" <el-input v-model="fmData.personInCharge"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入"> placeholder="请输入">
</el-input> </el-input>
</div> </div>
</div> </div>
</el-col>--> </el-col>-->
<el-col :span="8"> <el-col :span="8">
<div class="resi-cell"> <div class="resi-cell">
@ -50,9 +50,7 @@
</div> </div>
</div> </div>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="24">
<div class="resi-cell"> <div class="resi-cell">
<div class="resi-cell-label">服务时间</div> <div class="resi-cell-label">服务时间</div>
<div class="resi-cell-value" <div class="resi-cell-value"
@ -63,23 +61,40 @@
clearable clearable
placeholder="请输入"> placeholder="请输入">
</el-input> </el-input>
<!-- <el-date-picker v-model="fmData.serviceTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd">
</el-date-picker>-->
</div> </div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row>
<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-input v-model="fmData.serviceTimeStr"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
</el-input>
&lt;!&ndash; <el-date-picker v-model="fmData.serviceTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd">
</el-date-picker>&ndash;&gt;
</div>
</div>
</el-col>
</el-row>-->
</el-row> </el-row>
<el-row class="resi-search"> <el-row class="resi-search">
<el-col :span="24"> <el-col :span="24">
<el-button type="primary" <el-button type="primary"
size="small" size="small"
@click="handleSearch">查询</el-button> @click="handleSearch">查询
</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-card> </el-card>
@ -89,11 +104,13 @@
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button type="success" <el-button type="success"
size="small" size="small"
@click="handleAdd">新增</el-button> @click="handleAdd">新增
</el-button>
<el-button class="diy-button--search" <el-button class="diy-button--search"
style="margin-left:10px" style="margin-left:10px"
size="small" size="small"
@click="handleExportModule('room')">下载模板</el-button> @click="handleExportModule('room')">下载模板
</el-button>
<el-upload ref="upload" <el-upload ref="upload"
class="upload-btn" class="upload-btn"
action="uploadUlr" action="uploadUlr"
@ -108,13 +125,15 @@
<el-button type="warning" <el-button type="warning"
size="small" size="small"
:loading="importLoading">{{ :loading="importLoading">{{
importBtnTitle importBtnTitle
}}</el-button> }}
</el-button>
</el-upload> </el-upload>
<el-button @click="handleChu" <el-button @click="handleChu"
type="danger" type="danger"
size="small">excel导出</el-button> size="small">导出
</el-button>
</div> </div>
<el-table :data="tableData" <el-table :data="tableData"
border border
@ -124,23 +143,23 @@
<el-table-column label="序号" <el-table-column label="序号"
type="index" type="index"
align="center" align="center"
width="50" /> width="50"/>
<el-table-column prop="societyName" <el-table-column prop="societyName"
label="组织名称"> label="组织名称">
</el-table-column> </el-table-column>
<el-table-column prop="serviceMatters" <el-table-column prop="serviceMatters"
label="服务内容"> label="服务内容">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="personInCharge" <!-- <el-table-column prop="personInCharge"
label="负责人"> label="负责人">
</el-table-column>--> </el-table-column>-->
<el-table-column prop="mobile" <el-table-column prop="mobile"
label="服务电话"> </el-table-column> label="服务电话"></el-table-column>
<el-table-column prop="serviceTimeStr" <el-table-column prop="serviceTimeStr"
label="服务时间"> </el-table-column> label="服务时间"></el-table-column>
<!-- <el-table-column prop="score" <!-- <el-table-column prop="score"
width="80" width="80"
label="积分"> </el-table-column>--> label="积分"> </el-table-column>-->
<el-table-column fixed="right" <el-table-column fixed="right"
label="操作" label="操作"
align="center" align="center"
@ -148,16 +167,18 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleWatch(scope.$index)" <el-button @click="handleWatch(scope.$index)"
type="text" type="text"
size="small">查看</el-button> size="small">查看
<!-- <el-button type="text" </el-button>
style="color:#00A7A9;" <!-- <el-button type="text"
size="small" style="color:#00A7A9;"
@click="handleScore(scope.row)">积分记录</el-button>--> size="small"
@click="handleScore(scope.row)">积分记录</el-button>-->
<el-button @click="handleEdit(scope.$index)" <el-button @click="handleEdit(scope.$index)"
type="text" type="text"
size="small" 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)" @onConfirm="handleDel(scope.row, scope.$index)"
@ -165,7 +186,8 @@
<el-button slot="reference" <el-button slot="reference"
type="text" type="text"
size="small" size="small"
style="color: #d51010">删除</el-button> style="color: #d51010">删除
</el-button>
</el-popconfirm> </el-popconfirm>
</template> </template>
</el-table-column> </el-table-column>
@ -210,16 +232,16 @@
</template> </template>
<script> <script>
import { requestPost } from "@/js/dai/request"; import {requestPost} from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick"; import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex"; import {mapGetters} from "vuex";
import editForm from "./cpts/edit"; import editForm from "./cpts/edit";
import axios from "axios"; import axios from "axios";
import scoreRecord from '../../../components/scoreRecord.vue' import scoreRecord from '../../../components/scoreRecord.vue'
export default { export default {
components: { editForm, scoreRecord }, components: {editForm, scoreRecord},
data () { data() {
return { return {
openSearch: false, openSearch: false,
@ -242,7 +264,7 @@ export default {
serviceTimeStr: "", serviceTimeStr: "",
}, },
importBtnTitle: "excel导入", importBtnTitle: "导入",
importLoading: false, importLoading: false,
//积分记录 //积分记录
@ -251,14 +273,14 @@ export default {
}; };
}, },
computed: { computed: {
maxTableHeight () { maxTableHeight() {
return this.clientHeight - 450; return this.clientHeight - 450;
}, },
...mapGetters(["clientHeight"]), ...mapGetters(["clientHeight"]),
}, },
watch: { watch: {
"fmData.serviceTime": function (val) { "fmData.serviceTime": function (val) {
console.log("watch start"+val+'_'+Array.isArray(val)) console.log("watch start" + val + '_' + Array.isArray(val))
if (Array.isArray(val) && val.length == 2) { if (Array.isArray(val) && val.length == 2) {
this.fmData.serviceStartTime = val[0]; this.fmData.serviceStartTime = val[0];
this.fmData.serviceEndTime = val[1]; this.fmData.serviceEndTime = val[1];
@ -268,28 +290,28 @@ export default {
} }
}, },
}, },
mounted () { mounted() {
this.getTableData(); this.getTableData();
}, },
methods: { methods: {
// 上传大图标成功 // 上传大图标成功
handleExcelSuccess (res, file) { handleExcelSuccess(res, file) {
if (res.code === 0 && res.msg === "success") { if (res.code === 0 && res.msg === "success") {
console.log("resss---ppp", res); console.log("resss---ppp", res);
} else { } else {
this.$message.error(res.msg); this.$message.error(res.msg);
} }
}, },
handleProgress (event, file, fileList) { handleProgress(event, file, fileList) {
console.log("percentage", file.percentage); console.log("percentage", file.percentage);
}, },
beforeExcelUpload (file) { beforeExcelUpload(file) {
console.log("file", file); console.log("file", file);
const isType = file.type === "application/vnd.ms-excel"; const isType = file.type === "application/vnd.ms-excel";
const isTypeComputer = const isTypeComputer =
file.type === file.type ===
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
const fileType = isType || isTypeComputer; const fileType = isType || isTypeComputer;
const isLt1M = file.size / 1024 / 1024 < 10; const isLt1M = file.size / 1024 / 1024 < 10;
if (!fileType) { if (!fileType) {
@ -301,7 +323,7 @@ export default {
} }
return fileType && isLt1M; return fileType && isLt1M;
}, },
uploadHttpRequest (file) { uploadHttpRequest(file) {
this.importLoading = true; this.importLoading = true;
this.importBtnTitle = "正在上传中..."; this.importBtnTitle = "正在上传中...";
const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
@ -312,55 +334,55 @@ export default {
data: formData, data: formData,
// responseType: "blob", // responseType: "blob",
}) })
.then((res) => { .then((res) => {
this.importLoading = false; this.importLoading = false;
this.importBtnTitle = "excel导入"; this.importBtnTitle = "excel导入";
console.log("resresresresresresres", res); console.log("resresresresresresres", res);
this.getTableData(); this.getTableData();
if (res.data.code == 0) { if (res.data.code == 0) {
return this.$message.success(res.data.data || '导入成功'); return this.$message.success(res.data.data || '导入成功');
} else { } else {
return this.$message.error(res.data.msg); return this.$message.error(res.data.msg);
} }
}) })
.catch((err) => { .catch((err) => {
console.log("失败", err); console.log("失败", err);
}); });
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
}, },
handleSizeChange (val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
window.localStorage.setItem("pageSize", val); window.localStorage.setItem("pageSize", val);
this.getTableData(); this.getTableData();
}, },
handleCurrentChange (val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.pageNo = val; this.pageNo = val;
this.getTableData(); this.getTableData();
}, },
handleClose () { handleClose() {
this.formShow = false; this.formShow = false;
}, },
handleSearch (val) { handleSearch(val) {
console.log(this.fmData); console.log(this.fmData);
this.pageNo = 1; this.pageNo = 1;
this.getTableData(); this.getTableData();
}, },
async handleAdd () { async handleAdd() {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
console.log(this.$refs); console.log(this.$refs);
this.$refs.eleEditForm.initForm("add"); this.$refs.eleEditForm.initForm("add");
}, },
async handleChu () { async handleChu() {
const url = "/heart/societyorg/export"; const url = "/heart/societyorg/export";
const { pageSize, pageNo, fmData } = this; const {pageSize, pageNo, fmData} = this;
axios({ axios({
url: window.SITE_CONFIG["apiURL"] + url, url: window.SITE_CONFIG["apiURL"] + url,
method: "post", method: "post",
@ -371,50 +393,50 @@ export default {
}, },
responseType: "blob", responseType: "blob",
}) })
.then((res) => { .then((res) => {
let fileName = window.decodeURI( let fileName = window.decodeURI(
res.headers["content-disposition"].split(";")[1].split("=")[1] res.headers["content-disposition"].split(";")[1].split("=")[1]
); );
console.log("filename", fileName); console.log("filename", fileName);
let blob = new Blob([res.data], { type: "application/vnd.ms-excel" }); let blob = new Blob([res.data], {type: "application/vnd.ms-excel"});
var url = window.URL.createObjectURL(blob); var url = window.URL.createObjectURL(blob);
var aLink = document.createElement("a"); var aLink = document.createElement("a");
aLink.style.display = "none"; aLink.style.display = "none";
aLink.href = url; aLink.href = url;
aLink.setAttribute("download", fileName); aLink.setAttribute("download", fileName);
document.body.appendChild(aLink); document.body.appendChild(aLink);
aLink.click(); aLink.click();
document.body.removeChild(aLink); //下载完成移除元素 document.body.removeChild(aLink); //下载完成移除元素
window.URL.revokeObjectURL(url); //释放掉blob对象 window.URL.revokeObjectURL(url); //释放掉blob对象
}) })
.catch((err) => { .catch((err) => {
console.log("获取导出情失败", err); console.log("获取导出情失败", err);
return this.$message.error("网络错误"); return this.$message.error("网络错误");
}); });
}, },
async handleWatch (rowIndex) { async handleWatch(rowIndex) {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]); this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
}, },
async handleEdit (rowIndex) { async handleEdit(rowIndex) {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]); this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
}, },
handleEditSuccess () { handleEditSuccess() {
this.handleClose(); this.handleClose();
this.getTableData(); this.getTableData();
}, },
async handleDel (rowData, rowIndex) { async handleDel(rowData, rowIndex) {
console.log(rowData, rowIndex); console.log(rowData, rowIndex);
const url = "/heart/societyorg/del"; const url = "/heart/societyorg/del";
const { tableData } = this; const {tableData} = this;
const { data, code, msg } = await requestPost(url, { const {data, code, msg} = await requestPost(url, {
societyId: tableData[rowIndex].societyId, societyId: tableData[rowIndex].societyId,
}); });
@ -426,10 +448,10 @@ export default {
} }
}, },
async getTableData () { async getTableData() {
const url = "/heart/societyorg/getlist"; const url = "/heart/societyorg/getlist";
const { pageSize, pageNo, fmData } = this; const {pageSize, pageNo, fmData} = this;
const { data, code, msg } = await requestPost(url, { const {data, code, msg} = await requestPost(url, {
pageSize, pageSize,
pageNo, pageNo,
...fmData, ...fmData,
@ -438,29 +460,29 @@ export default {
console.log("列表请求成功！！！！！！！！！！！！！！"); console.log("列表请求成功！！！！！！！！！！！！！！");
this.total = data.total || 0; this.total = data.total || 0;
this.tableData = data.list this.tableData = data.list
? data.list.map((item) => { ? data.list.map((item) => {
item.serviceTime = item.serviceTime =
item.serviceStartTime + "至" + item.serviceEndTime; item.serviceStartTime + "至" + item.serviceEndTime;
return item; return item;
}) })
: []; : [];
} else { } else {
} }
}, },
//积分记录 //积分记录
handleScore (row) { handleScore(row) {
this.scoreDiaShow = true this.scoreDiaShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_score.initForm(row.societyId) this.$refs.ref_score.initForm(row.societyId)
}) })
}, },
diaClose () { diaClose() {
this.scoreDiaShow = false this.scoreDiaShow = false
}, },
async handleExportModule () { async handleExportModule() {
let url = "/heart/societyorg/import-template-download"; let url = "/heart/societyorg/import-template-download";
let params = {}; let params = {};
@ -516,10 +538,12 @@ export default {
background: #ebecf1; background: #ebecf1;
border-radius: 2px; border-radius: 2px;
} }
.el-tabs__nav-wrap::after, .el-tabs__nav-wrap::after,
.el-tabs__active-bar { .el-tabs__active-bar {
display: none; display: none;
} }
.el-tabs__nav-next, .el-tabs__nav-next,
.el-tabs__nav-prev { .el-tabs__nav-prev {
line-height: 20px; line-height: 20px;
@ -529,16 +553,20 @@ export default {
.resi-card-table { .resi-card-table {
margin-top: 20px; margin-top: 20px;
} }
.resi-row-btn { .resi-row-btn {
margin-bottom: 13px; margin-bottom: 13px;
.upload-btn { .upload-btn {
display: inline-block; display: inline-block;
margin: 0 10px; margin: 0 10px;
} }
} }
.resi-other { .resi-other {
width: 100%; width: 100%;
display: flex; display: flex;
.resi-other-title { .resi-other-title {
width: 100px; width: 100px;
box-sizing: border-box; box-sizing: border-box;
@ -549,6 +577,7 @@ export default {
color: #333; color: #333;
text-align: center; text-align: center;
} }
.tabs-other-info { .tabs-other-info {
// padding-left: 60px; // padding-left: 60px;
} }
@ -563,6 +592,7 @@ export default {
position: relative; position: relative;
overflow: visible; overflow: visible;
} }
.resi-down { .resi-down {
position: absolute; position: absolute;
left: 50%; left: 50%;
@ -577,30 +607,37 @@ export default {
cursor: pointer; cursor: pointer;
background: #ffffff; background: #ffffff;
border-radius: 0 0 10px 10px; border-radius: 0 0 10px 10px;
img { img {
display: block; display: block;
} }
} }
.resi-row-box { .resi-row-box {
height: 104px; height: 104px;
overflow: hidden; overflow: hidden;
transition: height 0.5s; transition: height 0.5s;
} }
.resi-row-more { .resi-row-more {
height: max-content; height: max-content;
transition: height 0.5s; transition: height 0.5s;
} }
.resi-row { .resi-row {
margin-bottom: 20px; margin-bottom: 20px;
} }
.resi-search { .resi-search {
.el-col { .el-col {
text-align: right; text-align: right;
} }
} }
.resi-cell { .resi-cell {
display: flex; display: flex;
align-items: center; align-items: center;
.resi-cell-label { .resi-cell-label {
width: 70px; width: 70px;
box-sizing: border-box; box-sizing: border-box;
@ -608,25 +645,31 @@ export default {
text-align: right; text-align: right;
// line-height: 32; // line-height: 32;
} }
.resi-cell-value-radio { .resi-cell-value-radio {
display: flex; display: flex;
align-items: center; align-items: center;
min-height: 32px; min-height: 32px;
} }
.resi-cell-input { .resi-cell-input {
width: 180px; width: 180px;
} }
.resi-cell-select { .resi-cell-select {
width: 180px; width: 180px;
box-sizing: border-box; box-sizing: border-box;
margin-right: 10px; margin-right: 10px;
&-middle { &-middle {
width: 130px; width: 130px;
} }
&-small { &-small {
width: 88px; width: 88px;
} }
} }
.resi-cell-select:last-child { .resi-cell-select:last-child {
margin-right: 0; margin-right: 0;
} }

Write Preview
Loading…
Cancel
Save