Browse Source

接口对接

xiaowang-featrue
是小王呀\24601 11 months ago
parent
commit
8d6875edcc
  1. 30
      src/views/modules/peopleOpinons/cpts/eventDetail.vue
  2. 34
      src/views/modules/peopleOpinons/cpts/eventInfo.vue
  3. 122
      src/views/modules/peopleOpinons/opinionsDaily.vue
  4. 11
      src/views/modules/workPc/guidance/add.vue
  5. 1
      src/views/modules/workPc/guidance/addForm.vue

30
src/views/modules/peopleOpinons/cpts/eventDetail.vue

@ -7,7 +7,7 @@
</h3>
<div class="m-detail-main">
<div class="m-info">
<div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' }]">
<!-- <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' }]">
<span class="u-info-title-2">所属网格</span>
<template v-if="!info.gridName">
<el-select v-model.trim="info.gridId" placeholder="请选择" clearable class="cell-width-1">
@ -19,34 +19,38 @@
<template v-else>
<span>{{ info.gridName|| info.agencyName }}</span>
</template>
</div>
</div> -->
<div :class="[
'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' },
]">
<span class="u-info-title-2">上报时间</span>
<span>{{ info.happenTime }}</span>
<span>{{ info.submitTime }}</span>
</div>
<div :class="[
'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' },
]">
<span class="u-info-title-2">征集领域</span>
<span>{{ info.eventContent }}</span>
<span>{{ info.typeCode }}</span>
</div>
<div :class="[
'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' },
]">
<span class="u-info-title-2">是否愿意公开</span>
<span>{{ info.eventContent }}</span>
<template slot-scope="scope">
<span v-if="scope.row.openFlag === 0" style="color: #ff6600;"></span>
<span v-else-if="scope.row.openFlag ===1"></span>
</template>
<span>{{info.eventContent==1?'是':'否'}}</span>
</div>
<div :class="[
'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' },
]">
<span class="u-info-title-2">意见标题</span>
<span>{{ info.eventContent }}</span>
<span>{{ info.subjectTitle }}</span>
</div>
<div :class="[
'm-info-prop',
@ -102,17 +106,20 @@
{ 'm-info-prop-vis': source === 'visiual' },
]">
<span class="u-info-title-2">选为"金点子"建议:</span>
<span>{{ info.markTypeName || "--" }}</span>
<!-- <span>{{info.goldenIdeaFlag==1?'是':'否'}}</span> -->
<el-switch v-model="info.goldenIdeaFlag" active-color="#13ce66" inactive-color="#ff4949" @change="sendValue">
</el-switch>
</div>
<div :class="[
<div :class="[
'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' },
]">
<span class="u-info-title-2">办理前</span>
<img :src="src" :key="src" style="width: 150px; height: 150px; padding-right: 10px"
<img :src="imageUrl" :key="src" style="width: 150px; height: 150px; padding-right: 10px"
v-for="src in info.imageList" @click="watchImg(src)" />
</div>
<div :class="[
<div :class="[
'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' },
]">
@ -248,6 +255,9 @@ export default {
},
methods: {
sendValue(){
this.$emit('update-value', this.info); //
},
watchImg(src) {
window.open(src);
},

34
src/views/modules/peopleOpinons/cpts/eventInfo.vue

@ -9,7 +9,7 @@
</div>
<div :class="['g-total', { 'g-left': projectProcess.length > 0, 'g-left-top40': pageType == 'info' }]"
style="z-index: 1;">
<event-detail ref="ref_detail" :type="pageType" :eventId="eventId" :eventDetailData="eventDetailData"
<event-detail ref="ref_detail" @update-value="handleValue" :type="pageType" :eventId="eventId" :eventDetailData="eventDetailData"
:eventDetailDatasource="source" @handleToProject="handleToProject" @handleToDemand="handleToDemand"
@handleToIssue="handleToIssue" @handleClose="handleClose"></event-detail>
<div class="process-form" v-if="pageTypeCopy == 'dispose' || pageTypeCopy == 'assign' ||pageTypeCopy == 'check' ||pageTypeCopy == 'return'">
@ -283,9 +283,10 @@ function iniData() {
issuePageType: "",
issueDetailData: {},
sourceType: "",
goldenIdeaFlag:'',
level: '',
replayDetailObj:{},
newgoldList:{}
};
}
export default {
@ -355,7 +356,16 @@ export default {
},
methods: {
handleValue(val) {
console.log(val,"ds;lfk;dfl ");
this.newgoldList=val
if (val.goldenIdeaFlag) {
this.goldenIdeaFlag=1
}else{
this.goldenIdeaFlag=0
}
},
changeName(val) {
this.demandUserName = val;
},
@ -420,12 +430,14 @@ export default {
async handelDispose() {
console.log("handelDispose......");
console.log("okflag:"+this.$refs.ref_processinfo_dispose.okflag);
this.$refs.ref_processinfo_dispose.getProcessInfo();
if (this.$refs.ref_processinfo_dispose.okflag) {
this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType;
this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
this.replayInfo.icEventId = this.eventId;
await this.submitDispose('/governance/icEvent/reply', this.replayInfo);
await this.submitDispose('/governance/icEventOld/reply', this.replayInfo);
} else {
return false;
}
@ -436,6 +448,7 @@ export default {
...params,
});
if (code === 0) {
await this.icEventOldupdate('/governance/icEventOld/update')
this.$message.success("操作成功!");
this.$emit("handleOk");
@ -444,6 +457,19 @@ export default {
}
},
async icEventOldupdate(url) {
console.log("sdfl;sdm.fm ",this.eventId);
const params={
goldenIdeaFlag:this.goldenIdeaFlag,
id:this.newgoldList.icEventId
}
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
} else {
this.$message.error(msg);
}
},
handleClose() {
if (this.pageTypeCopy === "add") {
this.eventInfo = this.$refs.ref_add.resetData();

122
src/views/modules/peopleOpinons/opinionsDaily.vue

@ -78,47 +78,24 @@
<div class="div_btn">
<el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
<!-- <el-button class="diy-button--white" size="small">
<el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn"
action="uploadUlr" :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true"
:show-file-list="false" :auto-upload="true" :on-progress="handleProgress"
:on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest">
上传导入
</el-upload>
</el-button> -->
<!-- <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
@command="(command) => importTypeChange(command)">
导入
<el-dropdown-menu slot="dropdown"> -->
<!-- <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item> -->
<!-- <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn"
action="uploadUlr" :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true"
:show-file-list="false" :auto-upload="true" :on-progress="handleProgress"
:on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest">
<el-dropdown-item command="1">上传导入</el-dropdown-item>
</el-upload>
</el-dropdown-menu> -->
<!-- </el-dropdown> -->
</div>
<el-table :data="tableData" border class="m-table-item" style="width: 100%"
@selection-change="handleSelectionChange" :height="maxTableHeight">
<el-table-column label="" fixed="left" type="selection" align="center" width="50" />
<!-- <el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> -->
<el-table-column prop="workOrderNum" align="center" label="所属组织" :show-overflow-tooltip="true">
<el-table-column prop="agencyName" align="center" label="所属组织" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="categoryAllName" label="征集领域" min-width="140" align="center"
<el-table-column prop="typeCode" label="征集领域" min-width="140" align="center"
:show-overflow-tooltip="true" />
<!-- <template slot-scope="scope">
{{ scope.row.firstName + '-' + scope.row.secondName }}
</template>
</el-table-column> -->
<el-table-column prop="eventContent" label="意见标题" align="center" :show-overflow-tooltip="true">
<el-table-column prop="subjectTitle" label="意见标题" align="center" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="name" label="意见内容" align="center" :show-overflow-tooltip="true">
<el-table-column prop="eventContent" label="意见内容" align="center" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="name" label="提交人" align="center" :show-overflow-tooltip="true">
</el-table-column>
@ -137,27 +114,27 @@
</span>
</template> -->
</el-table-column>
<el-table-column prop="statusName" align="center" width="110" label="是否愿意公开"
<el-table-column prop="openFlag" align="center" width="110" label="是否愿意公开"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.status === '0'" style="color: #ff6600;"></span>
<span v-else-if="scope.row.status ==='1'"></span>
<span v-if="scope.row.openFlag === 0" style="color: #ff6600;"></span>
<span v-else-if="scope.row.openFlag ===1"></span>
</template>
</el-table-column>
<el-table-column prop="statusName" align="center" width="110" label="是否金点子建议"
<el-table-column prop="goldenIdeaFlag" align="center" width="110" label="是否金点子建议"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.status === '0'" style="color: #ff6600;"></span>
<span v-else-if="scope.row.status ==='1'"></span>
<span v-if="scope.row.goldenIdeaFlag === 0" style="color: #ff6600;"></span>
<span v-else-if="scope.row.goldenIdeaFlag ===1"></span>
</template>
</el-table-column>
<el-table-column prop="limitTime" align="center" width="110" label="提交时间"
<el-table-column prop="submitTime" align="center" width="110" label="提交时间"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
<template slot-scope="scope">
<el-button @click="handleDispose(scope.row,'dispose')" type="text" size="small"
v-if="scope.row.status =='unassigned'||scope.row.status =='processing'||scope.row.operationType =='13'">办理</el-button>
>办理</el-button>
<el-button @click="handleDispose(scope.row,'info')" type="text" size="small"
>删除</el-button>
</template>
@ -354,19 +331,17 @@ export default {
{label:'违章停车',value:'1'}
],
formData: {
agencyId: "",
gridId:"",
sourceType: "",
eventContent: "",
demandType: "",
name: "",
mobile: "",
startTime: "",
endTime: "",
status: "",
firstIdList: [],
secondIdList: [],
openFlag:null,
keyProblem:''
eventContent: "",
operationType: 4,
openFlag: "",
specialSubjectId: "",
subjectTitle: "",
goldenIdeaFlag: "",
agencyId: "",
clientType: "web"
},
cateOptions: [],
optionProps: {
@ -423,8 +398,8 @@ export default {
mounted() {
this.user = this.$store.state.user;
this.agencyId = this.user.agencyId;
this.getOrgTreeList()
this.getGridList()
// this.getOrgTreeList()
// this.getGridList()
this.getTableData();
this.getCateOptions();
},
@ -618,7 +593,7 @@ export default {
async handleDispose(row,type) {
// this.eventDetailData = { ...data };
// this.pageType = type
this.eventId = "1855782512757325825";
this.eventId = row.icEventId;
const url = "/governance/icEventOld/detail";
const { data, code, msg } = await requestPost(url, {
icEventId: this.eventId,
@ -694,24 +669,24 @@ export default {
},
async getTableData() {
const url = "/governance/icEventOld/list";
const url = "/governance/icEventOld/ideaList";
console.log(this.formData,"formData");
if (this.eventTypeCheck) {
this.formData.secondIdList = this.eventTypeCheck
}
// agencyId
if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) {
if(this.level=="grid"){
this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1];
this.formData.agencyId = "";
}else{
this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1];
this.formData.gridId = "";
}
} else {
this.formData.agencyId = "";
this.formData.gridId = "";
}
// if (this.eventTypeCheck) {
// this.formData.secondIdList = this.eventTypeCheck
// }
// // agencyId
// if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) {
// if(this.level=="grid"){
// this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1];
// this.formData.agencyId = "";
// }else{
// this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1];
// this.formData.gridId = "";
// }
// } else {
// this.formData.agencyId = "";
// this.formData.gridId = "";
// }
const { pageSize, pageNo, formData } = this;
const { data, code, msg } = await requestPost(url, {
@ -726,19 +701,6 @@ export default {
return item;
})
: [];
// this.tableData.forEach(item => {
// if (item.operationType === '2') {
// item.operationTypeShow = ''
// }
// if (item.operationType === '1') {
// item.operationTypeShow = ''
// }
// if (item.operationType === '0') {
// item.operationTypeShow = ''
// }
// });
} else {
this.$message.error(msg);
}

11
src/views/modules/workPc/guidance/add.vue

@ -121,14 +121,15 @@ export default {
keyWords: '',
activityId: '',
formData: {
title: "",//
content: "",//
tagId: "",//id
orgId: "",//
categoryCode: "",//
title: "",//
coverPic: "",//
releaseTime: "",//
activeName: "",//
sendMsg: false,//
top: 1,//
status: 0 //
status: 0, //
attachmentList:[]
},
serviceList: [],
// gridList: [],

1
src/views/modules/workPc/guidance/addForm.vue

@ -472,7 +472,6 @@ export default {
if (res.code === 0 && res.msg === 'success') {
const array = file.name.split('.')
const fileType = array[array.length - 1]
file.url = res.data.url
file.type = fileType
this.fileList.push(file)

Loading…
Cancel
Save