From 0d439c842f5d7c5ea49eb3c20c8b9df119886ed5 Mon Sep 17 00:00:00 2001 From: xiaokangsix <2539509415@qq.com> Date: Fri, 26 Apr 2024 22:41:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 23 + .../projectEnd/projectIndex/projectIndex.vue | 1929 +++++++++-------- pages/projectEnd/ukashManage/lookDetails.vue | 135 +- pages/projectEnd/ukashManage/materials.vue | 70 +- pages/projectEnd/ukashManage/ukashManage.vue | 45 +- .../visitorsManage/visitorsDetails.vue | 129 ++ .../visitorsManage/visitorsManage.vue | 185 ++ 7 files changed, 1487 insertions(+), 1029 deletions(-) create mode 100644 pages/projectEnd/visitorsManage/visitorsDetails.vue create mode 100644 pages/projectEnd/visitorsManage/visitorsManage.vue diff --git a/pages.json b/pages.json index dd4d1926..b472c0d2 100644 --- a/pages.json +++ b/pages.json @@ -1405,6 +1405,29 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } + }, + { + "path": "pages/projectEnd/ukashManage/lookDetails", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/projectEnd/visitorsManage/visitorsManage", + "style" : + { + "navigationBarTitleText" : "访客管理", + "enablePullDownRefresh" : true + } + }, + { + "path" : "pages/projectEnd/visitorsManage/visitorsDetails", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } } ], // "subPackages":[{ diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue index 5bbd29b4..3b60b7b7 100644 --- a/pages/projectEnd/projectIndex/projectIndex.vue +++ b/pages/projectEnd/projectIndex/projectIndex.vue @@ -1,66 +1,66 @@ + .projectIndexBG { + width: 100%; + height: 357px; + position: absolute; + top: 0; + left: 0; + } + \ No newline at end of file diff --git a/pages/projectEnd/ukashManage/lookDetails.vue b/pages/projectEnd/ukashManage/lookDetails.vue index 842e32ba..a6afe6c5 100644 --- a/pages/projectEnd/ukashManage/lookDetails.vue +++ b/pages/projectEnd/ukashManage/lookDetails.vue @@ -1,50 +1,109 @@ \ No newline at end of file diff --git a/pages/projectEnd/ukashManage/materials.vue b/pages/projectEnd/ukashManage/materials.vue index bcbe06be..73c6acbc 100644 --- a/pages/projectEnd/ukashManage/materials.vue +++ b/pages/projectEnd/ukashManage/materials.vue @@ -5,18 +5,24 @@ 材料入场管理 - - + + + - 0000 + 材料名称: {{item.name}} 查看明细 - 型号: 2222s - 规格: 2222s - 单位: 2222s - 数量: 2222s + 型号: {{item.model}} + 规格: {{item.specifications}} + 单位: {{item.unit}} + 数量: {{item.num}} + 备注: {{item.remark}} + + + 暂无数据 + @@ -58,29 +64,34 @@ methods: { queryList() { let data = { - id:this.id + materialId: this.id } let _this = this this.sendRequest({ - url: 'xmgl/xzMaterialDetail/queryById', + url: 'xmgl/xzMaterialDetail/list', method: 'post', data: data, success: res => { console.log(res); - // this.dataList =res.result.records - // if (res.result.records.length < this.pageSize) { - // //判断接口返回数据量小于请求数据量，则表示此为最后一页 - // this.isLoadMore = true - // this.loadStatus = 'nomore' - // } else { - // this.isLoadMore = false - // // that.loadStatus='more' - // } - // uni.stopPullDownRefresh() - // // console.log(res.result) + this.dataList = res.result + if (res.result.length < this.pageSize) { + //判断接口返回数据量小于请求数据量，则表示此为最后一页 + this.isLoadMore = true + this.loadStatus = 'nomore' + } else { + this.isLoadMore = false + // that.loadStatus='more' + } + uni.stopPullDownRefresh() + // console.log(res.result) } }) }, + jobLookDetails(id){ + uni.navigateTo({ + url: './lookDetails?itemS=' + id + }) + } } } @@ -101,7 +112,7 @@ } .ukashList { - height: 163px; + height: 193px; background-color: #fff; margin: 10px 10px; border-radius: 15px; @@ -129,5 +140,22 @@ color: #b9bbc9; } } + + .no-data { + text-align: center; + + .img { + display: block; + height: 200rpx; + width: 200rpx; + margin: 0 auto; + margin-top: 60rpx; + margin-bottom: 60rpx; + } + + .txt { + color: #C0C4CC; + } + } } \ No newline at end of file diff --git a/pages/projectEnd/ukashManage/ukashManage.vue b/pages/projectEnd/ukashManage/ukashManage.vue index 0ed48d76..b5a3ae73 100644 --- a/pages/projectEnd/ukashManage/ukashManage.vue +++ b/pages/projectEnd/ukashManage/ukashManage.vue @@ -5,8 +5,8 @@ 材料入场管理 - - + + {{item.name}} @@ -15,6 +15,10 @@ 入场时间: {{item.entryTime}} + + + 暂无数据 + @@ -36,10 +40,11 @@ }, onReachBottom() { console.log(99999); + // this.pageNo += 1 + // this.queryList() if (!this.isLoadMore) { - this.isLoadMore = true - this.pageNo + 1 - this.queryList() + this.pageNo += 1; + this.queryList(); } }, onPullDownRefresh() { @@ -49,10 +54,11 @@ this.queryList() }, methods: { - queryList() { + queryList(name = null) { let data = { pageNo: this.pageNo, - pageSize: this.pageSize + pageSize: this.pageSize, + name: name ? name : null } let _this = this this.sendRequest({ @@ -61,7 +67,8 @@ data: data, success: res => { console.log(res); - this.dataList = res.result.records + this.dataList=this.dataList.concat(res.result.records) + // this.dataList = res.result.records if (res.result.records.length < this.pageSize) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 this.isLoadMore = true @@ -79,6 +86,11 @@ uni.navigateTo({ url: './materials?itemS=' + id }) + }, + handleInput(e) { + console.log(e); + this.dataList = null + this.queryList(e.detail.value) } } } @@ -128,5 +140,22 @@ color: #b9bbc9; } } + + .no-data { + text-align: center; + + .img { + display: block; + height: 200rpx; + width: 200rpx; + margin: 0 auto; + margin-top: 60rpx; + margin-bottom: 60rpx; + } + + .txt { + color: #C0C4CC; + } + } } \ No newline at end of file diff --git a/pages/projectEnd/visitorsManage/visitorsDetails.vue b/pages/projectEnd/visitorsManage/visitorsDetails.vue new file mode 100644 index 00000000..60647455 --- /dev/null +++ b/pages/projectEnd/visitorsManage/visitorsDetails.vue @@ -0,0 +1,129 @@ + + + + + \ No newline at end of file diff --git a/pages/projectEnd/visitorsManage/visitorsManage.vue b/pages/projectEnd/visitorsManage/visitorsManage.vue new file mode 100644 index 00000000..fc55bc52 --- /dev/null +++ b/pages/projectEnd/visitorsManage/visitorsManage.vue @@ -0,0 +1,185 @@ + + + + + \ No newline at end of file From 60ec3644399a8ba21f53ed83d3c0f451326ba6c0 Mon Sep 17 00:00:00 2001 From: xiaokangsix <2539509415@qq.com> Date: Sat, 27 Apr 2024 19:12:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/projectEnd/safeManage/safeIndex.vue | 8 +-- pages/projectEnd/ukashManage/materials.vue | 6 +- pages/projectEnd/ukashManage/ukashManage.vue | 50 +++++++++++++---- .../visitorsManage/visitorsDetails.vue | 50 +++++++++++++---- .../visitorsManage/visitorsManage.vue | 56 +++++++++++++------ 5 files changed, 125 insertions(+), 45 deletions(-) diff --git a/pages/projectEnd/safeManage/safeIndex.vue b/pages/projectEnd/safeManage/safeIndex.vue index 78f7d052..244b2437 100644 --- a/pages/projectEnd/safeManage/safeIndex.vue +++ b/pages/projectEnd/safeManage/safeIndex.vue @@ -70,10 +70,10 @@ 危大工程 - - - - + 材料名称: {{item.name}} - 查看明细 + 型号: {{item.model}} 规格: {{item.specifications}} @@ -40,12 +40,10 @@ id: '' } }, - onShow() { - this.queryList() - }, onLoad(vai) { console.log(vai.itemS); this.id = vai.itemS + this.queryList() }, onReachBottom() { console.log(99999); diff --git a/pages/projectEnd/ukashManage/ukashManage.vue b/pages/projectEnd/ukashManage/ukashManage.vue index b5a3ae73..38d8a3b7 100644 --- a/pages/projectEnd/ukashManage/ukashManage.vue +++ b/pages/projectEnd/ukashManage/ukashManage.vue @@ -12,6 +12,7 @@ {{item.name}} 查看明细 + 企业: {{item.enterpriseName}} 入场时间: {{item.entryTime}} @@ -32,10 +33,11 @@ pageNo: 1, pageSize: 10, isLoadMore: false, - dataList: [] + dataList: [], + isFinished: false } }, - onShow() { + onLoad() { this.queryList() }, onReachBottom() { @@ -52,13 +54,13 @@ this.pageNo = 1 this.dataList = [] this.queryList() + this.isFinished = false }, methods: { - queryList(name = null) { + queryList() { let data = { pageNo: this.pageNo, pageSize: this.pageSize, - name: name ? name : null } let _this = this this.sendRequest({ @@ -67,12 +69,14 @@ data: data, success: res => { console.log(res); - this.dataList=this.dataList.concat(res.result.records) + // this.dataList = this.dataList.concat(res.result.records) + + this.dataList = [...this.dataList, ...res.result.records] + // console.log(this.dataList , res.result.total); // this.dataList = res.result.records if (res.result.records.length < this.pageSize) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 this.isLoadMore = true - this.loadStatus = 'nomore' } else { this.isLoadMore = false // that.loadStatus='more' @@ -88,9 +92,35 @@ }) }, handleInput(e) { - console.log(e); - this.dataList = null - this.queryList(e.detail.value) + this.dataList = [] + let data = { + pageNo: this.pageNo, + pageSize: this.pageSize, + name: e.detail.value ? e.detail.value : null + } + let _this = this + this.sendRequest({ + url: 'xmgl/xzMaterial/page', + method: 'post', + data: data, + success: res => { + console.log(res); + // this.dataList = this.dataList.concat(res.result.records) + + this.dataList = [...this.dataList, ...res.result.records] + // console.log(this.dataList , res.result.total); + // this.dataList = res.result.records + if (res.result.records.length < this.pageSize) { + //判断接口返回数据量小于请求数据量，则表示此为最后一页 + this.isLoadMore = true + } else { + this.isLoadMore = false + // that.loadStatus='more' + } + uni.stopPullDownRefresh() + // console.log(res.result) + } + }) } } } @@ -134,7 +164,7 @@ } .ukashList-time { - margin-top: 20px; + margin-top: 10px; margin-left: 20px; font-size: 12px; color: #b9bbc9; diff --git a/pages/projectEnd/visitorsManage/visitorsDetails.vue b/pages/projectEnd/visitorsManage/visitorsDetails.vue index 60647455..36521f08 100644 --- a/pages/projectEnd/visitorsManage/visitorsDetails.vue +++ b/pages/projectEnd/visitorsManage/visitorsDetails.vue @@ -8,34 +8,34 @@ 访客姓名 - {{result.name}} + {{result.visitName}} 访客身份证号 - {{result.model}} + {{result.idCard}} 预约人姓名 - {{result.specifications}} + {{result.appointmentName}} 预约结果 - {{result.unit}} + {{ result.isSuccess === 0 ? '预约成功' : '预约失败'}} 预约有效开始时间 - {{result.num}} + {{result.beginTime}} 预约有效结束时间 - {{result.num}} + {{result.endTime}} 当前状态 - {{result.remark}} + {{ result.isEnable === 0 ? '预约有效' : '预约已失效'}} - 删除 + 删除 @@ -68,7 +68,7 @@ } let _this = this this.sendRequest({ - url: 'xmgl/xzMaterialDetail/queryById', + url: 'xmgl/xzVisitorManageRecord/queryById', method: 'post', data: data, success: res => { @@ -76,6 +76,34 @@ this.result = res.result } }) + }, + deleteEvent(){ + let data = { + id: this.id + } + let _this = this + this.sendRequest({ + url: 'xmgl/xzVisitorManageRecord/delete', + method: 'post', + data: data, + success: res => { + console.log(res); + // this.result = res.result + if(res.code=== 200){ + uni.showToast({ + title: '删除成功', + duration: 2000, + icon: 'none', + mask: true, + }) + setTimeout(() => { + uni.navigateBack({ + url:'visitorsManage' + }) + }, 1000) + } + } + }) } } } @@ -111,8 +139,8 @@ padding: 0 15px; margin-top: 15px; } - - .delete{ + + .delete { position: absolute; bottom: 60px; left: 0; diff --git a/pages/projectEnd/visitorsManage/visitorsManage.vue b/pages/projectEnd/visitorsManage/visitorsManage.vue index fc55bc52..61dab715 100644 --- a/pages/projectEnd/visitorsManage/visitorsManage.vue +++ b/pages/projectEnd/visitorsManage/visitorsManage.vue @@ -6,25 +6,25 @@ - - + + - 访客姓名:浏览 - 访客姓名:浏览 + 访客姓名: {{item.visitName}} + {{item.isSuccess===1?'预约成功':'预约失败'}} - 访客身份证号: - 预约人姓名: - 预约开始时间: + 访客身份证号: {{item.idCard}} + 预约人姓名: {{ item.appointmentName }} + 预约开始时间: {{ item.beginTime }} - 预约结束时间: - 访客姓名:浏览 + 预约结束时间: {{ item.endTime }} + {{ item.isEnable === 1 ? '预约有效' : '预约已失效' }} - + @@ -43,7 +43,7 @@ isBrowsing : 0 } }, - onShow() { + onLoad() { this.queryList() }, onReachBottom() { @@ -68,12 +68,12 @@ } let _this = this this.sendRequest({ - url: 'xmgl/visitorManageRecord/list', + url: 'xmgl/xzVisitorManageRecord/page', method: 'post', data: data, success: res => { console.log(res); - this.dataList = res.result.records + this.dataList = this.dataList.concat(res.result.records) if (res.result.records.length < this.pageSize) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 this.isLoadMore = true @@ -94,8 +94,32 @@ }, handleInput(e) { console.log(e); - this.dataList = null - this.queryList(e.detail.value) + this.dataList = [] + let data = { + pageNo: this.pageNo, + pageSize: this.pageSize, + visitName: e.detail.value ? e.detail.value : null + } + let _this = this + this.sendRequest({ + url: 'xmgl/xzVisitorManageRecord/page', + method: 'post', + data: data, + success: res => { + console.log(res); + this.dataList = this.dataList.concat(res.result.records) + if (res.result.records.length < this.pageSize) { + //判断接口返回数据量小于请求数据量，则表示此为最后一页 + this.isLoadMore = true + this.loadStatus = 'nomore' + } else { + this.isLoadMore = false + // that.loadStatus='more' + } + uni.stopPullDownRefresh() + // console.log(res.result) + } + }) } } }