diff --git a/api/information.js b/api/information.js index 70d566b..725c2c5 100644 --- a/api/information.js +++ b/api/information.js @@ -5,7 +5,8 @@ const Submit = BASE_URL + '/visitor/apply/submit' const visitReason = BASE_URL + '/sys/dict/code/visitReason' const devicePosition = BASE_URL + '/sys/dict/code/devicePosition' -const DEL_APPLY = BASE_URL + 'visitor/delApply' +const DEL_APPLY = BASE_URL + '/visitor/delApply' +const CHANGE_APPLY = BASE_URL + '/visitor/updateApply' /** * 提交访客记录 @@ -44,3 +45,13 @@ } return fetch.get(DEL_APPLY, params).then(res => res); } + +/** + * 申请者修改申请 + * @param {Object} code + */ +export function updateApply(params) { + useNetWork(); + return fetch.post(CHANGE_APPLY, params).then(res => res); +} + diff --git a/api/information.js b/api/information.js index 70d566b..725c2c5 100644 --- a/api/information.js +++ b/api/information.js @@ -5,7 +5,8 @@ const Submit = BASE_URL + '/visitor/apply/submit' const visitReason = BASE_URL + '/sys/dict/code/visitReason' const devicePosition = BASE_URL + '/sys/dict/code/devicePosition' -const DEL_APPLY = BASE_URL + 'visitor/delApply' +const DEL_APPLY = BASE_URL + '/visitor/delApply' +const CHANGE_APPLY = BASE_URL + '/visitor/updateApply' /** * 提交访客记录 @@ -44,3 +45,13 @@ } return fetch.get(DEL_APPLY, params).then(res => res); } + +/** + * 申请者修改申请 + * @param {Object} code + */ +export function updateApply(params) { + useNetWork(); + return fetch.post(CHANGE_APPLY, params).then(res => res); +} + diff --git a/pages.json b/pages.json index 092484a..70f476b 100644 --- a/pages.json +++ b/pages.json @@ -165,17 +165,16 @@ "navigationBarTitleText": "信息查看", "enablePullDownRefresh": false } + }, + { + "path" : "changeListInfo/changeListInfo", + "style" : + { + "navigationBarTitleText": "信息编辑", + "enablePullDownRefresh": false + } } - ,{ - "path" : "changeListInfo/changeListInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ] + ] } ], "uniIdRouter": {} diff --git a/api/information.js b/api/information.js index 70d566b..725c2c5 100644 --- a/api/information.js +++ b/api/information.js @@ -5,7 +5,8 @@ const Submit = BASE_URL + '/visitor/apply/submit' const visitReason = BASE_URL + '/sys/dict/code/visitReason' const devicePosition = BASE_URL + '/sys/dict/code/devicePosition' -const DEL_APPLY = BASE_URL + 'visitor/delApply' +const DEL_APPLY = BASE_URL + '/visitor/delApply' +const CHANGE_APPLY = BASE_URL + '/visitor/updateApply' /** * 提交访客记录 @@ -44,3 +45,13 @@ } return fetch.get(DEL_APPLY, params).then(res => res); } + +/** + * 申请者修改申请 + * @param {Object} code + */ +export function updateApply(params) { + useNetWork(); + return fetch.post(CHANGE_APPLY, params).then(res => res); +} + diff --git a/pages.json b/pages.json index 092484a..70f476b 100644 --- a/pages.json +++ b/pages.json @@ -165,17 +165,16 @@ "navigationBarTitleText": "信息查看", "enablePullDownRefresh": false } + }, + { + "path" : "changeListInfo/changeListInfo", + "style" : + { + "navigationBarTitleText": "信息编辑", + "enablePullDownRefresh": false + } } - ,{ - "path" : "changeListInfo/changeListInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ] + ] } ], "uniIdRouter": {} diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 0c3aa3f..8b3d31c 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -33,31 +33,29 @@ item.value === '申请已提交' ? 'blue' : 'value'">{{item.value}} - - - - - - 申请通过 - - - - 申请不通过 - - - - - + + + 提示 + + {{content}} + + + + + + + + + + 申请通过 + 申请不通过 + @@ -155,7 +153,7 @@ }, methods: { handleClick(value, text) { - if(text === '已通过') { + if(text === '通过') { this.willchange = '2'; //1提交2通过3不通过 } else { this.willchange = '3'; @@ -163,7 +161,7 @@ let index = this.list.findIndex(item => item.id === 'applyNo'); if(index !== -1) { let number = this.list[index].value; - this.content = `单号${number}访客访客申请${text}`; + this.content = `确认${text}单号${number}的访客申请？`; this.show = true; } else { wx.showToast({ @@ -218,6 +216,40 @@ + + \ No newline at end of file diff --git a/api/information.js b/api/information.js index 70d566b..725c2c5 100644 --- a/api/information.js +++ b/api/information.js @@ -5,7 +5,8 @@ const Submit = BASE_URL + '/visitor/apply/submit' const visitReason = BASE_URL + '/sys/dict/code/visitReason' const devicePosition = BASE_URL + '/sys/dict/code/devicePosition' -const DEL_APPLY = BASE_URL + 'visitor/delApply' +const DEL_APPLY = BASE_URL + '/visitor/delApply' +const CHANGE_APPLY = BASE_URL + '/visitor/updateApply' /** * 提交访客记录 @@ -44,3 +45,13 @@ } return fetch.get(DEL_APPLY, params).then(res => res); } + +/** + * 申请者修改申请 + * @param {Object} code + */ +export function updateApply(params) { + useNetWork(); + return fetch.post(CHANGE_APPLY, params).then(res => res); +} + diff --git a/pages.json b/pages.json index 092484a..70f476b 100644 --- a/pages.json +++ b/pages.json @@ -165,17 +165,16 @@ "navigationBarTitleText": "信息查看", "enablePullDownRefresh": false } + }, + { + "path" : "changeListInfo/changeListInfo", + "style" : + { + "navigationBarTitleText": "信息编辑", + "enablePullDownRefresh": false + } } - ,{ - "path" : "changeListInfo/changeListInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ] + ] } ], "uniIdRouter": {} diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 0c3aa3f..8b3d31c 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -33,31 +33,29 @@ item.value === '申请已提交' ? 'blue' : 'value'">{{item.value}} - - - - - - 申请通过 - - - - 申请不通过 - - - - - + + + 提示 + + {{content}} + + + + + + + + + + 申请通过 + 申请不通过 + @@ -155,7 +153,7 @@ }, methods: { handleClick(value, text) { - if(text === '已通过') { + if(text === '通过') { this.willchange = '2'; //1提交2通过3不通过 } else { this.willchange = '3'; @@ -163,7 +161,7 @@ let index = this.list.findIndex(item => item.id === 'applyNo'); if(index !== -1) { let number = this.list[index].value; - this.content = `单号${number}访客访客申请${text}`; + this.content = `确认${text}单号${number}的访客申请？`; this.show = true; } else { wx.showToast({ @@ -218,6 +216,40 @@ + + \ No newline at end of file diff --git a/pages/information/information.vue b/pages/information/information.vue index ad0ec91..c53e223 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -218,7 +218,11 @@ } if (this.isForm && this.submitButton) { this.submitButton = false + wx.showLoading({ + title: '提交中' + }) let res = await getSubmit(this.callerInfo) + wx.hideLoading() this.isForm = false this.submitButton = true } diff --git a/api/information.js b/api/information.js index 70d566b..725c2c5 100644 --- a/api/information.js +++ b/api/information.js @@ -5,7 +5,8 @@ const Submit = BASE_URL + '/visitor/apply/submit' const visitReason = BASE_URL + '/sys/dict/code/visitReason' const devicePosition = BASE_URL + '/sys/dict/code/devicePosition' -const DEL_APPLY = BASE_URL + 'visitor/delApply' +const DEL_APPLY = BASE_URL + '/visitor/delApply' +const CHANGE_APPLY = BASE_URL + '/visitor/updateApply' /** * 提交访客记录 @@ -44,3 +45,13 @@ } return fetch.get(DEL_APPLY, params).then(res => res); } + +/** + * 申请者修改申请 + * @param {Object} code + */ +export function updateApply(params) { + useNetWork(); + return fetch.post(CHANGE_APPLY, params).then(res => res); +} + diff --git a/pages.json b/pages.json index 092484a..70f476b 100644 --- a/pages.json +++ b/pages.json @@ -165,17 +165,16 @@ "navigationBarTitleText": "信息查看", "enablePullDownRefresh": false } + }, + { + "path" : "changeListInfo/changeListInfo", + "style" : + { + "navigationBarTitleText": "信息编辑", + "enablePullDownRefresh": false + } } - ,{ - "path" : "changeListInfo/changeListInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ] + ] } ], "uniIdRouter": {} diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 0c3aa3f..8b3d31c 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -33,31 +33,29 @@ item.value === '申请已提交' ? 'blue' : 'value'">{{item.value}} - - - - - - 申请通过 - - - - 申请不通过 - - - - - + + + 提示 + + {{content}} + + + + + + + + + + 申请通过 + 申请不通过 + @@ -155,7 +153,7 @@ }, methods: { handleClick(value, text) { - if(text === '已通过') { + if(text === '通过') { this.willchange = '2'; //1提交2通过3不通过 } else { this.willchange = '3'; @@ -163,7 +161,7 @@ let index = this.list.findIndex(item => item.id === 'applyNo'); if(index !== -1) { let number = this.list[index].value; - this.content = `单号${number}访客访客申请${text}`; + this.content = `确认${text}单号${number}的访客申请？`; this.show = true; } else { wx.showToast({ @@ -218,6 +216,40 @@ + + \ No newline at end of file diff --git a/pages/information/information.vue b/pages/information/information.vue index ad0ec91..c53e223 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -218,7 +218,11 @@ } if (this.isForm && this.submitButton) { this.submitButton = false + wx.showLoading({ + title: '提交中' + }) let res = await getSubmit(this.callerInfo) + wx.hideLoading() this.isForm = false this.submitButton = true } diff --git a/pages/list/list.vue b/pages/list/list.vue index 6f84539..caf1888 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -146,10 +146,12 @@ }, data() { return { + account: '', //申请者工号---获取列表申请者需要传申请者工号 checkRadio: null, //单选框选中 isManager: false, //是否是物业管理员 scrollTop: 0, queryList: { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -173,13 +175,13 @@ statusListManager: [ { name: "申请已提交", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], statusList: [ { name: "申请中", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], time: "筛选时间", @@ -220,6 +222,7 @@ this.phone = uni.getStorageSync("registerPhone"); this.checkphone(); this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -227,10 +230,6 @@ offset: this.offset, limit: this.limit }; - const param = { - offset: 1, - limit: this.limit - } this.nothingMore = false; const res = await getList(this.queryList); this.list = res.records.map((item) => { @@ -252,12 +251,13 @@ onPullDownRefresh() { this.offset = 1; this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; this.statusInfo = "筛选状态"; this.time = "筛选时间"; @@ -292,11 +292,16 @@ async change(e) { this.offset = 1; if (e.trim() === "") { //空 - const param = { + this.queryList = { + account: this.account, + keywords: "", + startTime: "", + endTime: "", + status: "", offset: this.offset, limit: this.limit - } - const res = await getList(param); + }; + const res = await getList(this.queryList); this.list = res.records.map((item) => { if (item.visitorApplyStatus == "1") { item.status = this.isManager ? "申请已提交" : '申请中'; @@ -352,6 +357,7 @@ this.offset = 1 } this.queryList.offset = this.offset; + this.queryList.account = this.account; const res = await getList(this.queryList); if(res.records && res.records.length) { this.nothingMore = false; @@ -393,6 +399,7 @@ this.text = this.checkboxList.length !== 0 ? "选中的" : "所有"; this.ispassShow = true; }, + //点击确认-改变状态 async possQr() { const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1') let ids = statusList.map((item) => item.id).join(); @@ -406,7 +413,16 @@ duration: 2000, }) } + wx.showLoading({ + title: '加载中' + }) let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids); + wx.hideLoading() + wx.showToast({ + title: `操作成功`, + icon: 'sucess', + duration: 2000, + }) this.searchList(false); this.ispassShow = false; this.checkboxList = []; @@ -516,6 +532,11 @@ await getUserProfile(); //获取用户信息 const userInfo = JSON.parse(uni.getStorageSync('userInfo')); // this.isManager = userInfo.salt === '物业人员' + if(this.isManager) { //是物业人员 + this.account = '' //物业人员不允许传申请者工号 + } else { + this.account = userInfo.account //申请者工号 + } } } else { //没有电话就弹出授权 @@ -633,7 +654,7 @@ .close-circle { width: 55rpx; height: 55rpx; - background: url('@/static/listIcon/template.png') no-repeat; + background: url('@/static/listIcon/noNext.png') no-repeat; background-size: contain; margin-left: 16rpx; } @@ -714,42 +735,6 @@ border-radius: 10rpx; height: 80rpx; } -// .popup { -// width: 700rpx; -// height: 450rpx; -// .popup-title { -// text-align: center; -// font-size: 36rpx; -// margin: 35rpx; -// margin-top: 96rpx; -// } -// .popup-buttom { -// padding: 70rpx; -// margin-top: 150rpx; -// display: flex; -// justify-content: space-between; -// } -// .popup-jujue-fanhui { -// border: none; -// border-radius: 8rpx; -// background-color: gray; -// color: #fff; -// } -// .popup-jujue-queren { -// border: none; -// border-radius: 8rpx; -// background-color: skyblue; -// color: #fff; -// } -// .popup-buttom view { -// width: 180rpx; -// height: 56rpx; -// text-align: center; -// line-height: 56rpx; -// border-radius: 6rpx; -// border: 1px #000 solid; -// } -// } .green { width: 240rpx; height: 48rpx; diff --git a/api/information.js b/api/information.js index 70d566b..725c2c5 100644 --- a/api/information.js +++ b/api/information.js @@ -5,7 +5,8 @@ const Submit = BASE_URL + '/visitor/apply/submit' const visitReason = BASE_URL + '/sys/dict/code/visitReason' const devicePosition = BASE_URL + '/sys/dict/code/devicePosition' -const DEL_APPLY = BASE_URL + 'visitor/delApply' +const DEL_APPLY = BASE_URL + '/visitor/delApply' +const CHANGE_APPLY = BASE_URL + '/visitor/updateApply' /** * 提交访客记录 @@ -44,3 +45,13 @@ } return fetch.get(DEL_APPLY, params).then(res => res); } + +/** + * 申请者修改申请 + * @param {Object} code + */ +export function updateApply(params) { + useNetWork(); + return fetch.post(CHANGE_APPLY, params).then(res => res); +} + diff --git a/pages.json b/pages.json index 092484a..70f476b 100644 --- a/pages.json +++ b/pages.json @@ -165,17 +165,16 @@ "navigationBarTitleText": "信息查看", "enablePullDownRefresh": false } + }, + { + "path" : "changeListInfo/changeListInfo", + "style" : + { + "navigationBarTitleText": "信息编辑", + "enablePullDownRefresh": false + } } - ,{ - "path" : "changeListInfo/changeListInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ] + ] } ], "uniIdRouter": {} diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 0c3aa3f..8b3d31c 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -33,31 +33,29 @@ item.value === '申请已提交' ? 'blue' : 'value'">{{item.value}} - - - - - - 申请通过 - - - - 申请不通过 - - - - - + + + 提示 + + {{content}} + + + + + + + + + + 申请通过 + 申请不通过 + @@ -155,7 +153,7 @@ }, methods: { handleClick(value, text) { - if(text === '已通过') { + if(text === '通过') { this.willchange = '2'; //1提交2通过3不通过 } else { this.willchange = '3'; @@ -163,7 +161,7 @@ let index = this.list.findIndex(item => item.id === 'applyNo'); if(index !== -1) { let number = this.list[index].value; - this.content = `单号${number}访客访客申请${text}`; + this.content = `确认${text}单号${number}的访客申请？`; this.show = true; } else { wx.showToast({ @@ -218,6 +216,40 @@ + + \ No newline at end of file diff --git a/pages/information/information.vue b/pages/information/information.vue index ad0ec91..c53e223 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -218,7 +218,11 @@ } if (this.isForm && this.submitButton) { this.submitButton = false + wx.showLoading({ + title: '提交中' + }) let res = await getSubmit(this.callerInfo) + wx.hideLoading() this.isForm = false this.submitButton = true } diff --git a/pages/list/list.vue b/pages/list/list.vue index 6f84539..caf1888 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -146,10 +146,12 @@ }, data() { return { + account: '', //申请者工号---获取列表申请者需要传申请者工号 checkRadio: null, //单选框选中 isManager: false, //是否是物业管理员 scrollTop: 0, queryList: { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -173,13 +175,13 @@ statusListManager: [ { name: "申请已提交", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], statusList: [ { name: "申请中", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], time: "筛选时间", @@ -220,6 +222,7 @@ this.phone = uni.getStorageSync("registerPhone"); this.checkphone(); this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -227,10 +230,6 @@ offset: this.offset, limit: this.limit }; - const param = { - offset: 1, - limit: this.limit - } this.nothingMore = false; const res = await getList(this.queryList); this.list = res.records.map((item) => { @@ -252,12 +251,13 @@ onPullDownRefresh() { this.offset = 1; this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; this.statusInfo = "筛选状态"; this.time = "筛选时间"; @@ -292,11 +292,16 @@ async change(e) { this.offset = 1; if (e.trim() === "") { //空 - const param = { + this.queryList = { + account: this.account, + keywords: "", + startTime: "", + endTime: "", + status: "", offset: this.offset, limit: this.limit - } - const res = await getList(param); + }; + const res = await getList(this.queryList); this.list = res.records.map((item) => { if (item.visitorApplyStatus == "1") { item.status = this.isManager ? "申请已提交" : '申请中'; @@ -352,6 +357,7 @@ this.offset = 1 } this.queryList.offset = this.offset; + this.queryList.account = this.account; const res = await getList(this.queryList); if(res.records && res.records.length) { this.nothingMore = false; @@ -393,6 +399,7 @@ this.text = this.checkboxList.length !== 0 ? "选中的" : "所有"; this.ispassShow = true; }, + //点击确认-改变状态 async possQr() { const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1') let ids = statusList.map((item) => item.id).join(); @@ -406,7 +413,16 @@ duration: 2000, }) } + wx.showLoading({ + title: '加载中' + }) let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids); + wx.hideLoading() + wx.showToast({ + title: `操作成功`, + icon: 'sucess', + duration: 2000, + }) this.searchList(false); this.ispassShow = false; this.checkboxList = []; @@ -516,6 +532,11 @@ await getUserProfile(); //获取用户信息 const userInfo = JSON.parse(uni.getStorageSync('userInfo')); // this.isManager = userInfo.salt === '物业人员' + if(this.isManager) { //是物业人员 + this.account = '' //物业人员不允许传申请者工号 + } else { + this.account = userInfo.account //申请者工号 + } } } else { //没有电话就弹出授权 @@ -633,7 +654,7 @@ .close-circle { width: 55rpx; height: 55rpx; - background: url('@/static/listIcon/template.png') no-repeat; + background: url('@/static/listIcon/noNext.png') no-repeat; background-size: contain; margin-left: 16rpx; } @@ -714,42 +735,6 @@ border-radius: 10rpx; height: 80rpx; } -// .popup { -// width: 700rpx; -// height: 450rpx; -// .popup-title { -// text-align: center; -// font-size: 36rpx; -// margin: 35rpx; -// margin-top: 96rpx; -// } -// .popup-buttom { -// padding: 70rpx; -// margin-top: 150rpx; -// display: flex; -// justify-content: space-between; -// } -// .popup-jujue-fanhui { -// border: none; -// border-radius: 8rpx; -// background-color: gray; -// color: #fff; -// } -// .popup-jujue-queren { -// border: none; -// border-radius: 8rpx; -// background-color: skyblue; -// color: #fff; -// } -// .popup-buttom view { -// width: 180rpx; -// height: 56rpx; -// text-align: center; -// line-height: 56rpx; -// border-radius: 6rpx; -// border: 1px #000 solid; -// } -// } .green { width: 240rpx; height: 48rpx; diff --git a/pages/message/message.vue b/pages/message/message.vue index 0372e4f..403c3ea 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -2,7 +2,7 @@ @@ -155,7 +153,7 @@ }, methods: { handleClick(value, text) { - if(text === '已通过') { + if(text === '通过') { this.willchange = '2'; //1提交2通过3不通过 } else { this.willchange = '3'; @@ -163,7 +161,7 @@ let index = this.list.findIndex(item => item.id === 'applyNo'); if(index !== -1) { let number = this.list[index].value; - this.content = `单号${number}访客访客申请${text}`; + this.content = `确认${text}单号${number}的访客申请？`; this.show = true; } else { wx.showToast({ @@ -218,6 +216,40 @@ + + \ No newline at end of file diff --git a/pages/information/information.vue b/pages/information/information.vue index ad0ec91..c53e223 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -218,7 +218,11 @@ } if (this.isForm && this.submitButton) { this.submitButton = false + wx.showLoading({ + title: '提交中' + }) let res = await getSubmit(this.callerInfo) + wx.hideLoading() this.isForm = false this.submitButton = true } diff --git a/pages/list/list.vue b/pages/list/list.vue index 6f84539..caf1888 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -146,10 +146,12 @@ }, data() { return { + account: '', //申请者工号---获取列表申请者需要传申请者工号 checkRadio: null, //单选框选中 isManager: false, //是否是物业管理员 scrollTop: 0, queryList: { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -173,13 +175,13 @@ statusListManager: [ { name: "申请已提交", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], statusList: [ { name: "申请中", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], time: "筛选时间", @@ -220,6 +222,7 @@ this.phone = uni.getStorageSync("registerPhone"); this.checkphone(); this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -227,10 +230,6 @@ offset: this.offset, limit: this.limit }; - const param = { - offset: 1, - limit: this.limit - } this.nothingMore = false; const res = await getList(this.queryList); this.list = res.records.map((item) => { @@ -252,12 +251,13 @@ onPullDownRefresh() { this.offset = 1; this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; this.statusInfo = "筛选状态"; this.time = "筛选时间"; @@ -292,11 +292,16 @@ async change(e) { this.offset = 1; if (e.trim() === "") { //空 - const param = { + this.queryList = { + account: this.account, + keywords: "", + startTime: "", + endTime: "", + status: "", offset: this.offset, limit: this.limit - } - const res = await getList(param); + }; + const res = await getList(this.queryList); this.list = res.records.map((item) => { if (item.visitorApplyStatus == "1") { item.status = this.isManager ? "申请已提交" : '申请中'; @@ -352,6 +357,7 @@ this.offset = 1 } this.queryList.offset = this.offset; + this.queryList.account = this.account; const res = await getList(this.queryList); if(res.records && res.records.length) { this.nothingMore = false; @@ -393,6 +399,7 @@ this.text = this.checkboxList.length !== 0 ? "选中的" : "所有"; this.ispassShow = true; }, + //点击确认-改变状态 async possQr() { const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1') let ids = statusList.map((item) => item.id).join(); @@ -406,7 +413,16 @@ duration: 2000, }) } + wx.showLoading({ + title: '加载中' + }) let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids); + wx.hideLoading() + wx.showToast({ + title: `操作成功`, + icon: 'sucess', + duration: 2000, + }) this.searchList(false); this.ispassShow = false; this.checkboxList = []; @@ -516,6 +532,11 @@ await getUserProfile(); //获取用户信息 const userInfo = JSON.parse(uni.getStorageSync('userInfo')); // this.isManager = userInfo.salt === '物业人员' + if(this.isManager) { //是物业人员 + this.account = '' //物业人员不允许传申请者工号 + } else { + this.account = userInfo.account //申请者工号 + } } } else { //没有电话就弹出授权 @@ -633,7 +654,7 @@ .close-circle { width: 55rpx; height: 55rpx; - background: url('@/static/listIcon/template.png') no-repeat; + background: url('@/static/listIcon/noNext.png') no-repeat; background-size: contain; margin-left: 16rpx; } @@ -714,42 +735,6 @@ border-radius: 10rpx; height: 80rpx; } -// .popup { -// width: 700rpx; -// height: 450rpx; -// .popup-title { -// text-align: center; -// font-size: 36rpx; -// margin: 35rpx; -// margin-top: 96rpx; -// } -// .popup-buttom { -// padding: 70rpx; -// margin-top: 150rpx; -// display: flex; -// justify-content: space-between; -// } -// .popup-jujue-fanhui { -// border: none; -// border-radius: 8rpx; -// background-color: gray; -// color: #fff; -// } -// .popup-jujue-queren { -// border: none; -// border-radius: 8rpx; -// background-color: skyblue; -// color: #fff; -// } -// .popup-buttom view { -// width: 180rpx; -// height: 56rpx; -// text-align: center; -// line-height: 56rpx; -// border-radius: 6rpx; -// border: 1px #000 solid; -// } -// } .green { width: 240rpx; height: 48rpx; diff --git a/pages/message/message.vue b/pages/message/message.vue index 0372e4f..403c3ea 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -2,7 +2,7 @@ @@ -155,7 +153,7 @@ }, methods: { handleClick(value, text) { - if(text === '已通过') { + if(text === '通过') { this.willchange = '2'; //1提交2通过3不通过 } else { this.willchange = '3'; @@ -163,7 +161,7 @@ let index = this.list.findIndex(item => item.id === 'applyNo'); if(index !== -1) { let number = this.list[index].value; - this.content = `单号${number}访客访客申请${text}`; + this.content = `确认${text}单号${number}的访客申请？`; this.show = true; } else { wx.showToast({ @@ -218,6 +216,40 @@ + + \ No newline at end of file diff --git a/pages/information/information.vue b/pages/information/information.vue index ad0ec91..c53e223 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -218,7 +218,11 @@ } if (this.isForm && this.submitButton) { this.submitButton = false + wx.showLoading({ + title: '提交中' + }) let res = await getSubmit(this.callerInfo) + wx.hideLoading() this.isForm = false this.submitButton = true } diff --git a/pages/list/list.vue b/pages/list/list.vue index 6f84539..caf1888 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -146,10 +146,12 @@ }, data() { return { + account: '', //申请者工号---获取列表申请者需要传申请者工号 checkRadio: null, //单选框选中 isManager: false, //是否是物业管理员 scrollTop: 0, queryList: { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -173,13 +175,13 @@ statusListManager: [ { name: "申请已提交", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], statusList: [ { name: "申请中", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], time: "筛选时间", @@ -220,6 +222,7 @@ this.phone = uni.getStorageSync("registerPhone"); this.checkphone(); this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -227,10 +230,6 @@ offset: this.offset, limit: this.limit }; - const param = { - offset: 1, - limit: this.limit - } this.nothingMore = false; const res = await getList(this.queryList); this.list = res.records.map((item) => { @@ -252,12 +251,13 @@ onPullDownRefresh() { this.offset = 1; this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; this.statusInfo = "筛选状态"; this.time = "筛选时间"; @@ -292,11 +292,16 @@ async change(e) { this.offset = 1; if (e.trim() === "") { //空 - const param = { + this.queryList = { + account: this.account, + keywords: "", + startTime: "", + endTime: "", + status: "", offset: this.offset, limit: this.limit - } - const res = await getList(param); + }; + const res = await getList(this.queryList); this.list = res.records.map((item) => { if (item.visitorApplyStatus == "1") { item.status = this.isManager ? "申请已提交" : '申请中'; @@ -352,6 +357,7 @@ this.offset = 1 } this.queryList.offset = this.offset; + this.queryList.account = this.account; const res = await getList(this.queryList); if(res.records && res.records.length) { this.nothingMore = false; @@ -393,6 +399,7 @@ this.text = this.checkboxList.length !== 0 ? "选中的" : "所有"; this.ispassShow = true; }, + //点击确认-改变状态 async possQr() { const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1') let ids = statusList.map((item) => item.id).join(); @@ -406,7 +413,16 @@ duration: 2000, }) } + wx.showLoading({ + title: '加载中' + }) let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids); + wx.hideLoading() + wx.showToast({ + title: `操作成功`, + icon: 'sucess', + duration: 2000, + }) this.searchList(false); this.ispassShow = false; this.checkboxList = []; @@ -516,6 +532,11 @@ await getUserProfile(); //获取用户信息 const userInfo = JSON.parse(uni.getStorageSync('userInfo')); // this.isManager = userInfo.salt === '物业人员' + if(this.isManager) { //是物业人员 + this.account = '' //物业人员不允许传申请者工号 + } else { + this.account = userInfo.account //申请者工号 + } } } else { //没有电话就弹出授权 @@ -633,7 +654,7 @@ .close-circle { width: 55rpx; height: 55rpx; - background: url('@/static/listIcon/template.png') no-repeat; + background: url('@/static/listIcon/noNext.png') no-repeat; background-size: contain; margin-left: 16rpx; } @@ -714,42 +735,6 @@ border-radius: 10rpx; height: 80rpx; } -// .popup { -// width: 700rpx; -// height: 450rpx; -// .popup-title { -// text-align: center; -// font-size: 36rpx; -// margin: 35rpx; -// margin-top: 96rpx; -// } -// .popup-buttom { -// padding: 70rpx; -// margin-top: 150rpx; -// display: flex; -// justify-content: space-between; -// } -// .popup-jujue-fanhui { -// border: none; -// border-radius: 8rpx; -// background-color: gray; -// color: #fff; -// } -// .popup-jujue-queren { -// border: none; -// border-radius: 8rpx; -// background-color: skyblue; -// color: #fff; -// } -// .popup-buttom view { -// width: 180rpx; -// height: 56rpx; -// text-align: center; -// line-height: 56rpx; -// border-radius: 6rpx; -// border: 1px #000 solid; -// } -// } .green { width: 240rpx; height: 48rpx; diff --git a/pages/message/message.vue b/pages/message/message.vue index 0372e4f..403c3ea 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -2,7 +2,7 @@ @@ -155,7 +153,7 @@ }, methods: { handleClick(value, text) { - if(text === '已通过') { + if(text === '通过') { this.willchange = '2'; //1提交2通过3不通过 } else { this.willchange = '3'; @@ -163,7 +161,7 @@ let index = this.list.findIndex(item => item.id === 'applyNo'); if(index !== -1) { let number = this.list[index].value; - this.content = `单号${number}访客访客申请${text}`; + this.content = `确认${text}单号${number}的访客申请？`; this.show = true; } else { wx.showToast({ @@ -218,6 +216,40 @@ + + \ No newline at end of file diff --git a/pages/information/information.vue b/pages/information/information.vue index ad0ec91..c53e223 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -218,7 +218,11 @@ } if (this.isForm && this.submitButton) { this.submitButton = false + wx.showLoading({ + title: '提交中' + }) let res = await getSubmit(this.callerInfo) + wx.hideLoading() this.isForm = false this.submitButton = true } diff --git a/pages/list/list.vue b/pages/list/list.vue index 6f84539..caf1888 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -146,10 +146,12 @@ }, data() { return { + account: '', //申请者工号---获取列表申请者需要传申请者工号 checkRadio: null, //单选框选中 isManager: false, //是否是物业管理员 scrollTop: 0, queryList: { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -173,13 +175,13 @@ statusListManager: [ { name: "申请已提交", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], statusList: [ { name: "申请中", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], time: "筛选时间", @@ -220,6 +222,7 @@ this.phone = uni.getStorageSync("registerPhone"); this.checkphone(); this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -227,10 +230,6 @@ offset: this.offset, limit: this.limit }; - const param = { - offset: 1, - limit: this.limit - } this.nothingMore = false; const res = await getList(this.queryList); this.list = res.records.map((item) => { @@ -252,12 +251,13 @@ onPullDownRefresh() { this.offset = 1; this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; this.statusInfo = "筛选状态"; this.time = "筛选时间"; @@ -292,11 +292,16 @@ async change(e) { this.offset = 1; if (e.trim() === "") { //空 - const param = { + this.queryList = { + account: this.account, + keywords: "", + startTime: "", + endTime: "", + status: "", offset: this.offset, limit: this.limit - } - const res = await getList(param); + }; + const res = await getList(this.queryList); this.list = res.records.map((item) => { if (item.visitorApplyStatus == "1") { item.status = this.isManager ? "申请已提交" : '申请中'; @@ -352,6 +357,7 @@ this.offset = 1 } this.queryList.offset = this.offset; + this.queryList.account = this.account; const res = await getList(this.queryList); if(res.records && res.records.length) { this.nothingMore = false; @@ -393,6 +399,7 @@ this.text = this.checkboxList.length !== 0 ? "选中的" : "所有"; this.ispassShow = true; }, + //点击确认-改变状态 async possQr() { const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1') let ids = statusList.map((item) => item.id).join(); @@ -406,7 +413,16 @@ duration: 2000, }) } + wx.showLoading({ + title: '加载中' + }) let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids); + wx.hideLoading() + wx.showToast({ + title: `操作成功`, + icon: 'sucess', + duration: 2000, + }) this.searchList(false); this.ispassShow = false; this.checkboxList = []; @@ -516,6 +532,11 @@ await getUserProfile(); //获取用户信息 const userInfo = JSON.parse(uni.getStorageSync('userInfo')); // this.isManager = userInfo.salt === '物业人员' + if(this.isManager) { //是物业人员 + this.account = '' //物业人员不允许传申请者工号 + } else { + this.account = userInfo.account //申请者工号 + } } } else { //没有电话就弹出授权 @@ -633,7 +654,7 @@ .close-circle { width: 55rpx; height: 55rpx; - background: url('@/static/listIcon/template.png') no-repeat; + background: url('@/static/listIcon/noNext.png') no-repeat; background-size: contain; margin-left: 16rpx; } @@ -714,42 +735,6 @@ border-radius: 10rpx; height: 80rpx; } -// .popup { -// width: 700rpx; -// height: 450rpx; -// .popup-title { -// text-align: center; -// font-size: 36rpx; -// margin: 35rpx; -// margin-top: 96rpx; -// } -// .popup-buttom { -// padding: 70rpx; -// margin-top: 150rpx; -// display: flex; -// justify-content: space-between; -// } -// .popup-jujue-fanhui { -// border: none; -// border-radius: 8rpx; -// background-color: gray; -// color: #fff; -// } -// .popup-jujue-queren { -// border: none; -// border-radius: 8rpx; -// background-color: skyblue; -// color: #fff; -// } -// .popup-buttom view { -// width: 180rpx; -// height: 56rpx; -// text-align: center; -// line-height: 56rpx; -// border-radius: 6rpx; -// border: 1px #000 solid; -// } -// } .green { width: 240rpx; height: 48rpx; diff --git a/pages/message/message.vue b/pages/message/message.vue index 0372e4f..403c3ea 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -2,7 +2,7 @@ @@ -55,6 +89,9 @@ export default { data() { return { + popupText: '', + show: false, //控制提示删除popup + showNotAllow: false, //控制不允许修改和删除 form: { id: '', //主键 applyNo: '', //申请单号 @@ -71,12 +108,13 @@ staffPhone: '', // 申请者手机号 status: '', //申请状态 }, + ServiceTel: '987183691' //客服电话 } }, onLoad(options) { const getFormData = JSON.parse(decodeURIComponent(options.form)) console.log(getFormData) - this.form.id = getFormData.id //申请单号 + this.form.id = getFormData.id //主键 this.form.applyNo = getFormData.applyNo //申请单号 this.form.inTime = getFormData.inTime //开始时间 this.form.outTime = getFormData.outTime //结束时间 @@ -89,12 +127,52 @@ this.form.staffName = getFormData.staffName //申请者姓名 this.form.remarks = getFormData.remarks //备注 this.form.staffPhone = getFormData.staffPhone || '' // 申请者手机号 - this.form.status = getFormData.status || '' // 申请者手机号 + this.form.status = getFormData.status || '' // 申请状态 }, methods: { + //获取当前零点和第二天8点的时间戳(比较当前时间是否在预定访问时间的第二天的8点之后) + getStamp() { + //当前时间戳 + let nowStamp = new Date().getTime() + // 访问时间当天零点 + let currentZero = new Date(new Date(this.form.inTime).toLocaleDateString()).getTime() // 获取当天零点 + // 第二天8点（当天0点 + 24个小时 = 第二天0点 + 8个小时） + var currentTime = currentZero + 24 * 60 * 60 * 1000 + 8 * 60 * 60 * 1000 + if(nowStamp >= currentTime) {//过了次日8点了 + console.log('过时了') + return false + } else { + console.log('没过时') + return true + } + }, + //点击修改或删除 + handleClick(text) { + const timeDiffResult = this.getStamp() + this.popupText = `您的访客申请信息已无法进行${text}？如有问题请联系客服电话98778070` + if(timeDiffResult) { + if(text === '修改') { + this.changeApply() + } else { + this.show = true + } + } else { //超过访问时间次日8点,不可修改和删除 + this.showNotAllow = true + } + }, + //提示不可修改和删除的时候的点击确定 + confirm() { + wx.makePhoneCall({ + phoneNumber: this.ServiceTel, + }) + }, //点击删除申请 async deleteApply() { - const res = delApply(this.form.id) + wx.showLoading({ + title: '删除中' + }) + const res = await delApply(this.form.id) + wx.hideLoading() wx.showToast({ title: '删除成功', icon: 'success', @@ -108,7 +186,9 @@ }, //点击修改申请 changeApply() { - + wx.navigateTo({ + url: '/pagesA/changeListInfo/changeListInfo?form=' + encodeURIComponent(JSON.stringify(this.form)) + }) } } } @@ -116,7 +196,40 @@ diff --git a/api/information.js b/api/information.js index 70d566b..725c2c5 100644 --- a/api/information.js +++ b/api/information.js @@ -5,7 +5,8 @@ const Submit = BASE_URL + '/visitor/apply/submit' const visitReason = BASE_URL + '/sys/dict/code/visitReason' const devicePosition = BASE_URL + '/sys/dict/code/devicePosition' -const DEL_APPLY = BASE_URL + 'visitor/delApply' +const DEL_APPLY = BASE_URL + '/visitor/delApply' +const CHANGE_APPLY = BASE_URL + '/visitor/updateApply' /** * 提交访客记录 @@ -44,3 +45,13 @@ } return fetch.get(DEL_APPLY, params).then(res => res); } + +/** + * 申请者修改申请 + * @param {Object} code + */ +export function updateApply(params) { + useNetWork(); + return fetch.post(CHANGE_APPLY, params).then(res => res); +} + diff --git a/pages.json b/pages.json index 092484a..70f476b 100644 --- a/pages.json +++ b/pages.json @@ -165,17 +165,16 @@ "navigationBarTitleText": "信息查看", "enablePullDownRefresh": false } + }, + { + "path" : "changeListInfo/changeListInfo", + "style" : + { + "navigationBarTitleText": "信息编辑", + "enablePullDownRefresh": false + } } - ,{ - "path" : "changeListInfo/changeListInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ] + ] } ], "uniIdRouter": {} diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 0c3aa3f..8b3d31c 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -33,31 +33,29 @@ item.value === '申请已提交' ? 'blue' : 'value'">{{item.value}} - - - - - - 申请通过 - - - - 申请不通过 - - - - - + + + 提示 + + {{content}} + + + + + + + + + + 申请通过 + 申请不通过 + @@ -155,7 +153,7 @@ }, methods: { handleClick(value, text) { - if(text === '已通过') { + if(text === '通过') { this.willchange = '2'; //1提交2通过3不通过 } else { this.willchange = '3'; @@ -163,7 +161,7 @@ let index = this.list.findIndex(item => item.id === 'applyNo'); if(index !== -1) { let number = this.list[index].value; - this.content = `单号${number}访客访客申请${text}`; + this.content = `确认${text}单号${number}的访客申请？`; this.show = true; } else { wx.showToast({ @@ -218,6 +216,40 @@ + + \ No newline at end of file diff --git a/pages/information/information.vue b/pages/information/information.vue index ad0ec91..c53e223 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -218,7 +218,11 @@ } if (this.isForm && this.submitButton) { this.submitButton = false + wx.showLoading({ + title: '提交中' + }) let res = await getSubmit(this.callerInfo) + wx.hideLoading() this.isForm = false this.submitButton = true } diff --git a/pages/list/list.vue b/pages/list/list.vue index 6f84539..caf1888 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -146,10 +146,12 @@ }, data() { return { + account: '', //申请者工号---获取列表申请者需要传申请者工号 checkRadio: null, //单选框选中 isManager: false, //是否是物业管理员 scrollTop: 0, queryList: { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -173,13 +175,13 @@ statusListManager: [ { name: "申请已提交", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], statusList: [ { name: "申请中", id: "1" }, { name: "申请已通过", id: "2" }, - { name: "申请已失败", id: "3" }, + { name: "申请未通过", id: "3" }, { name: "全部", id: "0" }, ], time: "筛选时间", @@ -220,6 +222,7 @@ this.phone = uni.getStorageSync("registerPhone"); this.checkphone(); this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", @@ -227,10 +230,6 @@ offset: this.offset, limit: this.limit }; - const param = { - offset: 1, - limit: this.limit - } this.nothingMore = false; const res = await getList(this.queryList); this.list = res.records.map((item) => { @@ -252,12 +251,13 @@ onPullDownRefresh() { this.offset = 1; this.queryList = { + account: this.account, keywords: "", startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; this.statusInfo = "筛选状态"; this.time = "筛选时间"; @@ -292,11 +292,16 @@ async change(e) { this.offset = 1; if (e.trim() === "") { //空 - const param = { + this.queryList = { + account: this.account, + keywords: "", + startTime: "", + endTime: "", + status: "", offset: this.offset, limit: this.limit - } - const res = await getList(param); + }; + const res = await getList(this.queryList); this.list = res.records.map((item) => { if (item.visitorApplyStatus == "1") { item.status = this.isManager ? "申请已提交" : '申请中'; @@ -352,6 +357,7 @@ this.offset = 1 } this.queryList.offset = this.offset; + this.queryList.account = this.account; const res = await getList(this.queryList); if(res.records && res.records.length) { this.nothingMore = false; @@ -393,6 +399,7 @@ this.text = this.checkboxList.length !== 0 ? "选中的" : "所有"; this.ispassShow = true; }, + //点击确认-改变状态 async possQr() { const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1') let ids = statusList.map((item) => item.id).join(); @@ -406,7 +413,16 @@ duration: 2000, }) } + wx.showLoading({ + title: '加载中' + }) let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids); + wx.hideLoading() + wx.showToast({ + title: `操作成功`, + icon: 'sucess', + duration: 2000, + }) this.searchList(false); this.ispassShow = false; this.checkboxList = []; @@ -516,6 +532,11 @@ await getUserProfile(); //获取用户信息 const userInfo = JSON.parse(uni.getStorageSync('userInfo')); // this.isManager = userInfo.salt === '物业人员' + if(this.isManager) { //是物业人员 + this.account = '' //物业人员不允许传申请者工号 + } else { + this.account = userInfo.account //申请者工号 + } } } else { //没有电话就弹出授权 @@ -633,7 +654,7 @@ .close-circle { width: 55rpx; height: 55rpx; - background: url('@/static/listIcon/template.png') no-repeat; + background: url('@/static/listIcon/noNext.png') no-repeat; background-size: contain; margin-left: 16rpx; } @@ -714,42 +735,6 @@ border-radius: 10rpx; height: 80rpx; } -// .popup { -// width: 700rpx; -// height: 450rpx; -// .popup-title { -// text-align: center; -// font-size: 36rpx; -// margin: 35rpx; -// margin-top: 96rpx; -// } -// .popup-buttom { -// padding: 70rpx; -// margin-top: 150rpx; -// display: flex; -// justify-content: space-between; -// } -// .popup-jujue-fanhui { -// border: none; -// border-radius: 8rpx; -// background-color: gray; -// color: #fff; -// } -// .popup-jujue-queren { -// border: none; -// border-radius: 8rpx; -// background-color: skyblue; -// color: #fff; -// } -// .popup-buttom view { -// width: 180rpx; -// height: 56rpx; -// text-align: center; -// line-height: 56rpx; -// border-radius: 6rpx; -// border: 1px #000 solid; -// } -// } .green { width: 240rpx; height: 48rpx; diff --git a/pages/message/message.vue b/pages/message/message.vue index 0372e4f..403c3ea 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -2,7 +2,7 @@ @@ -55,6 +89,9 @@ export default { data() { return { + popupText: '', + show: false, //控制提示删除popup + showNotAllow: false, //控制不允许修改和删除 form: { id: '', //主键 applyNo: '', //申请单号 @@ -71,12 +108,13 @@ staffPhone: '', // 申请者手机号 status: '', //申请状态 }, + ServiceTel: '987183691' //客服电话 } }, onLoad(options) { const getFormData = JSON.parse(decodeURIComponent(options.form)) console.log(getFormData) - this.form.id = getFormData.id //申请单号 + this.form.id = getFormData.id //主键 this.form.applyNo = getFormData.applyNo //申请单号 this.form.inTime = getFormData.inTime //开始时间 this.form.outTime = getFormData.outTime //结束时间 @@ -89,12 +127,52 @@ this.form.staffName = getFormData.staffName //申请者姓名 this.form.remarks = getFormData.remarks //备注 this.form.staffPhone = getFormData.staffPhone || '' // 申请者手机号 - this.form.status = getFormData.status || '' // 申请者手机号 + this.form.status = getFormData.status || '' // 申请状态 }, methods: { + //获取当前零点和第二天8点的时间戳(比较当前时间是否在预定访问时间的第二天的8点之后) + getStamp() { + //当前时间戳 + let nowStamp = new Date().getTime() + // 访问时间当天零点 + let currentZero = new Date(new Date(this.form.inTime).toLocaleDateString()).getTime() // 获取当天零点 + // 第二天8点（当天0点 + 24个小时 = 第二天0点 + 8个小时） + var currentTime = currentZero + 24 * 60 * 60 * 1000 + 8 * 60 * 60 * 1000 + if(nowStamp >= currentTime) {//过了次日8点了 + console.log('过时了') + return false + } else { + console.log('没过时') + return true + } + }, + //点击修改或删除 + handleClick(text) { + const timeDiffResult = this.getStamp() + this.popupText = `您的访客申请信息已无法进行${text}？如有问题请联系客服电话98778070` + if(timeDiffResult) { + if(text === '修改') { + this.changeApply() + } else { + this.show = true + } + } else { //超过访问时间次日8点,不可修改和删除 + this.showNotAllow = true + } + }, + //提示不可修改和删除的时候的点击确定 + confirm() { + wx.makePhoneCall({ + phoneNumber: this.ServiceTel, + }) + }, //点击删除申请 async deleteApply() { - const res = delApply(this.form.id) + wx.showLoading({ + title: '删除中' + }) + const res = await delApply(this.form.id) + wx.hideLoading() wx.showToast({ title: '删除成功', icon: 'success', @@ -108,7 +186,9 @@ }, //点击修改申请 changeApply() { - + wx.navigateTo({ + url: '/pagesA/changeListInfo/changeListInfo?form=' + encodeURIComponent(JSON.stringify(this.form)) + }) } } } @@ -116,7 +196,40 @@ diff --git a/pagesA/submitInfo/submitInfo.vue b/pagesA/submitInfo/submitInfo.vue index 113b7d6..d680d70 100644 --- a/pagesA/submitInfo/submitInfo.vue +++ b/pagesA/submitInfo/submitInfo.vue @@ -123,14 +123,10 @@ trigger: ['change','blur'], }, { - // 自定义验证函数，见上说明 validator: (rule, value, callback) => { - // 上面有说，返回true表示校验通过，返回false表示不通过 - // uni.$u.test.mobile()就是返回true或者false的 return uni.$u.test.mobile(value); }, message: '手机号码不正确', - // 触发器可以同时用blur和change trigger: ['change','blur'], } ], @@ -217,6 +213,9 @@ icon: 'sucess', duration: 2000, }) + wx.switchTab({ + url: '/pages/list/list' + }) }, //点击取消 cancle() { @@ -310,5 +309,8 @@ .u-form-item__body__right__message { text-align: right !important; } + .u-form-item__body__left__content__label { + font-weight: 600; + } }