no message

src/packageWorkorder/pages/mixins/orderBtnsShow.js

@@ -37,8 +37,7 @@ export default {
           'DTJXSSPGP',
           'DZBSPGP',
           'DFZXPD',
-          'DFZXSPGP',
-          'FL'
+          'DFZXSPGP'
         ].includes(orderStatus)
       ) {
         // 待商户派工
@@ -63,7 +62,7 @@ export default {
       } else if (['YJS', 'LRCD'].includes(orderStatus)) {
         // 已结算
         return 'YJS'
-      } else if (['YQX', 'FWZT', 'YCGB', 'FWQX'].includes(orderStatus)) {
+      } else if (['YQX', 'FWZT', 'YCGB', 'FWQX', 'FL'].includes(orderStatus)) {
         // 已取消
         return 'YQX'
       }

src/packageWorkorder/pages/mixins/orderStatus_fh.js

@@ -0,0 +1,51 @@
+export default function (orderStatus, item) {
+  if (item?.isImportExcel && item?.isMeet === false) {
+    return 'DJD'
+  }
+  if (['DYY'].includes(orderStatus)) {
+    // 待预约
+    return 'DYY'
+  } else if (['DQD'].includes(orderStatus)) {
+    // 待抢单
+    return 'DQD'
+  } else if (
+    [
+      'DSHPG',
+      'CJ',
+      'YPD',
+      'DXSPD',
+      'DZBPG',
+      'DWDSPGP',
+      'DXSSPGP',
+      'DTJXSSPGP',
+      'DZBSPGP',
+      'DFZXPD',
+      'DFZXSPGP'
+    ].includes(orderStatus)
+  ) {
+    // 待商户派工
+    return 'DSHPG'
+  } else if (['DWDPG', 'DWDPD'].includes(orderStatus)) {
+    // 待网点派工
+    return 'DWDPG'
+  } else if (['DJD'].includes(orderStatus)) {
+    // 待接单
+    return 'DJD'
+  } else if (['FWZ', 'GCSZT', 'BFWG', 'DSM', 'YZP', 'WDBH', 'XSBH', 'TJXSBH', 'ZBBH', 'FZXBH'].includes(orderStatus)) {
+    // 服务中
+    return 'FWZ'
+  } else if (['YCD'].includes(orderStatus)) {
+    // 异常单
+    return 'YCD'
+  } else if (['YWG', 'GCSZX', 'WDWG', 'YWGO'].includes(orderStatus)) {
+    // 已完工待结算
+    return 'YWG'
+  } else if (['YJS', 'LRCD'].includes(orderStatus)) {
+    // 已结算
+    return 'YJS'
+  } else if (['YQX', 'FWZT', 'YCGB', 'FWQX', 'FL'].includes(orderStatus)) {
+    // 已取消
+    return 'YQX'
+  }
+  return ''
+}

src/packageWorkorder/pages/orderDetail.vue

@@ -720,6 +720,7 @@ import zhifutanchuan from '@/components/zhifutanchuan.vue'
 import { wxScanCode } from '@/common/utils/util.js'
 import { getStorage } from '@/common/utils/storage.js'
 import orderBtnsShow from './mixins/orderBtnsShow.js'
+import orderStatus_v from './mixins/orderStatus_fh.js'
 export default {
   mixins: [orderBtnsShow],
   components: {
@@ -788,60 +789,7 @@ export default {
       return getStorage('user')
     },
     orderStatus_v() {
-      if (this?.detail?.isImportExcel && this?.detail?.isMeet === false) {
-        return 'DJD'
-      }
-      if (['DYY'].includes(this?.detail?.orderStatus)) {
-        // 待预约
-        return 'DYY'
-      } else if (['DQD'].includes(this?.detail?.orderStatus)) {
-        // 待抢单
-        return 'DQD'
-      } else if (
-        [
-          'DSHPG',
-          'CJ',
-          'YPD',
-          'DXSPD',
-          'DZBPG',
-          'DWDSPGP',
-          'DXSSPGP',
-          'DTJXSSPGP',
-          'DZBSPGP',
-          'DFZXPD',
-          'DFZXSPGP',
-          'FL'
-        ].includes(this?.detail?.orderStatus)
-      ) {
-        // 待商户派工
-        return 'DSHPG'
-      } else if (['DWDPG', 'DWDPD'].includes(this?.detail?.orderStatus)) {
-        // 待网点派工
-        return 'DWDPG'
-      } else if (['DJD'].includes(this?.detail?.orderStatus)) {
-        // 待接单
-        return 'DJD'
-      } else if (
-        ['FWZ', 'GCSZT', 'BFWG', 'DSM', 'YZP', 'WDBH', 'XSBH', 'TJXSBH', 'ZBBH', 'FZXBH'].includes(
-          this?.detail?.orderStatus
-        )
-      ) {
-        // 服务中
-        return 'FWZ'
-      } else if (['YCD'].includes(this?.detail?.orderStatus)) {
-        // 异常单
-        return 'YCD'
-      } else if (['YWG', 'GCSZX', 'WDWG', 'YWGO'].includes(this?.detail?.orderStatus)) {
-        // 已完工待结算
-        return 'YWG'
-      } else if (['YJS', 'LRCD'].includes(this?.detail?.orderStatus)) {
-        // 已结算
-        return 'YJS'
-      } else if (['YQX', 'FWZT', 'YCGB', 'FWQX'].includes(this?.detail?.orderStatus)) {
-        // 已取消
-        return 'YQX'
-      }
-      return ''
+      return orderStatus_v(this?.detail?.orderStatus, this?.detail)
     }
   },
 

src/packageWorkorder/pages/orderList.vue

@@ -228,6 +228,7 @@ import zjDialogDateRangePicker from '@/components/zj-dialog/zj-dialog-dateRangeP
 import selectionWorkers from '@/components/selectionWorkers.vue'
 import { getStorage } from '@/common/utils/storage.js'
 import orderBtnsShow from './mixins/orderBtnsShow.js'
+import orderStatus_v from './mixins/orderStatus_fh.js'
 export default {
   mixins: [orderBtnsShow],
 
@@ -335,60 +336,7 @@ export default {
         inputDate.getDate() === today.getDate()
       )
     },
-    orderStatus_v(orderStatus, item) {
-      if (item?.isImportExcel && item?.isMeet === false) {
-        return 'DJD'
-      }
-      if (['DYY'].includes(orderStatus)) {
-        // 待预约
-        return 'DYY'
-      } else if (['DQD'].includes(orderStatus)) {
-        // 待抢单
-        return 'DQD'
-      } else if (
-        [
-          'DSHPG',
-          'CJ',
-          'YPD',
-          'DXSPD',
-          'DZBPG',
-          'DWDSPGP',
-          'DXSSPGP',
-          'DTJXSSPGP',
-          'DZBSPGP',
-          'DFZXPD',
-          'DFZXSPGP',
-          'FL'
-        ].includes(orderStatus)
-      ) {
-        // 待商户派工
-        return 'DSHPG'
-      } else if (['DWDPG', 'DWDPD'].includes(orderStatus)) {
-        // 待网点派工
-        return 'DWDPG'
-      } else if (['DJD'].includes(orderStatus)) {
-        // 待接单
-        return 'DJD'
-      } else if (
-        ['FWZ', 'GCSZT', 'BFWG', 'DSM', 'YZP', 'WDBH', 'XSBH', 'TJXSBH', 'ZBBH', 'FZXBH'].includes(orderStatus)
-      ) {
-        // 服务中
-        return 'FWZ'
-      } else if (['YCD'].includes(orderStatus)) {
-        // 异常单
-        return 'YCD'
-      } else if (['YWG', 'GCSZX', 'WDWG', 'YWGO'].includes(orderStatus)) {
-        // 已完工待结算
-        return 'YWG'
-      } else if (['YJS', 'LRCD'].includes(orderStatus)) {
-        // 已结算
-        return 'YJS'
-      } else if (['YQX', 'FWZT', 'YCGB', 'FWQX'].includes(orderStatus)) {
-        // 已取消
-        return 'YQX'
-      }
-      return ''
-    },
+    orderStatus_v,
     // 触发下拉刷新
     async refresherrefresh(e) {
       this.refresherTriggered = true

src/packageWorkorder/pages/search.vue

@@ -165,6 +165,7 @@
 import orderBtnsShow from './mixins/orderBtnsShow.js'
 import { getStorage } from '@/common/utils/storage.js'
 import selectionWorkers from '@/components/selectionWorkers.vue'
+import orderStatus_v from './mixins/orderStatus_fh.js'
 export default {
   mixins: [orderBtnsShow],
   components: {
@@ -216,60 +217,8 @@ export default {
         })
       }
     },
-    orderStatus_v(orderStatus, item) {
-      if (item?.isImportExcel && item?.isMeet === false) {
-        return 'DJD'
-      }
-      if (['DYY'].includes(orderStatus)) {
-        // 待预约
-        return 'DYY'
-      } else if (['DQD'].includes(orderStatus)) {
-        // 待抢单
-        return 'DQD'
-      } else if (
-        [
-          'DSHPG',
-          'CJ',
-          'YPD',
-          'DXSPD',
-          'DZBPG',
-          'DWDSPGP',
-          'DXSSPGP',
-          'DTJXSSPGP',
-          'DZBSPGP',
-          'DFZXPD',
-          'DFZXSPGP',
-          'FL'
-        ].includes(orderStatus)
-      ) {
-        // 待商户派工
-        return 'DSHPG'
-      } else if (['DWDPG', 'DWDPD'].includes(orderStatus)) {
-        // 待网点派工
-        return 'DWDPG'
-      } else if (['DJD'].includes(orderStatus)) {
-        // 待接单
-        return 'DJD'
-      } else if (
-        ['FWZ', 'GCSZT', 'BFWG', 'DSM', 'YZP', 'WDBH', 'XSBH', 'TJXSBH', 'ZBBH', 'FZXBH'].includes(orderStatus)
-      ) {
-        // 服务中
-        return 'FWZ'
-      } else if (['YCD'].includes(orderStatus)) {
-        // 异常单
-        return 'YCD'
-      } else if (['YWG', 'GCSZX', 'WDWG', 'YWGO'].includes(orderStatus)) {
-        // 已完工待结算
-        return 'YWG'
-      } else if (['YJS', 'LRCD'].includes(orderStatus)) {
-        // 已结算
-        return 'YJS'
-      } else if (['YQX', 'FWZT', 'YCGB', 'FWQX'].includes(orderStatus)) {
-        // 已取消
-        return 'YQX'
-      }
-      return ''
-    },
+
+    orderStatus_v,
 
     getList() {
       this.loadStatus = 1

src/packageWorkorder/pages/userWorkorderDetail.vue

@@ -15,7 +15,7 @@
           <u-steps
             :current="detail.serviceFlag"
             activeColor="#3D8FFD"
-            v-if="orderStatus_v(detail.orderStatus) !== 'YQX'"
+            v-if="orderStatus_v(detail.orderStatus, detail) !== 'YQX'"
           >
             <u-steps-item title="提单"></u-steps-item>
             <u-steps-item title="派工"></u-steps-item>
@@ -149,7 +149,7 @@
 
 <script>
 import Logistics from '@/components/logistics2/common-logistics.vue'
-
+import orderStatus_v from './mixins/orderStatus_fh.js'
 export default {
   components: {
     Logistics
@@ -184,57 +184,7 @@ export default {
   },
 
   methods: {
-    orderStatus_v(orderStatus) {
-      if (['DYY'].includes(orderStatus)) {
-        // 待预约
-        return 'DYY'
-      } else if (['DQD'].includes(orderStatus)) {
-        // 待抢单
-        return 'DQD'
-      } else if (
-        [
-          'DSHPG',
-          'CJ',
-          'YPD',
-          'DXSPD',
-          'DZBPG',
-          'DWDSPGP',
-          'DXSSPGP',
-          'DTJXSSPGP',
-          'DZBSPGP',
-          'DFZXPD',
-          'DFZXSPGP',
-          'FL'
-        ].includes(orderStatus)
-      ) {
-        // 待商户派工
-        return 'DSHPG'
-      } else if (['DWDPG', 'DWDPD'].includes(orderStatus)) {
-        // 待网点派工
-        return 'DWDPG'
-      } else if (['DJD'].includes(orderStatus)) {
-        // 待接单
-        return 'DJD'
-      } else if (
-        ['FWZ', 'GCSZT', 'BFWG', 'DSM', 'YZP', 'WDBH', 'XSBH', 'TJXSBH', 'ZBBH', 'FZXBH'].includes(orderStatus)
-      ) {
-        // 服务中
-        return 'FWZ'
-      } else if (['YCD'].includes(orderStatus)) {
-        // 异常单
-        return 'YCD'
-      } else if (['YWG', 'GCSZX', 'WDWG', 'YWGO'].includes(orderStatus)) {
-        // 已完工待结算
-        return 'YWG'
-      } else if (['YJS', 'LRCD'].includes(orderStatus)) {
-        // 已结算
-        return 'YJS'
-      } else if (['YQX', 'FWZT', 'YCGB', 'FWQX'].includes(orderStatus)) {
-        // 已取消
-        return 'YQX'
-      }
-      return ''
-    },
+    orderStatus_v,
     // 获取详情
     async getDetail() {
       return new Promise((resolve, reject) => {
@@ -272,7 +222,10 @@ export default {
                 content: `预约时间：${data.appointmentTime.slice(0, 10)}`
               })
             }
-            if (this.orderStatus_v(data.orderStatus) == 'YWG' || this.orderStatus_v(data.orderStatus) == 'YJS') {
+            if (
+              this.orderStatus_v(data.orderStatus, data) == 'YWG' ||
+              this.orderStatus_v(data.orderStatus, data) == 'YJS'
+            ) {
               list.unshift({
                 title: '服务完成',
                 time: data.overTime,
@@ -291,7 +244,7 @@ export default {
                 content: `评价结果：${MAP[data.appraiseStatus]}`
               })
             }
-            if (this.orderStatus_v(data.orderStatus) == 'YQX') {
+            if (this.orderStatus_v(data.orderStatus, data) == 'YQX') {
               list.unshift({
                 title: '取消工单',
                 time: data.lastOperatorTime,

src/packageWorkorder/pages/userWorkorderList.vue

@@ -62,17 +62,17 @@
         </view>
 
         <!-- 按钮：待预约 -->
-        <view class="btn-group" v-if="orderStatus_v(item.orderStatus) === 'DYY'">
+        <view class="btn-group" v-if="orderStatus_v(item.orderStatus, item) === 'DYY'">
           <div class="button red" @tap.stop="toBook(item.id, 1)">立即预约</div>
         </view>
         <!-- 按钮：服务中 -->
-        <view class="btn-group" v-else-if="orderStatus_v(item.orderStatus) === 'FWZ'">
+        <view class="btn-group" v-else-if="orderStatus_v(item.orderStatus, item) === 'FWZ'">
           <div class="button red" @tap.stop="toBook(item.id, 2)">改约</div>
         </view>
         <!-- 按钮：待评价 -->
         <view
           class="btn-group"
-          v-else-if="orderStatus_v(item.orderStatus) === 'YWG' || orderStatus_v(item.orderStatus) === 'YJS'"
+          v-else-if="orderStatus_v(item.orderStatus, item) === 'YWG' || orderStatus_v(item.orderStatus, item) === 'YJS'"
         >
           <!-- <div class="button gray" v-if="item.pay_confirm_path" @tap.stop="$navPage(`/pages/mine/workOrder/receipt?imgurl=${item.pay_confirm_path}`)">查看收据</div> -->
           <div class="button white" @tap.stop="toAppraise(item.id)" v-if="item.appraiseStatus == 'N'">评价</div>
@@ -81,7 +81,7 @@
         <!-- 按钮：已完成 -->
         <view
           class="btn-group"
-          v-else-if="orderStatus_v(item.orderStatus) === 'YWG' || orderStatus_v(item.orderStatus) === 'YJS'"
+          v-else-if="orderStatus_v(item.orderStatus, item) === 'YWG' || orderStatus_v(item.orderStatus, item) === 'YJS'"
         >
           <!-- <div class="button gray" v-if="item.pay_confirm_path" @tap.stop="$navPage(`/pages/mine/workOrder/receipt?imgurl=${item.pay_confirm_path}`)">查看收据</div> -->
           <div class="button white" @tap.stop="toAppraise(item.id)" v-if="item.appraiseStatus == 'N'">评价</div>
@@ -96,6 +96,7 @@
 </template>
 
 <script>
+import orderStatus_v from './mixins/orderStatus_fh.js'
 export default {
   data() {
     return {
@@ -141,57 +142,7 @@ export default {
   },
 
   methods: {
-    orderStatus_v(orderStatus) {
-      if (['DYY'].includes(orderStatus)) {
-        // 待预约
-        return 'DYY'
-      } else if (['DQD'].includes(orderStatus)) {
-        // 待抢单
-        return 'DQD'
-      } else if (
-        [
-          'DSHPG',
-          'CJ',
-          'YPD',
-          'DXSPD',
-          'DZBPG',
-          'DWDSPGP',
-          'DXSSPGP',
-          'DTJXSSPGP',
-          'DZBSPGP',
-          'DFZXPD',
-          'DFZXSPGP',
-          'FL'
-        ].includes(orderStatus)
-      ) {
-        // 待商户派工
-        return 'DSHPG'
-      } else if (['DWDPG', 'DWDPD'].includes(orderStatus)) {
-        // 待网点派工
-        return 'DWDPG'
-      } else if (['DJD'].includes(orderStatus)) {
-        // 待接单
-        return 'DJD'
-      } else if (
-        ['FWZ', 'GCSZT', 'BFWG', 'DSM', 'YZP', 'WDBH', 'XSBH', 'TJXSBH', 'ZBBH', 'FZXBH'].includes(orderStatus)
-      ) {
-        // 服务中
-        return 'FWZ'
-      } else if (['YCD'].includes(orderStatus)) {
-        // 异常单
-        return 'YCD'
-      } else if (['YWG', 'GCSZX', 'WDWG', 'YWGO'].includes(orderStatus)) {
-        // 已完工待结算
-        return 'YWG'
-      } else if (['YJS', 'LRCD'].includes(orderStatus)) {
-        // 已结算
-        return 'YJS'
-      } else if (['YQX', 'FWZT', 'YCGB', 'FWQX'].includes(orderStatus)) {
-        // 已取消
-        return 'YQX'
-      }
-      return ''
-    },
+    orderStatus_v,
 
     async getList() {
       return new Promise((resolve, reject) => {
@@ -242,17 +193,17 @@ export default {
     },
 
     getStatus(item) {
-      if (this.orderStatus_v(item.orderStatus) == 'DYY') {
+      if (this.orderStatus_v(item.orderStatus, item) == 'DYY') {
         return '待预约'
-      } else if (this.orderStatus_v(item.orderStatus) == 'FWZ') {
+      } else if (this.orderStatus_v(item.orderStatus, item) == 'FWZ') {
         return '服务中'
       } else if (
-        (this.orderStatus_v(item.orderStatus) == 'YWG' || this.orderStatus_v(item.orderStatus) == 'YJS') &&
+        (this.orderStatus_v(item.orderStatus, item) == 'YWG' || this.orderStatus_v(item.orderStatus, item) == 'YJS') &&
         item.appraiseStatus == 'N'
       ) {
         return '待评价'
       } else if (
-        (this.orderStatus_v(item.orderStatus) == 'YWG' || this.orderStatus_v(item.orderStatus) == 'YJS') &&
+        (this.orderStatus_v(item.orderStatus, item) == 'YWG' || this.orderStatus_v(item.orderStatus, item) == 'YJS') &&
         item.appraiseStatus != 'N'
       ) {
         return '已完成'