diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue index 85d4d109..8cb7c9c7 100644 --- a/src/views/modules/communityService/fuwujilu/addForm.vue +++ b/src/views/modules/communityService/fuwujilu/addForm.vue @@ -122,10 +122,10 @@ style="display: block"> @@ -175,10 +175,10 @@ style="display: block"> @@ -362,41 +362,6 @@ export default { address: '', attachmentList: [],// 附件列表 }, - formDataTemp: { - principalContact: "15111111111", - principalName: "31231", - remark: "4234234", - serviceCategoryKey: "01", - serviceOrgId: "1531105677127692289", - serviceProjectId: "1531514265581076482", - serviceScope: [ - { - objectId: "1479033225060757506", - objectName: "合肥路街道", - objectType: "street", - }, - { - objectId: "1514064686570147842", - objectName: "ss", - objectType: "street", - } - ], - serviceTimeEnd: "", - serviceTimeStart: "", - - feedback: { - address: "山东省青岛市市南区南京路73号", - latitude: 36.0722275, - longitude: 120.38945519, - satisfaction: "bad", - serviceEffect: "234234234", - serviceGoal: "234234", - servicePeopleNumber: 1, - serviceProjectId: "1531514265581076482", - serviceProjectName: "223", - serviceStatus: "completed", - } - }, projectList: [],//服务项目list orgList: [],//服务组织list @@ -430,18 +395,17 @@ export default { async mounted () { this.startLoading() this.initMap() + this.$refs.ref_form_feedback.resetFields(); if (this.formType === 'add') { this.$refs.ref_form.resetFields(); await this.loadScopeTree() - } - - this.$refs.ref_form_feedback.resetFields(); + } else { + this.$set(this.feedbackFormData, 'serviceProjectName', this.serviceProjectName) + } this.endLoading() - this.formData = JSON.parse(JSON.stringify(this.formDataTemp)); - this.feedbackFormData = { ...this.formData.feedback } }, @@ -598,7 +562,7 @@ export default { console.log(this.formData) // return false const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 - if (regPhone.test(this.formData.principalContact) === false) { + if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) { this.btnDisable = false this.$message({ type: 'warning', @@ -959,6 +923,11 @@ export default { type: String, required: '' }, + serviceProjectName: {//服务项目名称 + type: String, + required: false, + default: '' + }, formType: { //表单操作类型 add新增，edit编辑，detail详情,feedback反馈 type: String, required: '' diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue index 5ed9abe5..6125199c 100644 --- a/src/views/modules/communityService/fuwujilu/detailForm.vue +++ b/src/views/modules/communityService/fuwujilu/detailForm.vue @@ -139,6 +139,142 @@ +
+

反馈内容

+ + + + + + + + + + + + + + + + + 已完成 + + + + + + + + + + + + + + + + + +
+ + + {{ att.attachmentName }} + +
+ 无附件 + + +
+
@@ -202,6 +338,20 @@ export default { longitude: 36.0722275, //经度 latitude: 120.38945519 //纬度 }, + + feedbackFormData: { + serviceProjectId: '',// 服务项目id + serviceProjectName: '', + serviceGoal: '',// 服务目标 + serviceEffect: '',// 服务效果 + servicePeopleNumber: null,// 服务人数 + serviceStatus: 'completed',// 服务状态。in_service服务中；completed:已完成 + satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect + longitude: '',// 经度 + latitude: '',// 维度 + address: '', + attachmentList: [],// 附件列表 + }, serviceList: [],//服务list endPickerOptions: { @@ -211,18 +361,19 @@ export default { disabledDate: startDisabledDate }, - projectList: [], - + fileList: [], + uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile', } }, components: {}, mounted () { if (this.serviceRecordId) {//详情 this.loadInfo() + } // this.initMap() - console.log('mounted') + }, @@ -240,13 +391,26 @@ export default { if (code === 0) { this.formData = { ...data } this.formData.serviceRecordId = this.serviceRecordId + this.feedbackFormData = { ...data.feedBack } + this.feedbackFormData.servicePeopleNumber = this.formData.servicePeopleNumber + this.fileList = [] + if (data.feedBack.attachmentList && data.feedBack.attachmentList.length > 0) { + data.feedBack.attachmentList.forEach(element => { + let obj = { + name: element.attachmentName, + format: element.attachmentFormat, + url: element.attachmentUrl, + } + this.fileList.push(obj) + }); + } + + } else { this.$message.error(msg) } }, - - async handleComfirm () { this.btnDisable = true @@ -303,6 +467,19 @@ export default { }, + //下载 + handleFileDownload (file) { + + var a = document.createElement('a'); + var event = new MouseEvent('click'); + a.download = file.name; + console.log(a) + a.href = file.url; + a.dispatchEvent(event); + + + }, + // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap () { // 定义地图中心点坐标 @@ -485,7 +662,13 @@ export default { default () { return [] } - } + }, + satisfyArray: { + type: Array, + default () { + return [] + } + }, } } @@ -493,4 +676,18 @@ export default { diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue index de27fac6..2309bd62 100644 --- a/src/views/modules/communityService/fuwujilu/fuwuList.vue +++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue @@ -238,6 +238,7 @@ :statusArray="statusArray" :satisfyArray="satisfyArray" :serviceRecordId="serviceRecordId" + :serviceProjectName="serviceProjectName" @handleOk="handleOk" @handleClose="handleClose"> @@ -252,6 +253,7 @@ @closed="showDetail = false"> -
{{ fmData.serviceCategory || "--" }}
+
{{ fmData.serviceCategory || "--" }}
-
{{ fmData.serviceName || "--" }}
+
{{ fmData.serviceName || "--" }}
 -
{{ fmData.serviceContent || "--" }}
+
{{ fmData.serviceContent || "--" }}
 -
{{ fmData.policyLevelName || "--" }}
+
{{ fmData.policyLevelName || "--" }}
 -
{{ fmData.policyGround || "--" }}
+
{{ fmData.policyGround || "--" }}
 + 点击上传，支持图片、word、pdf格式 @@ -210,12 +214,12 @@ export default { serviceContent: [ { required: true, message: "服务内容不能为空", trigger: "blur" }, ], - policyGround: [ - { required: true, message: "政策依据不能为空", trigger: "blur" }, - ], - policyLevel: [ - { required: true, message: "政策级别不能为空", trigger: "blur" }, - ], + // policyGround: [ + // { required: true, message: "政策依据不能为空", trigger: "blur" }, + // ], + // policyLevel: [ + // { required: true, message: "政策级别不能为空", trigger: "blur" }, + // ], }; }, }, @@ -277,7 +281,7 @@ export default { ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf"].indexOf(format) == -1 ) { - this.$message.error("文档仅限pdf和office文件!"); + this.$message.error("仅限图片、word和pdf文件!"); return false; } return true; @@ -308,6 +312,11 @@ export default { } }, + handleImgPreview(file) { + console.log(file); + window.open(file.url || file.response.data.url); + }, + handleImgRemove(file) { console.log("handleImgRemove", file); if (file.response) { @@ -323,6 +332,13 @@ export default { } }, + handleImgExceed() { + this.$message({ + type: "warning", + message: "文件数量最多不超过三个", + }); + }, + watchImg(src) { window.open(src); }, diff --git a/src/views/modules/communityService/fuwuxiangmu/index.vue b/src/views/modules/communityService/fuwuxiangmu/index.vue index 93321bd0..2f0948d8 100644 --- a/src/views/modules/communityService/fuwuxiangmu/index.vue +++ b/src/views/modules/communityService/fuwuxiangmu/index.vue @@ -140,7 +140,7 @@ -
{{ fmData.serviceTypeName }}
+
{{ fmData.serviceTypeName }}
-
{{ fmData.orgName || '--' }}
+
{{ fmData.orgName || "--" }}
 -
{{ fmData.orgDescribe || '--' }}
+
{{ fmData.orgDescribe || "--" }}
 -
{{ fmData.principalName || '--' }}
+
{{ fmData.principalName || "--" }}
 -
{{ fmData.principalMobile || '--' }}
+
{{ fmData.principalMobile || "--" }}
 查询 -
{{ fmData.remark || '--' }}
+
{{ fmData.remark || "--" }}
@@ -191,6 +193,7 @@ var map; var search; var markers; var infoWindowList; +var geocoder; // 新建一个正逆地址解析类 export default { props: { @@ -282,6 +285,8 @@ export default { }); infoWindowList = Array(10); + geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 + // 监听地图平移结束 map.on("panend", () => { this.handleMoveCenter(); @@ -339,6 +344,12 @@ export default { this.fmData.latitude = lat; this.fmData.longitude = lng; this.setMarker(lat, lng); + + geocoder + .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 + .then((result) => { + // this.fmData.address = result.result.address; + }); }, async getInfo() { 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 adc0abe1..93c82dc2 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -469,9 +469,14 @@ export default { 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, ""); + if (type === "add") { + this.getServiceuserList(val, "add_demand"); + } else { + this.getServiceuserList(val, "query_demand"); + } + } else { + this.getServiceuserList(val, ""); + } }, async getServiceuserList (serviceType, query) {