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

Merge branch 'dev_shequzhili' into dev

test
jiangyy 3 years ago
parent
63e22f346a 8861a76939
commit
093e5b4552
12 changed files with 267 additions and 348 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. 2
      src/js/dai/request.js
  2. 2
      src/js/dai/request2.js
  3. 287
      src/views/modules/communityService/measure/info.vue
  4. 2
      src/views/modules/shequzhili/event/cpts/add.vue
  5. 1
      src/views/modules/shequzhili/event/cpts/event-detail.vue
  6. 4
      src/views/modules/shequzhili/event/cpts/event-info.vue
  7. 25
      src/views/modules/shequzhili/event/cpts/process-form-demand.vue
  8. 5
      src/views/modules/shequzhili/event/cpts/process-form-project.vue
  9. 1
      src/views/modules/shequzhili/event/cpts/process-form-replay.vue
  10. 1
      src/views/modules/shequzhili/event/eventList.vue
  11. 5
      src/views/modules/shequzhili/xiangmu/cpts/project-evaluation.vue
  12. 2
      src/views/modules/shequzhili/xiangmu/cpts/project-info.vue

2
src/js/dai/request.js
View File

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

2
src/js/dai/request2.js
View File

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

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

@ -1,41 +1,30 @@
<template> <template>
<el-dialog <el-dialog title="需求信息"
title="需求信息"
width="50%" width="50%"
top="5vh" top="5vh"
append-to-body append-to-body
class="dialog-h" class="dialog-h"
:visible="true" :visible="true"
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="handlerClose" :before-close="handlerClose">
> <el-form label-width="120px"
<el-form
label-width="120px"
:model="form" :model="form"
:rules="rules" :rules="rules"
ref="ruleForm" ref="ruleForm"
class="form-wr dialog-h-content scroll-h" class="form-wr dialog-h-content scroll-h">
> <el-form-item label="操作方式"
<el-form-item label="操作方式" prop="addType"> prop="addType">
<el-radio-group v-model="addType"> <el-radio-group v-model="addType">
<el-radio label="look">查看</el-radio> <el-radio label="look">查看</el-radio>
<template v-if="form.reportType != 'self_help'"> <template v-if="form.reportType != 'self_help'">
<el-radio label="edit" v-if="form.status === 'pending'" <el-radio label="edit"
>修改</el-radio v-if="form.status === 'pending'">修改</el-radio>
> <el-radio label="cancel"
<el-radio v-if="form.status !== 'finished' && form.status !== 'canceled'">取消</el-radio>
label="cancel"
v-if="form.status !== 'finished' && form.status !== 'canceled'"
>取消</el-radio
>
</template> </template>
<el-radio <el-radio label="appoint"
label="appoint" v-if="form.status === 'pending' || form.status === 'assigned'">指派</el-radio>
v-if="form.status === 'pending' || form.status === 'assigned'" <!-- <el-radio label="finish"
>指派</el-radio
>
<el-radio
label="finish"
v-if=" v-if="
(form.reportType == 'self_help' && (form.reportType == 'self_help' &&
form.serviceShowFlag && form.serviceShowFlag &&
@ -44,230 +33,198 @@
form.status === 'assigned' || form.status === 'assigned' ||
form.status === 'have_order' || form.status === 'have_order' ||
(form.status == 'finished' && !form.evaluateFlag) (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-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="所属网格" prop="gridId"> <el-form-item label="所属网格"
<el-input prop="gridId">
v-if="disabled" <el-input v-if="disabled"
v-model="form.gridName" v-model="form.gridName"
:disabled="disabled" :disabled="disabled"
class="input-width" class="input-width"></el-input>
></el-input>
<!-- <span >{{ form.gridName }}</span> --> <!-- <span >{{ form.gridName }}</span> -->
<el-select <el-select v-else
v-else
v-model="form.gridId" v-model="form.gridId"
filterable filterable
placeholder="请选择" placeholder="请选择"
class="input-width" class="input-width"
clearable clearable
:disabled="disabled" :disabled="disabled"
@change="handleGridChange" @change="handleGridChange">
> <el-option v-for="item in disabled ? optionsG : optionsEditG"
<el-option
v-for="item in disabled ? optionsG : optionsEditG"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="需求类型" prop="categoryCode"> <el-form-item label="需求类型"
<el-input prop="categoryCode">
v-if="disabled" <el-input v-if="disabled"
v-model="form.categoryName" v-model="form.categoryName"
:disabled="disabled" :disabled="disabled"
class="input-width" class="input-width"
clearable clearable></el-input>
></el-input> <el-cascader v-else
<el-cascader
v-else
v-model="form.categoryCodeArr" v-model="form.categoryCodeArr"
:options="demandOptions" :options="demandOptions"
:disabled="disabled" :disabled="disabled"
clearable clearable
class="input-width" class="input-width"
@change="handleCateSlect" @change="handleCateSlect"></el-cascader>
></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="上报类型" prop="reportType"> <el-form-item label="上报类型"
<el-input prop="reportType">
v-if="disabled" <el-input v-if="disabled"
v-model="form.reportTypeName" v-model="form.reportTypeName"
:disabled="disabled" :disabled="disabled"
class="input-width" class="input-width"></el-input>
></el-input> <el-select v-else
<el-select
v-else
v-model="form.reportType" v-model="form.reportType"
filterable filterable
class="input-width" class="input-width"
placeholder="请选择" placeholder="请选择"
clearable clearable
:disabled="disabled" :disabled="disabled">
> <el-option v-for="item in reportOptions"
<el-option
v-for="item in reportOptions"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="上报人" prop="reportUserName"> <el-form-item label="上报人"
<el-input prop="reportUserName">
v-model="form.reportUserName" <el-input v-model="form.reportUserName"
:disabled="disabled" :disabled="disabled"
placeholder="请输入" placeholder="请输入"
class="input-width" class="input-width"
clearable clearable></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上报人手机号" prop="reportUserMobile"> <el-form-item label="上报人手机号"
<el-input prop="reportUserMobile">
v-model="form.reportUserMobile" <el-input v-model="form.reportUserMobile"
:disabled="disabled" :disabled="disabled"
placeholder="请输入" placeholder="请输入"
class="input-width" class="input-width"
maxlength="11" maxlength="11"
clearable clearable></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上报时间" prop="reportTime"> <el-form-item label="上报时间"
<el-date-picker prop="reportTime">
v-model="form.reportTime" <el-date-picker v-model="form.reportTime"
type="datetime" type="datetime"
class="input-width" class="input-width"
clearable clearable
:disabled="disabled" :disabled="disabled"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间" placeholder="选择日期时间">
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="需求人" prop="demandUserId"> <el-form-item label="需求人"
<el-input prop="demandUserId">
v-if="disabled" <el-input v-if="disabled"
v-model="form.demandUserName" v-model="form.demandUserName"
:disabled="disabled" :disabled="disabled"
class="input-width" class="input-width"></el-input>
></el-input> <el-select v-else
<el-select
v-else
v-model="selectDemandUser" v-model="selectDemandUser"
class="input-width" class="input-width"
filterable filterable
:disabled="disabled" :disabled="disabled"
placeholder="请选择" placeholder="请选择"
clearable clearable
@change="handleDemandChange" @change="handleDemandChange">
> <el-option v-for="item in demandUserList"
<el-option
v-for="item in demandUserList"
:key="item.demandUserId" :key="item.demandUserId"
:label="item.label" :label="item.label"
:value="item" :value="item">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="服务时间" prop="wantServiceTime"> <el-form-item label="服务时间"
<el-date-picker prop="wantServiceTime">
v-model="form.wantServiceTime" <el-date-picker v-model="form.wantServiceTime"
type="datetime" type="datetime"
class="input-width" class="input-width"
clearable clearable
:disabled="disabled" :disabled="disabled"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间" placeholder="选择日期时间">
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="需求内容" prop="content"> <el-form-item label="需求内容"
<el-input prop="content">
v-model="form.content" <el-input v-model="form.content"
:autosize="{ minRows: 2, maxRows: 10 }" :autosize="{ minRows: 2, maxRows: 10 }"
:disabled="disabled" :disabled="disabled"
type="textarea" type="textarea"
clearable clearable
class="input-width-textarea" class="input-width-textarea"
placeholder="请输入内容" placeholder="请输入内容"></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item v-if="
v-if="
addType === 'appoint' || addType === 'appoint' ||
addType == 'finish' || addType == 'finish' ||
(addType == 'look' && form.serviceShowFlag) (addType == 'look' && form.serviceShowFlag)
" "
label="服务方" label="服务方"
prop="serviceType" prop="serviceType">
>
<template v-if="disabled && addType !== 'appoint'"> <template v-if="disabled && addType !== 'appoint'">
<el-input <el-input v-model="form.serviceShowName"
v-model="form.serviceShowName"
:disabled="disabled" :disabled="disabled"
class="input-width" class="input-width"></el-input>
></el-input>
</template> </template>
<template v-else> <template v-else>
<el-select <el-select v-model="form.serviceType"
v-model="form.serviceType"
class="input-width-small" class="input-width-small"
placeholder="请选择" placeholder="请选择"
clearable clearable
:disabled="disabled && addType !== 'appoint'" :disabled="disabled && addType !== 'appoint'"
@change="handleServiceChange('add', $event)" @change="handleServiceChange('add', $event)">
> <el-option v-for="item in serviceOptions"
<el-option
v-for="item in serviceOptions"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
- -
<el-select <el-select v-model="form.serverId"
v-model="form.serverId"
class="input-width-middle" class="input-width-middle"
filterable filterable
placeholder="请选择" placeholder="请选择"
clearable clearable
:disabled="disabled && addType !== 'appoint'" :disabled="disabled && addType !== 'appoint'">
> <el-option v-for="item in serviceOptiondList"
<el-option
v-for="item in serviceOptiondList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item <el-form-item v-if="addType == 'look' && form.status == 'canceled'"
v-if="addType == 'look' && form.status == 'canceled'"
label="取消时间" label="取消时间"
prop="cancelTime" prop="cancelTime">
>
<span>{{ form.cancelTime }}</span> <span>{{ form.cancelTime }}</span>
</el-form-item> </el-form-item>
<template <template v-if="
v-if="
(addType == 'finish' && form.reportType != 'self_help') || (addType == 'finish' && form.reportType != 'self_help') ||
(addType == 'look' && form.status == 'finished') (addType == 'look' && form.status == 'finished')
" ">
> <el-form-item label="实际服务时间"
<el-form-item label="实际服务时间" prop="serviceStartTime"> prop="serviceStartTime">
<el-date-picker <el-date-picker v-model="finishServiceTime"
v-model="finishServiceTime"
class="input-width-min" class="input-width-min"
clearable clearable
:disabled="disabled && addType != 'finish'" :disabled="disabled && addType != 'finish'"
@ -276,47 +233,40 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@change="handelBlurServiceTime" @change="handelBlurServiceTime">
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="完成情况" prop="finishResult"> <el-form-item label="完成情况"
<el-radio prop="finishResult">
v-model="form.finishResult" <el-radio v-model="form.finishResult"
label="resolved" label="resolved"
:disabled="disabled && addType != 'finish'" :disabled="disabled && addType != 'finish'">已解决</el-radio>
>已解决</el-radio <el-radio v-model="form.finishResult"
>
<el-radio
v-model="form.finishResult"
label="unresolved" label="unresolved"
:disabled="disabled && addType != 'finish'" :disabled="disabled && addType != 'finish'">未解决</el-radio>
>未解决</el-radio
>
</el-form-item> </el-form-item>
<el-form-item label="评价" prop="score" class="form-score"> <el-form-item label="评价"
<el-rate prop="score"
v-model="form.score" class="form-score">
<el-rate v-model="form.score"
:allow-half="true" :allow-half="true"
:disabled="disabled && addType != 'finish'" :disabled="disabled && addType != 'finish'"></el-rate>
></el-rate>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="finishDesc"> <el-form-item label="备注"
<el-input prop="finishDesc">
v-model="form.finishDesc" <el-input v-model="form.finishDesc"
:autosize="{ minRows: 2, maxRows: 10 }" :autosize="{ minRows: 2, maxRows: 10 }"
:disabled="disabled && addType != 'finish'" :disabled="disabled && addType != 'finish'"
type="textarea" type="textarea"
clearable clearable
class="input-width-textarea" class="input-width-textarea"
placeholder="请输入内容" placeholder="请输入内容"></el-input>
></el-input>
</el-form-item> </el-form-item>
</template> </template>
<template v-if="addType == 'finish' && form.reportType == 'self_help'"> <template v-if="addType == 'finish' && form.reportType == 'self_help'">
<el-form-item label="实际服务时间" prop="serviceStartTime"> <el-form-item label="实际服务时间"
<el-date-picker prop="serviceStartTime">
v-model="finishServiceTime" <el-date-picker v-model="finishServiceTime"
class="input-width-min" class="input-width-min"
clearable clearable
:disabled="disabled && addType != 'finish'" :disabled="disabled && addType != 'finish'"
@ -325,22 +275,19 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@change="handelBlurServiceTime" @change="handelBlurServiceTime">
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</template> </template>
</el-form> </el-form>
<div class="resi-btns"> <div class="resi-btns">
<el-button size="small" @click="handlerClose">关闭</el-button> <el-button size="small"
<el-button @click="handlerClose">关闭</el-button>
v-if="addType != 'look'" <el-button v-if="addType != 'look'"
type="primary" type="primary"
size="small" size="small"
:loading="btnLoading" :loading="btnLoading"
@click="handleSubmit" @click="handleSubmit">提交</el-button>
>提交</el-button
>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
@ -863,6 +810,8 @@ export default {
res.data.parentCode + res.data.categoryCode, res.data.parentCode + res.data.categoryCode,
], ],
}; };
this.finishServiceTime = [this.form.serviceStartTime, this.form.serviceEndTime]
this.getGridList(); this.getGridList();
this.getDemandOptions(); this.getDemandOptions();
this.getDemandUserList(); this.getDemandUserList();

