diff --git a/apis/apis.js b/apis/apis.js index cef07b4..df84761 100644 --- a/apis/apis.js +++ b/apis/apis.js @@ -182,6 +182,14 @@ const fetchExam = { header ) }, + async subExamCq (data = {} , header = {}){ + return await Http.post( + HttpConfig.basePath, + HttpConfig.serviceUrl.fetchExam.subExamCq, + data, + header + ) + }, async rejectExam (data = {} , header = {}){ return await Http.post( HttpConfig.basePath, @@ -190,6 +198,14 @@ const fetchExam = { header ) }, + async rejectExamCq (data = {} , header = {}){ + return await Http.post( + HttpConfig.basePath, + HttpConfig.serviceUrl.fetchExam.rejectExamCq, + data, + header + ) + }, async fetchExamListAll (data = {} , header = {}){ return await Http.get( HttpConfig.basePath, @@ -206,6 +222,14 @@ const fetchExam = { header ) }, + async fetchTrueExamListCq (data = {} , header = {}){ + return await Http.get( + HttpConfig.basePath, + HttpConfig.serviceUrl.fetchExam.fetchTrueExamListCq, + data, + header + ) + }, async fetchDetailList (data = {} , header = {}){ return await Http.get( HttpConfig.basePath, diff --git a/apis/http.js b/apis/http.js index bed4e96..ac7b3e2 100644 --- a/apis/http.js +++ b/apis/http.js @@ -3,24 +3,24 @@ class HttpConfig { baseUrl = "/api" // #endif // #ifdef APP-PLUS - baseUrl = "http://112.29.103.165:21624" - // baseUrl = "http://192.168.0.14:21624" + // baseUrl = "http://112.29.103.165:21624" + baseUrl = "http://192.168.0.14:21624" // baseUrl = "http://112.29.103.165:21626" // baseUrl = "http://172.20.10.3:8080" - // baseUrl = "http://10.40.92.13:8080" - // baseUrl = "http://10.40.92.75:8080" // baseUrl = "http://10.40.92.8:8080" + // baseUrl = "http://10.40.92.52:28080" + // baseUrl = "http://10.40.92.81:8080" // baseUrl = "https://z.csgmall.com.cn/gl" // #endif // 基地址 - /* authPath = `${this.baseUrl}/dev-api/auth` + authPath = `${this.baseUrl}/dev-api/auth` systemPath = `${this.baseUrl}/dev-api/system` basePath = `${this.baseUrl}/dev-api/base` - materialPath = `${this.baseUrl}/dev-api/material` */ - authPath = `${this.baseUrl}/auth` + materialPath = `${this.baseUrl}/dev-api/material` + /* authPath = `${this.baseUrl}/auth` systemPath = `${this.baseUrl}/system` basePath = `${this.baseUrl}/base` - materialPath = `${this.baseUrl}/material` + materialPath = `${this.baseUrl}/material` */ // 短链 serviceUrl = { login: { @@ -54,9 +54,12 @@ class HttpConfig { fetchExamList: '/tm_task/getLeaseAuditList', // 获取领料审批清单 fetchExamListAll: '/tm_task/getLeaseAuditListAll', // 获取领料申请列表 fetchTrueExamList: '/tm_task/getLeaseManageListAll', // 获取领料审批列表 + fetchTrueExamListCq: '/tm_task/getLeaseManageListAllCq', // 获取重庆领料审批列表 fetchDetailList: '/tm_task/getLeaseListAll', // 获取领料明细列表 subExam: '/tm_task/auditLeaseByCompany', // 通过领料审批 + subExamCq: '/tm_task/auditLeaseByCompanyCq', // 通过重庆领料审批 rejectExam: '/tm_task/rejectLeaseByCompany', // 驳回领料审批 + rejectExamCq: '/tm_task/rejectLeaseByCompanyCq', // 驳回重庆领料审批 }, fetchMaterialOutStore: { fetchInfoByCode: '/leaseOutDetails/getMaMachineByCode', // 根据maId获取机具详情 diff --git a/pages.json b/pages.json index 3dc64ee..fc9b023 100644 --- a/pages.json +++ b/pages.json @@ -340,7 +340,7 @@ "path" : "pages/moreNotice/moreNotice", "style" : { - "navigationBarTitleText": "更多公告" + "navigationBarTitleText": "通知公告" } } diff --git a/pages/backMaterialReceive/backMaterialReceive.vue b/pages/backMaterialReceive/backMaterialReceive.vue index 737c6ae..cb35316 100644 --- a/pages/backMaterialReceive/backMaterialReceive.vue +++ b/pages/backMaterialReceive/backMaterialReceive.vue @@ -1,8 +1,8 @@ @@ -140,7 +176,8 @@ title: '未选中审核项！' }) } else { - uni.showModal({ + that.openPopup() + /* uni.showModal({ title: '确认审核', content: '是否通过审核？', confirmText: '通过', @@ -156,15 +193,15 @@ } console.log(that.subObj); that.subInStore(that.subObj) - }/* else if (res.cancel) { + } else if (res.cancel) { that.inStoreList.forEach((item) => { item.checkType = 2 }) console.log(that.inStoreList); that.subInStore(that.inStoreList) - } */ + } } - }) + }) */ } }, subInStore (obj) { @@ -177,9 +214,7 @@ icon: 'none', title: res.data.msg, success: () => { - /* uni.redirectTo({ - url: '/pages/repairTestInStore/repairTestInStore' - }) */ + that.closePopup() uni.navigateBack() } }) @@ -190,6 +225,34 @@ }) } }) + }, + openPopup () { + this.$refs.popup.open() + }, + closePopup () { + this.$refs.popup.close() + }, + modalConfirm () { + let that = this + that.taskIdList.push(that.taskId) + that.subObj = { + checkResult: '通过', + taskIdList: that.taskIdList, + auditDetailList: that.auditDetailList + } + console.log(that.subObj); + that.subInStore(that.subObj) + }, + modalReject () { + let that = this + that.taskIdList.push(that.taskId) + that.subObj = { + checkResult: '驳回', + taskIdList: that.taskIdList, + auditDetailList: that.auditDetailList + } + console.log(that.subObj); + that.subInStore(that.subObj) } }, onLoad(params) { @@ -341,4 +404,41 @@ width: 150rpx; text-align: center; } + + .popup{ + width: 80vw; + height: 20vh; + background-color: #fff; + border-radius: 15rpx; + overflow: hidden; + background: linear-gradient(#D9E7FE, #fff, #fff, #fff); + } + + .popup>.pop-top{ + width: 100%; + height: 5vh; + box-sizing: border-box; + padding: 0 25rpx; + display: flex; + justify-content: space-between; + align-items: center; + } + + .popup>.select-area{ + width: 85%; + margin: 40rpx auto; + display: flex; + justify-content: space-around; + align-items: center; + } + + .popup>.select-area>view{ + box-sizing: border-box; + font-size: 30rpx; + padding: 12rpx 24rpx; + background-color: #3788FF; + color: #fff; + border-radius: 20rpx; + } +