From e51f9f0c1e0b4730d912295a6349dcf72005d554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Fri, 29 Mar 2024 17:25:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=96=B0=E5=A2=9E=E8=AE=B0=E5=BD=95,?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/work2/work2.js | 9 +- pages/work2/work2.wxml | 4 +- .../pages/followUpList/followUpList.js | 142 +++++++---- .../pages/followUpList/followUpList.json | 5 +- .../pages/followUpList/followUpList.wxml | 52 +++- .../pages/followUpList/followUpList.wxss | 227 ++++++++++++------ .../communitySelfInsp/pages/image/del.png | Bin 0 -> 600 bytes .../communitySelfInsp/pages/image/downG.png | Bin 0 -> 393 bytes 8 files changed, 304 insertions(+), 135 deletions(-) create mode 100644 subpages/communitySelfInsp/pages/image/del.png create mode 100644 subpages/communitySelfInsp/pages/image/downG.png diff --git a/pages/work2/work2.js b/pages/work2/work2.js index e3fa136..46ab0c7 100644 --- a/pages/work2/work2.js +++ b/pages/work2/work2.js @@ -68,7 +68,7 @@ Page({ url: '../../subpages/addResi/pages/addResi/addResi', }) }, - onAddHouse(){ + onAddHouseLL(){ wx.navigateTo({ url: '../../subpages/addhouse/pages/addhouse/addhouse', }) @@ -85,9 +85,14 @@ Page({ }, onFollowUpList(){ wx.navigateTo({ - url: '../../subpages/communitySelfInsp/pages/followUpList/followUpList', + url: '../../subpages/communitySelfInsp/pages/followUpList/followUpList?key1=resi', }) }, + onFollowUpLi(){ + wx.navigateTo({ + url: '../../subpages/communitySelfInsp/pages/followUpList/followUpList?key1=house', + }) + }, onMyTroubleshootDemand(){ wx.navigateTo({ url: '../../subpages/myTroubleshootDemand/pages/index/index', diff --git a/pages/work2/work2.wxml b/pages/work2/work2.wxml index d08d5dc..dd12468 100644 --- a/pages/work2/work2.wxml +++ b/pages/work2/work2.wxml @@ -31,10 +31,10 @@ - + 新增房屋信息 - + 新增记录 diff --git a/subpages/communitySelfInsp/pages/followUpList/followUpList.js b/subpages/communitySelfInsp/pages/followUpList/followUpList.js index 409c53d..855191d 100644 --- a/subpages/communitySelfInsp/pages/followUpList/followUpList.js +++ b/subpages/communitySelfInsp/pages/followUpList/followUpList.js @@ -1,28 +1,42 @@ -import {getFollowUpList} from "../../../../utils/api" -const app = getApp() +// subpages/gatherInformation/pages/gatherInformation/gatherInformation.js +import { $wuxCalendar } from '../../../../components/dist/index' +import {getCollect} from '../../../../utils/api' Page({ + /** * 页面的初始数据 */ data: { - tableData:[], + selectList:[['全部信息','居民信息采集','房屋信息采集']], + selectValue:['全部信息',''], + pageSize:10, pageNo:1, - pageSize:7, + tableData:[], lowerThreshold:'10', loadMoreVisible:false, loadMoreType: "none", - nodata:false + nodata:false, + visible:false, + typeVal:'', + collectType:'', + newType:'', + form:{ + type: "", + collectType: "", + collectStartDate: "", + collectEndDate: "" + } }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - this.setData({ - satisfactionCategory:options.category, - inspRecordId:options.inspRecordId, - createdBy:app.globalData.user.id - }) + console.log("123123",options.key1) + this.setData({ + newType: options.key1 + }); + this.getCollect() }, /** @@ -36,11 +50,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - this.setData({ - pageNo:1, - tableData:[] - }) - this.getFollowUpList() + }, /** @@ -70,29 +80,43 @@ Page({ onReachBottom() { }, - onScrollToLower(e){ - if (this.data.loadMoreType === 'more') { + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + openCalendar2() { + console.log(123) + $wuxCalendar().open({ + value: this.data.value2, + multiple: true, + onChange: (values, displayValues) => { + console.log('onChange', values, displayValues) this.setData({ - loadMoreVisible: true, + 'form.collectStartDate': displayValues[0], + 'form.collectEndDate': displayValues[1], }) - this.data.pageNo += 1 - this.getFollowUpList() - } + }, + }) }, - getFollowUpList(){ + getCollect(){ this.setData({ loadMoreVisible: true, nodata: false, loadMoreType: "more", }) - let parm = { - inspRecordId:'', - createdBy:this.data.createdBy, + const parm = { + type:this.data.newType, + pageSize:this.data.pageSize, pageNo:this.data.pageNo, - pageSize:this.data.pageSize + collectType:'add', + collectStartDate:this.data.form.collectStartDate, + collectEndDate:this.data.form.collectEndDate } - if(!parm.type) delete parm.type - getFollowUpList(parm).then(res=>{ + console.log(parm); + getCollect(parm).then(res=>{ this.setData({ loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none', tableData: this.data.tableData.concat(res.data.list), @@ -111,21 +135,53 @@ Page({ }) }) }, - handleClickPhone(e){ - wx.makePhoneCall({ - phoneNumber: e.currentTarget.dataset.mobile, - }) + onScrollToLower(e){ + if (this.data.loadMoreType === 'more') { + this.setData({ + loadMoreVisible: true, + }) + this.data.pageNo += 1 + this.getCollect() + } }, - toFollowUpDetail(e){ - wx.navigateTo({ - url: `/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail?resiInfo=${JSON.stringify(e.currentTarget.dataset.item)}&type=edit`, - }) - + onValueChange(e){ + this.setData({ + typeVal: e.detail.selectedIndex[0] === 1 ? 'resi' : e.detail.selectedIndex[0] === 2 ? 'house' : '', + collectTypeVal: e.detail.selectedIndex[1] === 1 ? 'add' : e.detail.selectedIndex[1] === 2 ? 'edit' : e.detail.selectedIndex[1] === 3 ? 'del' : '', + }) }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } + onConfirm(e) { + this.setData({ + typeVal: e.detail.selectedIndex[0] === 1 ? 'resi' : e.detail.selectedIndex[0] === 2 ? 'house' : '', + collectTypeVal: e.detail.selectedIndex[1] === 1 ? 'add' : e.detail.selectedIndex[1] === 2 ? 'edit' : e.detail.selectedIndex[1] === 3 ? 'del' : '', + 'form.type': e.detail.selectedIndex[0] === 1 ? 'resi' : e.detail.selectedIndex[0] === 2 ? 'house' : '', + 'form.collectType':e.detail.selectedIndex[1] === 1 ? 'add' : e.detail.selectedIndex[1] === 2 ? 'edit' : e.detail.selectedIndex[1] === 3 ? 'del' : '', + visible:false, + selectValue:e.detail.selectedValue + }) + }, + handelShow(){ + this.setData({ + visible:true + }) + }, + handelHidden(){ + this.setData({ + visible:false + }) + }, + handleClickfilter(){ + this.setData({ + tableData:[], + pageNo:1 + }) + this.getCollect() + + }, + handelDel(){ + this.setData({ + 'form.collectStartDate':'', + 'form.collectEndDate':'' + }) + } }) \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/followUpList/followUpList.json b/subpages/communitySelfInsp/pages/followUpList/followUpList.json index 0ea7ac1..998c4fd 100644 --- a/subpages/communitySelfInsp/pages/followUpList/followUpList.json +++ b/subpages/communitySelfInsp/pages/followUpList/followUpList.json @@ -1,7 +1,10 @@ { "usingComponents": { "load-more": "../../../../components/loadMore/loadMore", - "no-data": "../../../../components/noData/nodata" + "no-data": "../../../../components/noData/nodata", + "wux-calendar":"../../../../components/dist/calendar", + "wux-picker":"../../../../components/dist/picker/index" + }, "navigationBarTitleText": "我的回访记录" } \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/followUpList/followUpList.wxml b/subpages/communitySelfInsp/pages/followUpList/followUpList.wxml index 4abc2a5..8d91277 100644 --- a/subpages/communitySelfInsp/pages/followUpList/followUpList.wxml +++ b/subpages/communitySelfInsp/pages/followUpList/followUpList.wxml @@ -1,19 +1,45 @@ - - + + + + {{typeVal =='resi'?'居民信息采集':typeVal=='house'?'房屋信息采集':'全部信息'}} + + + + + + + {{form.collectStartDate}} {{form.collectEndDate}} + 请选择时间 + + + + + + 筛选 + + - - - - {{item.followUpWayName}} - {{item.reporterName}} {{item.reporterMobile}} - - - - {{item.addressDetail != null?item.addressDetail:'--'}} - {{item.followUpTime}} + + + {{item.collectType == 'edit'?'修改':item.collectType == 'add'?'新增':'删除'}} {{item.houseName?item.houseName:'--'}} + {{item.orgName}} {{item.collectTime}} + - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/followUpList/followUpList.wxss b/subpages/communitySelfInsp/pages/followUpList/followUpList.wxss index 7f09439..53011b6 100644 --- a/subpages/communitySelfInsp/pages/followUpList/followUpList.wxss +++ b/subpages/communitySelfInsp/pages/followUpList/followUpList.wxss @@ -1,75 +1,154 @@ -page { - width: 100%; - min-height: 100vh; - overflow-y: scroll; - background-color: #f7f7f7; - } - .red, - .blue{ - font-size: 28rpx; - color: #fff; - padding: 8rpx 20rpx ; - border-radius: 40rpx; - box-sizing: border-box; - margin-right: 16rpx; - } - .red{ - background-color: #ff783c; - } - .blue{ - background-color: #4f94ff; - } - .blue_small, - .red_small{ - font-size: 26rpx; - width: fit-content; - padding: 8rpx 16rpx; - border-radius: 40rpx; - box-sizing: border-box; - height: 40rpx; - line-height: 20rpx; - margin: 24rpx 0 ; +/* subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss */ +page{ + height: 100vh; + overflow: hidden; + background-color:#f7f7f7 ; +} +.edit{ + background-color: #def7f6; + color:#04B8AD; +} +.add{ + background-color: #e6f0ff; + color: #4F94FF; +} +.del{ + color: #FF783C; + background-color: #ffece3; +} +.gray{ + background: rgba(245, 245, 245) !important; + border: 1px solid #c1c1c1 !important; + color: #c1c1c1 !important; +} +.search{ + height: 110rpx; + width: 100%; + padding:0 22rpx; + box-sizing: border-box; + background-color: #fff; + display: flex; + align-items: center; + justify-content: space-between; + padding-top: 20rpx; + box-sizing: border-box; +} +.search image{ + width: 16rpx; + height: 16rpx; +} +.search .filter{ + max-width: 300rpx; + height: 40rpx; + background: rgba(58,128,231,0.16); + border: 1px solid #3A80E7; + border-radius: 40rpx; + display: flex; + align-items: center; + color: #3A80E7 ; + justify-content: space-between; + padding: 13rpx 24rpx 13rpx 20rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.search .box { + flex: 1; + padding: 0 29rpx 0 15rpx; + overflow: hidden; +} +.search .box .date{ + height: 40rpx; + background: rgba(58,128,231,0.16); + border: 1px solid #3A80E7; + border-radius: 40rpx; + padding: 13rpx 24rpx 13rpx 20rpx; + display: flex; + justify-content: space-between; + align-items: center; + color: #3A80E7; +} +.search .box .date .text{ + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +/* */ +.search .btn { + width: 120rpx; + height: 66rpx; + line-height: 66rpx; + background: #3A80E7; + border-radius: 33rpx; + color: #fff; + text-align: center; +} +.body{ + padding: 20rpx; + box-sizing: border-box; + overflow: hidden; +} - } - .blue_small{ - background-color: #eef4fd; - color: #5693EE; - } - .red_small{ - background-color: #fff1eb; - color: #FF783C; - } - .content{ - width: 100%; - padding:0 20rpx ; - margin-top: 20rpx; - box-sizing: border-box; - } - .content .scroll { - height: calc(100vh - 50rpx); - overflow-y: scroll; - } - .content .card{ - width: 100%; - background-color: #fff; - display: flex; - height: 180rpx; - flex-direction: column; - border-radius: 20rpx; - padding: 30rpx 30rpx; - box-sizing: border-box; - overflow: hidden; - color: #333; - } - .content .card .title{ - display: flex; - justify-content: space-between; - } - .content .card .bottom{ - display: flex; - justify-content: space-between; - align-items: center; - margin-top: 30rpx; - border-bottom: 2rpx #EAEAEA solid; - padding-bottom: 20rpx; - } \ No newline at end of file +.body .scroll { + height: calc(100vh - 130rpx); + overflow-y: scroll; +} +.body .scroll .content{ + border-radius: 20rpx; + background-color: #fff; + height: auto; +} +.body .scroll .content .item{ + height: 150rpx; + display: flex; + box-sizing: border-box; + flex-direction: column; + justify-content: space-between; + padding: 30rpx; + border-bottom:1px solid #EAEAEA; +} +.body .scroll .content .item .top{ + display: flex; + align-items: center; + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + color: #333333; +} +.body .scroll .content .item .top text{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.body .scroll .content .item .top .tag{ + width: 80rpx; + height: 36rpx; + line-height: 36rpx; + border-radius: 18rpx; + font-size: 26rpx; + text-align: center; + margin-right: 20rpx; +} +.body .scroll .content .item .bto{ + display: flex; + justify-content: space-between; + font-size: 28rpx; + font-family: PingFang SC; + font-weight: 500; + color: #999999; +} +.body .scroll .content .item .bto .address{ + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.body .scroll .content .item .bto .date{ + width: 265rpx; + height: 20rpx; + font-size: 26rpx; + font-family: PingFang SC; + font-weight: 500; + color: #C1C1C1; +} \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/image/del.png b/subpages/communitySelfInsp/pages/image/del.png new file mode 100644 index 0000000000000000000000000000000000000000..bc50e586a2bb912a9741964628fc597230813a85 GIT binary patch literal 600 zcmV-e0;m0nP)Px%5=lfsRA@u(S<7+4Kn#^^QUFjuOeau82)E#S%uFf(D##4Z9gYNwfK-B00MG!o zGP}kJ0o&}_J1`{TilmkF^g$1V8~@;q`wtwzwGm_l7=e-*Fj7LD*R2!U&_s;xRs12c zKJ5^e)0b+XBA+KyI)IM9ZAL%~ZASW(IbQkp_ zLdUdQs`l(1x_QGvtMODHy`}=^hdRZz&q91#u#r)h$iP2N7F8q==5!o1M2;?La+G0mbu=w|Xd1db$! z_x5zjUM&Q~8z({NK$s_65LN8}k|3Z0PDtRW{;84Yy9L%qQHHuu0H%^|!VU*uB8z2g mFal+=XF`_|FpPx$LrFwIRA@u(m)#A*FbsqfPXdcH?IegvfK6bMsFT1XE$SOWh@NvcsFM3y+qv(~ z>Q7D^zw*ZQrvUhOf{{QZKspdBL>fr9M*_5k~qO1ZWG%0g(V{Al)i}+>$Ylv3y6o3^3Bc29eAz1My z0Id)f;>`dWAkL+f3-V4_t5H8jzYRp*6Z1S@`@TP}2}AFj0<0xrE#7p6ULE_Cgok)H zfDcKS?fm;{nXl0M0n2AN`e}^r{cD{&K#M3%PXK7#@~DjjJY3bxj07}pdDKP%90K>uGc(9H0y00000NkvXXu0mjf$9JG9 literal 0 HcmV?d00001 From 7f8bbeb08be7af39843be05dc47f2bab8a09e766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Fri, 29 Mar 2024 17:39:29 +0800 Subject: [PATCH 2/2] 11111 --- .../communitySelfInsp/pages/followUpList/followUpList.js | 5 +++++ .../communitySelfInsp/pages/followUpList/followUpList.json | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/subpages/communitySelfInsp/pages/followUpList/followUpList.js b/subpages/communitySelfInsp/pages/followUpList/followUpList.js index 855191d..d78c232 100644 --- a/subpages/communitySelfInsp/pages/followUpList/followUpList.js +++ b/subpages/communitySelfInsp/pages/followUpList/followUpList.js @@ -36,6 +36,11 @@ Page({ this.setData({ newType: options.key1 }); + let title = options.key1 == 'resi'?'新增居民记录':'新增房屋记录' + wx.setNavigationBarTitle({ + title: title + }) + this.getCollect() }, diff --git a/subpages/communitySelfInsp/pages/followUpList/followUpList.json b/subpages/communitySelfInsp/pages/followUpList/followUpList.json index 998c4fd..e7f7937 100644 --- a/subpages/communitySelfInsp/pages/followUpList/followUpList.json +++ b/subpages/communitySelfInsp/pages/followUpList/followUpList.json @@ -5,6 +5,5 @@ "wux-calendar":"../../../../components/dist/calendar", "wux-picker":"../../../../components/dist/picker/index" - }, - "navigationBarTitleText": "我的回访记录" + } } \ No newline at end of file