From 8dc9f140b5db6b95b16e530d1e05ee4bdcff0199 Mon Sep 17 00:00:00 2001 From: FrancisHu <2756004617@qq.com> Date: Mon, 1 Apr 2024 09:11:26 +0800 Subject: [PATCH] =?UTF-8?q?4.1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/apis.js | 2 +- apis/http.js | 20 +++++----- apis/request.js | 37 ++++++++++++++++--- manifest.json | 16 ++++++-- .../backMaterialReceiveDetail.vue | 1 + pages/codeOutStore/codeOutStore.vue | 8 +++- pages/exitExam/exitExam.vue | 2 +- pages/exitExamDetail/exitExamDetail.vue | 3 +- .../fetchMaterialOutStore.vue | 3 +- .../fetchMaterialOutStoreDetail.vue | 6 ++- 10 files changed, 73 insertions(+), 25 deletions(-) diff --git a/apis/apis.js b/apis/apis.js index ed8e3b8..759b71b 100644 --- a/apis/apis.js +++ b/apis/apis.js @@ -21,7 +21,7 @@ const login = { async log (data = {} , header = {}){ return await Http.post( HttpConfig.authPath, - HttpConfig.serviceUrl.login.log, + HttpConfig.serviceUrl.login.log, data, header ) diff --git a/apis/http.js b/apis/http.js index 53e475e..aa31d10 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://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.12:8080" - // baseUrl = "http://10.40.92.209:8080" - // baseUrl = "http://10.40.92.7:8080" + // baseUrl = "http://10.40.92.13:8080" + // baseUrl = "http://10.40.92.75:8080" + baseUrl = "http://10.40.92.8:8080" // baseUrl = "https://z.csgmall.com.cn/gl" // #endif // 基地址 - // 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` + /* 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` systemPath = `${this.baseUrl}/system` basePath = `${this.baseUrl}/base` - materialPath = `${this.baseUrl}/material` + materialPath = `${this.baseUrl}/material` // 短链 serviceUrl = { login: { diff --git a/apis/request.js b/apis/request.js index 3de2e6f..2c4da53 100644 --- a/apis/request.js +++ b/apis/request.js @@ -16,7 +16,12 @@ class Http{ if (res.data.code == 401) { uni.showToast({ icon: 'none', - title: '登录状态过期，请重新登录！' + title: '登录状态过期，请重新登录！', + success: () => { + uni.reLaunch({ + url: '/pages/login/login' + }) + } }) } else { resolve(res) @@ -43,11 +48,16 @@ class Http{ }, // 成功的回调 success(res) { - console.log(baseUrl + url); + // console.log(res); if (res.data.code == 401) { uni.showToast({ icon: 'none', - title: '登录状态过期，请重新登录！' + title: '登录状态过期，请重新登录！', + success: () => { + uni.reLaunch({ + url: '/pages/login/login' + }) + } }) } else { resolve(res) @@ -77,7 +87,12 @@ class Http{ if (res.data.code == 401) { uni.showToast({ icon: 'none', - title: '登录状态过期，请重新登录！' + title: '登录状态过期，请重新登录！', + success: () => { + uni.reLaunch({ + url: '/pages/login/login' + }) + } }) } else { resolve(res) @@ -107,7 +122,12 @@ class Http{ if (res.data.code == 401) { uni.showToast({ icon: 'none', - title: '登录状态过期，请重新登录！' + title: '登录状态过期，请重新登录！', + success: () => { + uni.reLaunch({ + url: '/pages/login/login' + }) + } }) } else { resolve(res) @@ -135,7 +155,12 @@ class Http{ if (res.data.code == 401) { uni.showToast({ icon: 'none', - title: '登录状态过期，请重新登录！' + title: '登录状态过期，请重新登录！', + success: () => { + uni.reLaunch({ + url: '/pages/login/login' + }) + } }) } else { resolve(res) diff --git a/manifest.json b/manifest.json index 6ba9666..5fcaa06 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "智慧仓储", "appid" : "__UNI__9D122E1", "description" : "", - "versionName" : "1.0.2", - "versionCode" : 102, + "versionName" : "1.0.4", + "versionCode" : 104, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -48,7 +48,17 @@ }, /* ios打包配置 */ "ios" : { - "dSYMs" : false + "dSYMs" : false, + "idfa" : false, + "privacyDescription" : { + "NSPhotoLibraryUsageDescription" : "该应用上传照片信息时需要访问您的相册", + "NSPhotoLibraryAddUsageDescription" : "该应用上传照片信息时需要访问您的相册", + "NSCameraUsageDescription" : "该应用需要扫描二维码或拍照，是否允许打开相机", + "NSMicrophoneUsageDescription" : "该应用需要使用您的麦克风，以便视频录音", + "NSLocationWhenInUseUsageDescription" : "该应用需要使用您的地理位置，以便为您提供当前位置信息", + "NSLocationAlwaysUsageDescription" : "该应用需要使用您的地理位置，以便为您提供当前位置信息", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要使用您的地理位置，以便为您提供当前位置信息" + } }, /* SDK配置 */ "sdkConfigs" : { diff --git a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue index e1da363..71194b2 100644 --- a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue +++ b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue @@ -294,6 +294,7 @@ return } that.submitFlag = true + console.log(that.taskId, that.detailsId); that.$api.backMaterialReceive.backReceiveEndBack({ createBy: uni.getStorageSync('userInfo').userid, taskId: that.taskId, diff --git a/pages/codeOutStore/codeOutStore.vue b/pages/codeOutStore/codeOutStore.vue index ea39818..0fad37d 100644 --- a/pages/codeOutStore/codeOutStore.vue +++ b/pages/codeOutStore/codeOutStore.vue @@ -57,6 +57,8 @@ num: '', parentId: '', infoList: '', + manageType: '', + taskId: '', subList: {} } }, @@ -94,6 +96,8 @@ that.subList = { parentId: that.parentId, typeId: that.typeId, + manageType: that.manageType, + taskId: that.taskId, maId: that.infoList[0].maId, outNum: 1, carCode: that.carCode, @@ -101,7 +105,7 @@ } console.log(that.subList); // 提交编码出库申请 - that.$api.fetchMaterialOutStore.subOutStore(that.subList, null).then(res => { + that.$api.fetchMaterialOutStore.subOutStore(that.subList).then(res => { console.log(res); if (res.data.code == 200) { uni.showToast({ @@ -128,6 +132,8 @@ this.typeId = params.typeId this.num = params.num this.parentId = params.parentId + this.manageType = params.manageType + this.taskId = params.taskId // this.codeVal = params.transCode } } diff --git a/pages/exitExam/exitExam.vue b/pages/exitExam/exitExam.vue index 46a87c8..3bf40d9 100644 --- a/pages/exitExam/exitExam.vue +++ b/pages/exitExam/exitExam.vue @@ -7,7 +7,7 @@ > - {{ fetch.backPerson.slice(0, 1) }} + {{ fetch.backPerson == null ? '' : fetch.backPerson.slice(0, 1) }}

{{ fetch.backPerson }}

diff --git a/pages/exitExamDetail/exitExamDetail.vue b/pages/exitExamDetail/exitExamDetail.vue index 8233987..d4fdf18 100644 --- a/pages/exitExamDetail/exitExamDetail.vue +++ b/pages/exitExamDetail/exitExamDetail.vue @@ -155,7 +155,8 @@ // 初始化获取退料审批明细 that.$api.exitExam.exitExamDetail({ id: params.id - }, null).then(res => { + }).then(res => { + console.log(res); if (res.data.code == 200) { for (let i = 0; i < res.data.data.length; i++) { res.data.data[i].num = res.data.data[i].num.split('.')[0] diff --git a/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue b/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue index 89edda2..6c68c3e 100644 --- a/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue +++ b/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue @@ -211,7 +211,8 @@ import { basePath } from '../../public' that.showLoading = true // 获取领料出库数据 that.$api.fetchExam.fetchExamList({ - role: uni.getStorageSync('roles').join(',') + role: uni.getStorageSync('roles').join(','), + flag: 0 }).then(res => { console.log(res); if (res.data.code == 200) { diff --git a/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue b/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue index 8255dc3..8802dba 100644 --- a/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue +++ b/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue @@ -187,7 +187,7 @@ this.closePopup1() console.log(this.infoList); uni.navigateTo({ - url: `/pages/codeOutStore/codeOutStore?typeId=${this.infoList.typeId}&num=${this.infoList.preCountNum}&parentId=${this.infoList.parentId}` + url: `/pages/codeOutStore/codeOutStore?typeId=${this.infoList.typeId}&num=${this.infoList.preCountNum}&parentId=${this.infoList.parentId}&manageType=${this.infoList.manageType}&taskId=${this.infoList.taskId}` }) }, rfidOut () { @@ -212,8 +212,12 @@ } else { that.showLoading = true that.subList = { + id: that.infoList.id, + maId: that.infoList.maId, + manageType: that.infoList.manageType, parentId: that.infoList.parentId, typeId: that.infoList.typeId, + taskId: that.infoList.taskId, carCode: that.carCode, outNum: that.multiNum, companyId: uni.getStorageSync('userInfo').sysUser.companyId