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)
+ }
+ })
}
}
}