From 893e54de6d608d182d2a87924fac1fb0faa73b50 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 12 Dec 2024 14:08:40 +0800
Subject: [PATCH] 1

---
 config.js                                 |   4 +-
 pages-home/home/home.vue                  |  30 +-
 pages-order/orderList/orderList-back.vue  | 584 ++++++++++++++++++++++
 pages-order/orderList/orderSimpleList.vue | 320 ++++++++++++
 pages.json                                |   6 +
 5 files changed, 934 insertions(+), 10 deletions(-)
 create mode 100644 pages-order/orderList/orderList-back.vue
 create mode 100644 pages-order/orderList/orderSimpleList.vue

diff --git a/config.js b/config.js
index 7b3b4c0..e8e6698 100644
--- a/config.js
+++ b/config.js
@@ -1,9 +1,9 @@
 // 应用全局配置
 module.exports = {
-	baseUrl: 'https://www.nuoyunr.com',
+	// baseUrl: 'https://www.nuoyunr.com',
 	// baseUrl: 'http://124.222.105.7:48080',
 	// baseUrl: 'http://192.168.1.4:48080',
-	// baseUrl: "http://localhost:48080",
+	baseUrl: "http://localhost:48080",
 	// baseUrl: "http://rzqhb7.natappfree.cc",
 	imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
 	baseImageUrl: 'https://www.nuoyunr.com/minio/',
diff --git a/pages-home/home/home.vue b/pages-home/home/home.vue
index 6d75c03..ac1d5b0 100644
--- a/pages-home/home/home.vue
+++ b/pages-home/home/home.vue
@@ -72,17 +72,17 @@
       </view>
       <!-- 总检角色和维修业务管理员 -->
       <view class="orderCount" v-if="userInfo.roleCodes.includes('general_inspection') || userInfo.roleCodes.includes('weixiu')">
-        <view class="orderCountItem">
+        <view class="orderCountItem" @click="viewOrder(bossNum.workingIdList)">
           <text class="label">维修中</text>
           <text class="value">{{ bossNum.workingNum }}</text>
         </view>
 <!--        <view class="line"></view>-->
-        <view class="orderCountItem">
+        <view class="orderCountItem" @click="viewOrder(bossNum.noPayIdList)">
           <text class="label">未结算</text>
           <text class="value">{{ bossNum.noPayNum }}</text>
         </view>
 <!--        <view class="line"></view>-->
-        <view class="orderCountItem">
+        <view class="orderCountItem" @click="viewOrder(bossNum.inCompanyIdList)">
           <text class="label">在厂数</text>
           <text class="value">{{ bossNum.inCompanyNum }}</text>
         </view>
@@ -122,17 +122,17 @@
 <!--          </view>-->
 <!--        </view>-->
         <view class="orderCount" >
-          <view class="orderCountItem">
+          <view class="orderCountItem" @click="viewOrder(bossNum.newOrderIdList)">
             <text class="label">进厂数</text>
             <text class="value">{{ bossNum.newOrderNum }}</text>
           </view>
 <!--          <view class="line"></view>-->
-          <view class="orderCountItem">
+          <view class="orderCountItem" @click="viewOrder(bossNum.overIdList)">
             <text class="label">已竣工</text>
             <text class="value">{{ bossNum.overNum }}</text>
           </view>
 <!--          <view class="line"></view>-->
-          <view class="orderCountItem">
+          <view class="orderCountItem" @click="viewOrder(bossNum.giveCusIdList)">
             <text class="label">已交车</text>
             <text class="value">{{ bossNum.giveCusNum }}</text>
           </view>
@@ -141,7 +141,7 @@
       <!-- 服务顾问角色 -->
       <view class="orderCount" v-if="userInfo.roleCodes.includes('service_advisor') || userInfo.roleCodes.includes('weixiu')|| userInfo.roleCodes.includes('general_inspection')" @click="serviceWork">
         <view class="orderCountItem">
-          <view class="label">待审批配件申请单<view class="number-box">{{serviceNum}}</view></view>
+          <view class="label">待审批配件单<view class="number-box">{{serviceNum}}</view></view>
         </view>
 <!--        <view class="orderCountItem">-->
 <!--          <view class="label">待办工单<view class="number-box">{{total}}</view></view>-->
@@ -311,11 +311,17 @@ export default {
       //总检查看维修中、已竣工的工单数量
       bossNum:{
         workingNum:0,
+        workingIdList:[],
         inCompanyNum:0,
+        inCompanyIdList:[],
         newOrderNum:0,
+        newOrderIdList:[],
         overNum:0,
+        overIdList:[],
         giveCusNum:0,
-        noPayNum:0
+        giveCusIdList:[],
+        noPayNum:0,
+        noPayIdList:0
       },
       defaultAvatar: require('@/static/icons/avatar.png'),
       //未读消息数量
@@ -400,6 +406,14 @@ export default {
     }
   },
   methods: {
+    viewOrder(idList){
+      if(idList.length>0){
+        setJSONData("orderIdList",idList)
+        uni.navigateTo({
+          url: '/pages-order/orderList/orderSimpleList'
+        })
+      }
+    },
     /**
      * 切换客户来源
      */
diff --git a/pages-order/orderList/orderList-back.vue b/pages-order/orderList/orderList-back.vue
new file mode 100644
index 0000000..3fbb167
--- /dev/null
+++ b/pages-order/orderList/orderList-back.vue
@@ -0,0 +1,584 @@
+<template>
+  <view class="container">
+    <view class="body">
+      <view class="tabList">
+        <view v-for="(item, index) in tabList" :key="index" :class="{actived: item.id === activeKey}" class="tabItem"
+              @click.stop="changeTabFun(item.id)">
+          {{ item.title }}
+          <text v-if="activeKey === item.id">({{total}})</text>
+          <view v-if="activeKey === item.id" class="activeLine"></view>
+        </view>
+      </view>
+      <view class="header" v-if="!isRepairWarehouse && activeKey==1">
+        <view class="searchBox">
+          <input class="searchInput" type="text" v-model="searchText" placeholder="工单号、车牌号、手机号、客户姓名" placeholder-style="font-size: 28rpx">
+<!--          <text class="searchBtn" @click="onRefresherrefresh">搜索</text>-->
+          <text class="searchBtn" @click="clearText">清空</text>
+        </view>
+        <uni-datetime-picker v-model="range" type="daterange" @maskClick="maskClick" />
+        <view class="body-top-tab">
+          <view  class="body-top-tab-item">
+            <picker @change="bindCusFromChange" :value="cusFromIndex" :range="cusFromList">
+              <view class="uni-input">{{cusFromList[cusFromIndex]}}</view>
+            </picker>
+          </view>
+          <view class="line"></view>
+          <view  class="body-top-tab-item">
+            <picker @change="bindRepairTypeChange" :value="repairTypeIndex" :range="repairTypeList">
+              <view class="uni-input">{{repairTypeList[repairTypeIndex]}}</view>
+            </picker>
+          </view>
+          <view class="line"></view>
+          <view  class="body-top-tab-item">
+            <picker @change="bindTicketsStatusChange" :value="ticketsStatusIndex" :range="ticketsStatusList">
+              <view class="uni-input">{{ticketsStatusList[ticketsStatusIndex]}}</view>
+            </picker>
+          </view>
+        </view>
+      </view>
+      <view class="orderList" v-if="!isRepairWarehouse && activeKey==1">
+        <scroll-view scroll-y="true" style="height: 100%" class="itemContent" @scrolltolower="onReachBottomCus"
+                     refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
+          <order-card :userInfo="userInfo" v-for="(item, index) in orderList" :key="index" :order="item" @childEvent="onRefresherrefresh" @startWork="startWork"></order-card>
+          <view style="text-align: center" v-if="orderList.length==0">
+            <image class=""  src="@/static/images/nothing.png" ></image>
+          </view>
+        </scroll-view>
+      </view>
+      <view class="orderList" style="height: calc(100% - 86rpx)" v-if="!isRepairWarehouse && activeKey==0">
+        <scroll-view  scroll-y="true" style="height: 100%" class="itemContent" @scrolltolower="onReachBottomCus"
+                     refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
+          <order-card :userInfo="userInfo" v-for="(item, index) in orderList" :key="index" :order="item" @childEvent="onRefresherrefresh" @startWork="startWork"></order-card>
+          <view style="text-align: center" v-if="orderList.length==0">
+            <image class=""  src="@/static/images/nothing.png" ></image>
+          </view>
+        </scroll-view>
+      </view>
+      <view class="orderList" v-else>
+        <scroll-view scroll-y="true" style="height: 100%" class="itemContent" @scrolltolower="onReachBottomCus"
+                     refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
+          <repair-so-card v-for="(item, index) in repairSoList" :key="index" :order="item" @childEvent="onRefresherrefresh" @startWork="startWork"></repair-so-card>
+          <view style="text-align: center" v-if="repairSoList.length==0">
+            <image class=""  src="@/static/images/nothing.png" ></image>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+    <tabBarVue v-if="isRepairWarehouse" title="采购单" msg="2"></tabBarVue>
+    <tabBarVue v-else msg="2"></tabBarVue>
+  </view>
+</template>
+
+<script>
+import VNavigationBar from '@/components/VNavigationBar.vue'
+import tabBarVue from '@/components/tabBar/tabBar.vue'
+import OrderCard from "@/components/orderCard.vue";
+import request from '@/utils/request';
+import {formatTimestamp,getOrderStatusText,builderOrder,saveTicketsRecords} from "@/utils/utils";
+import {
+  getToken,
+  getUserInfo,
+  getStrData,
+  getTenantId,
+  getStorageWithExpiry,
+  setStorageWithExpiry
+} from '@/utils/auth'
+import RepairSoCard from "@/components/repairSoCard.vue";
+
+export default {
+  components: {
+    OrderCard,
+    tabBarVue,
+    VNavigationBar,
+    RepairSoCard
+  },
+  data() {
+    return {
+      searchText:"",
+      payShow: false,
+      activeKey: 0,
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      isRepairWarehouse : false, //是否是仓库管理员
+      //下来刷新状态
+      isTriggered:false,
+      //日期默认选中范围
+      range: [],
+      imageUrl: '',
+      tabList: [
+        {
+          id: 0,
+          title: '待处理'
+        },
+        {
+          id: 1,
+          title: '全部'
+        },
+      ],
+      orderList: [
+      ],
+      repairSoList: [],
+      userInfo:{},
+      //维修项目可选值
+      repairTypeList:['按维修类别'],
+      //维修项目可选值--值
+      repairTypeValueList:[''],
+      // 维修项目选中下标
+      repairTypeIndex:0,
+      //客户来源可选值
+      cusFromList:['按客户来源'],
+      //客户来源可选值---值
+      cusFromValueList:[''],
+      // 客户来源选中下标
+      cusFromIndex:0,
+      //工单状态可选值
+      ticketsStatusList:['按工单状态','进厂','维修中','已竣工','已交车','未结算','在厂'],
+      //工单状态可选值--值
+      ticketsStatusValueList:['','jinchang','weixiuzhong','yijungong','yijiaoche','weijiesuan','zaichang'],
+      //工单状态选中下标
+      ticketsStatusIndex:0,
+      twId: null,
+    }
+  },
+  watch: {
+    range(newval) {
+      this.onRefresherrefresh()
+    },
+    searchText(newval) {
+      this.onRefresherrefresh()
+    },
+    repairTypeIndex(newval) {
+      this.onRefresherrefresh()
+    },
+    cusFromIndex(newval) {
+      this.onRefresherrefresh()
+    },
+    ticketsStatusIndex(newval) {
+      this.onRefresherrefresh()
+    },
+  },
+  onLoad(data){
+    if (data && data.twId){
+      this.twId = data.twId
+    }else {
+      this.twId = null
+    }
+    if(!getToken()){
+      uni.reLaunch({
+        url: '/pages/login/login'
+      })
+    }else{
+      //直接取缓存中的用户信息
+      this.userInfo = getUserInfo()
+      if (this.userInfo.roleCodes.includes("repair_warehouse")){
+        this.tabList = [
+          {
+            id: 0,
+            title: '采购单'
+          },
+        ]
+        this.isRepairWarehouse = true
+      }
+      //查2个数据字典备用---客户注册方式-cus_sign_type、维修业务分类-repair_type
+      this.initDict("repair_type")
+      this.initDict("cus_sign_type")
+      // this.initDict("repair_tickets_status")
+    }
+  },
+  onShow() {
+    if(!getToken()){
+      uni.reLaunch({
+        url: '/pages/login/login'
+      })
+    }else{
+      this.onRefresherrefresh()
+    }
+  },
+  methods: {
+    maskClick(e){
+      console.log('maskClick事件:', e);
+    },
+    /**
+     * 切换客户来源
+     */
+    bindCusFromChange(e){
+      this.cusFromIndex = e.detail.value
+      // this.onRefresherrefresh()
+    },
+    /**
+     * 切换维修项目类型
+     */
+    bindRepairTypeChange(e){
+      this.repairTypeIndex = e.detail.value
+      // this.onRefresherrefresh()
+    },
+    /**
+     * 切换工单状态
+     */
+    bindTicketsStatusChange(e){
+      this.ticketsStatusIndex = e.detail.value
+      // this.onRefresherrefresh()
+    },
+    /**
+     * 查2个数据字典备用---客户注册方式-cus_sign_type、维修业务分类-repair_type
+     */
+    initDict(dictCode){
+      let dictArray = getStorageWithExpiry(dictCode);
+      if(null==dictArray || undefined==dictArray){
+        request({
+          url: '/admin-api/system/dict-data/type',
+          method: 'get',
+          params:{type:dictCode}
+        }).then((res) => {
+          if (res.code == 200) {
+            setStorageWithExpiry(dictCode,res.data,3600)
+            this.$nextTick(()=>{
+              res.data.map(item=>{
+                this.setDictItem(dictCode,item)
+              })
+            })
+          }
+        })
+      }else{
+        this.$nextTick(()=>{
+          dictArray.map(item=>{
+            this.setDictItem(dictCode,item)
+          })
+        })
+      }
+    },
+    setDictItem(dictCode,item){
+      if("repair_type"==dictCode){
+        //维修项目
+        this.repairTypeList.push(item.label)
+        this.repairTypeValueList.push(item.value)
+      }else if("cus_sign_type"==dictCode){
+        //客户来源
+        this.cusFromList.push(item.label)
+        this.cusFromValueList.push(item.value)
+      }else if("repair_tickets_status"==dictCode){
+        //工单状态
+        this.ticketsStatusList.push(item.label)
+        this.ticketsStatusValueList.push(item.value)
+      }
+    },
+    /**
+     * 上滑加载数据
+     */
+    onReachBottomCus() {
+      //判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
+      if (this.pageNo * this.pageSize >= this.total) {
+        uni.$u.toast('没有更多数据了')
+        return
+      }
+      //页码+1,调用获取数据的方法获取第二页数据
+      this.pageNo++
+      //此处调用自己获取数据列表的方法
+      if(this.repairSoList.length>0 || this.orderList.length>0){
+        if (this.isRepairWarehouse) {
+          this.getRepairSoList()
+        }else{
+          this.getOrderList()
+        }
+      }
+    },
+    /**
+     * 下拉刷新数据
+     */
+    onRefresherrefresh(){
+      this.isTriggered = true
+      this.pageNo = 1
+      this.total = 0
+      if (this.isRepairWarehouse) {
+        this.getRepairSoList()
+        this.repairSoList = []
+      }else{
+        this.getOrderList()
+        this.orderList = []
+      }
+    },
+    /**
+     * 清空
+     */
+    clearText(){
+      this.searchText = ""
+    },
+    /**
+     * 开始施工
+     */
+    startWork(id){
+      let paramsObj = {ticketId:id}
+      //先查当前用户在本工单下有几个维修项目
+      request({
+        url: '/admin-api/repair/titem/listProject',
+        method: 'get',
+        params:paramsObj
+      }).then((res) => {
+        console.log(res)
+        if (res.code == 200 && res.data.length>0) {
+          if(res.data.length==1){
+            //只有1个，直接开始施工
+            this.startWorkRequest(id,"02",res.data[0].id,"02","kssg","开始施工")
+          }else{
+            uni.showActionSheet({
+              itemList: res.data.map(m => m.itemName),
+              success: ({
+                          tapIndex
+                        }) => {
+                this.startWorkRequest(id,"02",res.data[tapIndex].id,"02","kssg","开始施工")
+              }
+            })
+          }
+        }else{
+          uni.showToast({
+            title: '操作失败，请联系管理员',
+            icon: 'none'
+          })
+        }
+      })
+    },
+    /**
+     * 开始施工请求后台
+     */
+    async startWorkRequest(id,ticketsWorkStatus,itemId,itemStatus,recordType,remark){
+      try {
+        const result = await saveTicketsRecords(id,ticketsWorkStatus,itemId,itemStatus,recordType,remark,null);
+        console.error("result",result);
+        this.onRefresherrefresh()
+      } catch (error) {
+        console.error(error);
+      }
+    },
+    getOrderList(){
+      let paramsObj = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        isFinish: "0",
+        cusFrom: this.cusFromValueList[this.cusFromIndex],
+        repairType: this.repairTypeValueList[this.repairTypeIndex],
+        ticketsStatus: this.ticketsStatusValueList[this.ticketsStatusIndex]
+      }
+      console.log("this.searchText",this.searchText)
+      if(''!=this.searchText){
+        paramsObj['ticketNo'] = this.searchText
+      }
+      if(this.range.length==2){
+        paramsObj['startDate'] = this.range[0]
+        paramsObj['endDate'] = this.range[1]
+      }
+      if(1==this.activeKey){
+        //查所有订单
+        paramsObj['selectType'] = "all"
+      }
+      request({
+        url: '/admin-api/repair/tickets/pageType',
+        method: 'get',
+        params:paramsObj
+      }).then((res) => {
+        console.log(res)
+        if (res.code == 200) {
+          let thisPageRecords = []
+          if(res.data && res.data.hasOwnProperty("records")){
+            for (let i = 0; i < res.data.records.length; i++) {
+              let order = res.data.records[i]
+              let viewOrder = builderOrder(order)
+              if(order.booking){
+                viewOrder['appointDate'] = formatTimestamp(order.createTime)
+              }
+              let projectList = []
+              if(order.itemList){
+                for (let j = 0; j < order.itemList.length; j++) {
+                  let itemObj = order.itemList[j]
+                  if("01"==itemObj.itemType){
+                    projectList.push({
+                      id:itemObj.id,
+                      name:itemObj.itemName
+                    })
+                  }
+                }
+              }
+              viewOrder['projectList'] = projectList
+              thisPageRecords.push(viewOrder)
+            }
+          }
+          //判断 如果获取的数据的页码不是第一页，就让之前赋值获取过的数组数据 concat连接 刚获取的第n页数据
+          if (this.pageNo != 1) {
+            this.orderList = this.orderList.concat(thisPageRecords)
+          } else {
+            this.orderList = thisPageRecords
+          }
+          //将获取的总条数赋值
+          this.total = res.data.total
+          this.isTriggered = false
+        }
+      })
+    },
+    changeTabFun(id) {
+      this.activeKey = id
+      this.onRefresherrefresh()
+    },
+    gotoDetail(row) {
+      if (row.goodsType === '2') {
+        uni.navigateTo({
+          url: '/pages-order/orderDetail/orderDetail?ticketsId=' + row.goodsId
+        })
+      } else {
+        uni.navigateTo({
+          url: '/pages-order/orderDetail/orderDetail'
+        })
+      }
+    },
+    /**
+     * 获取采购单
+     */
+    getRepairSoList(){
+      const paramsObj = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        userId: this.userInfo.id,
+        soType: "01"
+      }
+      if (this.twId){
+        paramsObj.twId = this.twId
+      }
+      request({
+        url: '/admin-api/repair/so/page',
+        method: 'get',
+        params: paramsObj
+      }).then((res) => {
+
+        //判断 如果获取的数据的页码不是第一页，就让之前赋值获取过的数组数据 concat连接 刚获取的第n页数据
+        if (this.pageNo != 1) {
+          this.repairSoList = this.repairSoList.concat(res.data.records)
+        } else {
+          this.repairSoList = res.data.records
+        }
+        //将获取的总条数赋值
+        this.total = res.data.total
+        this.isTriggered = false
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.container {
+  height: 100%;
+  background: #F3F5F7;
+  display: flex;
+  flex-direction: column;
+  color: #333333;
+
+  .header {
+    padding: 20rpx 32rpx 0 32rpx;
+    background-color: #fff;
+
+    .searchBox {
+      background: #F3F5F7;
+      padding: 20rpx 32rpx;
+      border-radius: 12rpx 12rpx 12rpx 12rpx;
+      display: flex;
+      align-items: center;
+      column-gap: 12rpx;
+      .searchInput {
+        flex: 1;
+        width: 0;
+      }
+      .searchBtn {
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #0174F6;
+      }
+    }
+  }
+
+  .body {
+    flex: 1;
+    height: 0;
+    padding: 24rpx 32rpx;
+    overflow: auto;
+  }
+
+  .body-top-tab {
+    background: white;
+    display: flex;
+    font-size: 30rpx;
+    padding: 5rpx 0;
+    align-items: center;
+
+    .line {
+      width: 2rpx;
+      height: 60rpx;
+      background-color: #DDDDDD;
+    }
+
+    .body-top-tab-item {
+      flex: 1;
+      width: 0;
+      text-align: center;
+      padding: 16rpx 20rpx;
+      position: relative;
+
+      &.active {
+        color: #0174F6;
+      }
+
+      .activeLine {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 96rpx;
+        height: 6rpx;
+        background: #0174F6;
+        border-radius: 4rpx 4rpx 0rpx 0rpx;
+      }
+    }
+  }
+
+  .tabList {
+    background: #FFFFFF;
+    border-radius: 12rpx 12rpx 0 0;
+    display: flex;
+    align-items: center;
+    padding: 0 40rpx;
+
+    .tabItem {
+      padding: 30rpx;
+      flex: 1;
+      //z-index: 9999999;
+      text-align: center;
+      position: relative;
+      font-size: 28rpx;
+
+      &.actived {
+        color: #0174F6;
+      }
+
+      .activeLine {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 96rpx;
+        height: 6rpx;
+        background: #0174F6;
+        border-radius: 4rpx 4rpx 0rpx 0rpx;
+      }
+    }
+  }
+
+  .orderList {
+    //padding: 30rpx 0;
+    padding-top: 10rpx;
+    height: calc(100% - 340rpx);
+    display: flex;
+    flex-direction: column;
+
+    .orderItem {
+    }
+  }
+}
+</style>
diff --git a/pages-order/orderList/orderSimpleList.vue b/pages-order/orderList/orderSimpleList.vue
new file mode 100644
index 0000000..4f4df61
--- /dev/null
+++ b/pages-order/orderList/orderSimpleList.vue
@@ -0,0 +1,320 @@
+<template>
+  <view class="container">
+    <VNavigationBar background-color="#fff" title="工单列表" title-color="#333"></VNavigationBar>
+    <view class="body">
+      <view class="orderList" style="height: 100%" >
+        <scroll-view  scroll-y="true" style="height: 100%" class="itemContent" @scrolltolower="onReachBottomCus"
+                     refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
+          <order-card :userInfo="userInfo" v-for="(item, index) in orderList" :key="index" :order="item" @childEvent="onRefresherrefresh" @startWork="startWork"></order-card>
+          <view style="text-align: center" v-if="orderList.length==0">
+            <image class=""  src="@/static/images/nothing.png" ></image>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+    <tabBarVue msg="1"></tabBarVue>
+  </view>
+</template>
+
+<script>
+import VNavigationBar from '@/components/VNavigationBar.vue'
+import tabBarVue from '@/components/tabBar/tabBar.vue'
+import OrderCard from "@/components/orderCard.vue";
+import request from '@/utils/request';
+import {formatTimestamp,getOrderStatusText,builderOrder,saveTicketsRecords} from "@/utils/utils";
+import {
+  getToken,
+  getUserInfo,
+  getStrData,
+  getJSONData,
+  getTenantId,
+  getStorageWithExpiry,
+  setStorageWithExpiry
+} from '@/utils/auth'
+import RepairSoCard from "@/components/repairSoCard.vue";
+
+export default {
+  components: {
+    OrderCard,
+    tabBarVue,
+    VNavigationBar,
+    RepairSoCard
+  },
+  data() {
+    return {
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      //下来刷新状态
+      isTriggered:false,
+      orderList: [
+      ],
+      userInfo:{},
+      idList:[],
+    }
+  },
+  onLoad(data){
+    if (getJSONData("orderIdList")){
+      this.idList = getJSONData("orderIdList")
+    }
+    if(!getToken()){
+      uni.reLaunch({
+        url: '/pages/login/login'
+      })
+    }else{
+      //直接取缓存中的用户信息
+      this.userInfo = getUserInfo()
+      if(this.idList.length>0){
+        this.onRefresherrefresh()
+      }
+    }
+  },
+  onShow() {
+
+  },
+  methods: {
+    /**
+     * 上滑加载数据
+     */
+    onReachBottomCus() {
+      //判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
+      if (this.pageNo * this.pageSize >= this.total) {
+        uni.$u.toast('没有更多数据了')
+        return
+      }
+      //页码+1,调用获取数据的方法获取第二页数据
+      this.pageNo++
+      //此处调用自己获取数据列表的方法
+      if(this.orderList.length>0){
+        this.getOrderList()
+      }
+    },
+    /**
+     * 下拉刷新数据
+     */
+    onRefresherrefresh(){
+      this.isTriggered = true
+      this.pageNo = 1
+      this.total = 0
+      this.orderList = []
+      this.getOrderList()
+    },
+    /**
+     * 开始施工
+     */
+    startWork(id){
+      let paramsObj = {ticketId:id}
+      //先查当前用户在本工单下有几个维修项目
+      request({
+        url: '/admin-api/repair/titem/listProject',
+        method: 'get',
+        params:paramsObj
+      }).then((res) => {
+        console.log(res)
+        if (res.code == 200 && res.data.length>0) {
+          if(res.data.length==1){
+            //只有1个，直接开始施工
+            this.startWorkRequest(id,"02",res.data[0].id,"02","kssg","开始施工")
+          }else{
+            uni.showActionSheet({
+              itemList: res.data.map(m => m.itemName),
+              success: ({
+                          tapIndex
+                        }) => {
+                this.startWorkRequest(id,"02",res.data[tapIndex].id,"02","kssg","开始施工")
+              }
+            })
+          }
+        }else{
+          uni.showToast({
+            title: '操作失败，请联系管理员',
+            icon: 'none'
+          })
+        }
+      })
+    },
+    /**
+     * 开始施工请求后台
+     */
+    async startWorkRequest(id,ticketsWorkStatus,itemId,itemStatus,recordType,remark){
+      try {
+        const result = await saveTicketsRecords(id,ticketsWorkStatus,itemId,itemStatus,recordType,remark,null);
+        console.error("result",result);
+        this.onRefresherrefresh()
+      } catch (error) {
+        console.error(error);
+      }
+    },
+    getOrderList(){
+      let paramsObj = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        isFinish: "0",
+        idList:this.idList
+      }
+      request({
+        url: '/admin-api/repair/tickets/pageType',
+        method: 'get',
+        params:paramsObj
+      }).then((res) => {
+        console.log(res)
+        if (res.code == 200) {
+          let thisPageRecords = []
+          if(res.data && res.data.hasOwnProperty("records")){
+            for (let i = 0; i < res.data.records.length; i++) {
+              let order = res.data.records[i]
+              let viewOrder = builderOrder(order)
+              if(order.booking){
+                viewOrder['appointDate'] = formatTimestamp(order.createTime)
+              }
+              let projectList = []
+              if(order.itemList){
+                for (let j = 0; j < order.itemList.length; j++) {
+                  let itemObj = order.itemList[j]
+                  if("01"==itemObj.itemType){
+                    projectList.push({
+                      id:itemObj.id,
+                      name:itemObj.itemName
+                    })
+                  }
+                }
+              }
+              viewOrder['projectList'] = projectList
+              thisPageRecords.push(viewOrder)
+            }
+          }
+          //判断 如果获取的数据的页码不是第一页，就让之前赋值获取过的数组数据 concat连接 刚获取的第n页数据
+          if (this.pageNo != 1) {
+            this.orderList = this.orderList.concat(thisPageRecords)
+          } else {
+            this.orderList = thisPageRecords
+          }
+          //将获取的总条数赋值
+          this.total = res.data.total
+          this.isTriggered = false
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.container {
+  height: 100%;
+  background: #F3F5F7;
+  display: flex;
+  flex-direction: column;
+  color: #333333;
+
+  .header {
+    padding: 20rpx 32rpx 0 32rpx;
+    background-color: #fff;
+
+    .searchBox {
+      background: #F3F5F7;
+      padding: 20rpx 32rpx;
+      border-radius: 12rpx 12rpx 12rpx 12rpx;
+      display: flex;
+      align-items: center;
+      column-gap: 12rpx;
+      .searchInput {
+        flex: 1;
+        width: 0;
+      }
+      .searchBtn {
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #0174F6;
+      }
+    }
+  }
+
+  .body {
+    flex: 1;
+    height: 0;
+    padding: 14rpx 32rpx;
+    overflow: auto;
+  }
+
+  .body-top-tab {
+    background: white;
+    display: flex;
+    font-size: 30rpx;
+    padding: 5rpx 0;
+    align-items: center;
+
+    .line {
+      width: 2rpx;
+      height: 60rpx;
+      background-color: #DDDDDD;
+    }
+
+    .body-top-tab-item {
+      flex: 1;
+      width: 0;
+      text-align: center;
+      padding: 16rpx 20rpx;
+      position: relative;
+
+      &.active {
+        color: #0174F6;
+      }
+
+      .activeLine {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 96rpx;
+        height: 6rpx;
+        background: #0174F6;
+        border-radius: 4rpx 4rpx 0rpx 0rpx;
+      }
+    }
+  }
+
+  .tabList {
+    background: #FFFFFF;
+    border-radius: 12rpx 12rpx 0 0;
+    display: flex;
+    align-items: center;
+    padding: 0 40rpx;
+
+    .tabItem {
+      padding: 30rpx;
+      flex: 1;
+      //z-index: 9999999;
+      text-align: center;
+      position: relative;
+      font-size: 28rpx;
+
+      &.actived {
+        color: #0174F6;
+      }
+
+      .activeLine {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 96rpx;
+        height: 6rpx;
+        background: #0174F6;
+        border-radius: 4rpx 4rpx 0rpx 0rpx;
+      }
+    }
+  }
+
+  .orderList {
+    //padding: 30rpx 0;
+    padding-top: 10rpx;
+    height: calc(100% - 340rpx);
+    display: flex;
+    flex-direction: column;
+
+    .orderItem {
+    }
+  }
+}
+</style>
diff --git a/pages.json b/pages.json
index e700517..c9f6a6e 100644
--- a/pages.json
+++ b/pages.json
@@ -87,6 +87,12 @@
             "navigationBarTitleText": ""
           }
         },
+        {
+          "path": "orderList/orderSimpleList",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
         {
           "path": "orderList/orderListByIn",
           "style": {