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

5.27重庆部分bug修改

This commit is contained in:
FrancisHu 2024-05-27 10:55:08 +08:00
parent 254b2003f0
commit 6ef31781c1
8 changed files with 86 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apis/http.js
View File

@ -5,23 +5,23 @@ class HttpConfig {
// #ifdef APP-PLUS
// baseUrl = "http://112.29.103.165:21624"
// baseUrl = "http://192.168.0.14:21624"
baseUrl = "http://192.168.0.14:18866"
// baseUrl = "http://192.168.0.14:18866"
// baseUrl = "http://112.29.103.165:21626"
// baseUrl = "http://172.20.10.3:8080"
// baseUrl = "http://10.40.92.9:8080"
// baseUrl = "http://10.40.92.52:28080"
// baseUrl = "http://10.40.92.81:8080"
baseUrl = "http://10.40.92.141:28080"
// 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: {

112
pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
View File

@ -181,69 +181,81 @@ export default {
this.transMaCode = list.code
this.sendTypeId = list.typeId
this.parentId = list.id
if (list.manageType == 2) {
/* if (list.manageType == '2') {
return
} else {
console.log(1);
return
} */
/* if (Number(list.num) == 0) {
uni.showToast({
icon: 'none',
title: '待退料数据为0，请勿再点击'
})
} */
if (this.infoList.manageType == '0') {
if (Number(list.num) == 0) {
uni.showToast({
icon: 'none',
title: '待退料数据为0，请勿再点击'
})
} else {
this.$refs.popup1.open()
}
} else if (this.infoList.manageType == '2') {
if (Number(list.partNum) == 0) {
uni.showToast({
icon: 'none',
title: '待退料数据为0，请勿再点击'
})
} else {
const userInfo = uni.getStorageSync('userInfo');
const { manageType, taskId } = this.infoList
const userId = userInfo.userid
const maList = encodeURIComponent(JSON.stringify(this.infoList.maTypeDetails))
uni.navigateTo({
url: `/pages/numLoanReceive/numLoanReceive?arr=${maList}&userId=${userId}&manageType=${manageType}&taskId=${taskId}`
})
}
return
} else {
if (Number(list.num) == 0) {
uni.showToast({
icon: 'none',
title: '待退料数据为0，请勿再点击'
})
} else {
const userInfo = uni.getStorageSync('userInfo');
console.log("userInfo", userInfo)
const userId = userInfo.userid
const {
taskId,
id,
typeId,
modelId,
manageType,
typeName,
typeCode,
num
} = this.infoList
const params = {
taskId,
id,
typeId,
modelId,
manageType,
userId,
typeName,
typeCode,
num
}
const urlStr = QS.stringify(params)
console.log("urlSTR", urlStr)
uni.navigateTo({
url: `/pages/numReceive/numReceive?${urlStr}`
})
}
return
}
if (Number(list.num) == 0) {
uni.showToast({
icon: 'none',
title: '待退料数据为0，请勿再点击'
})
}
if (this.infoList.manageType == '0') {
this.$refs.popup1.open()
} else if (this.infoList.manageType == '2') {
const userInfo = uni.getStorageSync('userInfo');
const { manageType, taskId } = this.infoList
const userId = userInfo.userid
const maList = encodeURIComponent(JSON.stringify(this.infoList.maTypeDetails))
uni.navigateTo({
url: `/pages/numLoanReceive/numLoanReceive?arr=${maList}&userId=${userId}&manageType=${manageType}&taskId=${taskId}`
})
} else {
const userInfo = uni.getStorageSync('userInfo');
console.log("userInfo", userInfo)
const userId = userInfo.userid
const {
taskId,
id,
typeId,
modelId,
manageType,
typeName,
typeCode,
num
} = this.infoList
const params = {
taskId,
id,
typeId,
modelId,
manageType,
userId,
typeName,
typeCode,
num
}
const urlStr = QS.stringify(params)
console.log("urlSTR", urlStr)
uni.navigateTo({
url: `/pages/numReceive/numReceive?${urlStr}`
})
}
},
openPopup3 (list) {

5
pages/exitExam/exitExam.vue
View File

@ -289,11 +289,12 @@ import { basePath } from '../../public'
console.log(err);
})
},
rejectExam (id) {
rejectExam (id, directAuditRemark) {
let that = this
// 拒绝单个审核
that.$api.exitExam.rejectExitExam({
id
id,
directAuditRemark
}).then(res => {
console.log(res);
if (res.data.code == 200) {

2
pages/fetchExam/fetchExam.vue
View File

@ -588,7 +588,7 @@ import { basePath } from '../../public'
let that = this
that.showLoading = true
that.$api.fetchExam.fetchTrueExamListCq({
sourceBy: 1
souceBy: 1
}).then(res => {
console.log(res);
if (res.data.code == 200) {

2
pages/fix/fix.vue
View File

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

2
pages/repairTestInStoreDetail/repairTestInStoreDetail.vue
View File

@ -29,7 +29,7 @@
<h4>{{ fetch.maCode }}</h4>
</view>
<view>
<span>入库时间</span>
<span>入库时间/状态</span>
<h4>{{ fetch.status == '已入库' ? fetch.updateTime : fetch.status }}</h4>
</view>
</view>

18
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/app-plus/app-view.js vendored
View File

@ -21526,7 +21526,7 @@ var render = function () {
{ attrs: { _i: "17-" + $30 } },
[
_c("span", { attrs: { _i: "18-" + $30 } }, [
_vm._v("入库时间"),
_vm._v("入库时间/状态"),
]),
_c("h4", { attrs: { _i: "19-" + $30 } }, [
_vm._v(_vm._$g("19-" + $30, "t0-0")),