diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 4ccd172..9b0d791 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -13,7 +13,7 @@ "type" : "uniCloud" }, { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" } ] diff --git a/apis/http.js b/apis/http.js index 2c757e0..8ef0233 100644 --- a/apis/http.js +++ b/apis/http.js @@ -4,13 +4,13 @@ class HttpConfig { // #endif // #ifdef APP-PLUS // baseUrl = "http://112.29.103.165:21624" - baseUrl = "http://192.168.2.152:28080" + // 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.8:8080" // baseUrl = "http://10.40.92.52:28080" // baseUrl = "http://10.40.92.78:28080" - // baseUrl = "http://192.168.2.167:28080" + baseUrl = "http://192.168.2.136:28090" // baseUrl = "https://z.csgmall.com.cn/gl" // baseUrl = "http://10.40.92.141:28080" // #endif @@ -85,6 +85,7 @@ class HttpConfig { newExitList: '/back_apply/addBackTask', // 新建退料任务单 selectMaterial: '/back_apply/materialList', // 退料物料选择 ifAgreement: '/select/getAgreementInfoById', // 单位id和工程id是否匹配 + audit: '/back_apply/audit',// }, exitExam: { exitExamList: '/back_apply/examineList', // 获取退料审核列表 diff --git a/pages/exitMaterialDetail/exitMaterialDetail.vue b/pages/exitMaterialDetail/exitMaterialDetail.vue index 50e6fff..f05c0ee 100644 --- a/pages/exitMaterialDetail/exitMaterialDetail.vue +++ b/pages/exitMaterialDetail/exitMaterialDetail.vue @@ -156,6 +156,20 @@ import { basePath } from '../../public'; num: subList }).then(res => { console.log(res); + if (res.data.code === 200) { + // 使用相同的参数调用审核API + that.$api.exitMaterial.audit({ + typeId: that.typeId, + num: subList + }).then(auditRes => { + console.log(auditRes); + // 如果审核成功,可以在这里添加更多的逻辑 + }).catch(auditErr => { + console.error('审核API调用失败', auditErr); + }); + } else { + console.error('提交退料清单失败'); + } }).catch(err => { console.log(err); }) diff --git a/pages/fetchExam/fetchExam.vue b/pages/fetchExam/fetchExam.vue index c6f1e20..9c9338e 100644 --- a/pages/fetchExam/fetchExam.vue +++ b/pages/fetchExam/fetchExam.vue @@ -73,7 +73,7 @@ @@ -760,6 +760,7 @@ import { basePath } from '../../public' if (item == 'dm01' || item == 'dm02') item = 'tsfgs' }) */ if (that.roles.includes('admin')) that.roles = ['fgs', 'sgb', 'ajb', 'jjfgs', 'tsfgs', 'admin'] + // if (that.roles.includes('sgb')) that.roles = ['sgb'] console.log(that.roles); that.initFetch() // that.getRoles() diff --git a/pages/workSpace/workSpace.vue b/pages/workSpace/workSpace.vue index f9af5f6..4ad31aa 100644 --- a/pages/workSpace/workSpace.vue +++ b/pages/workSpace/workSpace.vue @@ -32,7 +32,6 @@

移动办公

@@ -98,6 +97,7 @@ name: "综合服务中心审核", pic: "/static/serviceCenterExam.png", url: "serviceCenterExam", + isShow: ["*:*:*"] }, { name: "新购入库",