From 6ac3b2e3ac8665703c2cdf0b322c019fa99dbb46 Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Mon, 25 Nov 2024 11:48:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.js | 78 ++- common/betone_components/betone-list.vue | 359 ++++++++---- common/betone_components/betone-new-input.vue | 3 +- common/betone_components/betone-upload.vue | 6 + main.js | 3 + pages/home/index.vue | 4 +- pages/inspection/components/plan-list.vue | 4 +- pages/inspection/quest.vue | 8 +- pages/login/authInfo.vue | 4 +- pages/login/login.vue | 6 +- pages/my/my.vue | 8 +- pages/my/records.vue | 12 +- pages/order/tasking.vue | 10 +- pages/register/index.vue | 8 +- pages/submission/components/subForm.vue | 24 +- pages/submission/evaluate.vue | 144 ++++- pages/submission/index.vue | 3 +- pages/submission/records.vue | 11 +- pages/submission/recordsdetails.vue | 181 ++---- pages/submission/sendOrders.vue | 538 +++++++++++++++--- store/$u.mixin.js | 28 + 21 files changed, 1034 insertions(+), 408 deletions(-) create mode 100644 store/$u.mixin.js diff --git a/api/api.js b/api/api.js index 658f9e0..9c8da2d 100644 --- a/api/api.js +++ b/api/api.js @@ -50,31 +50,27 @@ const install = (Vue, vm) => { }) // 需求提报 提交接口 - let workOrderSave = (params) => http.post('/workOrder/save', params, { + let workOrderSave = (params) => http.post('/lab-ops/work-order/customer-save', params, { authorizations: true, isparams: false }) - // 需求提报 列表 /lab/workOrder/list - let getWorkOrderRecords = (params) => http.get('/workOrder/list', { ...params }, { + // 需求提报 列表 + let getWorkOrderRecords = (params) => http.get('/lab-ops/work-order/page', { ...params }, { authorizations: true, isparams: false }) // 根据id查询故障详情 - let getBreakdownInfo = (params) => http.get('/workOrder/detail', { ...params }, { + let getBreakdownInfo = (params) => http.get('/lab-ops/work-order/detail', { ...params }, { authorizations: true, isparams: false }) - // 修改白送 /lab/workOrder/update - let workOrderupdate = (params) => http.post('/workOrder/update', params, { + // 修改需求单 + let workOrderupdate = (params) => http.post('/lab-ops/work-order/update', params, { authorizations: true, isparams: true }) - // 评价提交 - let evaluateSign = (params) => http.post('/workOrder/evaluateSign', params, { - authorizations: true, - isparams: false - }) + // 获取维修人员 / let getRepairPersons = (params) => http.get('/blade-system/user/repairPersons', { ...params }, { @@ -137,7 +133,7 @@ const install = (Vue, vm) => { isparams: true }) // 客服关闭接口 / - let cloneOrder = (params) => http.post('/workOrder/clone', params, { + let cloneOrder = (params) => http.post('/lab-ops/work-order/service-close', params, { authorizations: true, isparams: false }) @@ -148,7 +144,7 @@ const install = (Vue, vm) => { isparams: false }) // 维修人员驳回 / - let repairReject = (params) => http.post('/workOrder/repairReject', params, { + let repairReject = (params) => http.post('/lab-ops/work-order/serviceman-reject', params, { authorizations: true, isparams: false }) @@ -158,8 +154,62 @@ const install = (Vue, vm) => { isparams: false }) + // 客服派单 + let serviceman = (params) => http.post('/lab-ops/work-order/service-to-serviceman', params, { + authorizations: true, + isparams: false + }) + + // 维修人员接收工单 / + let servicemanReceive = (params) => http.post('/lab-ops/work-order/serviceman-receive', params, { + authorizations: true, + isparams: false + }) + // 维修人员提交维修方案 / + let servicemanSubmit = (params) => http.post('/lab-ops/work-order/serviceman-submit', params, { + authorizations: true, + isparams: false + }) + // 魏旭人员确认维修方案 + let supervisorconfirm = (params) => http.post('/lab-ops/work-order/supervisor-confirm', params, { + authorizations: true, + isparams: false + }) + // 维修负责人 驳回 维修方案 / + let supervisorReject = (params) => http.post('/lab-ops/work-order/supervisor-reject', params, { + authorizations: true, + isparams: false + }) + // 客户确认维修方案 + let customerConfirm = (params) => http.post('/lab-ops/work-order/customer-confirm', params, { + authorizations: true, + isparams: false + }) + // 客户驳回维修方案 + let customerReject = (params) => http.post('/lab-ops/work-order/customer-reject', params, { + authorizations: true, + isparams: false + }) + + // 维修人员确认维修完成 + let servicemanRepairSubmit = (params) => http.post('/lab-ops/work-order/serviceman-repair-submit', params, { + authorizations: true, + isparams: false + }) + + // 评价 已完成 提交 + let evaluateSign = (params) => http.post('/lab-ops/work-order/customer-repair-confirm', params, { + authorizations: true, + isparams: false + }) + // 评价 未完成 提交 + let evaluateRepairReject = (params) => http.post('/lab-ops/work-order/customer-repair-reject', params, { + authorizations: true, + isparams: false + }) + // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下 - vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave,sendVerify }; + vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave,sendVerify,serviceman,servicemanReceive,servicemanSubmit,supervisorReject ,supervisorconfirm,customerConfirm,customerReject,servicemanRepairSubmit,evaluateRepairReject}; } export default { diff --git a/common/betone_components/betone-list.vue b/common/betone_components/betone-list.vue index c51438e..19d6443 100644 --- a/common/betone_components/betone-list.vue +++ b/common/betone_components/betone-list.vue @@ -11,12 +11,12 @@ - 单号：{{ item.requirementCode }} + 单号：{{ item.requirementCode }} {{ item.fillingTime }} - {{ item.reportUnit }} - 单号：{{ item.requirementCode }} {{ item.fillingTime }} + {{ item.reportUnit ? item.reportUnit : '单位' }} + 单号：{{ item.requirementCode }} {{ item.faultDescribe }} - + + 查看 + @click.stop="openWorkOrder(item)">查看 + + 提报 + 修改 + 确认方案 + + 查看位置 + 评价 - - + + + 查看 - - - - - 查看 + 接单 - - - - 接单确认 - - - 维修 - - - - 提报 - 修改 - - + 确认付款 + 关闭 - - 查看位置 - - 评价 + + + + + 查看 + 审批 + - - - 关闭 - - - - 驳回 + + + + 查看 + + 确认 + 驳回 + 提交 + 维修完成 + @@ -93,17 +98,31 @@ - - + + + + + + + + + + + + + - - + + - + 请确认维修是否已经完成？ + + @@ -131,8 +150,8 @@ export default { 待确认: "#81B337", 待维修: "#3A62D7", 待提报: "#81B337", - 已完成: "#CECECE", 待维修: '#E99D42', + 已完成: "#CECECE", }, current: 0, @@ -150,8 +169,13 @@ export default { sendOrdersList: [], cloneVisible: false,//关闭弹框 - cloneReason: '',//关闭原因 - cloneInfo: {},//需要关闭的订单信息 + closeReason: '',//关闭原因 + rowInfo: {},//需要关闭的订单信息 + + turnShow: false,//驳回弹框 + repaiRejectReason: '',//驳回弹框 + + repairShow:false,//维修人员 去人维修完成弹框 }; }, computed: { @@ -166,7 +190,6 @@ export default { mounted() { this.$nextTick(() => { this.getRecordsList() - // this.getRepairPersons()//获取维修人员列表 // 触底触发 uni.$on('onReachBottom', () => { if (this.isNomore) { @@ -187,16 +210,14 @@ export default { methods: { // 获取列表 getRecordsList() { - this.$refs.BetLoading.show(); + this.BetLoading.show(); this.loadingState = "loading"; let query = { current: this.page.currentPage, //页数 size: this.page.pageSize, //条数 dataType: this.dataTypes,//数据权限 - // ...this.searchInfo - // reportUnit: this.searchInfo.reportUnit + ...this.searchInfo } - this.$u.api.getWorkOrderRecords(query).then(res => { if (res.code == 200) { @@ -215,7 +236,7 @@ export default { this.loadingState = "nomore"; this.isNomore = true; } - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); } }).catch(err => { @@ -236,72 +257,124 @@ export default { // tab切换 changeTab(index) { this.current = index; - this.searchInfo.type = this.tabList[index].key == '9999' ? '' : this.tabList[index].key + this.searchInfo.status = this.tabList[index].key == '9999' ? '' : this.tabList[index].key this.isNomore = false this.page.currentPage = 1; this.getRecordsList() }, // 获取状态信息 statusName(item) { - if (this.type != 'submission') { + // 实验室 + if (this.dataTypes == 1) { if (item == -1) { return '待提报' } if (item == 0) { return '待接单' } - if (item == 2) { //待维修人员接单 + if (item == 1 || item == 2 || item == 3) { + return '待维修' + } + if (item == 4) { + return '确认方案' + } + if (item == 5) { + return '维修中' + } + if (item == 6) { + return '待评价' + } + if (item == 7) { + return '待付款' + } + if (item == 8 || item == 9) { + return '已完成' + } + } + // 2 客服 3 维修负责人 4 维修人员 + if (this.dataTypes == 2) { + + if (item == 0) { return '待接单' } - if (item == 1 || item == 3) { + if (item == 1 || item == 2 || item == 3 || item == 4) { return '待维修' } - if (item == 4 || item == 5 || item == 6 || item == 9) { - return '已完成' + + if (item == 5) { + return '维修中' + } + if (item == 6) { + return '维修完成' } if (item == 7) { - return '已驳回' + return '待付款' } - } else { - if (item == -1) { - return '待提报' + if (item == 8 || item == 9) { + return '已完成' } + } + // 维修负责人 1839537055389515777 + if (this.dataTypes == 3) { if (item == 0) { return '待接单' } - - if (item == 1 || item == 3 || item == 2) { - return '待维修' + if (item == 2) { + return '已驳回' + } + if (item == 3) { + return '待审批' } if (item == 4) { - return '维修完成' + return '已通过' } if (item == 5) { - return '待评价' + return '维修中' } if (item == 6) { + return '维修完成' + } + if (item == 7) { + return '待付款' + } + if (item == 8 || item == 9) { return '已完成' } - - if (item == 9||item == 7) { + } + // 维修人员 1839552581620793346 + if (this.dataTypes == 4) { + if (item == 0) { return '已驳回' } + if (item == 1) { + return '待确认' + } + if (item == 2) { + return '待提交' + } + if (item == 3 || item == 4) { + return '待审批' + } + if (item == 5) { + return '维修中' + } + if (item == 6 || item == 7 || item == 8 || item == 9) { + return '已完成' + } } - }, // 提报按钮 subOrder(row) { let query_ = [row] this.$u.api.workOrderSave(query_).then(res => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); if (res.code == 200) { - uni.navigateBack({ - delta: 1 // 默认值是1，表示返回的页面层数 - }) + this.page.currentPage = 1; + this.getRecordsList() } }).catch(err => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); }) }, @@ -315,7 +388,7 @@ export default { }); }, - // 维修人员 接单确认 + // 、维修人员、维修主管、客服 操作流程页面 orderConfirm(row) { let param = { id: row.id @@ -338,25 +411,33 @@ export default { }) }, // 客服关闭 - openClone(item) { - this.cloneVisible = true - this.cloneInfo = item + openModel(item, type) { + if (type == 'close') { + this.cloneVisible = true + } + if (type == 'turn') { + this.turnShow = true + } + if(type=='repair'){ + this.repairShow = true + } + + this.rowInfo = item }, confirmCloseSub() { - if (this.cloneReason == '') { + if (this.closeReason == '') { uni.showToast({ title: "请填写关闭原因", icon: "none" }); return false; } let query = { - id: this.cloneInfo.id, - cloneReason: this.cloneReason, - status: 9 + id: this.rowInfo.id, + closeReason: this.closeReason, } - this.$refs.BetLoading.show(); + this.BetLoading.show(); this.$u.api.cloneOrder(query).then(res => { this.cloneVisible = false - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); if (res.code == 200) { uni.showToast({ title: "关闭成功", icon: "none" }); this.getRecordsList() @@ -365,45 +446,77 @@ export default { }, // 跳转详情 goPage(item, type) { - if (type == 'details') { - uni.navigateTo({ - url: "/pages/submission/recordsdetails?id=" + item.id, - }); + + // if (type == 'evaluate') { + // let param = { + // id: item.id, + // } + // uni.navigateTo({ + // url: `/pages/submission/evaluate${this.$u.queryParams(param)}`, + // }); + // } + + }, + // 查看需求工单 + openWorkOrder(row) { + let param = { + id: row.id, + type: 'breakdownView' } - - if (type == 'breakdownView') { - let param = { - id: item.id, - type: type - } - uni.navigateTo({ - url: `/pages/submission/submissionDetails${this.$u.queryParams(param)}`, - }); + uni.navigateTo({ + url: `/pages/submission/recordsdetails${this.$u.queryParams(param)}`, + }); + }, + // 客服 修改 + orderUpdate(item) { + let param = { + id: item.id, + type: 'breakdownUpdate' } - if (type == 'breakdownUpdate') { - let param = { - id: item.id, - type: type + uni.navigateTo({ + url: `/pages/submission/submissionDetails${this.$u.queryParams(param)}`, + }); + }, + // 维修人员驳回 + turnFn() { + if (this.repaiRejectReason == '') { + uni.showToast({ title: "请输入驳回原因", icon: "none" }); + return false + } + let query = { + id: this.rowInfo.id, + repaiRejectReason: this.repaiRejectReason, + } + this.$u.api.repairReject(query).then(res => { + if (res.code == 200) { + this.turnShow = false + uni.showToast({ title: "驳回成功", icon: "none" }); + this.getRecordsList() } - uni.navigateTo({ - url: `/pages/submission/submissionDetails${this.$u.queryParams(param)}`, - }); + }) + }, + // 维修人员确认维修是否完成 + repairFn(){ + let query = { + id: this.rowInfo.id, } - if (type == 'evaluate') { - let param = { + this.$u.api.servicemanRepairSubmit(query).then(res => { + if (res.code == 200) { + this.repairShow = false + uni.showToast({ title: "维修完成", icon: "none" }); + this.getRecordsList() + } + }) + }, + // 跳转评价 + openEvaluate(item){ + let param = { id: item.id, } uni.navigateTo({ url: `/pages/submission/evaluate${this.$u.queryParams(param)}`, }); - } - if (type == 'location') {//查看位置 - uni.navigateTo({ - url: `/pages/order/location`, - }) - } }, - }, }; @@ -456,7 +569,7 @@ export default { } .item-right { - width: 162rpx; + max-width: 162rpx; height: 48rpx; margin: 36rpx 24rpx 0 0; } diff --git a/common/betone_components/betone-new-input.vue b/common/betone_components/betone-new-input.vue index 4fc43b6..0406804 100644 --- a/common/betone_components/betone-new-input.vue +++ b/common/betone_components/betone-new-input.vue @@ -8,7 +8,7 @@ {{ label }} - + diff --git a/common/betone_components/betone-upload.vue b/common/betone_components/betone-upload.vue index d14265e..bfcd83f 100644 --- a/common/betone_components/betone-upload.vue +++ b/common/betone_components/betone-upload.vue @@ -147,10 +147,16 @@ export default { }); }, uploadFile(filePath) { + const token = uni.getStorageSync("token") uni.uploadFile({ url: website.baseUrl + "/blade-resource/oss/endpoint/put-file", // 服务器上传接口 filePath: filePath, name: "file", // 必须填写，后台用来接收文件 + header: { + 'Blade-Auth': 'bearer ' + token, + 'Authorization':`Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`, + 'blade-requested-with': 'BladeHttpRequest' //自定义请求头 + }, formData: {}, success: (res) => { let info = JSON.parse(res.data); diff --git a/main.js b/main.js index 9e1291b..14a132f 100644 --- a/main.js +++ b/main.js @@ -7,6 +7,9 @@ Vue.config.productionTip = false import uView from '@/uni_modules/uview-ui' Vue.use(uView) +// 引入uView提供的对vuex的简写法文件 +let vuexStore = require('@/store/$u.mixin.js'); +Vue.mixin(vuexStore); App.mpType = 'app' diff --git a/pages/home/index.vue b/pages/home/index.vue index 8f56cf4..2683dbc 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -55,9 +55,9 @@ export default { onShow() { this.$nextTick(() => { this.$refs.tabbarRef.getPermission(); - this.$refs.BetLoading.show(); + this.BetLoading.show(); setTimeout(() => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); }, 1000); }); //工作台 diff --git a/pages/inspection/components/plan-list.vue b/pages/inspection/components/plan-list.vue index 157b537..d841ed7 100644 --- a/pages/inspection/components/plan-list.vue +++ b/pages/inspection/components/plan-list.vue @@ -97,7 +97,7 @@ export default { // 获取列表 getRecordsList() { - // this.$refs.BetLoading.show(); + //this.BetLoading.show(); // this.$u.api.getDictionaryList().then(res => { // if (res.code == 200) { @@ -105,7 +105,7 @@ export default { // this.orderData = res.data; - // this.$refs.BetLoading.hide(); + // this.BetLoading.hide(); // } // }).catch(err => { diff --git a/pages/inspection/quest.vue b/pages/inspection/quest.vue index 7785fbd..273a7a5 100644 --- a/pages/inspection/quest.vue +++ b/pages/inspection/quest.vue @@ -107,9 +107,9 @@ export default { onShow() { this.$nextTick(() => { this.$refs.tabbarRef.getPermission(); - this.$refs.BetLoading.show(); + this.BetLoading.show(); setTimeout(() => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); }, 1000); }); }, @@ -135,7 +135,7 @@ export default { methods: { // 获取列表 getRecordsList() { - this.$refs.BetLoading.show(); + this.BetLoading.show(); this.loadingState = "loading"; let query = { current: this.page.currentPage, //页数 @@ -163,7 +163,7 @@ export default { this.loadingState = "nomore"; this.isNomore = true; } - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); } }).catch(err => { diff --git a/pages/login/authInfo.vue b/pages/login/authInfo.vue index 364eb4e..032c12c 100644 --- a/pages/login/authInfo.vue +++ b/pages/login/authInfo.vue @@ -83,9 +83,9 @@ onShow() { this.$nextTick(() => { this.$refs.tabbarRef.getPermission(); - this.$refs.BetLoading.show(); + this.BetLoading.show(); setTimeout(() => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); }, 1000); }); //工作台 diff --git a/pages/login/login.vue b/pages/login/login.vue index 08352e7..1178355 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -83,7 +83,7 @@ export default { uni.showToast({ title: "请输入密码", icon: "none" }); return false; } - this.$refs.BetLoading.show(); + this.BetLoading.show(); // // 实例化smCrypto // const smCryptoInstance = new smCrypto.SM2Instance(); // // 设置密钥 @@ -124,7 +124,7 @@ export default { console.log(555555555,res.detail.status) this.$store.dispatch("changeTabbar", res); - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); }) .catch((err) => { if (err.error_code == 2004) { @@ -133,7 +133,7 @@ export default { }); return false } - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); }); }, diff --git a/pages/my/my.vue b/pages/my/my.vue index d967666..9ab707f 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -79,9 +79,9 @@ export default { console.log(11111,this.userIfo) this.status = this.userIfo.detail.status this.$refs.tabbarRef.getPermission(); - this.$refs.BetLoading.show(); + this.BetLoading.show(); setTimeout(() => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); }, 1000); }); }, @@ -97,9 +97,9 @@ export default { content: "请确认是否要退出登录?", success: (res) => { if (res.confirm) { - this.$refs.BetLoading.show(); + this.BetLoading.show(); this.$u.api.logout().then(res => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); //TODO uni.removeStorageSync("token"); uni.removeStorageSync("userinfo"); diff --git a/pages/my/records.vue b/pages/my/records.vue index f86823a..d0d13b0 100644 --- a/pages/my/records.vue +++ b/pages/my/records.vue @@ -68,7 +68,7 @@ export default { methods: { // 获取人员列表 getUserList getUserLists() { - this.$refs.BetLoading.show() + this.BetLoading.show() let query_ = { current: 1, size: 10 @@ -78,7 +78,7 @@ export default { this.getUserData = res.data.records } - this.$refs.BetLoading.hide() + this.BetLoading.hide() }); }, // 人员选择 @@ -95,7 +95,7 @@ export default { }, // 获取登录记录 getLoginRcords() { - this.$refs.BetLoading.show() + this.BetLoading.show() let query_ = { logType: 1, userId: this.searchInfo.id @@ -104,12 +104,12 @@ export default { if (res.code == 200) { this.recordData = res.data } - this.$refs.BetLoading.hide() + this.BetLoading.hide() }); }, // 获取修改记录 getEditRcords() { - this.$refs.BetLoading.show() + this.BetLoading.show() let query_ = { logType: 2, //1 登录日志 2 修改日志 userId: this.searchInfo.id @@ -119,7 +119,7 @@ export default { this.recordData = res.data } - this.$refs.BetLoading.hide() + this.BetLoading.hide() }); }, searchData() { diff --git a/pages/order/tasking.vue b/pages/order/tasking.vue index b2b7e09..dcf1f88 100644 --- a/pages/order/tasking.vue +++ b/pages/order/tasking.vue @@ -95,7 +95,7 @@ export default { key: "6", }, { - name: "代付款", + name: "待付款", key: "7", }, { @@ -111,6 +111,10 @@ export default { name: "全部", key: "9999", }, + { + name: "待确认", + key: "1", + }, { name: "待提交", key: "2", @@ -119,6 +123,10 @@ export default { name: "待审批", key: "3,4", }, + { + name: "已驳回", + key: "0", + }, { name: "维修中", key: "5", diff --git a/pages/register/index.vue b/pages/register/index.vue index ced039c..51cfb61 100644 --- a/pages/register/index.vue +++ b/pages/register/index.vue @@ -192,7 +192,7 @@ export default { uni.$u.toast("请勾选《注册服务协议》及《隐私权政策》"); return false; } - this.$refs.BetLoading.show(); + this.BetLoading.show(); let query_ = { "deptName": this.registerInfo.businessName,//企业名称 "address": this.registerInfo.area,//详细地址 @@ -204,7 +204,7 @@ export default { "verifyCode": this.registerInfo.verificationCode,//验证码 } this.$u.api.registerUser(query_).then(res => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); if (res.code == 200) { setTimeout(() => { uni.navigateTo({ @@ -215,11 +215,11 @@ export default { uni.$u.toast(res.msg); } }).finally(err => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); uni.$u.toast(err.data.msg); }) } else { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); console.log('验证失败'); } }); diff --git a/pages/submission/components/subForm.vue b/pages/submission/components/subForm.vue index 9a04052..488a316 100644 --- a/pages/submission/components/subForm.vue +++ b/pages/submission/components/subForm.vue @@ -37,7 +37,7 @@ - 新增 @@ -90,9 +90,9 @@ export default { }, onShow() { this.$nextTick(() => { - this.$refs.BetLoading.show(); + this.BetLoading.show(); setTimeout(() => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); }, 1000); }); @@ -144,24 +144,18 @@ export default { }, // 报送提交 async submitBreakdown() { - // this.$refs.BetLoading.show(); + //this.BetLoading.show(); try { this.breakdownInfo.forEach((i, index) => { this.$refs[`breakdownForm${index}`][0].setRules(this.rules) this.$refs[`breakdownForm${index}`][0].validate(valid => { if (!valid) { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); validator = false return } else { // 判断是新提交还是修改 - - if (this.type == 'breakdownUpdate') { - this.updateInfo() - } - if (this.type == 'add') { this.submit() - } } }) @@ -176,14 +170,14 @@ export default { // 新提交 submit() { this.$u.api.workOrderSave(this.breakdownInfo).then(res => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); if (res.code == 200) { uni.navigateTo({ url: "/pages/submission/records", }); } }).catch(err => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); }) }, // 修改 @@ -193,14 +187,14 @@ export default { id: this.pageId } this.$u.api.workOrderupdate(query_).then(res => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); if (res.code == 200) { uni.redirectTo({ url: "/pages/submission/records", }); } }).catch(err => { - this.$refs.BetLoading.hide(); + this.BetLoading.hide(); }) } }, diff --git a/pages/submission/evaluate.vue b/pages/submission/evaluate.vue index b6f5c9f..44c7b1e 100644 --- a/pages/submission/evaluate.vue +++ b/pages/submission/evaluate.vue @@ -1,18 +1,30 @@ diff --git a/pages/submission/index.vue b/pages/submission/index.vue index c5eb147..a731c87 100644 --- a/pages/submission/index.vue +++ b/pages/submission/index.vue @@ -18,6 +18,7 @@ export default { }; }, + onLoad(options) { }, @@ -37,6 +38,6 @@ export default { background: #efefef; display: flex; flex-direction: column; - + } \ No newline at end of file diff --git a/pages/submission/records.vue b/pages/submission/records.vue index f34c1c8..2f4b28c 100644 --- a/pages/submission/records.vue +++ b/pages/submission/records.vue @@ -1,6 +1,6 @@