Merge branch 'dev-1.4.5' into test

src/components/order/index.vue

@@ -299,7 +299,7 @@ export default {
 					待预约	orderStatus == 31  and appointmentDatetime == null								工单状态等于30并且预约时间为空
 					待签到	orderStatus == 31  and appointmentDatetime is not null							工单状态等于30并且预约时间不为空
 					待完工	orderStatus >31 and orderStatus < 80											工单状态大于31 小于80
-					审核中	orderStatus ==85 or  orderStatus == 87	 or  orderStatus == 88					工单状态 等于85 或者 等于87 或者 等于88
+					审核中	orderStatus ==83 or  orderStatus == 87	 or  orderStatus == 88					工单状态 等于85 或者 等于87 或者 等于88
 					异常		orderStatus ==86																工单状态 等于86
 					已完工	orderStatus in(80,81,89,110)													工单状态 等于80 or 81 or 89 or 110
 				*/
@@ -318,12 +318,13 @@ export default {
         ) {
           return 3
         } else if (
+          this.orderData.orderStatus == 83 ||
           this.orderData.orderStatus == 85 ||
-          this.orderData.orderStatus == 87 ||
-		  this.orderData.orderStatus == 88
+          this.orderData.orderStatus == 87 ||
+          this.orderData.orderStatus == 88
         ) {
           return 4
-        } else if ( this.orderData.orderStatus == 86) {
+        } else if (this.orderData.orderStatus == 86) {
           return 5
         } else if (
           [80, 81, 89, 110].indexOf(this.orderData.orderStatus) != -1

src/pages/order/complete.vue

@@ -550,7 +550,8 @@ export default {
     },
     readOnly() {
       return (
-        [80, 81, 85, 87, 89, 88, 110].indexOf(Number(this.orderStatus)) != -1
+        [80, 81, 83, 85, 87, 89, 88, 110].indexOf(Number(this.orderStatus)) !=
+        -1
       )
     },
     tabList() {
@@ -968,7 +969,6 @@ export default {
           resolve(true)
         }
       })
-      
     },
     // 提交订单
     orderFinish() {
@@ -982,7 +982,8 @@ export default {
       this.$u.api.saveCompleteData(param, this.orderId).then(async (res) => {
         if (res.code == 200) {
           //完工项信息保存成功再次完工工单
-          if (!this.exception) { // 核销配件
+          if (!this.exception) {
+            // 核销配件
             const submitPart = await this.submitParts()
             if (!submitPart) return
           }
@@ -990,7 +991,6 @@ export default {
           if (this.inGuaranteePeriod === 'Y') {
             this.$u.api.inOrderFinish(this.orderId).then((res) => {
               if (res.code == 200) {
-                
                 this.$refs.uToast.show({
                   title: '提交成功',
                   type: 'success',