Commit dd17c51d authored by Facius's avatar Facius

Merge branch 'dev-1.4.3' into test

parents fb007aaf da190585
...@@ -295,13 +295,13 @@ export default { ...@@ -295,13 +295,13 @@ export default {
orderType() { orderType() {
/* /*
orderStatus: orderStatus:
待接单 orderStatus<31 工单状态小于31 待接单 orderStatus<31 工单状态小于31
待预约 orderStatus == 31 and appointmentDatetime == null 工单状态等于30并且预约时间为空 待预约 orderStatus == 31 and appointmentDatetime == null 工单状态等于30并且预约时间为空
待签到 orderStatus == 31 and appointmentDatetime is not null 工单状态等于30并且预约时间不为空 待签到 orderStatus == 31 and appointmentDatetime is not null 工单状态等于30并且预约时间不为空
待完工 orderStatus >31 and orderStatus < 80 工单状态大于31 小于80 待完工 orderStatus >31 and orderStatus < 80 工单状态大于31 小于80
审核中 orderStatus ==85 or orderStatus == 87 工单状态 等于85 或者 等于有87 审核中 orderStatus ==85 or orderStatus == 87 or orderStatus == 88 工单状态 等于85 或者 等于有87
异常 orderStatus ==86 or orderStatus == 88 工单状态 等于86 或者 等于有88 异常 orderStatus ==86 工单状态 等于86
已完工 orderStatus in(80,81,89,110) 工单状态 等于80 or 81 or 89 or 110 已完工 orderStatus in(80,81,89,110) 工单状态 等于80 or 81 or 89 or 110
*/ */
if (!this.type) { if (!this.type) {
if (this.orderData.orderStatus < 31) { if (this.orderData.orderStatus < 31) {
...@@ -319,13 +319,11 @@ export default { ...@@ -319,13 +319,11 @@ export default {
return 3 return 3
} else if ( } else if (
this.orderData.orderStatus == 85 || this.orderData.orderStatus == 85 ||
this.orderData.orderStatus == 87 this.orderData.orderStatus == 87 ||
this.orderData.orderStatus == 88
) { ) {
return 4 return 4
} else if ( } else if ( this.orderData.orderStatus == 86) {
this.orderData.orderStatus == 86 ||
this.orderData.orderStatus == 88
) {
return 5 return 5
} else if ( } else if (
[80, 81, 89, 110].indexOf(this.orderData.orderStatus) != -1 [80, 81, 89, 110].indexOf(this.orderData.orderStatus) != -1
......
...@@ -210,6 +210,7 @@ export default { ...@@ -210,6 +210,7 @@ export default {
// tab栏切换 // tab栏切换
change(index) { change(index) {
this.current = index this.current = index
this.orderList = []
this.reloadOrderList() this.reloadOrderList()
}, },
......
...@@ -550,7 +550,7 @@ export default { ...@@ -550,7 +550,7 @@ export default {
}, },
computed: { computed: {
readOnly() { readOnly() {
return [80, 81, 85, 87, 89, 110].indexOf(Number(this.orderStatus)) != -1 return [80, 81, 85, 87, 89, 88, 110].indexOf(Number(this.orderStatus)) != -1
}, },
tabList() { tabList() {
// 没有数据的时候tab要有占位数据,不然有页面有晃动 // 没有数据的时候tab要有占位数据,不然有页面有晃动
...@@ -649,7 +649,7 @@ export default { ...@@ -649,7 +649,7 @@ export default {
// this.showTab = this.list.length > 1 // this.showTab = this.list.length > 1
// 异常单处理 // 异常单处理
if (this.orderStatus === '88' || this.orderStatus === '86'){ if (this.orderStatus === '86'){
if (this.auditResults.length === 0) { if (this.auditResults.length === 0) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '未找到不通过项', title: '未找到不通过项',
......
...@@ -607,9 +607,9 @@ ...@@ -607,9 +607,9 @@
// 完工 // 完工
this.type = 'waitFinish' this.type = 'waitFinish'
this.submitType = "toFilish" this.submitType = "toFilish"
}else if (orderStatus == 85 || orderStatus == 87) { // 审核中 }else if (orderStatus == 85 || orderStatus == 87 || orderStatus == 88) { // 审核中
this.type = 'audit' this.type = 'audit'
} else if (orderStatus == 86 || orderStatus == 88) { // 异常单 } else if (orderStatus == 86) { // 异常单
this.type = 'exception' this.type = 'exception'
} else if ([80, 81, 89, 110].indexOf(orderStatus) != -1) { // 已完工 } else if ([80, 81, 89, 110].indexOf(orderStatus) != -1) { // 已完工
this.type = 'finish' this.type = 'finish'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment