From 54701e66c5fda30070829c056a90aa26ae208dee Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 24 May 2022 18:07:33 +0800 Subject: [PATCH 1/7] 111 --- .../modules/communityService/measure/info.vue | 565 ++++++++---------- 1 file changed, 257 insertions(+), 308 deletions(-) diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue index de7a2ca51..74193bd21 100644 --- a/src/views/modules/communityService/measure/info.vue +++ b/src/views/modules/communityService/measure/info.vue @@ -1,42 +1,31 @@ @@ -360,7 +307,7 @@ export default { }, }, - data() { + data () { return { btnLoading: false, pageLoading: false, @@ -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; @@ -554,7 +501,7 @@ export default { this.dialogVisible = true; }, - async appointAjax() { + async appointAjax () { const _form = { demandRecId: this.form.demandRecId, serviceType: this.form.serviceType, @@ -578,7 +525,7 @@ export default { this.btnLoading = false; }, - async finishAjax() { + async finishAjax () { const { reportType, serviceShowFlag, serviceType } = this.form; const _form = { demandRecId: this.form.demandRecId, @@ -607,7 +554,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 +590,7 @@ export default { this.btnLoading = false; }, - handleSubmit() { + handleSubmit () { this.$refs.ruleForm.validate(async (valid) => { if (valid) { this.btnLoading = true; @@ -659,7 +606,7 @@ export default { }); }, - handleDel() { + handleDel () { let params = { demandRecId: this.demandRecId, }; @@ -680,7 +627,7 @@ export default { }); }, - getTreeData(data) { + getTreeData (data) { if (!Array.isArray(data)) return []; let arr = data.map((item) => { let _item = {}; @@ -696,7 +643,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 +655,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 +679,7 @@ export default { }); }, - async getDemandUserList() { + async getDemandUserList () { const { user } = await this.$store.state; console.log("user---ppp", user); const params = { @@ -756,7 +703,7 @@ export default { }); }, - async getDemandOptions() { + async getDemandOptions () { this.$http .post("/heart/icresidemanddict/demandoption") .then(({ data: res }) => { @@ -775,7 +722,7 @@ export default { }); }, - async getServiceuserList(serviceType, query) { + async getServiceuserList (serviceType, query) { if (!serviceType) return false; const { demandUserId } = this.form; const params = { @@ -799,7 +746,7 @@ export default { }); }, - async getDictOptions() { + async getDictOptions () { this.$http .post("/sys/dict/data/dictlist", { dictType: "user_demand_status" }) .then(({ data: res }) => { @@ -845,7 +792,7 @@ export default { }); }, - async getInfo() { + async getInfo () { let params = { demandRecId: this.demandRecId, }; @@ -863,6 +810,8 @@ export default { res.data.parentCode + res.data.categoryCode, ], }; + + this.finishServiceTime = [this.form.serviceStartTime, this.form.serviceEndTime] this.getGridList(); this.getDemandOptions(); this.getDemandUserList(); From 8861a76939781a20ec7c17b3bb5796462679b83d Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 25 May 2022 09:36:49 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=BD=91=E6=A0=BCid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/dai/request.js | 2 +- src/js/dai/request2.js | 2 +- .../modules/shequzhili/event/cpts/add.vue | 2 -- .../shequzhili/event/cpts/event-detail.vue | 1 - .../shequzhili/event/cpts/event-info.vue | 4 ++- .../event/cpts/process-form-demand.vue | 25 +------------------ .../event/cpts/process-form-project.vue | 5 ---- .../event/cpts/process-form-replay.vue | 1 - .../modules/shequzhili/event/eventList.vue | 1 + 9 files changed, 7 insertions(+), 36 deletions(-) diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 0d257d339..92fb78314 100644 --- a/src/js/dai/request.js +++ b/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别处登录 diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js index 0d257d339..92fb78314 100644 --- a/src/js/dai/request2.js +++ b/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别处登录 diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index d22ccc17f..9dd650e6e 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/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) } diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 74df7aa31..06a4766cd 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -297,7 +297,6 @@ export default { this.info.satisfactionName = '111' this.showSatisfy = false - } else { this.$message.error(msg) } diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index e1d2075cd..b6569ada3 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/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); } }, diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index 8458cdc4e..bf0cee252 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/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, //地图相关 diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue index 8096461ed..7aafae755 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue +++ b/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, { }); diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue index 4f3ce9c1b..d01d4879e 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue @@ -143,7 +143,6 @@ export default { ++this.iscascaderShow this.casOptions = [] - this.casOptions = treeDataNew } else { diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index cee63d86d..f333e1d9e 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -588,6 +588,7 @@ export default { }); } else { + this.$message.error(msg); } }, From 494470b1d0e2110ec9923eb5d8124eebdbcb53fa Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 25 May 2022 09:52:30 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityService/measure/info.vue | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue index 74193bd21..5d84e0cde 100644 --- a/src/views/modules/communityService/measure/info.vue +++ b/src/views/modules/communityService/measure/info.vue @@ -301,17 +301,17 @@ export default { type: String, default: "", }, - addType: { - type: String, - default: "look", - }, + // addType: { + // type: String, + // default: "look", + // }, }, data () { return { btnLoading: false, pageLoading: false, - + addType: 'look', form: { gridId: "", categoryCodeArr: [], @@ -476,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; } From b17b34536d38665359ee46f745103541291c935b Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 25 May 2022 09:58:34 +0800 Subject: [PATCH 4/7] 111 --- src/views/modules/shequzhili/event/cpts/event-detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 06a4766cd..868e6f84e 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -75,7 +75,7 @@
- 满意度评价 From bb50fd2604b00472c88f454218c775302d1153a6 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 25 May 2022 13:33:49 +0800 Subject: [PATCH 5/7] orgType --- .../shijianfenlei/shijianfenleifenxi.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue index 626673f04..a703ccacc 100644 --- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue @@ -623,12 +623,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 = '' From a05af088f820deeeaafbc37fd32e31da6dd08803 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 25 May 2022 14:31:45 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/shequzhili/event-info.scss | 93 +++++++++++++------ .../modules/shequzhili/event/cpts/add.vue | 3 + .../shequzhili/event/cpts/event-detail.vue | 79 ++++++++++------ .../shequzhili/event/cpts/process-form.vue | 13 +-- .../modules/shequzhili/event/eventList.vue | 2 +- .../shijianchuli/shijianchulifenxi.vue | 1 + .../shijianfenlei/shijianfenleifenxi.vue | 19 ++-- 7 files changed, 136 insertions(+), 74 deletions(-) diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index eddc90d5e..39f48b609 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/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 } } diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 9dd650e6e..6c689aca7 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -585,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 () { diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 868e6f84e..711f9416a 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -73,24 +73,51 @@
+ +
+ 关闭 + +
+ + +

满意度评价

+
+
+ +
+
+ +
不满意
+
+
+ +
满意
+
+
+ +
非常满意
+
+
+
+ +
- 满意度评价 + 关闭 + 确定
- -
-
- -
不满意
-
-
- -
满意
-
-
- -
非常满意
-
-
关闭 @@ -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 diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue index 05efadcc3..dcfa39a1a 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form.vue @@ -10,10 +10,13 @@ - + + 暂不处理 回复 立项 转服务 + @@ -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) { diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index f333e1d9e..6c6621bf2 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -246,7 +246,7 @@ width="100">