elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

111

master
jiangyy 3 years ago
parent
27f8409e12
commit
33192eda36
2 changed files with 414 additions and 505 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 461
      src/views/modules/communityService/measure/index.vue
  2. 18
      src/views/modules/communityService/measure/info.vue

461
src/views/modules/communityService/measure/index.vue
View File

@ -1,39 +1,35 @@
<template>
<div v-if="pageLoading" class="resi-container">
<el-card ref="searchCard" class="search-card">
<div v-if="pageLoading"
class="resi-container">
<el-card ref="searchCard"
class="search-card">
<div>
<el-form
ref="searchForm"
<el-form ref="searchForm"
:inline="true"
:model="searchForm"
class="demo-form-inline"
label-width="80px"
>
label-width="80px">
<div>
<el-form-item label="所属网格" prop="gridId">
<el-select
v-model="searchForm.gridId"
<el-form-item label="所属网格"
prop="gridId">
<el-select v-model="searchForm.gridId"
filterable
placeholder="请选择"
clearable
>
<el-option
v-for="item in optionsG"
clearable>
<el-option v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="需求分类" prop="categoryCode">
<el-cascader
v-model="searchForm.categoryCode"
<el-form-item label="需求分类"
prop="categoryCode">
<el-cascader v-model="searchForm.categoryCode"
:options="searchdemandOptions"
:props="{ checkStrictly: true }"
clearable
@change="handleCateCHange"
></el-cascader>
@change="handleCateCHange"></el-cascader>
<!-- <el-select v-model="searchForm.categoryCode" filterable placeholder="请选择" clearable>
<el-option
v-for="item in demandOptions"
@ -43,108 +39,89 @@
</el-option>
</el-select> -->
</el-form-item>
<el-form-item label="需求人" prop="demandUserName">
<el-input
v-model="searchForm.demandUserName"
<el-form-item label="需求人"
prop="demandUserName">
<el-input v-model="searchForm.demandUserName"
placeholder="请输入内容"
clearable=""
></el-input>
clearable=""></el-input>
</el-form-item>
</div>
<div>
<el-form-item label="状态" prop="status">
<el-select
v-model="searchForm.status"
<el-form-item label="状态"
prop="status">
<el-select v-model="searchForm.status"
filterable
placeholder="请选择"
clearable
>
<el-option
v-for="item in statusOptions"
clearable>
<el-option v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="上报时间" prop="reportStartTime">
<el-date-picker
v-model="reportTime"
<el-form-item label="上报时间"
prop="reportStartTime">
<el-date-picker v-model="reportTime"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
clearable=""
>
clearable="">
</el-date-picker>
</el-form-item>
</div>
<div>
<el-form-item label="服务类型" prop="serviceType">
<el-select
v-model="searchForm.serviceType"
<el-form-item label="服务类型"
prop="serviceType">
<el-select v-model="searchForm.serviceType"
filterable
placeholder="请选择"
clearable
@change="handleServiceChange('query', $event)"
>
<el-option
v-for="item in serviceOptions"
@change="handleServiceChange('query', $event)">
<el-option v-for="item in serviceOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="serverId">
<el-select
v-model="searchForm.serverId"
<el-select v-model="searchForm.serverId"
filterable
:disabled="searchForm.serviceType ? false : true"
placeholder="请选择"
clearable
>
<el-option
v-for="item in serviceOptiondList"
clearable>
<el-option v-for="item in serviceOptiondList"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="服务时间" prop="wantServiceStartTime">
<el-date-picker
v-model="serviceTime"
<el-form-item label="服务时间"
prop="wantServiceStartTime">
<el-date-picker v-model="serviceTime"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
clearable
>
clearable>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
class="diy-button--search"
<el-button class="diy-button--search"
size="small"
@click="handleSearch"
>查询</el-button
>
@click="handleSearch">查询</el-button>
</el-form-item>
<el-form-item>
<el-button
class="diy-button--reset"
<el-button class="diy-button--reset"
size="small"
@click="resetForm('searchForm')"
>重置</el-button
>
@click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</div>
</el-form>
@ -152,194 +129,157 @@
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button
class="diy-button--add"
<el-button class="diy-button--add"
size="small"
@click="handleAdd('add')"
>新增</el-button
>
@click="handleAdd('add')">新增</el-button>
</div>
<el-table
:data="tableData"
<el-table :data="tableData"
row-key="categoryId"
v-loading="tableLoading"
border
:height="tableHeight"
style="width: 100%"
class="resi-table"
>
<el-table-column label="序号" type="index" align="center" width="50">
class="resi-table">
<el-table-column label="序号"
type="index"
align="center"
width="50">
</el-table-column>
<el-table-column
v-for="item in tableHeader"
<el-table-column v-for="item in tableHeader"
:key="item.columnName"
:prop="item.columnName"
:label="item.label"
:align="item.align"
:min-width="item.width"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ handleFilterSpan(scope.row, item) }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="200">
<el-table-column fixed="right"
label="操作"
align="center"
width="200">
<template slot-scope="scope">
<template v-if="filterEdit(scope.row.agencyId)">
<el-button
v-if="
<el-button v-if="
scope.row.status === 'pending' ||
scope.row.status === 'assigned'
"
type="text"
size="small"
@click="handleAppoint(scope.row, 'appoint')"
>指派</el-button
>
@click="handleAppoint(scope.row, 'appoint')">指派</el-button>
<!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
<template
v-if="
<template v-if="
scope.row.reportType == 'self_help' &&
scope.row.serviceShowFlag
"
>
<el-button
v-if="
">
<el-button v-if="
scope.row.serviceType !== 'volunteer' &&
scope.row.status !== 'finished'
"
type="text"
size="small"
@click="handleFinish(scope.row, 'finish')"
>完成情况</el-button
>
@click="handleFinish(scope.row, 'finish')">完成情况</el-button>
</template>
<template v-else>
<el-button
v-if="
<el-button v-if="
scope.row.status === 'assigned' ||
scope.row.status === 'have_order' ||
(scope.row.status == 'finished' && !scope.row.evaluateFlag)
"
type="text"
size="small"
@click="handleFinish(scope.row, 'finish')"
>完成情况</el-button
>
@click="handleFinish(scope.row, 'finish')">完成情况</el-button>
</template>
<template v-if="scope.row.reportType != 'self_help'">
<el-button
v-if="scope.row.status === 'pending'"
<el-button v-if="scope.row.status === 'pending'"
@click="handleEdit(scope.row, 'edit')"
type="text"
size="small"
class="btn-color-edit"
>修改</el-button
>
<el-popconfirm
title="取消之后无法恢复，确认取消？"
@onConfirm="handleDel(scope.row)"
>
<el-button
v-if="
class="btn-color-edit">修改</el-button>
<el-popconfirm title="取消之后无法恢复，确认取消？"
@onConfirm="handleDel(scope.row)">
<el-button v-if="
scope.row.status !== 'finished' &&
scope.row.status !== 'canceled'
"
slot="reference"
type="text"
size="small"
class="btn-color-del"
>取消</el-button
>
class="btn-color-del">取消</el-button>
</el-popconfirm>
</template>
</template>
<el-button
@click="handleLook(scope.row, 'look')"
<el-button @click="handleLook(scope.row, 'look')"
type="text"
size="small"
class="btn-color-look"
>查看</el-button
>
class="btn-color-look">查看</el-button>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChange"
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
:page-sizes="[20, 50, 100, 200]"
:page-size="pageSize"
layout="sizes, prev, pager, next, total"
:total="total"
>
:total="total">
</el-pagination>
</div>
</el-card>
<el-dialog
title="需求信息"
<el-dialog title="需求信息"
:visible.sync="dialogVisible"
width="50%"
top="5vh"
append-to-body
class="dialog-h"
:close-on-click-modal="false"
:before-close="handlerCancle"
>
<el-form
v-if="dialogVisible"
:before-close="handlerCancle">
<el-form v-if="dialogVisible"
label-width="120px"
:model="form"
:rules="rules"
ref="ruleForm"
class="form-wr dialog-h-content scroll-h"
>
<el-form-item label="所属网格" prop="gridId">
<el-input
v-if="disabled"
class="form-wr dialog-h-content scroll-h">
<el-form-item label="所属网格"
prop="gridId">
<el-input v-if="disabled"
v-model="form.gridName"
:disabled="disabled"
class="input-width"
></el-input>
class="input-width"></el-input>
<!-- <span >{{ form.gridName }}</span> -->
<el-select
v-else
<el-select v-else
v-model="form.gridId"
filterable
placeholder="请选择"
class="input-width"
clearable
:disabled="disabled"
@change="handleGridChange"
>
<el-option
v-for="item in disabled ? optionsG : optionsEditG"
@change="handleGridChange">
<el-option v-for="item in disabled ? optionsG : optionsEditG"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="需求类型" prop="categoryCode">
<el-input
v-if="disabled"
<el-form-item label="需求类型"
prop="categoryCode">
<el-input v-if="disabled"
v-model="form.categoryName"
:disabled="disabled"
class="input-width-min"
></el-input>
<el-cascader
v-else
class="input-width-min"></el-input>
<el-cascader v-else
v-model="form.categoryCode"
:options="demandOptions"
:disabled="disabled"
clearable
class="input-width"
@change="handleCateSlect"
></el-cascader>
@change="handleCateSlect"></el-cascader>
<!-- <el-select v-model="form.parentCode" filterable placeholder="请选择" class="input-width" clearable>
<el-option
v-for="item in demandOptions"
@ -349,179 +289,148 @@
</el-option>
</el-select> -->
</el-form-item>
<el-form-item label="上报类型" prop="reportType">
<el-input
v-if="disabled"
<el-form-item label="上报类型"
prop="reportType">
<el-input v-if="disabled"
v-model="form.reportTypeName"
:disabled="disabled"
class="input-width"
></el-input>
<el-select
v-else
class="input-width"></el-input>
<el-select v-else
v-model="form.reportType"
filterable
class="input-width"
placeholder="请选择"
clearable
:disabled="disabled"
>
<el-option
v-for="item in reportOptions"
:disabled="disabled">
<el-option v-for="item in reportOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="上报人" prop="reportUserName">
<el-input
v-model="form.reportUserName"
<el-form-item label="上报人"
prop="reportUserName">
<el-input v-model="form.reportUserName"
:disabled="disabled"
placeholder="请输入"
class="input-width"
clearable
></el-input>
clearable></el-input>
</el-form-item>
<el-form-item label="上报人手机号" prop="reportUserMobile">
<el-input
v-model="form.reportUserMobile"
<el-form-item label="上报人手机号"
prop="reportUserMobile">
<el-input v-model="form.reportUserMobile"
:disabled="disabled"
placeholder="请输入"
class="input-width"
maxlength="11"
clearable
></el-input>
clearable></el-input>
</el-form-item>
<el-form-item label="上报时间" prop="reportTime">
<el-date-picker
v-model="form.reportTime"
<el-form-item label="上报时间"
prop="reportTime">
<el-date-picker v-model="form.reportTime"
type="datetime"
class="input-width"
clearable
:disabled="disabled"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
>
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="需求人" prop="demandUserId">
<el-input
v-if="disabled"
<el-form-item label="需求人"
prop="demandUserId">
<el-input v-if="disabled"
v-model="form.demandUserName"
:disabled="disabled"
class="input-width"
></el-input>
<el-select
v-else
class="input-width"></el-input>
<el-select v-else
v-model="selectDemandUser"
class="input-width"
filterable
:disabled="disabled"
placeholder="请选择"
clearable
@change="handleDemandChange"
>
<el-option
v-for="item in demandUserList"
@change="handleDemandChange">
<el-option v-for="item in demandUserList"
:key="item.demandUserId"
:label="item.label"
:value="item"
>
:value="item">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="服务时间" prop="wantServiceTime">
<el-date-picker
v-model="form.wantServiceTime"
<el-form-item label="服务时间"
prop="wantServiceTime">
<el-date-picker v-model="form.wantServiceTime"
type="datetime"
class="input-width"
clearable
:disabled="disabled"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
>
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="需求内容" prop="content">
<el-input
v-model="form.content"
<el-form-item label="需求内容"
prop="content">
<el-input v-model="form.content"
:autosize="{ minRows: 2, maxRows: 10 }"
:disabled="disabled"
type="textarea"
clearable
class="input-width-textarea"
placeholder="请输入内容"
></el-input>
placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item
v-if="
<el-form-item v-if="
addType === 'appoint' ||
addType == 'finish' ||
(addType == 'look' && form.serviceShowFlag)
"
label="服务方"
prop="serviceType"
>
prop="serviceType">
<template v-if="disabled && addType !== 'appoint'">
<el-input
v-model="form.serviceShowName"
<el-input v-model="form.serviceShowName"
:disabled="disabled"
class="input-width"
></el-input>
class="input-width"></el-input>
</template>
<template v-else>
<el-select
v-model="form.serviceType"
<el-select v-model="form.serviceType"
class="input-width-small"
placeholder="请选择"
clearable
:disabled="disabled && addType !== 'appoint'"
@change="handleServiceChange('add', $event)"
>
<el-option
v-for="item in serviceOptions"
@change="handleServiceChange('add', $event)">
<el-option v-for="item in serviceOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
-
<el-select
v-model="form.serverId"
<el-select v-model="form.serverId"
class="input-width-middle"
filterable
placeholder="请选择"
clearable
:disabled="disabled && addType !== 'appoint'"
>
<el-option
v-for="item in serviceOptiondList"
:disabled="disabled && addType !== 'appoint'">
<el-option v-for="item in serviceOptiondList"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</template>
</el-form-item>
<el-form-item
v-if="addType == 'look' && form.status == 'canceled'"
<el-form-item v-if="addType == 'look' && form.status == 'canceled'"
label="取消时间"
prop="cancelTime"
>
prop="cancelTime">
<span>{{ form.cancelTime }}</span>
</el-form-item>
<template
v-if="
<template v-if="
(addType == 'finish' && form.reportType != 'self_help') ||
(addType == 'look' && form.status == 'finished')
"
>
<el-form-item label="实际服务时间" prop="serviceStartTime">
<el-date-picker
v-model="finishServiceTime"
">
<el-form-item label="实际服务时间"
prop="serviceStartTime">
<el-date-picker v-model="finishServiceTime"
class="input-width-min"
clearable
:disabled="disabled && addType != 'finish'"
@ -530,47 +439,40 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handelBlurServiceTime"
>
@change="handelBlurServiceTime">
</el-date-picker>
</el-form-item>
<el-form-item label="完成情况" prop="finishResult">
<el-radio
v-model="form.finishResult"
<el-form-item label="完成情况"
prop="finishResult">
<el-radio v-model="form.finishResult"
label="resolved"
:disabled="disabled && addType != 'finish'"
>已解决</el-radio
>
<el-radio
v-model="form.finishResult"
:disabled="disabled && addType != 'finish'">已解决</el-radio>
<el-radio v-model="form.finishResult"
label="unresolved"
:disabled="disabled && addType != 'finish'"
>未解决</el-radio
>
:disabled="disabled && addType != 'finish'">未解决</el-radio>
</el-form-item>
<el-form-item label="评价" prop="score" class="form-score">
<el-rate
v-model="form.score"
<el-form-item label="评价"
prop="score"
class="form-score">
<el-rate v-model="form.score"
:allow-half="true"
:disabled="disabled && addType != 'finish'"
></el-rate>
:disabled="disabled && addType != 'finish'"></el-rate>
</el-form-item>
<el-form-item label="备注" prop="finishDesc">
<el-input
v-model="form.finishDesc"
<el-form-item label="备注"
prop="finishDesc">
<el-input v-model="form.finishDesc"
:autosize="{ minRows: 2, maxRows: 10 }"
:disabled="disabled && addType != 'finish'"
type="textarea"
clearable
class="input-width-textarea"
placeholder="请输入内容"
></el-input>
placeholder="请输入内容"></el-input>
</el-form-item>
</template>
<template v-if="addType == 'finish' && form.reportType == 'self_help'">
<el-form-item label="实际服务时间" prop="serviceStartTime">
<el-date-picker
v-model="finishServiceTime"
<el-form-item label="实际服务时间"
prop="serviceStartTime">
<el-date-picker v-model="finishServiceTime"
class="input-width-min"
clearable
:disabled="disabled && addType != 'finish'"
@ -579,34 +481,29 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handelBlurServiceTime"
>
@change="handelBlurServiceTime">
</el-date-picker>
</el-form-item>
</template>
</el-form>
<div class="resi-btns">
<el-button size="small" @click="handlerCancle">{{
<el-button size="small"
@click="handlerCancle">{{
addType != "look" ? "取消" : "关闭"
}}</el-button>
<el-button
v-if="addType != 'look'"
<el-button v-if="addType != 'look'"
type="primary"
size="small"
:loading="btnLoading"
@click="handleSUbmit"
>提交</el-button
>
@click="handleSUbmit">提交</el-button>
</div>
</el-dialog>
<info
:addType="infoAddType"
<info :addType="infoAddType"
:demand-rec-id="currDemandId"
v-if="visitableInfo"
@close="visitableInfo = false"
@success="getTableData"
></info>
@success="getTableData"></info>
</div>
</template>

18
src/views/modules/communityService/measure/info.vue
View File

@ -5,7 +5,8 @@
:model="form"
:rules="rules"
ref="ruleForm">
<el-form-item label="操作方式"
<el-form-item v-if="formType==='add'"
label="操作方式"
:class="{'form-item':source==='visiual'}"
prop="addType">
<el-radio-group v-model="addType">
@ -202,6 +203,7 @@
</div>
</el-form-item>
<el-form-item v-if="
addType === 'add' ||
addType === 'appoint' ||
addType == 'finish' ||
(addType == 'look' && form.serviceShowFlag)
@ -369,6 +371,10 @@ export default {
type: String,
default: "",
},
formType: {
type: String,
default: "",
},
// addType: {
// type: String,
// default: "look",
@ -452,7 +458,7 @@ export default {
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
disabled () {
return this.addType != "edit";
return this.addType != "edit" || this.addType != "add";
},
},
@ -464,8 +470,14 @@ export default {
async created () {
this.customerId = localStorage.getItem("customerId");
if (this.formType === 'add') {
this.addType = 'add'
} else {
this.getInfo();
}
this.pageLoading = true;
},

Write Preview
Loading…
Cancel
Save