2
src/views/modules/shequzhili/event/cpts/add.vue
View File

@ -467,10 +467,8 @@ export default {
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
this.demandUserList = data; this.demandUserList = data;
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }

1
src/views/modules/shequzhili/event/cpts/event-detail.vue
View File

@ -297,7 +297,6 @@ export default {
this.info.satisfactionName = '111' this.info.satisfactionName = '111'
this.showSatisfy = false this.showSatisfy = false
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }

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

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

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

@ -238,30 +238,7 @@ export default {
}, },
formData: iniFmData(), 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, okflag: false,
//地图相关 //地图相关

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

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

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

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

1
src/views/modules/shequzhili/event/eventList.vue
View File

@ -588,6 +588,7 @@ export default {
}); });
} else { } else {
this.$message.error(msg);
} }
}, },

5
src/views/modules/shequzhili/xiangmu/cpts/project-evaluation.vue
View File

@ -73,7 +73,7 @@ export default {
props: { props: {
projectId: { projectId: {
type: String, type: String,
default: "64502a8f1048a7240295527a9b32e513", default: "",
}, },
}, },
@ -124,10 +124,9 @@ export default {
async getTableData() { async getTableData() {
const url = "/gov/project/project/satisfaction-evaluation-list"; const url = "/gov/project/project/satisfaction-evaluation-list";
// const url =
// "http://yapi.elinkservice.cn/mock/245/gov/project/project/satisfaction-evaluation-list";
const { pageSize, pageNo, fmData } = this; const { pageSize, pageNo, fmData } = this;
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
projectId: this.projectId,
pageSize, pageSize,
pageNo, pageNo,
...fmData, ...fmData,

2
src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
View File

@ -474,7 +474,7 @@
class="dialog-h" class="dialog-h"
@closed="showedEvaluation = false" @closed="showedEvaluation = false"
> >
<project-evaluation :projectId="projectIdCopy"></project-evaluation> <project-evaluation :project-id="projectIdCopy"></project-evaluation>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

Write Preview
Loading…
Cancel
Save