Browse Source

Merge branch 'dev_shequzhili' into test

test
dai 3 years ago
parent
commit
0341e8458e
  1. 93
      src/assets/scss/modules/shequzhili/event-info.scss
  2. 2
      src/js/dai/request.js
  3. 2
      src/js/dai/request2.js
  4. 582
      src/views/modules/communityService/measure/info.vue
  5. 5
      src/views/modules/shequzhili/event/cpts/add.vue
  6. 80
      src/views/modules/shequzhili/event/cpts/event-detail.vue
  7. 4
      src/views/modules/shequzhili/event/cpts/event-info.vue
  8. 25
      src/views/modules/shequzhili/event/cpts/process-form-demand.vue
  9. 5
      src/views/modules/shequzhili/event/cpts/process-form-project.vue
  10. 1
      src/views/modules/shequzhili/event/cpts/process-form-replay.vue
  11. 13
      src/views/modules/shequzhili/event/cpts/process-form.vue
  12. 3
      src/views/modules/shequzhili/event/eventList.vue
  13. 4
      src/views/modules/shequzhili/xiangmu/index.vue
  14. 1
      src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
  15. 30
      src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue

93
src/assets/scss/modules/shequzhili/event-info.scss

@ -24,29 +24,58 @@
.avatar-uploader {
margin: 0 0 0 20px;
/deep/ .el-upload--picture-card{
width: 100px;
height: 100px;
}
/deep/ .el-upload{
width: 100px;
height: 100px;
line-height: 100px;
}
/deep/ .el-upload-list--picture-card .el-upload-list__item{
width: 100px;
height: 100px;
line-height: 100px;
}
/deep/ .el-upload-list--picture-card .el-upload-list__item-thumbnail{
width: 100px;
height: 100px;
line-height: 100px;
}
/deep/ .avatar{
width: 100px;
height: 100px;
}
// /deep/ .el-upload--picture-card{
// width: 100px;
// height: 100px;
// }
// /deep/ .el-upload{
// width: 100px;
// height: 100px;
// line-height: 100px;
// }
// /deep/ .el-upload-list--picture-card .el-upload-list__item{
// width: 100px;
// height: 100px;
// line-height: 100px;
// }
// /deep/ .el-upload-list--picture-card .el-upload-list__item-thumbnail{
// width: 100px;
// height: 100px;
// line-height: 100px;
// }
// /deep/ .avatar{
// width: 100px;
// height: 100px;
// }
// /deep/ .el-upload-list__item-status-label {
// display: block;
// position: absolute;
// right: -15px;
// top: -6px;
// width: 40px;
// height: 24px;
// background: #13ce66;
// text-align: center;
// -webkit-transform: rotate(45deg);
// transform: rotate(45deg);
// -webkit-box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
// box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
// }
// /deep/ .el-upload-list__item-actions {
// position: absolute;
// width: 100%;
// height: 100%;
// left: 0;
// top: 0;
// cursor: default;
// text-align: center;
// color: #fff;
// opacity: 0;
// font-size: 20px;
// background-color: rgba(0, 0, 0, 0.5);
// -webkit-transition: opacity .3s;
// transition: opacity .3s;
// }
}
@ -206,8 +235,9 @@
}
.m-row {
display: flex;
// display: flex;
justify-content: space-between;
width:100%;
}
.m-hint {
@ -404,17 +434,20 @@
}
.div-satisfy{
padding:50px;
padding:10px 0 0;
display:flex ;
justify-content: space-around;
text-align: center;
justify-content: flex-start;
text-align: center;
>div{
margin-left:50px;
}
img{
width:100px;
height:100px;
width:80px;
height:80px;
}
.tip-satisfy{
text-align: center;
margin-top:20px
margin-top:10px
}
}

2
src/js/dai/request.js

