diff --git a/apis/apis.js b/apis/apis.js index 9d30a0c..661d637 100644 --- a/apis/apis.js +++ b/apis/apis.js @@ -259,7 +259,7 @@ const fetchExam = { const newInStore = { async fetchNewInStoreList (data = {} , header = {}){ return await Http.get( - HttpConfig.basePath, + HttpConfig.materialPath, HttpConfig.serviceUrl.newInStore.fetchNewInStoreList, data, header @@ -852,6 +852,33 @@ const preCrashList = { }, } +const serviceCenterExam = { + async fetchCenterList(data = {}, header = {}) { + return await Http.get( + HttpConfig.materialPath, + HttpConfig.serviceUrl.serviceCenterExam.fetchCenterList, + data, + header + ) + }, + async fetchCenterDetail(data = {}, header = {}) { + return await Http.get( + HttpConfig.materialPath, + HttpConfig.serviceUrl.serviceCenterExam.fetchCenterDetail, + data, + header + ) + }, + async examCenterRecord(data = {}, header = {}) { + return await Http.put( + HttpConfig.materialPath, + HttpConfig.serviceUrl.serviceCenterExam.examCenterRecord, + data, + header + ) + }, +} + const url = HttpConfig.systemPath export default{ @@ -878,5 +905,6 @@ export default{ indexScan, preCrashExam, preCrashList, + serviceCenterExam, url } \ No newline at end of file diff --git a/apis/http.js b/apis/http.js index dcaec44..06546dc 100644 --- a/apis/http.js +++ b/apis/http.js @@ -10,7 +10,7 @@ class HttpConfig { // baseUrl = "http://10.40.92.8:8080" // baseUrl = "http://10.40.92.52:28080" // baseUrl = "http://10.40.92.78:28080" - // baseUrl = "http://192.168.2.122:28080" + // baseUrl = "http://192.168.2.248:28080" // baseUrl = "https://z.csgmall.com.cn/gl" // baseUrl = "http://10.40.92.141:28080" // #endif @@ -91,7 +91,7 @@ class HttpConfig { rejectExitExam: '/back_apply/refuse', // 拒绝单个审核 }, newInStore: { - fetchNewInStoreList: '/purchaseInput/list', // 获取新购入库列表 + fetchNewInStoreList: '/purchaseCheckInfo/putInList', // 获取新购入库列表 fetchNewBuyDetail: '/purchaseInput/putinDetails', // 获取新购入库详情 subNewBuy: '/purchaseInput/manageStatus', // 新购明细提交审核 }, @@ -171,6 +171,11 @@ class HttpConfig { fetchPreSubList: '/scrap/getScrapTaskListApp', // 获取预报废提交列表 fetchDeptTree: '/user/deptTree', // 获取部门树状结构 submitCrashTask: '/scrap/submitScrapTask', // 预报废列表提交报废 + }, + serviceCenterExam: { + fetchCenterList: '/purchaseCheckServiceCenter/putInList', // 获取综合服务中心审核列表 + fetchCenterDetail: '/purchaseCheckServiceCenter/putinDetails', //获取综合服务中心列表详情 + examCenterRecord: '/purchaseCheckServiceCenter/manageStatus', // 审核综合服务中心任务 } } } diff --git a/pages.json b/pages.json index bc2811f..67b894b 100644 --- a/pages.json +++ b/pages.json @@ -507,6 +507,14 @@ } } + ,{ + "path" : "pages/serviceCenterExamDetail/serviceCenterExamDetail", + "style" : + { + "navigationBarTitleText": "综合服务中心审核详情" + } + + } ], "tabBar": { "color": "#2c2c2c", diff --git a/pages/crashExam/crashExam.vue b/pages/crashExam/crashExam.vue index 329a3c8..0643187 100644 --- a/pages/crashExam/crashExam.vue +++ b/pages/crashExam/crashExam.vue @@ -431,25 +431,32 @@ // 初始化查询报废审核清单 that.$api.crashExam.crashExamList().then(res => { console.log(res); - if (res.data.total != 0) { - res.data.rows.forEach(item => { - item.ableExam = true - item.scrapAuditorSetList.forEach(roleList => { - if (roleList.deptId == uni.getStorageSync('userInfo').sysUser.deptId) { - if (roleList.status != '0') { - item.already = '0' + if (res.data.code == 200) { + if (res.data.total != 0) { + res.data.rows.forEach(item => { + item.ableExam = true + item.scrapAuditorSetList.forEach(roleList => { + if (roleList.deptId == uni.getStorageSync('userInfo').sysUser.deptId) { + if (roleList.status != '0') { + item.already = '0' + } + } else { + item.ableExam = false } - } else { - item.ableExam = false - } + }) }) - }) - that.fetchMaterialList = res.data.rows - console.log(that.fetchMaterialList); + that.fetchMaterialList = res.data.rows + console.log(that.fetchMaterialList); + } else { + uni.showToast({ + icon: 'none', + title: '暂无数据！' + }) + } } else { uni.showToast({ icon: 'none', - title: '暂无数据！' + title: res.data.msg }) } }).catch(err => { diff --git a/pages/fix/fix.vue b/pages/fix/fix.vue index d1c514c..27ab516 100644 --- a/pages/fix/fix.vue +++ b/pages/fix/fix.vue @@ -272,7 +272,9 @@ import { basePath } from '../../public' onShow() { let that = this // 获取维修任务列表 - that.$api.fix.fixList().then(res => { + that.$api.fix.fixList({ + backSource: 2 + }).then(res => { console.log(res); if (res.data.code == 200) { if (res.data.data.length == 0) { @@ -281,11 +283,11 @@ import { basePath } from '../../public' title: '未查询到相关数据！' }) } else { - for (let i = 0; i < res.data.data.length; i++) { - if (res.data.data[i].repairStatus != '维修完成') { - res.data.data[i].checked = false + res.data.data.forEach(item => { + if (item.repairStatus != '维修完成') { + item.checked = false } - } + }) that.fetchMaterialList = res.data.data console.log(that.fetchMaterialList); } diff --git a/pages/newInStore/newInStore.vue b/pages/newInStore/newInStore.vue index 93772c9..3c8babd 100644 --- a/pages/newInStore/newInStore.vue +++ b/pages/newInStore/newInStore.vue @@ -230,7 +230,7 @@ that.$api.newInStore.fetchNewInStoreList().then(res => { console.log(res); if (res.data.code == 200) { - that.fetchMaterialList = res.data.data + that.fetchMaterialList = res.data.rows } else { uni.showToast({ icon: 'none', diff --git a/pages/orderCart/orderCart.vue b/pages/orderCart/orderCart.vue index 85a9151..f741e7f 100644 --- a/pages/orderCart/orderCart.vue +++ b/pages/orderCart/orderCart.vue @@ -311,7 +311,7 @@ import { basePath } from '../../public'; }) let setArr = [] that.totalGoods.forEach(list => { - setArr.push(list.manageType) + setArr.push(list.companyId) }) console.log(setArr); let set = new Set(setArr) diff --git a/pages/serviceCenterExam/serviceCenterExam.vue b/pages/serviceCenterExam/serviceCenterExam.vue index 8183fd0..f44167f 100644 --- a/pages/serviceCenterExam/serviceCenterExam.vue +++ b/pages/serviceCenterExam/serviceCenterExam.vue @@ -1,6 +1,95 @@ @@ -8,15 +97,196 @@ export default { data() { return { - + centerIpt: '', + centerExamList: [] } }, methods: { - + searchKeyword () { + this.getCenterList(this.centerIpt) + }, + seeCenterDetail (taskId) { + console.log(taskId); + uni.navigateTo({ + url: `/pages/serviceCenterExamDetail/serviceCenterExamDetail?taskId=${taskId}` + }) + }, + examCenterDetail (taskId) { + console.log(taskId); + uni.navigateTo({ + url: `/pages/serviceCenterExamDetail/serviceCenterExamDetail?taskId=${taskId}&showExam=0` + }) + }, + getCenterList (keyWord) { + let that = this + that.$api.serviceCenterExam.fetchCenterList({ + flag: 1, + keyWord + }).then(res => { + console.log(res); + if (res.data.code == 200) { + res.data.data.forEach(item => { + switch (item.taskStatus) { + case 26: + item.taskMark = '待审核' + break; + case 28: + item.taskMark = '已全部入库' + break; + case 105: + item.taskMark = '入库审核中' + break; + case 106: + item.taskMark = '综合服务中心未通过' + break; + case 107: + item.taskMark = '入库审核未通过' + break; + case 122: + item.taskMark = '待审核' + break; + case 123: + item.taskMark = '部分已入库' + break; + } + }) + that.centerExamList = res.data.data + } else { + uni.showToast({ + icon: 'none', + title: res.data.msg + }) + } + }).catch(err => { + console.log(err); + }) + } + }, + onShow() { + this.centerIpt = '' + this.getCenterList('') } } - diff --git a/pages/serviceCenterExamDetail/serviceCenterExamDetail.vue b/pages/serviceCenterExamDetail/serviceCenterExamDetail.vue new file mode 100644 index 0000000..9951a6c --- /dev/null +++ b/pages/serviceCenterExamDetail/serviceCenterExamDetail.vue @@ -0,0 +1,242 @@ + + + + + diff --git a/pages/workSpace/workSpace.vue b/pages/workSpace/workSpace.vue index 2d6831b..0c3dfc5 100644 --- a/pages/workSpace/workSpace.vue +++ b/pages/workSpace/workSpace.vue @@ -67,16 +67,11 @@ pic: '/static/qrcodeBinding.png', url: 'qrcodeBinding' }, - /* { - name: '新购验收', - pic: '/static/newCheck.png', - url: 'newCheck' - }, */ - /* { + { name: '综合服务中心审核', pic: '/static/serviceCenterExam.png', url: 'serviceCenterExam' - }, */ + }, { name: '新购入库', pic: '/static/newInStore.png', @@ -107,7 +102,7 @@ pic: '/static/fix.png', url: 'fix' }, - /* { + { name: '预报废审核', pic: '/static/preCrashExam.png', url: 'preCrashExam' @@ -116,7 +111,7 @@ name: '预报废列表', pic: '/static/preCrashList.png', url: 'preCrashList' - }, */ + }, { name: '报废审核', pic: '/static/crashExam.png', diff --git a/router.js b/router.js index add8ca3..88ca1e3 100644 --- a/router.js +++ b/router.js @@ -461,6 +461,13 @@ const router = createRouter({ "meta": { "needAuth": "true" } + }, + { + "path" : "/pages/serviceCenterExamDetail/serviceCenterExamDetail", + "name": 'serviceCenterExamDetail', + "meta": { + "needAuth": "true" + } } ] })