From 66f3e29764027fdc0a3aa57b1525e7f173165de9 Mon Sep 17 00:00:00 2001 From: FrancisHu <2756004617@qq.com> Date: Mon, 1 Jul 2024 10:50:02 +0800 Subject: [PATCH] =?UTF-8?q?7.1=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/http.js | 12 ++-- pages/codeReceive/codeReceive.vue | 5 ++ pages/crashExam/crashExam.vue | 5 ++ pages/crashExam/crashExamDetails.vue | 5 ++ pages/exitExam/exitExam.vue | 8 +++ pages/fetchExam/fetchExam.vue | 11 ++++ .../fetchMaterialOutStoreDetail.vue | 8 +++ pages/newBuyDetail/newBuyDetail.vue | 5 ++ pages/preCrashList/preCrashList.vue | 63 ++++++++++--------- .../repairTestInStoreDetail.vue | 5 ++ pages/rfidReceive/rfidReceive.vue | 7 ++- pages/scanReceive/scanReceive.vue | 5 ++ pages/testExam/testExam.vue | 5 ++ pages/testExam/testExamDetails.vue | 5 ++ pages/testExam/testExamList.vue | 2 +- pages/workSpace/workSpace.vue | 4 +- 16 files changed, 117 insertions(+), 38 deletions(-) diff --git a/apis/http.js b/apis/http.js index 7bfc1e5..b708bdc 100644 --- a/apis/http.js +++ b/apis/http.js @@ -4,25 +4,25 @@ class HttpConfig { // #endif // #ifdef APP-PLUS // baseUrl = "http://112.29.103.165:21624" - // baseUrl = "http://192.168.0.14: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.8:8080" // baseUrl = "http://10.40.92.52:28080" // baseUrl = "http://10.40.92.78:28080" - baseUrl = "http://192.168.2.122:38080" + // baseUrl = "http://192.168.2.122:28080" // baseUrl = "https://z.csgmall.com.cn/gl" // baseUrl = "http://10.40.92.141:28080" // #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: { diff --git a/pages/codeReceive/codeReceive.vue b/pages/codeReceive/codeReceive.vue index c74f679..5ef2d7e 100644 --- a/pages/codeReceive/codeReceive.vue +++ b/pages/codeReceive/codeReceive.vue @@ -56,6 +56,7 @@ 接收 --> + @@ -63,6 +64,7 @@ export default { data() { return { + showLoading: false, typeId: '', num: '', parentId: '', @@ -176,6 +178,7 @@ itemList: ['合格', '待修', '待报废'], itemColor: '#333', success: function(res) { + that.showLoading = true // console.log('选中了第' + (res.tapIndex + 1) + '个按钮'); let type = res.tapIndex + 1 const arrList = [{ @@ -198,6 +201,7 @@ that.$api.backMaterialReceive.backMaterialSetCodeBack(params).then(res => { console.log(res); if (res.data.code == 200) { + that.showLoading = false uni.showToast({ icon: 'none', title: res.data.msg, @@ -207,6 +211,7 @@ }) // that.searchCode() } else { + that.showLoading = false uni.showToast({ icon: 'none', title: res.data.msg diff --git a/pages/crashExam/crashExam.vue b/pages/crashExam/crashExam.vue index c4b4ed3..1caf0fd 100644 --- a/pages/crashExam/crashExam.vue +++ b/pages/crashExam/crashExam.vue @@ -116,6 +116,7 @@ + @@ -123,6 +124,7 @@ export default { data() { return { + showLoading: false, allChecked: false, examFormData: { ifPass: '', @@ -230,10 +232,12 @@ }, subInStore (obj) { let that = this + that.showLoading = true // 通过审核或驳回 that.$api.crashExam.crashExamAudit(obj).then(res => { console.log(res); if (res.data.code == 200) { + that.showLoading = false uni.showToast({ icon: 'none', title: res.data.msg, @@ -245,6 +249,7 @@ } }) } else { + that.showLoading = false uni.showToast({ icon: 'none', title: res.data.msg diff --git a/pages/crashExam/crashExamDetails.vue b/pages/crashExam/crashExamDetails.vue index d00e24f..c2ab688 100644 --- a/pages/crashExam/crashExamDetails.vue +++ b/pages/crashExam/crashExamDetails.vue @@ -103,6 +103,7 @@ + @@ -110,6 +111,7 @@ export default { data() { return { + showLoading: false, fetchList: [ ], @@ -206,10 +208,12 @@ }, subInStore (obj) { let that = this + that.showLoading = true // 通过审核或驳回 that.$api.crashExam.crashExamAudit(obj).then(res => { console.log(res); if (res.data.code == 200) { + that.showLoading = false uni.showToast({ icon: 'none', title: res.data.msg, @@ -219,6 +223,7 @@ } }) } else { + that.showLoading = false uni.showToast({ icon: 'none', title: res.data.msg diff --git a/pages/exitExam/exitExam.vue b/pages/exitExam/exitExam.vue index 58ad0e1..decf39f 100644 --- a/pages/exitExam/exitExam.vue +++ b/pages/exitExam/exitExam.vue @@ -149,6 +149,7 @@ + @@ -157,6 +158,7 @@ import { basePath } from '../../public' export default { data() { return { + showLoading: false, allChecked: false, examFormData: { ifPass: '', @@ -259,6 +261,7 @@ import { basePath } from '../../public' }, seeExam (id, directAuditRemark) { let that = this + that.showLoading = true // 提交单个审核 that.$api.exitExam.subExitExam({ id, @@ -266,6 +269,7 @@ import { basePath } from '../../public' }).then(res => { console.log(res); if (res.data.code == 200) { + that.showLoading = false that.closePopup() that.closePopup1() uni.showToast({ @@ -278,6 +282,7 @@ import { basePath } from '../../public' } }) } else { + that.showLoading = false that.closePopup() that.closePopup1() uni.showToast({ @@ -291,12 +296,14 @@ import { basePath } from '../../public' }, rejectExam (id) { let that = this + that.showLoading = true // 拒绝单个审核 that.$api.exitExam.rejectExitExam({ id }).then(res => { console.log(res); if (res.data.code == 200) { + that.showLoading = false that.closePopup() that.closePopup1() uni.showToast({ @@ -309,6 +316,7 @@ import { basePath } from '../../public' } }) } else { + that.showLoading = false that.closePopup() that.closePopup1() uni.showToast({ diff --git a/pages/fetchExam/fetchExam.vue b/pages/fetchExam/fetchExam.vue index d907ae6..9a94e28 100644 --- a/pages/fetchExam/fetchExam.vue +++ b/pages/fetchExam/fetchExam.vue @@ -223,6 +223,7 @@ + @@ -232,6 +233,7 @@ import { basePath } from '../../public' data() { return { showLoading: false, + showSubLoading: false, allChecked: false, examFormData: { ifPass: '', @@ -321,12 +323,14 @@ import { basePath } from '../../public' this.examList = { taskId: that.modalList.taskId, taskStatus: that.modalList.taskStatus + 1, + code: that.modalList.code, leaseApplyInfoList: that.modalList.leaseApplyInfoList } } else if (that.modalList.leaseApplyInfoList[0].leaseApplyDetails[0].companyId == 102) { this.examList = { taskId: that.modalList.taskId, taskStatus: that.modalList.taskStatus + 2, + code: that.modalList.code, leaseApplyInfoList: that.modalList.leaseApplyInfoList } } @@ -334,6 +338,7 @@ import { basePath } from '../../public' this.examList = { taskId: that.modalList.taskId, taskStatus: that.modalList.taskStatus + 1, + code: that.modalList.code, leaseApplyInfoList: that.modalList.leaseApplyInfoList, leaseApplyDetails: that.modalList.leaseApplyInfoList[0].leaseApplyDetails } @@ -593,10 +598,12 @@ import { basePath } from '../../public' }, */ toggleSubmit (list) { let that = this + that.showSubLoading = true console.log(list); that.$api.fetchExam.subExam(list).then(res => { console.log(res); if (res.data.code == 200) { + that.showSubLoading = false that.closePopup() uni.showToast({ icon: 'none', @@ -608,6 +615,7 @@ import { basePath } from '../../public' } }) } else { + that.showSubLoading = false that.closePopup() uni.showToast({ icon: 'none', @@ -620,9 +628,11 @@ import { basePath } from '../../public' }, rejectSubmit (list) { let that = this + that.showSubLoading = true that.$api.fetchExam.rejectExam(list).then(res => { console.log(res); if (res.data.code == 200) { + that.showSubLoading = false that.closePopup() that.closePopup1() uni.showToast({ @@ -635,6 +645,7 @@ import { basePath } from '../../public' } }) } else { + that.showSubLoading = false that.closePopup() that.closePopup1() uni.showToast({ diff --git a/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue b/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue index d27464a..a8adc03 100644 --- a/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue +++ b/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue @@ -335,6 +335,7 @@ confirmText: '出库', success: (res) => { if (res.confirm) { + that.showLoading = true console.log(that.infoList); that.$api.fetchMaterialOutStore.directOutStore({ id: that.infoList.parentId, @@ -342,6 +343,7 @@ }).then(res => { console.log(res); if (res.data.code == 200) { + that.showLoading = false uni.showToast({ icon: 'none', title: res.data.msg, @@ -349,6 +351,12 @@ uni.navigateBack() } }) + } else { + that.showLoading = false + uni.showToast({ + icon: 'none', + title: res.data.msg + }) } }).catch(err => { console.log(err); diff --git a/pages/newBuyDetail/newBuyDetail.vue b/pages/newBuyDetail/newBuyDetail.vue index f675933..efa21f1 100644 --- a/pages/newBuyDetail/newBuyDetail.vue +++ b/pages/newBuyDetail/newBuyDetail.vue @@ -97,12 +97,14 @@ +