bonus
/
SmartStorage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4.1提交

This commit is contained in:
FrancisHu 2024-04-01 09:11:26 +08:00
parent cc58bfd237
commit 8dc9f140b5
10 changed files with 73 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apis/http.js
View File

@ -3,21 +3,21 @@ 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`

37
apis/request.js
View File

@ -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)

16
manifest.json
View File

@ -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" : {

1
pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
View File

@ -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,

8
pages/codeOutStore/codeOutStore.vue
View File

@ -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
}
}

2
pages/exitExam/exitExam.vue
View File

@ -7,7 +7,7 @@
>
<view class="fetch-upper">
<view class="upper-lef">
{{ fetch.backPerson.slice(0, 1) }}
{{ fetch.backPerson == null ? '' : fetch.backPerson.slice(0, 1) }}
</view>
<view class="upper-rig">
<h4 style="font-size: 16px;">{{ fetch.backPerson }}</h4>

3
pages/exitExamDetail/exitExamDetail.vue
View File

@ -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]

3
pages/fetchMaterialOutStore/fetchMaterialOutStore.vue
View File

@ -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) {

6
pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue
View File

@ -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