@ -36,7 +36,7 @@ const request = curry(
// retData = Vue.$afterRequestHook(retData);
// }
if (res.data.code > 8000 && res.data.code < 10000) {
Message.error(res.data.msg);
// Message.error(res.data.msg);
}
if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
// 10005 token为空 10006登陆超时 10007别处登录

2
src/js/dai/request2.js

@ -36,7 +36,7 @@ const request = curry(
// retData = Vue.$afterRequestHook(retData);
// }
if (res.data.code > 8000 && res.data.code < 10000) {
Message.error(res.data.msg);
// Message.error(res.data.msg);
}
if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
// 10005 token为空 10006登陆超时 10007别处登录

582
src/views/modules/communityService/measure/info.vue

@ -1,42 +1,31 @@
<template>
<el-dialog
title="需求信息"
width="50%"
top="5vh"
append-to-body
class="dialog-h"
:visible="true"
:close-on-click-modal="false"
:before-close="handlerClose"
>
<el-form
label-width="120px"
:model="form"
:rules="rules"
ref="ruleForm"
class="form-wr dialog-h-content scroll-h"
>
<el-form-item label="操作方式" prop="addType">
<el-dialog title="需求信息"
width="50%"
top="5vh"
append-to-body
class="dialog-h"
:visible="true"
:close-on-click-modal="false"
:before-close="handlerClose">
<el-form label-width="120px"
:model="form"
:rules="rules"
ref="ruleForm"
class="form-wr dialog-h-content scroll-h">
<el-form-item label="操作方式"
prop="addType">
<el-radio-group v-model="addType">
<el-radio label="look">查看</el-radio>
<template v-if="form.reportType != 'self_help'">
<el-radio label="edit" v-if="form.status === 'pending'"
>修改</el-radio
>
<el-radio
label="cancel"
v-if="form.status !== 'finished' && form.status !== 'canceled'"
>取消</el-radio
>
<el-radio label="edit"
v-if="form.status === 'pending'">修改</el-radio>
<el-radio label="cancel"
v-if="form.status !== 'finished' && form.status !== 'canceled'">取消</el-radio>
</template>
<el-radio
label="appoint"
v-if="form.status === 'pending' || form.status === 'assigned'"
>指派</el-radio
>
<el-radio
label="finish"
v-if="
<el-radio label="appoint"
v-if="form.status === 'pending' || form.status === 'assigned'">指派</el-radio>
<!-- <el-radio label="finish"
v-if="
(form.reportType == 'self_help' &&
form.serviceShowFlag &&
form.serviceType !== 'volunteer' &&
@ -44,303 +33,261 @@
form.status === 'assigned' ||
form.status === 'have_order' ||
(form.status == 'finished' && !form.evaluateFlag)
"
>完成</el-radio
>
">完成</el-radio> -->
<el-radio label="finish"
v-if="
(form.reportType == 'self_help' &&
form.serviceShowFlag &&
form.serviceType !== 'volunteer' &&
form.status !== 'finished') ||
form.status === 'assigned' ||
form.status === 'have_order'
">完成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="所属网格" prop="gridId">
<el-input
v-if="disabled"
v-model="form.gridName"
:disabled="disabled"
class="input-width"
></el-input>
<el-form-item label="所属网格"
prop="gridId">
<el-input v-if="disabled"
v-model="form.gridName"
:disabled="disabled"
class="input-width"></el-input>
<!-- <span >{{ form.gridName }}</span> -->
<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"
:key="item.value"
:label="item.label"
:value="item.value"
>
<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"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="需求类型" prop="categoryCode">
<el-input
v-if="disabled"
v-model="form.categoryName"
:disabled="disabled"
class="input-width"
clearable
></el-input>
<el-cascader
v-else
v-model="form.categoryCodeArr"
:options="demandOptions"
:disabled="disabled"
clearable
class="input-width"
@change="handleCateSlect"
></el-cascader>
<el-form-item label="需求类型"
prop="categoryCode">
<el-input v-if="disabled"
v-model="form.categoryName"
:disabled="disabled"
class="input-width"
clearable></el-input>
<el-cascader v-else
v-model="form.categoryCodeArr"
:options="demandOptions"
:disabled="disabled"
clearable
class="input-width"
@change="handleCateSlect"></el-cascader>
</el-form-item>
<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
v-model="form.reportType"
filterable
class="input-width"
placeholder="请选择"
clearable
:disabled="disabled"
>
<el-option
v-for="item in reportOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
<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
v-model="form.reportType"
filterable
class="input-width"
placeholder="请选择"
clearable
:disabled="disabled">
<el-option v-for="item in reportOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="上报人" prop="reportUserName">
<el-input
v-model="form.reportUserName"
:disabled="disabled"
placeholder="请输入"
class="input-width"
clearable
></el-input>
<el-form-item label="上报人"
prop="reportUserName">
<el-input v-model="form.reportUserName"
:disabled="disabled"
placeholder="请输入"
class="input-width"
clearable></el-input>
</el-form-item>
<el-form-item label="上报人手机号" prop="reportUserMobile">
<el-input
v-model="form.reportUserMobile"
:disabled="disabled"
placeholder="请输入"
class="input-width"
maxlength="11"
clearable
></el-input>
<el-form-item label="上报人手机号"
prop="reportUserMobile">
<el-input v-model="form.reportUserMobile"
:disabled="disabled"
placeholder="请输入"
class="input-width"
maxlength="11"
clearable></el-input>
</el-form-item>
<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="选择日期时间"
>
<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="选择日期时间">
</el-date-picker>
</el-form-item>
<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
v-model="selectDemandUser"
class="input-width"
filterable
:disabled="disabled"
placeholder="请选择"
clearable
@change="handleDemandChange"
>
<el-option
v-for="item in demandUserList"
:key="item.demandUserId"
:label="item.label"
:value="item"
>
<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
v-model="selectDemandUser"
class="input-width"
filterable
:disabled="disabled"
placeholder="请选择"
clearable
@change="handleDemandChange">
<el-option v-for="item in demandUserList"
:key="item.demandUserId"
:label="item.label"
:value="item">
</el-option>
</el-select>
</el-form-item>
<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="选择日期时间"
>
<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="选择日期时间">
</el-date-picker>
</el-form-item>
<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>
<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>
</el-form-item>
<el-form-item
v-if="
<el-form-item v-if="
addType === 'appoint' ||
addType == 'finish' ||
(addType == 'look' && form.serviceShowFlag)
"
label="服务方"
prop="serviceType"
>
label="服务方"
prop="serviceType">
<template v-if="disabled && addType !== 'appoint'">
<el-input
v-model="form.serviceShowName"
:disabled="disabled"
class="input-width"
></el-input>
<el-input v-model="form.serviceShowName"
:disabled="disabled"
class="input-width"></el-input>
</template>
<template v-else>
<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"
:key="item.value"
:label="item.label"
:value="item.value"
>
<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"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
-
<el-select
v-model="form.serverId"
class="input-width-middle"
filterable
placeholder="请选择"
clearable
:disabled="disabled && addType !== 'appoint'"
>
<el-option
v-for="item in serviceOptiondList"
:key="item.value"
:label="item.label"
:value="item.value"
>
<el-select v-model="form.serverId"
class="input-width-middle"
filterable
placeholder="请选择"
clearable
:disabled="disabled && addType !== 'appoint'">
<el-option v-for="item in serviceOptiondList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</template>
</el-form-item>
<el-form-item
v-if="addType == 'look' && form.status == 'canceled'"
label="取消时间"
prop="cancelTime"
>
<el-form-item v-if="addType == 'look' && form.status == 'canceled'"
label="取消时间"
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"
class="input-width-min"
clearable
:disabled="disabled && addType != 'finish'"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handelBlurServiceTime"
>
">
<el-form-item label="实际服务时间"
prop="serviceStartTime">
<el-date-picker v-model="finishServiceTime"
class="input-width-min"
clearable
:disabled="disabled && addType != 'finish'"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handelBlurServiceTime">
</el-date-picker>
</el-form-item>
<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"
label="unresolved"
:disabled="disabled && addType != 'finish'"
>未解决</el-radio
>
<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"
label="unresolved"
:disabled="disabled && addType != 'finish'">未解决</el-radio>
</el-form-item>
<el-form-item label="评价" prop="score" class="form-score">
<el-rate
v-model="form.score"
:allow-half="true"
:disabled="disabled && addType != 'finish'"
></el-rate>
<el-form-item label="评价"
prop="score"
class="form-score">
<el-rate v-model="form.score"
:allow-half="true"
:disabled="disabled && addType != 'finish'"></el-rate>
</el-form-item>
<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>
<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>
</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"
class="input-width-min"
clearable
:disabled="disabled && addType != 'finish'"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handelBlurServiceTime"
>
<el-form-item label="实际服务时间"
prop="serviceStartTime">
<el-date-picker v-model="finishServiceTime"
class="input-width-min"
clearable
:disabled="disabled && addType != 'finish'"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handelBlurServiceTime">
</el-date-picker>
</el-form-item>
</template>
</el-form>
<div class="resi-btns">
<el-button size="small" @click="handlerClose">关闭</el-button>
<el-button
v-if="addType != 'look'"
type="primary"
size="small"
:loading="btnLoading"
@click="handleSubmit"
>提交</el-button
>
<el-button size="small"
@click="handlerClose">关闭</el-button>
<el-button v-if="addType != 'look'"
type="primary"
size="small"
:loading="btnLoading"
@click="handleSubmit">提交</el-button>
</div>
</el-dialog>
</template>
@ -354,17 +301,17 @@ export default {
type: String,
default: "",
},
addType: {
type: String,
default: "look",
},
// addType: {
// type: String,
// default: "look",
// },
},
data() {
data () {
return {
btnLoading: false,
pageLoading: false,
addType: 'look',
form: {
gridId: "",
categoryCodeArr: [],
@ -432,18 +379,18 @@ export default {
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
disabled() {
disabled () {
return this.addType != "edit";
},
},
watch: {
addType(val) {
addType (val) {
this.formatRowForm(val);
},
},
async created() {
async created () {
this.customerId = localStorage.getItem("customerId");
this.getInfo();
@ -452,11 +399,11 @@ export default {
},
methods: {
filterEdit(id) {
filterEdit (id) {
const { user } = this.$store.state;
return id === user.agencyId;
},
handleCateSlect(val) {
handleCateSlect (val) {
console.log("val", val);
if (val.length === 1) {
this.demandOptions.forEach((item) => {
@ -468,31 +415,31 @@ export default {
this.form.categoryCode = val[1];
}
},
handleDemandChange(val) {
handleDemandChange (val) {
console.log("val", val, this.selectDemandUser);
this.selectDemandUser = val.label;
this.form.demandUserName = val.demandUserName;
this.form.demandUserMobile = val.demandUserMobile;
this.form.demandUserId = val.demandUserId;
},
handelBlurServiceTime(val) {
handelBlurServiceTime (val) {
console.log("val", val);
if (val.length > 0) {
this.form.serviceStartTime = val[0];
this.form.serviceEndTime = val[1];
}
},
handleServiceChange(type, val) {
handleServiceChange (type, val) {
if (val === "social_org") {
if (type === "add") this.getServiceuserList(val, "add_demand");
else this.getServiceuserList(val, "query_demand");
} else this.getServiceuserList(val, "");
},
handleGridChange(val) {
handleGridChange (val) {
this.getDemandUserList();
},
handelBlurServiceTime(val) {
handelBlurServiceTime (val) {
console.log("val", val);
if (val.length > 0) {
this.form.serviceStartTime = val[0];
@ -500,23 +447,23 @@ export default {
}
},
handleServiceChange(type, val) {
handleServiceChange (type, val) {
if (val === "social_org") {
if (type === "add") this.getServiceuserList(val, "add_demand");
else this.getServiceuserList(val, "query_demand");
} else this.getServiceuserList(val, "");
},
handleAdd(addType) {
handleAdd (addType) {
this.addType = addType;
this.dialogVisible = true;
},
handlerClose() {
handlerClose () {
this.$emit("close");
},
async formatRowForm(addType) {
async formatRowForm (addType) {
this.addType = addType;
const { form: row } = this;
@ -529,9 +476,14 @@ export default {
"";
}
if (addType == "finish") {
if (row.serviceStartTime)
if (row.serviceStartTime && row.serviceEndTime) {
this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime];
} else {
this.finishServiceTime = []
}
this.form.finishResult = "resolved";
this.form.score = 5;
}
@ -554,7 +506,7 @@ export default {
this.dialogVisible = true;
},
async appointAjax() {
async appointAjax () {
const _form = {
demandRecId: this.form.demandRecId,
serviceType: this.form.serviceType,
@ -578,7 +530,7 @@ export default {
this.btnLoading = false;
},
async finishAjax() {
async finishAjax () {
const { reportType, serviceShowFlag, serviceType } = this.form;
const _form = {
demandRecId: this.form.demandRecId,
@ -607,7 +559,7 @@ export default {
this.btnLoading = false;
},
async editCate() {
async editCate () {
const categoryCode = this.form.categoryCode;
if (Array.isArray(categoryCode)) {
if (categoryCode.length === 1) {
@ -643,7 +595,7 @@ export default {
this.btnLoading = false;
},
handleSubmit() {
handleSubmit () {
this.$refs.ruleForm.validate(async (valid) => {
if (valid) {
this.btnLoading = true;
@ -659,7 +611,7 @@ export default {
});
},
handleDel() {
handleDel () {
let params = {
demandRecId: this.demandRecId,
};
@ -680,7 +632,7 @@ export default {
});
},
getTreeData(data) {
getTreeData (data) {
if (!Array.isArray(data)) return [];
let arr = data.map((item) => {
let _item = {};
@ -696,7 +648,7 @@ export default {
return arr;
},
getFlagData(data, flag) {
getFlagData (data, flag) {
if (!Array.isArray(data)) return [];
let arr1 = data.filter((item) => item[flag]);
let arr2 = arr1.map((item) => {
@ -708,7 +660,7 @@ export default {
return arr2;
},
async getGridList(type, agencyId) {
async getGridList (type, agencyId) {
const { user } = await this.$store.state;
console.log("user---ppp", user);
// addorupdate query
@ -732,7 +684,7 @@ export default {
});
},
async getDemandUserList() {
async getDemandUserList () {
const { user } = await this.$store.state;
console.log("user---ppp", user);
const params = {
@ -756,7 +708,7 @@ export default {
});
},
async getDemandOptions() {
async getDemandOptions () {
this.$http
.post("/heart/icresidemanddict/demandoption")
.then(({ data: res }) => {
@ -775,7 +727,7 @@ export default {
});
},
async getServiceuserList(serviceType, query) {
async getServiceuserList (serviceType, query) {
if (!serviceType) return false;
const { demandUserId } = this.form;
const params = {
@ -799,7 +751,7 @@ export default {
});
},
async getDictOptions() {
async getDictOptions () {
this.$http
.post("/sys/dict/data/dictlist", { dictType: "user_demand_status" })
.then(({ data: res }) => {
@ -845,7 +797,7 @@ export default {
});
},
async getInfo() {
async getInfo () {
let params = {
demandRecId: this.demandRecId,
};
@ -863,6 +815,8 @@ export default {
res.data.parentCode + res.data.categoryCode,
],
};
this.finishServiceTime = [this.form.serviceStartTime, this.form.serviceEndTime]
this.getGridList();
this.getDemandOptions();
this.getDemandUserList();

5
src/views/modules/shequzhili/event/cpts/add.vue

@ -467,10 +467,8 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.demandUserList = data;
} else {
this.$message.error(msg)
}
@ -587,12 +585,15 @@ export default {
removePic (file, fileList) {
this.formData.imageList.splice(this.formData.imageList.findIndex(item => item === file.url), 1)
this.replayImgList.splice(this.replayImgList.findIndex(item => item.uid === file.uid), 1)
this.hideUploadBtn = fileList.length >= 3;
},
// 3
handleEditChange (file, fileList) {
this.hideUploadBtn = fileList.length >= 3;
},
exceedPic () {

80
src/views/modules/shequzhili/event/cpts/event-detail.vue

@ -73,24 +73,51 @@
</div>
</div>
<div v-if="info.operationId&&info.status!=='closed_case'"
class="div-btn ">
<el-button size="small"
@click="handleCloseEvent">关闭</el-button>
</div>
</el-card>
<el-card v-if=" info.status==='closed_case'">
<h3>满意度评价</h3>
<div class="m-row">
<div class="m-info">
<div class="div-satisfy">
<div>
<img :src="selBad?badurl_light:badurl"
@click="clickSatisfy('bad')" />
<div class="tip-satisfy">不满意</div>
</div>
<div>
<img :src="selGood?goodurl_light:goodurl"
@click="clickSatisfy('good')" />
<div class="tip-satisfy">满意</div>
</div>
<div>
<img :src="selPerfect?perfecturl_light:perfecturl"
@click="clickSatisfy('perfect')" />
<div class="tip-satisfy">非常满意</div>
</div>
</div>
</div>
</div>
<div v-if="info.operationId||info.status==='closed_case'"
class="div-btn ">
<el-button v-if=" !info.satisfactionName && user.id===info.createdUserId"
size="small"
class="diy-button--reset"
@click="handleSatisfy">满意度评价</el-button>
<el-button size="small"
@click="handleCloseEvent">关闭</el-button>
<el-button v-if="info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId"
size="small"
type="primary"
@click="handleComfirmSatisfy">确定</el-button>
</div>
</el-card>
<!-- <div v-if="showType=='project'">
<project-info ref="eleEditForm"
:type="projectPageType"
:projectId="info.operationId"
@close="handleClose"
@afterEdit="handleClose" />
</div> -->
<el-dialog :visible.sync="showSatisfy"
:close-on-click-modal="false"
:close-on-press-escape="false"
@ -100,23 +127,6 @@
class="dialog-h"
@closed="showSatisfy=false">
<div class="div-satisfy">
<div>
<img :src="selBad?badurl_light:badurl"
@click="clickSatisfy('bad')" />
<div class="tip-satisfy">不满意</div>
</div>
<div>
<img :src="selGood?goodurl_light:goodurl"
@click="clickSatisfy('good')" />
<div class="tip-satisfy">满意</div>
</div>
<div>
<img :src="selPerfect?perfecturl_light:perfecturl"
@click="clickSatisfy('perfect')" />
<div class="tip-satisfy">非常满意</div>
</div>
</div>
<div class="div-btn">
<el-button size="small"
@click="showSatisfy=false">关闭</el-button>
@ -213,6 +223,11 @@ export default {
this.user = this.$store.state.user
if (this.eventId) {
this.info = JSON.parse(JSON.stringify(this.eventDetailData));
//
if (this.info.status === 'closed_case' && this.info.satisfactionName) {
this.changeSatisfyType(this.info.satisfaction)
}
}
// this.getApiData();
@ -255,6 +270,14 @@ export default {
},
clickSatisfy (type) {
if (this.info.satisfactionName) {
return false
}
this.changeSatisfyType(type)
},
changeSatisfyType (type) {
if (type === 'bad') {
this.selGood = false
this.selPerfect = false
@ -297,7 +320,6 @@ export default {
this.info.satisfactionName = '111'
this.showSatisfy = false
} else {
this.$message.error(msg)
}

4
src/views/modules/shequzhili/event/cpts/event-info.vue

@ -403,7 +403,7 @@ export default {
this.replayInfo = {}
this.project = {}
this.demand = this.$refs.ref_processinfo_add.demand
this.demand.gridId = this.eventInfoData.gridId
//
this.eventInfoData.categoryList = []
this.eventInfoData.categoryList.push(this.demand.categoryId)
@ -440,6 +440,7 @@ export default {
}
this.$emit("handleOk");
} else {
this.$message.error(msg);
}
},
@ -500,6 +501,7 @@ export default {
this.$emit("handleOk");
} else {
this.$message.error(msg);
}
},

25
src/views/modules/shequzhili/event/cpts/process-form-demand.vue

@ -238,30 +238,7 @@ export default {
},
formData: iniFmData(),
formDataTemp: {
icEventId: "",
serviceLocation: "34534534",
categoryCode: "10030002",
content: "341231",
demandUserId: "",
demandUserMobile: "15111111111",
demandUserName: "123123",
gridId: "",
operationType: "2",
parentCode: "1003",
reportTime: "",
reportType: "self_help",
reportUserMobile: "",
reportUserName: "",
serverId: "cebe59b05d02715141762211bf57734f",
serviceType: "volunteer",
wantServiceTime: "2022-05-17 00:00:00",
latitude: 36.069920462445104,
locationDetail: "345345",
longitude: 120.38677261825706,
serviceLocation: "山东省青岛市市南区闽江路82号"
},
okflag: false,
//

5
src/views/modules/shequzhili/event/cpts/process-form-project.vue

@ -393,14 +393,11 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
let treeDataNew = this.filterTree(data)
//
++this.iscascaderShow
this.casOptions = []
this.casOptions = treeDataNew
} else {
@ -433,7 +430,6 @@ export default {
},
async loadGrid () {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId
}
@ -483,7 +479,6 @@ export default {
//
async getTagList () {
const url = "/gov/issue/issueprojecttagdict/list";
const { data, code, msg } = await requestPost(url, {
});

1
src/views/modules/shequzhili/event/cpts/process-form-replay.vue

@ -143,7 +143,6 @@ export default {
++this.iscascaderShow
this.casOptions = []
this.casOptions = treeDataNew
} else {

13
src/views/modules/shequzhili/event/cpts/process-form.vue

@ -10,10 +10,13 @@
<el-form-item label="处理方式"
label-width="150px"
prop="operationType">
<el-radio-group v-model="operationType">
<el-radio-group v-model="operationType"
@change="handleChangeOperationType">
<el-radio label="">暂不处理</el-radio>
<el-radio label="0">回复</el-radio>
<el-radio label="1">立项</el-radio>
<el-radio label="2">转服务</el-radio>
</el-radio-group>
</el-form-item>
@ -142,13 +145,11 @@ export default {
},
methods: {
handleChangeOperationType (val) {
},
async getProcessInfo () {
this.okflag = false
// this.categoryList = []
// this.categoryList.push(this.selCategoryArray[1])
if (this.operationType === '0') {
this.$refs.ref_process_form_replay.getReplayInfo()
if (this.$refs.ref_process_form_replay.okflag) {

3
src/views/modules/shequzhili/event/eventList.vue

@ -246,7 +246,7 @@
width="100">
<template slot-scope="scope">
<el-button v-if="scope.row.status==='processing' "
<el-button v-if="scope.row.status==='processing'&&!scope.row.operationId "
@click="handleDispose(scope.row)"
type="text"
size="small"
@ -588,6 +588,7 @@ export default {
});
} else {
this.$message.error(msg);
}
},

4
src/views/modules/shequzhili/xiangmu/index.vue

@ -476,8 +476,8 @@ export default {
url: window.SITE_CONFIG["apiURL"] + url,
method: "post",
data: {
pageSize,
pageNo,
// pageSize,
// pageNo,
...fmData,
},
responseType: "blob",

1
src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue

@ -448,6 +448,7 @@ export default {
queryEndTime: this.queryEndTime,
pageNo: this.demand.pageNo,
pageSize: this.demand.pageSize,
biz: 'eventProcessAnalysis'
};
const { data, code, msg } = await requestPost(url, params);

30
src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue

@ -124,7 +124,7 @@ import dateFormat from "dai-js/tools/dateFormat"
import nextTick from 'dai-js/tools/nextTick'
const colorArray = [ '#1B51FF', '#00E5ED', '#7800FF', '#16D783', '#FF7800', '#FFBA00', '#FFD685', '#2A00FF', '#C600FF', '#FF2A00']
const colorArray = ['#1B51FF', '#00E5ED', '#7800FF', '#16D783', '#FF7800', '#FFBA00', '#FFD685', '#2A00FF', '#C600FF', '#FF2A00']
export default {
name: "shijianchulifenxi",
data () {
@ -256,7 +256,7 @@ export default {
//
this.initData()
await this.getAgencylist() //
//
await this.handleChangeDate(this.dataType)
this.dataLoading = false
@ -276,7 +276,7 @@ export default {
let end = new Date()
let start = new Date()
if (index === '1') { //
start.setFullYear(start.getFullYear() -1)
start.setFullYear(start.getFullYear() - 1)
} else if (index === '2') { //
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
@ -287,10 +287,10 @@ export default {
start.setTime(start.getTime() - 3600 * 1000 * 24 * 183)
}
if (index != '0') {
this.queryStartTime = dateFormat(start,'yyyy-MM-dd')+" 00:00:00"
this.queryEndTime = dateFormat(end,'yyyy-MM-dd')+" 23:59:59"
this.queryStartTime = dateFormat(start, 'yyyy-MM-dd') + " 00:00:00"
this.queryEndTime = dateFormat(end, 'yyyy-MM-dd') + " 23:59:59"
}
if (index !== '0'){
if (index !== '0') {
await this.getApiData()
// this.assignData()
}
@ -303,8 +303,8 @@ export default {
handleSelectChange (value) {
console.log(value)
this.queryStartTime = value[0]+" 00:00:00"
this.queryEndTime = value[1]+" 23:59:59"
this.queryStartTime = value[0] + " 00:00:00"
this.queryEndTime = value[1] + " 23:59:59"
this.getApiData()
},
@ -423,6 +423,7 @@ export default {
categoryCode: this.categoryCode,
pageNo: this.demand.pageNo,
pageSize: this.demand.pageSize,
biz: 'eventCategoryAnalysis'
}
const { data, code, msg } = await requestPost(url, params)
@ -433,7 +434,7 @@ export default {
this.tableList = data.list
this.demand.list = data.list.map((item, index) => {
return [
index+1,
index + 1,
item.gridName ? item.gridName : '',
item.eventContent ? item.eventContent : '',
item.sourceTypeName ? item.sourceTypeName : '',
@ -623,12 +624,11 @@ export default {
},
handleChangeAgency (value) {
let orgArray = []
let key = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
if (key) {
orgArray = key.split('-')
this.orgId = orgArray[0]
this.orgType = orgArray[1] === 'grid' ? 'grid' : 'agency'
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) {
this.orgType = obj.level === 'grid' ? 'grid' : 'agency'
this.orgId = obj.agencyId
} else {
this.orgId = ''
this.orgType = ''

Loading…
Cancel
Save