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

6.20宁夏生产问题修改

This commit is contained in:
FrancisHu 2024-06-20 09:13:53 +08:00
parent 2f63a7d96c
commit 20834903a3
8 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/http.js
View File

@ -3,9 +3,9 @@ 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://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"

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "智慧仓储",
"appid" : "__UNI__9D122E1",
"description" : "",
"versionName" : "1.1.1",
"versionCode" : 111,
"versionName" : "1.1.2",
"versionCode" : 112,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

4
pages/exitMaterial/exitMaterial.vue
View File

@ -574,10 +574,6 @@ import { basePath } from '../../public'
.select-area{
width: 85%;
margin: 40rpx auto;
.submit-btn{
background-color: #409EFF;
color: #fff;
}
}
}
</style>

7
pages/fetchExam/fetchExam.vue
View File

@ -334,7 +334,8 @@ import { basePath } from '../../public'
this.examList = {
taskId: that.modalList.taskId,
taskStatus: that.modalList.taskStatus + 1,
leaseApplyInfoList: that.modalList.leaseApplyInfoList
leaseApplyInfoList: that.modalList.leaseApplyInfoList,
leaseApplyDetails: that.modalList.leaseApplyInfoList[0].leaseApplyDetails
}
}
if (that.roles.includes('fgs') && that.modalList.taskStatus == 30) {
@ -389,7 +390,8 @@ import { basePath } from '../../public'
this.examList = {
taskId: that.modalList.taskId,
taskStatus: that.modalList.taskStatus + 1,
leaseApplyInfoList: that.modalList.leaseApplyInfoList
leaseApplyInfoList: that.modalList.leaseApplyInfoList,
leaseApplyDetails: that.modalList.leaseApplyInfoList[0].leaseApplyDetails
}
if (that.roles.includes('fgs')) {
for (let k = 0; k < that.examList.leaseApplyInfoList.length; k++) {
@ -591,6 +593,7 @@ import { basePath } from '../../public'
}, */
toggleSubmit (list) {
let that = this
console.log(list);
that.$api.fetchExam.subExam(list).then(res => {
console.log(res);
if (res.data.code == 200) {

13
pages/innerFix/innerFix.vue
View File

@ -63,6 +63,7 @@
</view>
<view
@click="subForm"
:disabled="btnDisabled"
style="border: 1px solid #EBEBEB;"
>
维修完成
@ -110,7 +111,8 @@ import form from '../../uni_modules/uview-ui/libs/config/props/form';
id: '',
taskId: '',
maId: '',
typeId: ''
typeId: '',
btnDisabled: false
}
},
methods: {
@ -130,6 +132,7 @@ import form from '../../uni_modules/uview-ui/libs/config/props/form';
},
subForm () {
let that = this
that.btnDisabled = true
this.submitForm = this.allForm
for (let i = 0; i < this.submitForm.length; i++) {
this.submitForm[i].partId = this.submitForm[i].partId[0]
@ -153,13 +156,13 @@ import form from '../../uni_modules/uview-ui/libs/config/props/form';
title: res.data.msg,
success: () => {
that.showLoading = false
uni.navigateBack({
delta: 2
})
that.btnDisabled = false
uni.navigateBack()
}
})
} else {
that.showLoading = false
that.btnDisabled = false
uni.showToast({
icon: 'none',
title: res.data.msg
@ -167,6 +170,8 @@ import form from '../../uni_modules/uview-ui/libs/config/props/form';
}
}).catch(err => {
console.log(err);
that.showLoading = false
that.btnDisabled = false
})
},
handleTree (data, id, parentId, children) {

17
pages/numReceive/numReceive.vue
View File

@ -26,9 +26,10 @@
<uni-easyinput type="number" v-model="lowerIpt.waitCrashNum" placeholder="请输入数量"></uni-easyinput>
</view>
</view>
<view class="sub-btn" @click="subForm">
<view class="sub-btn" @click="subForm" :disabled="btnDisabled">
确认
</view>
<u-loading-page :loading="showLoading" color="#000" loading-text="表单提交中,请稍后..."></u-loading-page>
</view>
</template>
@ -47,7 +48,9 @@
waitRepairNum: '',
waitCrashNum: ''
},
totalNum: 0
totalNum: 0,
showLoading: false,
btnDisabled: false
}
},
methods: {
@ -63,7 +66,11 @@
// "createBy": "1"
// }
let that = this
that.showLoading = true
that.btnDisabled = true
if (!this.lowerIpt.passedNum && !this.lowerIpt.waitRepairNum && !this.lowerIpt.waitCrashNum) {
that.showLoading = false
that.btnDisabled = false
uni.showToast({
icon: 'none',
title: '请至少填写一个数据！'
@ -75,11 +82,15 @@
.lowerIpt.waitCrashNum)
console.log(that.totalNum);
if (that.totalNum > that.upperInfo.num) {
that.showLoading = false
that.btnDisabled = false
uni.showToast({
icon: 'none',
title: '接收总量不能大于退库数量！'
})
} else if (that.totalNum == 0) {
that.showLoading = false
that.btnDisabled = false
uni.showToast({
icon: 'none',
title: '请确保退料总量不为0！'
@ -91,6 +102,8 @@
arr: this.handleSubmitData()
}).then(res => {
console.log("res===", res)
that.showLoading = false
that.btnDisabled = false
uni.showToast({
icon: 'none',
title: '接收成功'

17
pages/returnFix/returnFix.vue
View File

@ -59,7 +59,12 @@
维修完成
</view>
</view> -->
<button @click="subForm">维修完成</button>
<button
@click="subForm"
:disabled="btnDisabled"
>
维修完成
</button>
</view>
<u-loading-page :loading="showLoading" color="#000" loading-text="表单提交中,请稍后..."></u-loading-page>
</view>
@ -96,7 +101,8 @@ import { basePath } from '../../public'
id: '',
taskId: '',
maId: '',
typeId: ''
typeId: '',
btnDisabled: false
}
},
methods: {
@ -120,6 +126,8 @@ import { basePath } from '../../public'
}, */
subForm () {
let that = this
that.btnDisabled = true
that.showLoading = true
this.totalSub.partStrList = JSON.stringify(this.returnForm)
this.totalSub.id = this.id
this.totalSub.taskId = this.taskId
@ -129,7 +137,6 @@ import { basePath } from '../../public'
this.totalSub.userId = uni.getStorageSync('userInfo').userid
this.totalSub.repairType = 2
console.log(this.totalSub);
this.showLoading = true
that.$api.fix.submitFix(that.totalSub).then(res => {
console.log(res);
if (res.data.code == 200) {
@ -138,6 +145,7 @@ import { basePath } from '../../public'
title: res.data.msg,
success: () => {
that.showLoading = false
that.btnDisabled = false
/* uni.switchTab({
url: '/pages/workSpace/workSpace'
}) */
@ -146,6 +154,7 @@ import { basePath } from '../../public'
})
} else {
that.showLoading = false
that.btnDisabled = false
uni.showToast({
icon: 'none',
title: res.data.msg
@ -153,6 +162,8 @@ import { basePath } from '../../public'
}
}).catch(err => {
console.log(err);
that.showLoading = false
that.btnDisabled = false
})
},
handleTree (data, id, parentId, children) {

15
pages/waitCrash/waitCrash.vue
View File

@ -34,7 +34,12 @@
:del-icon="false"
></uni-file-picker>
</uni-forms-item>
<button style="background-color: #3788FF; color: #fff;" @click="subForm">提交</button>
<button
@click="subForm"
:disabled="btnDisabled"
>
提交
</button>
</uni-forms>
</view>
<u-loading-page :loading="showLoading" color="#000" loading-text="表单提交中,请稍后..."></u-loading-page>
@ -63,7 +68,8 @@ import { basePath, systemPath } from '../../public';
id: '',
taskId: '',
maId: '',
typeId: ''
typeId: '',
btnDisabled: false
}
},
methods: {
@ -86,6 +92,7 @@ import { basePath, systemPath } from '../../public';
},
subForm () {
let that = this
that.btnDisabled = true
this.crashForm.fileIds = this.crashForm.fileIds.join(',')
this.crashForm.id = this.id
this.crashForm.taskId = this.taskId
@ -104,6 +111,7 @@ import { basePath, systemPath } from '../../public';
title: res.data.msg,
success: () => {
that.showLoading = false
that.btnDisabled = false
/* uni.switchTab({
url: '/pages/workSpace/workSpace'
}) */
@ -112,6 +120,7 @@ import { basePath, systemPath } from '../../public';
})
} else {
that.showLoading = false
that.btnDisabled = false
uni.showToast({
icon: 'none',
title: res.data.msg
@ -119,6 +128,8 @@ import { basePath, systemPath } from '../../public';
}
}).catch(err => {
console.log(err);
that.showLoading = false
that.btnDisabled = false
})
}
},