From 2f22a2d8a80cf1e73b7627b93a1a05656f1e013a Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 24 Nov 2021 17:31:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/measure/index.vue | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 47da7883d..e11049665 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -58,7 +58,7 @@ - + - + + placeholder="请输入" class="input-width" maxlength="11" clearable> + @change="handleServiceChange('add', $event)"> 0) { + if (Array.isArray(this.reportTime) && this.reportTime.length > 0) { this.searchForm.reportStartTime = this.reportTime[0] this.searchForm.reportEndTime = this.reportTime[1] } - if (this.serviceTime.length > 0) { + if (Array.isArray(this.serviceTime) && this.serviceTime.length > 0) { this.searchForm.wantServiceStartTime = this.serviceTime[0] - this.searchForm.wantServiceTime = this.serviceTime[1] + this.searchForm.wantServiceEndTime = this.serviceTime[1] } this.getTableData() }, @@ -688,8 +689,12 @@ export default { } }, - handleServiceChange(val) { - this.getServiceuserList(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) { this.getDemandUserList() @@ -969,12 +974,12 @@ export default { return this.$message.error('网络错误') }) }, - async getServiceuserList(serviceType) { - if (!serviceType) return this.$message.error('服务方不能为空') + async getServiceuserList(serviceType, query) { + if (!serviceType) return false const params = { serviceName: '', serviceType: serviceType, - queryPurpose: '' + queryPurpose: query } await this.$http .post('/heart/userdemand/servicelist', params) From 824e9702ae4d037d574d9ccc04edb8703bb6e737 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 25 Nov 2021 09:08:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?= =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ninePlaces/inspect/inspect.vue | 441 +++++--------- .../ninePlaces/inspect/inspectForm.vue | 441 ++++++++++++++ .../ninePlaces/inspect/inspectReview.vue | 439 ++++++++++++++ .../ninePlaces/inspect/unitsForm.vue | 553 ------------------ .../ninePlaces/places/places.vue | 17 +- .../ninePlaces/places/placesForm.vue | 22 +- .../communityService/ninePlaces/team/team.vue | 39 +- .../ninePlaces/team/teamForm.vue | 99 ++-- 8 files changed, 1132 insertions(+), 919 deletions(-) create mode 100644 src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue create mode 100644 src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue delete mode 100644 src/views/modules/communityService/ninePlaces/inspect/unitsForm.vue diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue index b8849d202..abf64bea0 100644 --- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue +++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue @@ -6,7 +6,33 @@ ref="ref_searchform" :label-width="'100px'">
- + + + + + + + + + + + + + - - - - - +
+
+ + - @@ -44,42 +64,19 @@ -
-
- + + - - - - - - - - - - - - -
-
- 新增 - - 导入 - - 导出 - - - -
+ 新增 - + label="场所名称" + min-width="180"> - + label="场所类型" + min-width="180"> - + label="分队名称" + min-width="180"> - + label="检察人员" + min-width="180"> - + label="首次巡检时间" + min-width="150"> - + label="隐患明细" + min-width="280"> - + label="首次检查结果" + min-width="180"> - + label="拟复查时间" + min-width="110"> - + label="最新结果" + min-width="110"> + + + @@ -216,7 +196,7 @@ @@ -232,12 +212,25 @@ width="850px" top="5vh" @closed="diaClose"> - + + + + + +
@@ -245,7 +238,8 @@ + + diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue new file mode 100644 index 000000000..7af128683 --- /dev/null +++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue @@ -0,0 +1,439 @@ + + + + + + diff --git a/src/views/modules/communityService/ninePlaces/inspect/unitsForm.vue b/src/views/modules/communityService/ninePlaces/inspect/unitsForm.vue deleted file mode 100644 index 383174ba6..000000000 --- a/src/views/modules/communityService/ninePlaces/inspect/unitsForm.vue +++ /dev/null @@ -1,553 +0,0 @@ - - - - - - diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index 0d0dd69fc..46a147352 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -61,9 +61,9 @@ + prop="ninePlaceVal"> + prop="ninePlaceVal"> + prop="ninePlaceVal"> - - + width="180"> - + width="110"> - - - - { + let timeArray = item.time.split(' ') + item.time = timeArray[0] + }); } else { this.$message.error(msg) } @@ -365,8 +370,8 @@ export default { }, async deleteTeam (row) { - // const url = "/gov/org/placepatrolteam/del" - const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del" + const url = "/gov/org/placepatrolteam/del" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del" let params = { teamId: row.teamId @@ -392,7 +397,7 @@ export default { personInCharge: '',//负责人 mobile: '',//联系电话 gridId: '',//负责区域【网格Id】 - ninePlacsVal: '',//场所类型【九小场所Value值】 + ninePlaceVal: '',//场所类型【九小场所Value值】 isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是 } }, diff --git a/src/views/modules/communityService/ninePlaces/team/teamForm.vue b/src/views/modules/communityService/ninePlaces/team/teamForm.vue index 534afb1fe..db8196783 100644 --- a/src/views/modules/communityService/ninePlaces/team/teamForm.vue +++ b/src/views/modules/communityService/ninePlaces/team/teamForm.vue @@ -37,12 +37,12 @@ + v-model="formData.ninePlaceArray"> {{item.label}} @@ -69,7 +69,7 @@ prop="time" label-width="150px"> @@ -102,7 +102,6 @@ prop="member"> @@ -110,24 +109,24 @@ :key="index" class="div_person_list"> 姓名 - {{item.name}} + v-else>{{item.name}} 联系电话 - {{item.mobile}} + v-else>{{item.mobile}} { + item.isSet = false + }); } else { this.$message.error(msg) } }, - - async handleComfirm () { this.btnDisable = true @@ -255,7 +252,7 @@ export default { let obj = { name: '', mobile: '', - isEdit: true + isSet: true } this.memberList.push(obj) @@ -278,21 +275,32 @@ export default { } else { return false } - if (this.formData.ninePlacsArray.length > 0) { - this.formData.ninePlacsVals = this.formData.ninePlacsArray.join(',') + if (this.formData.ninePlaceArray.length > 0) { + this.formData.ninePlaceVals = this.formData.ninePlaceArray.join(',') } else { return false } + let msgMember = this.validataMemeberList() + if (msgMember) { + this.$message({ + type: 'warning', + message: msgMember + }) + return false + } + + this.formData.memberList = this.memberList + let url = '' if (this.formType === 'edit') { - // url = '/gov/org/placeorg/edit' - url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit' + url = '/gov/org/placepatrolteam/edit' + // url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit' } else { - // url = "/gov/org/placepatrolteam/add" - url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/add" + url = "/gov/org/placepatrolteam/add" + // url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/add" } const { data, code, msg } = await requestPost(url, this.formData) @@ -312,6 +320,18 @@ export default { }, + validataMemeberList () { + if (this.memberList.length === 0) { + return '成员列表不能为空' + } + this.memberList.forEach(element => { + if (!element.mobile || !element.name) { + return '成员的姓名和电话不能为空' + } + }); + return '' + }, + handleCancle () { this.resetData() @@ -326,14 +346,15 @@ export default { teamName: '',//分队名称 gridIds: '',//负责区域，多个值逗号分隔 gridIdArray: [], - ninePlacsVals: '',//负责场所类型，多个值逗号分隔 - ninePlacsArray: [], + ninePlaceVals: '',//负责场所类型，多个值逗号分隔 + ninePlaceArray: [], plan: '',//巡查计划 time: '',//时间 personInCharge: '',//负责人 mobile: '',//联系电话 member: '1'//成员信息集合 } + this.memberList = [] }, // 开启加载动画 startLoading () { @@ -360,7 +381,7 @@ export default { gridIdArray: [ { required: true, message: '负责区域不能为空', trigger: 'blur' }, ], - ninePlacsArray: [ + ninePlaceArray: [ { required: true, message: '场所类型不能为空', trigger: 'blur' } ],