Browse Source

Merge branch 'dev-220309' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-220309

shibei_master
dai 4 years ago
parent
commit
450525b9a8
  1. 37
      src/views/modules/base/resi.vue
  2. 4
      src/views/modules/communityParty/elegant/index.vue
  3. 2
      src/views/modules/communityService/dqfwzx/cpts/edit.vue
  4. 95
      src/views/modules/communityService/dqfwzx/cpts/order.vue
  5. 66
      src/views/modules/communityService/dqfwzx/cpts/orderList.vue
  6. 3
      src/views/modules/communityService/dqfwzx/index.vue
  7. 119
      src/views/modules/workSys/demandCate.vue

37
src/views/modules/base/resi.vue

@ -7,10 +7,12 @@
@search="handleSearch" /> @search="handleSearch" />
<el-card class="resi-card-table"> <el-card class="resi-card-table">
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button <el-button size="small"
size="small"
class="diy-button--add" class="diy-button--add"
@click="handleAdd">新增</el-button> @click="handleAdd">新增</el-button>
<el-button class="diy-button--export"
size="small"
@click="handleExportModule('room')">下载人口模板</el-button>
<el-upload ref="upload" <el-upload ref="upload"
class="upload-demo" class="upload-demo"
action="uploadUlr" action="uploadUlr"
@ -22,25 +24,20 @@
:on-success="handleExcelSuccess" :on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload" :before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest"> :http-request="uploadHttpRequest">
<el-button <el-button size="small"
size="small"
class="diy-button--delete" class="diy-button--delete"
:loading="importLoading">{{importBtnTitle}}</el-button> :loading="importLoading">{{importBtnTitle}}</el-button>
</el-upload> </el-upload>
<el-button
size="small" <el-button size="small"
class="diy-button--reset" class="diy-button--reset"
:loading="exportBtn" :loading="exportBtn"
@click="handleExport">{{exportBtnTitle}}</el-button> @click="handleExport">{{exportBtnTitle}}</el-button>
<!-- <el-button type="primary" size="small">下载人口模板</el-button> --> <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
<el-button
class="diy-button--export"
size="small"
@click="handleExportModule('room')">下载人口模板</el-button>
</div> </div>
<el-table ref="ref_table" :data="tableData" <el-table ref="ref_table"
:data="tableData"
v-loading="tableLoading" v-loading="tableLoading"
border border
style="width: 100%" style="width: 100%"
@ -67,7 +64,9 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
:width="item.itemType === 'radio' ? computedWidth(item.label) : 180"> :width="item.itemType === 'radio' ? computedWidth(item.label) : 180">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="item.columnName == 'NAME'" class="name-a" @click="handleLook(scope.row)"> <a v-if="item.columnName == 'NAME'"
class="name-a"
@click="handleLook(scope.row)">
{{ handleFilterSpan(scope.row, item) }} {{ handleFilterSpan(scope.row, item) }}
</a> </a>
<span v-else>{{ handleFilterSpan(scope.row, item) }}</span> <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
@ -85,13 +84,11 @@
<el-button @click="handleTransfer(scope.row)" <el-button @click="handleTransfer(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail" class="div-table-button--detail">调动</el-button>
>调动</el-button>
<el-button @click="handleChangeRecord(scope.row)" <el-button @click="handleChangeRecord(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail" class="div-table-button--detail">变更记录</el-button>
>变更记录</el-button>
<template v-if="filterEdit(scope.row.ORG_ID)"> <template v-if="filterEdit(scope.row.ORG_ID)">
<el-button @click="handleEdit(scope.row)" <el-button @click="handleEdit(scope.row)"
type="text" type="text"
@ -114,7 +111,8 @@
v-model="selAllFlag" v-model="selAllFlag"
:disabled="selAllFlagDisabled" :disabled="selAllFlagDisabled"
@change="handleSelectAll">全选</el-checkbox> @change="handleSelectAll">全选</el-checkbox>
<el-button v-if="selection.length > 0" style="margin-left:15px" <el-button v-if="selection.length > 0"
style="margin-left:15px"
type="danger" type="danger"
size="small" size="small"
@click="deleteBatch">删除</el-button> @click="deleteBatch">删除</el-button>
@ -492,6 +490,7 @@ export default {
await this.$http await this.$http
.post(url, params) .post(url, params)
.then(res => { .then(res => {
console.log('res----dddd', res)
// this.download(res.data, title + '.xls') // this.download(res.data, title + '.xls')
if (res.headers["content-disposition"]) { if (res.headers["content-disposition"]) {
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
@ -1015,7 +1014,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} else { } else {
// console.log('', res.data) console.log('获取查询详情成功--sss', res)
this.searchList = res.data this.searchList = res.data
res.data.forEach((item) => { res.data.forEach((item) => {
if (item.optionSourceType === 'remote') { if (item.optionSourceType === 'remote') {

4
src/views/modules/communityParty/elegant/index.vue

@ -63,10 +63,10 @@
<el-button size="small" class="diy-button--delete" :loading="importLoading">{{importBtnTitle}}</el-button> <el-button size="small" class="diy-button--delete" :loading="importLoading">{{importBtnTitle}}</el-button>
</el-upload> </el-upload>
<el-button class="diy-button--reset" size="small" :loading="exportBtn" @click="handleExport">{{ exportBtnTitle }}</el-button> <el-button class="diy-button--reset" size="small" :loading="exportBtn" @click="handleExport">{{ exportBtnTitle }}</el-button>
<el-button <!-- <el-button
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule('room')">下载模板</el-button> @click="handleExportModule('room')">下载模板</el-button> -->
</div> </div>
<el-table <el-table

2
src/views/modules/communityService/dqfwzx/cpts/edit.vue

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<div> <div class="dialog-h-content scroll-h">
<el-form ref="ref_form" <el-form ref="ref_form"
:inline="true" :inline="true"
:model="dataForm" :model="dataForm"

95
src/views/modules/communityService/dqfwzx/cpts/order.vue

@ -1,36 +1,28 @@
<template> <template>
<div> <div>
<div> <div class="dialog-h-content scroll-h">
<el-form <el-form ref="ref_form"
ref="ref_form"
:inline="true" :inline="true"
:model="dataForm" :model="dataForm"
:rules="dataRule" :rules="dataRule"
:disabled="formType === 'detail'" :disabled="formType === 'detail'"
class="form" class="form">
> <el-form-item label="事项名称"
<el-form-item
label="事项名称"
prop="matterName" prop="matterName"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
v-model="info.matterName" v-model="info.matterName"
disabled disabled>
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="预约日期"
label="预约日期"
prop="appointmentDate" prop="appointmentDate"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
>
<!-- <el-date-picker <!-- <el-date-picker
v-model="dataForm.appointmentDate" v-model="dataForm.appointmentDate"
placeholder="预约日期" placeholder="预约日期"
@ -38,98 +30,77 @@
:picker-options="dateOptions" :picker-options="dateOptions"
> >
</el-date-picker> --> </el-date-picker> -->
<el-select v-model="dataForm.appointmentDate" placeholder="请选择"> <el-select v-model="dataForm.appointmentDate"
<el-option placeholder="请选择">
v-for="item in dateList" <el-option v-for="item in dateList"
:key="item" :key="item"
:label="item" :label="item"
:value="item" :value="item">
> </el-option>
</el-option </el-select>
></el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item v-if="timeList.length > 0"
v-if="timeList.length > 0"
label="预约时段" label="预约时段"
prop="timeId" prop="timeId"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
>
<div style="margin-left: auto; width: 600px"> <div style="margin-left: auto; width: 600px">
<el-checkbox <el-checkbox :label="item.timeId"
:label="item.timeId"
:key="item.timeId" :key="item.timeId"
:disabled="!item.isAppointment" :disabled="!item.isAppointment"
v-for="(item, index) in timeList" v-for="(item, index) in timeList"
:checked="item.selected" :checked="item.selected"
:value="item.selected" :value="item.selected"
@change="selectTime(index)" @change="selectTime(index)"
@onChange="selectTime(index)" @onChange="selectTime(index)">{{ item.time }}</el-checkbox>
>{{ item.time }}</el-checkbox
>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="预约人"
label="预约人"
prop="appointmentName" prop="appointmentName"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入预约人" placeholder="请输入预约人"
v-model="dataForm.appointmentName" v-model="dataForm.appointmentName">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="联系方式"
label="联系方式"
prop="appointmentPhone" prop="appointmentPhone"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入联系方式" placeholder="请输入联系方式"
v-model="dataForm.appointmentPhone" v-model="dataForm.appointmentPhone">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="备注"
label="备注"
prop="remark" prop="remark"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
type="textarea" type="textarea"
maxlength="1000" maxlength="1000"
show-word-limit show-word-limit
:rows="3" :rows="3"
placeholder="请输入备注,不超过1000字" placeholder="请输入备注,不超过1000字"
v-model="dataForm.remark" v-model="dataForm.remark"></el-input>
></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="div_btn"> <div class="div_btn">
<el-button @click="handleCancle"> </el-button> <el-button @click="handleCancle"> </el-button>
<el-button <el-button v-if="formType != 'detail'"
v-if="formType != 'detail'"
type="primary" type="primary"
:disabled="btnDisable" :disabled="btnDisable"
@click="handleComfirm" @click="handleComfirm"> </el-button>
> </el-button
>
</div> </div>
</div> </div>
</template> </template>

66
src/views/modules/communityService/dqfwzx/cpts/orderList.vue

@ -1,55 +1,55 @@
<template> <template>
<div style="min-height: 400px"> <div style="min-height: 400px">
<el-form ref="ref_form" :inline="true" class="form"> <el-form ref="ref_form"
<el-form-item :inline="true"
label="选择预约日期" class="form">
<el-form-item label="选择预约日期"
prop="appointmentDate" prop="appointmentDate"
label-width="110px" label-width="110px"
style="display: block" style="display: block">
> <el-date-picker v-model="appointmentDate"
<el-date-picker
v-model="appointmentDate"
placeholder="预约日期" placeholder="预约日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd">
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table v-if="tableData.length > 0"
v-if="tableData.length > 0"
:data="tableData" :data="tableData"
border border
style="width: 96%; margin: 0 auto" style="width: 96%; margin: 0 auto"
class="resi-table" class="resi-table"
:max-height="maxTableHeight" :max-height="maxTableHeight">
> <el-table-column label="序号"
<el-table-column label="序号" type="index" align="center" width="50" /> type="index"
<el-table-column prop="matterName" label="预约事项"></el-table-column> align="center"
<el-table-column width="50" />
prop="appointmentTime" <el-table-column prop="matterName"
label="预约时间" label="预约事项"></el-table-column>
></el-table-column> <el-table-column prop="appointmentTime"
<el-table-column prop="appointmentName" label="预约人"></el-table-column> label="预约时间"></el-table-column>
<el-table-column <el-table-column prop="appointmentName"
prop="appointmentPhone" label="预约人"></el-table-column>
label="联系方式" <el-table-column prop="appointmentPhone"
></el-table-column> label="联系方式"></el-table-column>
<el-table-column prop="remark" label="备注"></el-table-column> <el-table-column prop="remark"
<el-table-column fixed="right" label="操作" align="center" width="120"> label="备注"></el-table-column>
<el-table-column fixed="right"
label="操作"
align="center"
width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button @click="handleCancel(scope.$index)"
@click="handleCancel(scope.$index)"
type="text" type="text"
size="small" size="small">取消</el-button>
>取消</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="m-hint" v-else> <div class="m-hint"
<el-empty description="暂无内容" :image-size="200"></el-empty> v-else>
<el-empty description="暂无内容"
:image-size="200"></el-empty>
</div> </div>
</div> </div>
</template> </template>

3
src/views/modules/communityService/dqfwzx/index.vue

@ -98,6 +98,7 @@
:title="formTitle" :title="formTitle"
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h"
@closed="handleClose"> @closed="handleClose">
<edit-form ref="eleEditForm" <edit-form ref="eleEditForm"
@dialogCancle="handleClose" @dialogCancle="handleClose"
@ -111,6 +112,7 @@
title="预约" title="预约"
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h"
@closed="handleCloseForm2"> @closed="handleCloseForm2">
<order-form ref="eleOrderForm" <order-form ref="eleOrderForm"
@dialogCancle="handleCloseForm2" @dialogCancle="handleCloseForm2"
@ -124,6 +126,7 @@
title="预约记录" title="预约记录"
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h"
@closed="handleCloseOrderList"> @closed="handleCloseOrderList">
<order-list ref="eleOrderList" <order-list ref="eleOrderList"
@dialogCancle="handleCloseOrderList"></order-list> @dialogCancle="handleCloseOrderList"></order-list>

119
src/views/modules/workSys/demandCate.vue

@ -1,12 +1,19 @@
<template> <template>
<div v-if="pageLoading" class="resi-container"> <div v-if="pageLoading"
<el-card ref="searchCard" class="search-card"> class="resi-container">
<el-card ref="searchCard"
class="search-card">
<div> <div>
<el-form :inline="true" :model="form" class="demo-form-inline"> <el-form :inline="true"
:model="form"
class="demo-form-inline">
<el-form-item label="需求分类"> <el-form-item label="需求分类">
<el-select v-model="form.firstCategoryCode" filterable placeholder="请选择" clearable> <el-select size="small"
<el-option v-model="form.firstCategoryCode"
v-for="item in demandOptions" filterable
placeholder="请选择"
clearable>
<el-option v-for="item in demandOptions"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -14,110 +21,110 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button> <el-button class="diy-button--search"
size="small"
@click="handleSearch">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</el-card> </el-card>
<el-card class="resi-card-table"> <el-card class="resi-card-table">
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button class="diy-button--add" size="small" @click="handleAdd('1', 'add')">新增分类</el-button> <el-button class="diy-button--add"
size="small"
@click="handleAdd('1', 'add')">新增分类</el-button>
</div> </div>
<el-table <el-table :data="tableData"
:data="tableData"
row-key="categoryId" row-key="categoryId"
v-loading="tableLoading" v-loading="tableLoading"
border border
:height="tableHeight" :height="tableHeight"
style="width: 100%" style="width: 100%"
class="resi-table" class="resi-table">
> <el-table-column label="序号"
<el-table-column label="序号" type="index" align="center" width="50"> type="index"
align="center"
width="50">
<template slot-scope="scope">{{ scope.row.index }}</template> <template slot-scope="scope">{{ scope.row.index }}</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column v-for="item in tableHeader"
v-for="item in tableHeader"
:key="item.columnName" :key="item.columnName"
:prop="item.columnName" :prop="item.columnName"
:label="item.label" :label="item.label"
:align="item.align" :align="item.align">
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ handleFilterSpan(scope.row, item) }}</span> <span>{{ handleFilterSpan(scope.row, item) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="200"> <el-table-column label="操作"
align="center"
width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button v-if="scope.row.hasBtn"
v-if="scope.row.hasBtn"
@click="handleLook(scope.row)" @click="handleLook(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail" class="div-table-button--detail">{{(scope.row.usableFlag&&'禁用') || '启用'}}</el-button>
>{{(scope.row.usableFlag&&'禁用') || '启用'}}</el-button <el-button v-if="scope.row.level == 1"
>
<el-button
v-if="scope.row.level == 1"
@click="handleAdd('2', 'add', scope.row)" @click="handleAdd('2', 'add', scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--delete" class="div-table-button--delete">添加二级分类</el-button>
>添加二级分类</el-button <el-button @click="handleEdit(scope.row, 'edit')"
>
<el-button
@click="handleEdit(scope.row, 'edit')"
type="text" type="text"
size="small" size="small"
class="div-table-button--edit" class="div-table-button--edit">编辑</el-button>
>编辑</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination <el-pagination @size-change="handleSizeChange"
@size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-sizes="[20, 50, 100, 200]" :page-sizes="[20, 50, 100, 200]"
:page-size="pageSize" :page-size="pageSize"
layout="sizes, prev, pager, next, total" layout="sizes, prev, pager, next, total"
:total="total" :total="total">
>
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
<el-dialog <el-dialog title="居民需求分类"
title="居民需求分类"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="40%" width="40%"
append-to-body append-to-body
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="handlerCancle" :before-close="handlerCancle">
> <el-form label-width="100px"
<el-form label-width="100px" :model="form" :rules="rules" ref="ruleForm"> :model="form"
<el-form-item label="分类名称" prop="categoryName"> :rules="rules"
<el-input v-model="form.categoryName" size="small" style="width: 180px;"></el-input> ref="ruleForm">
<el-form-item label="分类名称"
prop="categoryName">
<el-input v-model="form.categoryName"
size="small"
style="width: 180px;"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="状态"> <!-- <el-form-item label="状态">
<el-switch v-model="form.usableFlag"></el-switch> <el-switch v-model="form.usableFlag"></el-switch>
</el-form-item> --> </el-form-item> -->
<el-form-item v-if="addLevel == '2'" label="奖励积分"> <el-form-item v-if="addLevel == '2'"
<el-input-number v-model="form.awardPoint" :min="0" size="small" label="描述文字"></el-input-number> label="奖励积分">
<el-input-number v-model="form.awardPoint"
:min="0"
size="small"
label="描述文字"></el-input-number>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="resi-btns"> <div class="resi-btns">
<el-button size="small" @click="handlerCancle">取消</el-button> <el-button size="small"
<el-button @click="handlerCancle">取消</el-button>
type="primary" <el-button type="primary"
size="small" size="small"
:loading="btnLoading" :loading="btnLoading"
@click="handleSUbmit" @click="handleSUbmit">提交</el-button>
>提交</el-button
>
</div> </div>
</el-dialog> </el-dialog>
@ -444,7 +451,6 @@ export default {
} }
.cell { .cell {
span:nth-of-type(3) { span:nth-of-type(3) {
display: inline-block; display: inline-block;
width: 90%; width: 90%;
@ -483,14 +489,13 @@ export default {
} }
} }
.avatar-uploader { .avatar-uploader {
::v-deep ::v-deep .el-upload {
.el-upload {
cursor: pointer; cursor: pointer;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.el-upload:hover { .el-upload:hover {
border-color: #409EFF; border-color: #409eff;
} }
.avatar { .avatar {
width: 70px; width: 70px;
@ -509,8 +514,6 @@ export default {
} }
} }
.resi-btns { .resi-btns {
margin-top: 20px; margin-top: 20px;
text-align: center; text-align: center;

Loading…
Cancel
Save