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