20240827内容修改

完成以下修改：
首页消息提醒，点击直接到维修界面
我要报修上传图片后图片不展示
我要报修->故障描述输入框点击没反应
维修员在报修查询里面看到别人的报修记录
报修人姓名和联系电话移至故障类型上面
报修记录查询里，加入搜索和切换（我的数据、全部数据）
维修入口查看数据后提示红点消失
退回工单提示的tip显示错位
报修详情页，维修中时加入维修员姓名和电话
消息提示文字
消息通知批量清除
维修入口点击上方统计圆圈也可以切换tab
分享时的标题为null

miniprogram/api/repair/repair.js

@@ -145,6 +145,15 @@ export function repairRemindReadRq(data) {
     });
 }
 
+// 清空消息列表
+export function repairRemindClearRq(data) {
+  return request({
+      url: `/app/repairRemind/clear`,
+      method: "post",
+      data
+  });
+}
+
 // 返回订单状态
 export function getStatusName(status) {
     // 状态:1 待派单,3 重新派单,5 已派单,7 处理中, 9已完成 待评价, 11 已关闭 13 已评价

miniprogram/pages/my/info/info.js

@@ -1,158 +1,190 @@
 const app = getApp()
 
 import {
-    repairRemindListRq,
+  repairRemindListRq,
-    repairRemindReadRq
+  repairRemindReadRq,
+  repairRemindClearRq
 } from "../../../api/repair/repair.js"
 
-
+import Dialog from '@vant/weapp/dialog/dialog';
 
 Page({
 
-    /**
+  /**
-     * 页面的初始数据
+   * 页面的初始数据
-     */
+   */
-    data: {
+  data: {
-        IMG_NAME: app.IMG_NAME,
+    IMG_NAME: app.IMG_NAME,
-        // info
+    // info
-        info: {
+    info: {
-            pageNum: 1,
+      pageNum: 1,
-            pageSize: 10,
+      pageSize: 10,
-            dataList: [],
+      dataList: [],
-            isDataAll: false,
+      isDataAll: false,
-        },
     },
+  },
 
-    /**
+  /**
-     * 生命周期函数--监听页面加载
+   * 生命周期函数--监听页面加载
-     */
+   */
-    onLoad(options) {
+  onLoad(options) {
-        
-    },
 
-    // 获取数据
+  },
-    getDataList() {
-        let _this = this;
 
-        // 获取参数
+  // 获取数据
-        let pageNum = null
+  getDataList() {
-        let pageSize = null
+    let _this = this;
-        let type = null
-        let isDataAll = null
 
-        let info = _this.data.info
+    // 获取参数
-        //
+    let pageNum = null
-        pageNum = info.pageNum
+    let pageSize = null
-        pageSize = info.pageSize
+    let type = null
-        isDataAll = info.isDataAll
+    let isDataAll = null
 
-        // 判断数据是否已全部加载
+    let info = _this.data.info
-        if (isDataAll) {
+    //
-            return;
+    pageNum = info.pageNum
-        }
+    pageSize = info.pageSize
-        // 传递参数
+    isDataAll = info.isDataAll
-        let param = {
-            pageNum,
-            pageSize,
-        }
-        // 查询数据        
-        repairRemindListRq(param).then(res => {
-            console.log('repairRemindListRq', res);
-            let dataList = res.rows
-            let isDataAll = false
-            if (pageNum * pageSize >= res.total) {
-                isDataAll = true
-            }
-            //
-            info.dataList = info.dataList.concat(_this.formartData(dataList))
-            info.pageNum = info.pageNum + 1
-            info.isDataAll = isDataAll
-            _this.setData({
-                info
-            })
-        })
-    },
-
-    // 格式化数据
-    formartData(dataList) {
-        // 格式化数据
-        return dataList.map(item => {
-            return item;
-        })
-    },
-
-    jumpInfoDetail(e) {
-        console.log('detail', e);
-        let id = e.currentTarget.dataset.obj.id
-        let repairId = e.currentTarget.dataset.obj.repairId
-        repairRemindReadRq({
-            id
-        }).then(res => {
-            wx.navigateTo({
-                url: `/pages/reportRepair/assign/detail/detail?id=${repairId}`,
-            })
-        })
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-        let _this = this;
-        _this.setData({
-            info: {
-                pageNum: 1,
-                pageSize: 10,
-                dataList: [],
-                isDataAll: false,
-            }
-        })
-        //
-        _this.getDataList()
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-        console.log('onReachBottom', '页面上拉触底事件的处理函数');
-        let _this = this;
-        // 获取数据
-        _this.getDataList()
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
 
+    // 判断数据是否已全部加载
+    if (isDataAll) {
+      return;
     }
+    // 传递参数
+    let param = {
+      pageNum,
+      pageSize,
+    }
+    // 查询数据        
+    repairRemindListRq(param).then(res => {
+      console.log('repairRemindListRq', res);
+      let dataList = res.rows
+      let isDataAll = false
+      if (pageNum * pageSize >= res.total) {
+        isDataAll = true
+      }
+      //
+      info.dataList = info.dataList.concat(_this.formartData(dataList))
+      info.pageNum = info.pageNum + 1
+      info.isDataAll = isDataAll
+      _this.setData({
+        info
+      })
+    })
+  },
+
+  // 格式化数据
+  formartData(dataList) {
+    // 格式化数据
+    return dataList.map(item => {
+      return item;
+    })
+  },
+
+  jumpInfoDetail(e) {
+    console.log('detail', e);
+    let id = e.currentTarget.dataset.obj.id
+    let repairId = e.currentTarget.dataset.obj.repairId
+    let title = e.currentTarget.dataset.obj.content
+    let url = `/pages/reportRepair/assign/detail/detail?id=${repairId}`
+    if ((title.includes('你收到工单') && title.includes('请尽快处理')) || title.includes('已经超时，黄灯告警') || title.includes('已经严重超时，红灯告警')) {
+      // 此处为维修单，要跳转到case
+      url = `/pages/reportRepair/repair/case/case?id=${repairId}`
+    }
+    repairRemindReadRq({
+      id
+    }).then(res => {
+      wx.navigateTo({
+        url: url,
+      })
+    })
+  },
+  removeAll() {
+    let _this = this
+    // 确认
+    Dialog.confirm({
+        title: '请确认',
+        message: '您即将清空消息列表，是否确认？',
+      })
+      .then(() => {
+        repairRemindClearRq({}).then(res => {
+          // 清空消息后，重新加载
+          _this.setData({
+            info: {
+              pageNum: 1,
+              pageSize: 10,
+              dataList: [],
+              isDataAll: false,
+            }
+          })
+          // 重新加载
+          _this.getDataList()
+        })
+      })
+      .catch(() => {
+        // on cancel
+      })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    let _this = this;
+    _this.setData({
+      info: {
+        pageNum: 1,
+        pageSize: 10,
+        dataList: [],
+        isDataAll: false,
+      }
+    })
+    //
+    _this.getDataList()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+    console.log('onReachBottom', '页面上拉触底事件的处理函数');
+    let _this = this;
+    // 获取数据
+    _this.getDataList()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
 })

miniprogram/pages/my/info/info.json

@@ -2,7 +2,8 @@
     "navigationBarTitleText": "消息通知",
     "usingComponents": {
         "van-divider": "@vant/weapp/divider/index",
-        "van-icon": "@vant/weapp/icon/index"
+        "van-icon": "@vant/weapp/icon/index",
+        "van-dialog": "@vant/weapp/dialog/index"
     },
     "onReachBottomDistance": 100
 }

miniprogram/pages/my/info/info.wxml

@@ -1,5 +1,8 @@
 <view class="containerView public">
-
+  <view class="itemTitleView">
+        <view class="title"></view>
+        <view class="more" bind:tap="removeAll">清空</view>
+    </view>
     <view class="infoView">
         <view class="itemView {{item.read != '1' ? 'activity' : ''}} " wx:for="{{info.dataList}}" wx:for-item="item" wx:key="*this" data-obj="{{item}}" bind:tap="jumpInfoDetail">
             <view class="contentView ellipsisFont">
@@ -15,4 +18,5 @@
         <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
     </view>
 
-</view>
+</view>
+<van-dialog id="van-dialog" />

miniprogram/pages/my/info/info.wxss

@@ -4,6 +4,26 @@
 }
 
 
+.itemTitleView {
+  /* border-left: 8rpx solid #76aef9; */
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 10px;
+}
+
+.itemTitleView .title {
+  margin-left: 10rpx;
+  font-size: 28rpx;
+  color: #141414;
+}
+
+
+.itemTitleView .more {
+  font-size: 28rpx;
+  color: #5482de;
+}
+
 .infoView {
     /* border: 1px solid red; */
     background: white;

miniprogram/pages/reportRepair/assign/detail/detail.js

@@ -252,6 +252,15 @@ Page({
             url: `/pages/reportRepair/assign/evaluate/evaluate?id=${_this.data.id}`,
         })
     },
+    // 点击拨打电话联系
+    makePhoneCall(e) {
+      let _phone = e.currentTarget.dataset.phone
+      if (_phone) {
+        wx.makePhoneCall({
+          phoneNumber: _phone
+        })
+      }
+    },
 
     /**
      * 生命周期函数--监听页面初次渲染完成
@@ -303,7 +312,7 @@ Page({
         console.log('onShareAppMessage');
         let _this = this;
         let obj = _this.data.detail
-        let title = `${obj.address + '/' + obj.floor}（${obj.room}）${obj.repairName}` 
+        let title = `${obj.address + '/' + obj.floor}（${obj.room}）${obj.typeName}` 
         //
         let param = {
             title,

miniprogram/pages/reportRepair/assign/detail/detail.wxml

@@ -107,9 +107,9 @@
             <view class="repairProgressView">
                 <view class="progressBar" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/repair/index/progressBar.png'}});"></view>
                 <view class="label">处理中</view>
+                <view class="label" >维修人：{{detail.repairUserName}} <view wx:if="{{detail.repairUserPhone}}" bind:tap="makePhoneCall" data-phone="{{detail.repairUserPhone}}">联系电话：{{detail.repairUserPhone}}</view></view>
             </view>
         </view>
-
         <view class="reportView" wx:if="{{detail.status == 9 || detail.status == 13}}">
             <view class="topTitle">维修反馈</view>
             <view class="selfLine"></view>

miniprogram/pages/reportRepair/assign/feedback/feedback.js

@@ -44,8 +44,8 @@ Page({
     let _this = this
     // 参数校验
     if (!_this.data.content) {
-      // 危险通知
+      // app.vantNotifyErrTop(Notify, '请输入描述信息!')
-      app.vantNotifyErrTop(Notify, '请输入描述信息!')
+      Notify('请输入描述信息');
       return
     }
     let data = {

miniprogram/pages/reportRepair/assign/feedback/feedback.wxml

@@ -7,6 +7,7 @@
 
 <view class="submitBtn" bind:tap="submit">提交</view>
 
+
+</view>
 <!-- 在页面内添加对应的节点 -->
-<van-notify id="van-notify" />
+<van-notify id="van-notify" />
-</view>

miniprogram/pages/reportRepair/assign/nullify/nullify.js

@@ -45,7 +45,8 @@ Page({
     // 参数校验
     if (!_this.data.content) {
       // 危险通知
-      app.vantNotifyErrTop(Notify, '请输入描述信息!')
+      // app.vantNotifyErrTop(Notify, '请输入描述信息!')
+      Notify('请输入描述信息');
       return
     }
     let data = {

miniprogram/pages/reportRepair/assign/record/record.js

@@ -180,15 +180,18 @@ Page({
         if (isDataAll) {
             return;
         }
+        let _role = _this.data.userData.dataType
+        if (_role = 9) {
+          _role = 3
+        }
         // 传递参数
         let param = {
             pageNum,
             pageSize,
-            menu: _this.data.userData.dataType, // 角色
             type,
-            role: _this.data.userData.dataType,
+            role: _role,
         }
-        // 查询数据        
+        // 查询数据
         repairListRq(param).then(res => {
             console.log('repairListRq', res);
             let dataList = res.rows

miniprogram/pages/reportRepair/index/index.js

@@ -71,7 +71,7 @@ Page({
         let dataType = userDetail.dataType
         let menuList = _this.data.menuList
         // 角色类型 1.普通用户，3派单员，5维修工，7管理员 , 9楼层
-        if (dataType == 3 || dataType == 7 || dataType == 9) { // 展示-派单入口
+        if (dataType == 3 || dataType == 7) { // 展示-派单入口，仅有派单员、管理员能进
             menuList = menuList.map(item => {
                 if (item.type == 'assign') {
                     item.visible = true

miniprogram/pages/reportRepair/query/record/record.js

@@ -3,395 +3,513 @@ const app = getApp()
 import Notify from '@vant/weapp/notify/notify';
 
 import {
-    repairListRq,
+  repairListRq,
-    getQueryStatusName
+  getQueryStatusName,
+  deviceTypeListRq,
+  selectAddressListRq
 } from "../../../../api/repair/repair.js"
 
-
 Page({
 
-    /**
+  /**
-     * 页面的初始数据
+   * 页面的初始数据
-     */
+   */
-    data: {
+  data: {
-        // tabBar param
+    search: {
-        tabBarParam: {
+      type: '0',
-            selected: 0,
+      address: '0',
-            color: "#515151",
+      isShowAll: '1',
-            selectedColor: "#217CFF",
+      opType: [{
-            backgroundColor: "#ffffff",
+        text: '全部类型',
-        },
+        value: '0'
-        // tabBar menu
+      }],
-        tabBarList: [{
+      opAddress: [{
-                "pagePath": "/pages/index/index",
+        text: '全部地点',
-                "iconPath": "/images/tabbar/home.png",
+        value: '0'
-                "selectedIconPath": "/images/tabbar/home-select.png",
+      }],
-                "text": "首页"
+      opIsShowAll: [{
-            },
+        text: '全部范围',
-            {
+        value: '1'
-                "pagePath": "/pages/reportRepair/report/report",
+      }, {
-                "iconPath": "/images/tabbar/center.png",
+        text: '本人报修',
-                "selectedIconPath": "/images/tabbar/center.png",
+        value: '0'
-                "text": "报修",
+      }],
-                "bulge": true,
-            },
-            {
-                "pagePath": "/pages/my/my",
-                "iconPath": "/images/tabbar/my.png",
-                "selectedIconPath": "/images/tabbar/my-select.png",
-                "text": "我的"
-            },
-        ],
-        IMG_NAME: app.IMG_NAME,
-        userData: null,
-        dataChange: false,
-        tabTitle: '全部',
-        // 全部
-        allOrder: {
-            pageNum: 1,
-            pageSize: 10,
-            type: 'all',
-            dataList: [],
-            isDataAll: false,
-        },
-        // 处理中
-        processOrder: {
-            pageNum: 1,
-            pageSize: 10,
-            type: 'process',
-            dataList: [],
-            isDataAll: false,
-        },
-        // 待评价
-        evalingOrder: {
-            pageNum: 1,
-            pageSize: 10,
-            type: 'evaling',
-            dataList: [],
-            isDataAll: false,
-        },
-        // 已评价
-        evaledOrder: {
-            pageNum: 1,
-            pageSize: 10,
-            type: 'evaled',
-            dataList: [],
-            isDataAll: false,
-        },
-        //无效申请 
-        invalidOrder: {
-            pageNum: 1,
-            pageSize: 10,
-            type: 'invalid',
-            dataList: [],
-            isDataAll: false,
-        },
     },
 
-    /**
+    // tabBar param
-     * 生命周期函数--监听页面加载
+    tabBarParam: {
-     */
+      selected: 0,
-    onLoad(options) {
+      color: "#515151",
-        let _this = this;
+      selectedColor: "#217CFF",
-        _this.setData({
+      backgroundColor: "#ffffff",
-            userData: wx.getStorageSync('user'),
-        })
-        console.log(_this.data.userData)
-        // 获取数据
-        let userId = _this.data.userData.id
     },
-
+    // tabBar menu
-    // 切换tabbar
+    tabBarList: [{
-    switchTab(e) {
+        "pagePath": "/pages/index/index",
-        const data = e.currentTarget.dataset
+        "iconPath": "/images/tabbar/home.png",
-        console.log('switchTab', data)
+        "selectedIconPath": "/images/tabbar/home-select.png",
-        const url = data.path
+        "text": "首页"
-        if (url == '/pages/reportRepair/report/report') {
+      },
-            wx.navigateTo({
+      {
-                url
+        "pagePath": "/pages/reportRepair/report/report",
-            })
+        "iconPath": "/images/tabbar/center.png",
-        } else {
+        "selectedIconPath": "/images/tabbar/center.png",
-            wx.switchTab({
+        "text": "报修",
-                url
+        "bulge": true,
-            })
+      },
-        }
+      {
+        "pagePath": "/pages/my/my",
+        "iconPath": "/images/tabbar/my.png",
+        "selectedIconPath": "/images/tabbar/my-select.png",
+        "text": "我的"
+      },
+    ],
+    IMG_NAME: app.IMG_NAME,
+    userData: null,
+    dataChange: false,
+    tabTitle: '全部',
+    // 全部
+    allOrder: {
+      pageNum: 1,
+      pageSize: 10,
+      type: 'all',
+      dataList: [],
+      isDataAll: false,
     },
-
+    // 处理中
-    // tab 点击切换
+    processOrder: {
-    tabClickSwitch(event) {
+      pageNum: 1,
-        console.log('tabClickSwitch', event);
+      pageSize: 10,
-        let _this = this;
+      type: 'process',
-        _this.setData({
+      dataList: [],
-            tabTitle: event.detail.title
+      isDataAll: false,
-        })
     },
+    // 待评价
+    evalingOrder: {
+      pageNum: 1,
+      pageSize: 10,
+      type: 'evaling',
+      dataList: [],
+      isDataAll: false,
+    },
+    // 已评价
+    evaledOrder: {
+      pageNum: 1,
+      pageSize: 10,
+      type: 'evaled',
+      dataList: [],
+      isDataAll: false,
+    },
+    //无效申请 
+    invalidOrder: {
+      pageNum: 1,
+      pageSize: 10,
+      type: 'invalid',
+      dataList: [],
+      isDataAll: false,
+    },
+  },
 
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    let _this = this;
+    _this.setData({
+      userData: wx.getStorageSync('user'),
+    })
+    console.log(_this.data.userData)
     // 获取数据
-    getDataList(transferTabTitle) {
+    let userId = _this.data.userData.id
-      console.log(transferTabTitle)
+    _this.queryDeviceType()
-        // 获取参数
+    _this.queryAddress()
-        let _this = this;
+  },
-        let tabTitle = _this.data.tabTitle
+  // 查询设备类型
-        if (transferTabTitle) {
+  queryDeviceType() {
-            tabTitle = transferTabTitle
+    let _this = this
+    deviceTypeListRq().then(res => {
+      console.log('deviceTypeListRq', res);
+      let _opType = _this.data.search.opType
+      let list = res.rows.map(item => {
+        return {
+          value: item.id,
+          text: item.name
         }
-        let pageNum = null
+      })
-        let pageSize = null
+      _opType = _opType.concat(list)
-        let type = null
+      _this.setData({
-        let isDataAll = null
+        ['search.opType']: _opType
-
+      })
-        //
+    })
-        let allOrder = _this.data.allOrder
+  },
-        let processOrder = _this.data.processOrder
+  // 查询地点
-        let evalingOrder = _this.data.evalingOrder
+  queryAddress() {
-        let evaledOrder = _this.data.evaledOrder
+    let _this = this
-        let invalidOrder = _this.data.invalidOrder
+    selectAddressListRq().then(res => {
-
+      let _opAddress = _this.data.search.opAddress
-        if (tabTitle == '全部') {
+      let list = res.rows.map(item => {
-            pageNum = allOrder.pageNum
+        return {
-            pageSize = allOrder.pageSize
+          value: item.id,
-            type = allOrder.type
+          text: item.name
-            isDataAll = allOrder.isDataAll
-
-        } else if (tabTitle == '处理中') {
-            pageNum = processOrder.pageNum
-            pageSize = processOrder.pageSize
-            type = processOrder.type
-            isDataAll = processOrder.isDataAll
-
-        } else if (tabTitle == '待评价') {
-            pageNum = evalingOrder.pageNum
-            pageSize = evalingOrder.pageSize
-            type = evalingOrder.type
-            isDataAll = evalingOrder.isDataAll
-
-        } else if (tabTitle == '已评价') {
-            pageNum = evaledOrder.pageNum
-            pageSize = evaledOrder.pageSize
-            type = evaledOrder.type
-            isDataAll = evaledOrder.isDataAll
-
-        } else if (tabTitle == '无效单') {
-            pageNum = invalidOrder.pageNum
-            pageSize = invalidOrder.pageSize
-            type = invalidOrder.type
-            isDataAll = invalidOrder.isDataAll
-
-        } else {
-            wx.showToast({
-                title: `tab 切换错误(${tabTitle})`,
-                icon: 'none',
-            });
-            return;
         }
+      })
+      _opAddress = _opAddress.concat(list)
+      _this.setData({
+        ['search.opAddress']: _opAddress
+      })
+    })
+  },
+  // 类型搜索变更方法
+  typeChange(e) {
+    // console.log('typeChange', e)
+    let _this = this
+    let _value = e.detail
+    _this.setData({
+      ['search.type']: _value
+    })
+    // 直接重新查询
+    _this.getAllData()
+  },
+  // 地点搜索变更方法
+  addressChange(e) {
+    // console.log('addressChange', e)
+    let _this = this
+    let _value = e.detail
+    _this.setData({
+      ['search.address']: _value
+    })
+     // 直接重新查询
+     _this.getAllData()
+  },
+  // 查询范围变更方法
+  isShowAllChange(e) {
+    let _this = this
+    let _value = e.detail
+    _this.setData({
+      ['search.isShowAll']: _value
+    })
+     // 直接重新查询
+     _this.getAllData()
+  },
 
-        // 判断数据是否已全部加载
+  // 切换tabbar
-        if (isDataAll) {
+  switchTab(e) {
-            return;
+    const data = e.currentTarget.dataset
-        }
+    console.log('switchTab', data)
-        // 传递参数
+    const url = data.path
-        let param = {
+    if (url == '/pages/reportRepair/report/report') {
-            pageNum,
+      wx.navigateTo({
-            pageSize,
+        url
-            menu: _this.data.userData.dataType, // 角色
+      })
-            type,
+    } else {
-            role: _this.data.userData.dataType, // 角色
+      wx.switchTab({
-        }
+        url
-        // 查询数据        
+      })
-        repairListRq(param).then(res => {
-            // console.log('repairListRq', res);
-            let dataList = res.rows
-            let _isDataAll = false
-            if (pageNum * pageSize >= res.total) {
-              _isDataAll = true
-            }
-            //
-            if (tabTitle == '全部') {
-                allOrder.dataList = allOrder.dataList.concat(_this.formartData(dataList))
-                allOrder.pageNum = allOrder.pageNum + 1
-                allOrder.isDataAll = _isDataAll
-                _this.setData({
-                    allOrder
-                })
-
-            } else if (tabTitle == '处理中') {
-                processOrder.dataList = processOrder.dataList.concat(_this.formartData(dataList))
-                processOrder.pageNum = processOrder.pageNum + 1
-                processOrder.isDataAll = _isDataAll
-                _this.setData({
-                    processOrder
-                })
-
-            } else if (tabTitle == '待评价') {
-                evalingOrder.dataList = evalingOrder.dataList.concat(_this.formartData(dataList))
-                evalingOrder.pageNum = evalingOrder.pageNum + 1
-                evalingOrder.isDataAll = _isDataAll
-                _this.setData({
-                    evalingOrder
-                })
-
-            } else if (tabTitle == '已评价') {
-                evaledOrder.dataList = evaledOrder.dataList.concat(_this.formartData(dataList))
-                evaledOrder.pageNum = evaledOrder.pageNum + 1
-                evaledOrder.isDataAll = _isDataAll
-                _this.setData({
-                    evaledOrder
-                })
-
-            } else if (tabTitle == '无效单') {
-                invalidOrder.dataList = invalidOrder.dataList.concat(_this.formartData(dataList))
-                invalidOrder.pageNum = invalidOrder.pageNum + 1
-                invalidOrder.isDataAll = _isDataAll
-                _this.setData({
-                    invalidOrder
-                })
-
-            }
-
-        })
-    },
-
-    // 格式化数据
-    formartData(dataList) {
-        // 格式化数据
-        return dataList.map(item => {
-            let ext1 = item.ext1
-            if (ext1) {
-                item.visibleImg = ext1
-            } else {
-                item.visibleImg = '/profile/static/repair/index/noneImg.png'
-            }
-            item.statusName = getQueryStatusName(item.status)
-            return item;
-        })
-    },
-
-    jumpDetail(e) {
-        console.log('jumpDetail', e);
-        let obj = e.currentTarget.dataset.obj
-        wx.navigateTo({
-            url: `/pages/reportRepair/assign/detail/detail?id=${obj.id}`,
-        })
-    },
-
-    jumpEvaluate(e) {
-        let obj = e.currentTarget.dataset.obj
-        console.log('jumpEvaluate', obj);
-        wx.navigateTo({
-            url: `/pages/reportRepair/assign/evaluate/evaluate?id=${obj.id}&back=1`,
-        })
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-        let _this = this;
-        _this.setData({
-            // 全部
-            allOrder: {
-                pageNum: 1,
-                pageSize: 10,
-                type: 'all',
-                dataList: [],
-                isDataAll: false,
-            },
-            // 处理中
-            processOrder: {
-                pageNum: 1,
-                pageSize: 10,
-                type: 'process',
-                dataList: [],
-                isDataAll: false,
-            },
-            // 待评价
-            evalingOrder: {
-                pageNum: 1,
-                pageSize: 10,
-                type: 'evaling',
-                dataList: [],
-                isDataAll: false,
-            },
-            // 已评价
-            evaledOrder: {
-                pageNum: 1,
-                pageSize: 10,
-                type: 'evaled',
-                dataList: [],
-                isDataAll: false,
-            },
-            //无效申请 
-            invalidOrder: {
-                pageNum: 1,
-                pageSize: 10,
-                type: 'invalid',
-                dataList: [],
-                isDataAll: false,
-            },
-        })
-        //
-        _this.getDataList('全部')
-        _this.getDataList('处理中')
-        _this.getDataList('待评价')
-        _this.getDataList('已评价')
-        _this.getDataList('无效单')
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-        console.log('onPullDownRefresh', '页面相关事件处理函数--监听用户下拉动作');
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-        console.log('onReachBottom', '页面上拉触底事件的处理函数');
-        let _this = this;
-        // 获取数据
-        let tabTitle = _this.data.tabTitle
-        _this.getDataList(tabTitle)
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage(e) {
-        console.log('onShareAppMessage', e);
-        let _this = this;
-        let obj = e.target.dataset.obj
-        let title = `${obj.address + '/' + obj.floor}（${obj.room}）${obj.repairName}` 
-        //
-        let param = {
-            title,
-            path: `/pages/reportRepair/assign/detail/detail?id=${obj.id}`,
-            imageUrl: app.IMG_NAME + obj.visibleImg,
-        }
-        console.log('onShareAppMessage', param);
-        return param;
     }
+  },
+
+  // tab 点击切换
+  tabClickSwitch(event) {
+    console.log('tabClickSwitch', event);
+    let _this = this;
+    _this.setData({
+      tabTitle: event.detail.title
+    })
+  },
+
+  // 获取数据
+  getDataList(transferTabTitle) {
+    console.log(transferTabTitle)
+    // 获取参数
+    let _this = this;
+    let tabTitle = _this.data.tabTitle
+    if (transferTabTitle) {
+      tabTitle = transferTabTitle
+    }
+    let pageNum = null
+    let pageSize = null
+    let type = null
+    let isDataAll = null
+
+    //
+    let allOrder = _this.data.allOrder
+    let processOrder = _this.data.processOrder
+    let evalingOrder = _this.data.evalingOrder
+    let evaledOrder = _this.data.evaledOrder
+    let invalidOrder = _this.data.invalidOrder
+
+    let searchType = _this.data.search.type
+    let searchAddress = _this.data.search.address
+    let searchIsShowAll = _this.data.search.isShowAll
+    // 默认为空
+    searchType = searchType == '0' ? '' : searchType
+    searchAddress = searchAddress == '0' ? '' : searchAddress
+
+    if (tabTitle == '全部') {
+      pageNum = allOrder.pageNum
+      pageSize = allOrder.pageSize
+      type = allOrder.type
+      isDataAll = allOrder.isDataAll
+
+    } else if (tabTitle == '处理中') {
+      pageNum = processOrder.pageNum
+      pageSize = processOrder.pageSize
+      type = processOrder.type
+      isDataAll = processOrder.isDataAll
+
+    } else if (tabTitle == '待评价') {
+      pageNum = evalingOrder.pageNum
+      pageSize = evalingOrder.pageSize
+      type = evalingOrder.type
+      isDataAll = evalingOrder.isDataAll
+
+    } else if (tabTitle == '已评价') {
+      pageNum = evaledOrder.pageNum
+      pageSize = evaledOrder.pageSize
+      type = evaledOrder.type
+      isDataAll = evaledOrder.isDataAll
+
+    } else if (tabTitle == '无效单') {
+      pageNum = invalidOrder.pageNum
+      pageSize = invalidOrder.pageSize
+      type = invalidOrder.type
+      isDataAll = invalidOrder.isDataAll
+
+    } else {
+      wx.showToast({
+        title: `tab 切换错误(${tabTitle})`,
+        icon: 'none',
+      });
+      return;
+    }
+
+    // 判断数据是否已全部加载
+    if (isDataAll) {
+      return;
+    }
+    let _role = _this.data.userData.dataType
+    if (_role == 5 || _role == 3) {
+      // 维修人员、派单员，非管理人员，仅可查看自己的报修记录
+      _role = 1
+    }
+    if (_role == 9 || _role == 7) {
+      // 管理人员可以切换自己上报的或所有的
+      if (searchIsShowAll == 0) {
+        // 为0，则只显示自己上报的
+        _role = 1
+      }
+    }
+    // 传递参数
+    let param = {
+      pageNum,
+      pageSize,
+      menu: _role, // 角色
+      type,
+      role: _role, // 角色
+      repair: {
+        typeId: searchType, // 类型筛选
+        addressId: searchAddress, // 地点筛选
+      }
+    }
+    // 查询数据        
+    repairListRq(param).then(res => {
+      // console.log('repairListRq', res);
+      let dataList = res.rows
+      let _isDataAll = false
+      if (pageNum * pageSize >= res.total) {
+        _isDataAll = true
+      }
+      //
+      if (tabTitle == '全部') {
+        allOrder.dataList = allOrder.dataList.concat(_this.formartData(dataList))
+        allOrder.pageNum = allOrder.pageNum + 1
+        allOrder.isDataAll = _isDataAll
+        _this.setData({
+          allOrder
+        })
+
+      } else if (tabTitle == '处理中') {
+        processOrder.dataList = processOrder.dataList.concat(_this.formartData(dataList))
+        processOrder.pageNum = processOrder.pageNum + 1
+        processOrder.isDataAll = _isDataAll
+        _this.setData({
+          processOrder
+        })
+
+      } else if (tabTitle == '待评价') {
+        evalingOrder.dataList = evalingOrder.dataList.concat(_this.formartData(dataList))
+        evalingOrder.pageNum = evalingOrder.pageNum + 1
+        evalingOrder.isDataAll = _isDataAll
+        _this.setData({
+          evalingOrder
+        })
+
+      } else if (tabTitle == '已评价') {
+        evaledOrder.dataList = evaledOrder.dataList.concat(_this.formartData(dataList))
+        evaledOrder.pageNum = evaledOrder.pageNum + 1
+        evaledOrder.isDataAll = _isDataAll
+        _this.setData({
+          evaledOrder
+        })
+
+      } else if (tabTitle == '无效单') {
+        invalidOrder.dataList = invalidOrder.dataList.concat(_this.formartData(dataList))
+        invalidOrder.pageNum = invalidOrder.pageNum + 1
+        invalidOrder.isDataAll = _isDataAll
+        _this.setData({
+          invalidOrder
+        })
+
+      }
+
+    })
+  },
+
+  // 格式化数据
+  formartData(dataList) {
+    // 格式化数据
+    return dataList.map(item => {
+      let ext1 = item.ext1
+      if (ext1) {
+        item.visibleImg = ext1
+      } else {
+        item.visibleImg = '/profile/static/repair/index/noneImg.png'
+      }
+      item.statusName = getQueryStatusName(item.status)
+      return item;
+    })
+  },
+
+  jumpDetail(e) {
+    console.log('jumpDetail', e);
+    let obj = e.currentTarget.dataset.obj
+    wx.navigateTo({
+      url: `/pages/reportRepair/assign/detail/detail?id=${obj.id}`,
+    })
+  },
+
+  jumpEvaluate(e) {
+    let obj = e.currentTarget.dataset.obj
+    console.log('jumpEvaluate', obj);
+    wx.navigateTo({
+      url: `/pages/reportRepair/assign/evaluate/evaluate?id=${obj.id}&back=1`,
+    })
+  },
+  // 获取所有数据方法
+  getAllData() {
+    let _this = this;
+    _this.setData({
+      // 全部
+      allOrder: {
+        pageNum: 1,
+        pageSize: 10,
+        type: 'all',
+        dataList: [],
+        isDataAll: false,
+      },
+      // 处理中
+      processOrder: {
+        pageNum: 1,
+        pageSize: 10,
+        type: 'process',
+        dataList: [],
+        isDataAll: false,
+      },
+      // 待评价
+      evalingOrder: {
+        pageNum: 1,
+        pageSize: 10,
+        type: 'evaling',
+        dataList: [],
+        isDataAll: false,
+      },
+      // 已评价
+      evaledOrder: {
+        pageNum: 1,
+        pageSize: 10,
+        type: 'evaled',
+        dataList: [],
+        isDataAll: false,
+      },
+      //无效申请 
+      invalidOrder: {
+        pageNum: 1,
+        pageSize: 10,
+        type: 'invalid',
+        dataList: [],
+        isDataAll: false,
+      },
+    })
+    //
+    _this.getDataList('全部')
+    _this.getDataList('处理中')
+    _this.getDataList('待评价')
+    _this.getDataList('已评价')
+    _this.getDataList('无效单')
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    this.getAllData()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+    console.log('onPullDownRefresh', '页面相关事件处理函数--监听用户下拉动作');
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+    console.log('onReachBottom', '页面上拉触底事件的处理函数');
+    let _this = this;
+    // 获取数据
+    let tabTitle = _this.data.tabTitle
+    _this.getDataList(tabTitle)
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage(e) {
+    console.log('onShareAppMessage', e);
+    let _this = this;
+    let obj = e.target.dataset.obj
+    let title = `${obj.address + '/' + obj.floor}（${obj.room}）${obj.typeName}`
+    //
+    let param = {
+      title,
+      path: `/pages/reportRepair/assign/detail/detail?id=${obj.id}`,
+      imageUrl: app.IMG_NAME + obj.visibleImg,
+    }
+    console.log('onShareAppMessage', param);
+    return param;
+  }
 })

miniprogram/pages/reportRepair/query/record/record.json

@@ -5,7 +5,9 @@
         "van-tabs": "@vant/weapp/tabs/index",
         "van-divider": "@vant/weapp/divider/index",
         "van-dialog": "@vant/weapp/dialog/index",
-        "van-notify": "@vant/weapp/notify/index"
+        "van-notify": "@vant/weapp/notify/index",
+        "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
+        "van-dropdown-item": "@vant/weapp/dropdown-item/index"
     },
     "onReachBottomDistance": 100
 }

miniprogram/pages/reportRepair/query/record/record.wxml

@@ -1,147 +1,152 @@
 <view class="containerView public">
-    <van-tabs bind:click="tabClickSwitch" color="#4e96f8" border animated title-active-color="black" title-inactive-color="gray">
+  <van-dropdown-menu>
-        <van-tab title="全部">
+    <van-dropdown-item value="{{ search.type }}" options="{{ search.opType }}" bind:change="typeChange"/>
-            <view class="itemView" wx:for="{{allOrder.dataList}}" wx:for-item="item" wx:key="*this">
+    <van-dropdown-item value="{{ search.address }}" options="{{ search.opAddress }}" bind:change="addressChange" />
-                <!-- <view class="topTitle">{{item.repairName}}</view> -->
+    <van-dropdown-item wx:if="{{ userData.dataType == 7 || userData.dataType == 9}}" value="{{ search.isShowAll }}" options="{{ search.opIsShowAll }}" bind:change="isShowAllChange" />
-                <view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
+  </van-dropdown-menu>
-                    <view class="showImg" style="background: no-repeat center/cover url({{IMG_NAME + item.visibleImg}});"></view>
+  <van-tabs bind:click="tabClickSwitch" color="#4e96f8" border animated title-active-color="black" title-inactive-color="gray">
-                    <view class="rightView">
+    <van-tab title="全部">
-                        <view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
+      <view class="itemView" wx:for="{{allOrder.dataList}}" wx:for-item="item" wx:key="*this">
-                        <view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
+        <!-- <view class="topTitle">{{item.repairName}}</view> -->
-                        <view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
+        <view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
-                    </view>
+          <view class="showImg" style="background: no-repeat center/cover url({{IMG_NAME + item.visibleImg}});"></view>
-                </view>
+          <view class="rightView">
-                <view class="bottomLine"></view>
+            <view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
-                <view class="bottomView">
+            <view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
-                    <view class="status">{{item.statusName}}</view>
+            <view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
-                    <view class="btnView">
+          </view>
-                        <view class="btn">分享
-                            <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="loadAllLine" wx:if="{{allOrder.isDataAll}}">
-                <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
-            </view>
-        </van-tab>
-
-        <van-tab title="处理中">
-            <view class="itemView" wx:for="{{processOrder.dataList}}" wx:for-item="item" wx:key="*this">
-                <!-- <view class="topTitle">{{item.repairName}}</view> -->
-                <view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
-                    <view class="showImg" style="background: no-repeat center/cover url({{IMG_NAME + item.visibleImg}});"></view>
-                    <view class="rightView">
-                        <view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
-                        <view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
-                        <view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
-                    </view>
-                </view>
-                <view class="bottomLine"></view>
-                <view class="bottomView">
-                    <view class="status">{{item.statusName}}</view>
-                    <view class="btnView">
-                        <view class="btn">分享
-                            <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="loadAllLine" wx:if="{{processOrder.isDataAll}}">
-                <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
-            </view>
-        </van-tab>
-        <van-tab title="待评价">
-            <view class="itemView" wx:for="{{evalingOrder.dataList}}" wx:for-item="item" wx:key="*this">
-                <!-- <view class="topTitle">{{item.repairName}}</view> -->
-                <view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
-                    <view class="showImg" style="background: no-repeat center/cover url({{IMG_NAME + item.visibleImg}});"></view>
-                    <view class="rightView">
-                        <view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
-                        <view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
-                        <view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
-                    </view>
-                </view>
-                <view class="bottomLine"></view>
-                <view class="bottomView">
-                    <view class="status">{{item.statusName}}</view>
-                    <view class="btnView">
-                        <view class="btn">分享
-                            <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
-                        </view>
-                        <view wx:if="{{item.createBy == userData.id}}" class="btn evaluate" data-obj="{{item}}" bind:tap="jumpEvaluate">评价</view>
-                    </view>
-                </view>
-            </view>
-            <view class="loadAllLine" wx:if="{{evalingOrder.isDataAll}}">
-                <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
-            </view>
-        </van-tab>
-        <van-tab title="已评价">
-            <view class="itemView" wx:for="{{evaledOrder.dataList}}" wx:for-item="item" wx:key="*this">
-                <!-- <view class="topTitle">{{item.repairName}}</view> -->
-                <view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
-                    <view class="showImg" style="background: no-repeat center/cover url({{IMG_NAME + item.visibleImg}});"></view>
-                    <view class="rightView">
-                        <view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
-                        <view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
-                        <view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
-                    </view>
-                </view>
-                <view class="bottomLine"></view>
-                <view class="bottomView">
-                    <view class="status">{{item.statusName}}</view>
-                    <view class="btnView">
-                        <view class="btn">分享
-                            <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="loadAllLine" wx:if="{{evaledOrder.isDataAll}}">
-                <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
-            </view>
-        </van-tab>
-        <van-tab title="无效单">
-            <view class="itemView" wx:for="{{invalidOrder.dataList}}" wx:for-item="item" wx:key="*this">
-                <!-- <view class="topTitle">{{item.repairName}}</view> -->
-                <view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
-                    <view class="showImg" style="background: no-repeat center/cover url({{IMG_NAME + item.visibleImg}});"></view>
-                    <view class="rightView">
-                        <view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
-                        <view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
-                        <view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
-                    </view>
-                </view>
-                <view class="bottomLine"></view>
-                <view class="bottomView">
-                    <view class="status">{{item.statusName}}</view>
-                    <view class="btnView">
-                        <view class="btn">分享
-                            <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="loadAllLine" wx:if="{{invalidOrder.isDataAll}}">
-                <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
-            </view>
-        </van-tab>
-    </van-tabs>
-
-
-     <!-- tabBar -->
-     <view class="tab-bar">
-        <view wx:for="{{tabBarList}}" wx:key="index" class="tab-bar-item {{item.bulge?'bulge':''}}" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
-            <view wx:if="item.bulge" class="tab-bar-bulge"></view>
-            <image class="image" src="{{tabBarParam.selected === index ? item.selectedIconPath : item.iconPath}}"></image>
-            <view class="tab-bar-view" style="color: {{tabBarParam.selected === index ? tabBarParam.selectedColor : tabBarParam.color}}">{{item.text}}</view>
         </view>
-    </view>
+        <view class="bottomLine"></view>
+        <view class="bottomView">
+          <view class="status">{{item.statusName}}</view>
+          <view class="btnView">
+            <view class="btn">分享
+              <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="loadAllLine" wx:if="{{allOrder.isDataAll}}">
+        <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
+      </view>
+    </van-tab>
 
-    <!-- 提示框 -->
+    <van-tab title="处理中">
-    <van-dialog id="van-dialog" />
+      <view class="itemView" wx:for="{{processOrder.dataList}}" wx:for-item="item" wx:key="*this">
-    <!-- 提示框 -->
+        <!-- <view class="topTitle">{{item.repairName}}</view> -->
-    <van-notify id="van-notify" />
+        <view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
+          <view class="showImg" style="background: no-repeat center/cover url({{IMG_NAME + item.visibleImg}});"></view>
+          <view class="rightView">
+            <view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
+            <view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
+            <view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
+          </view>
+        </view>
+        <view class="bottomLine"></view>
+        <view class="bottomView">
+          <view class="status">{{item.statusName}}</view>
+          <view class="btnView">
+            <view class="btn">分享
+              <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="loadAllLine" wx:if="{{processOrder.isDataAll}}">
+        <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
+      </view>
+    </van-tab>
+    <van-tab title="待评价">
+      <view class="itemView" wx:for="{{evalingOrder.dataList}}" wx:for-item="item" wx:key="*this">
+        <!-- <view class="topTitle">{{item.repairName}}</view> -->
+        <view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
+          <view class="showImg" style="background: no-repeat center/cover url({{IMG_NAME + item.visibleImg}});"></view>
+          <view class="rightView">
+            <view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
+            <view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
+            <view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
+          </view>
+        </view>
+        <view class="bottomLine"></view>
+        <view class="bottomView">
+          <view class="status">{{item.statusName}}</view>
+          <view class="btnView">
+            <view class="btn">分享
+              <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
+            </view>
+            <view wx:if="{{item.createBy == userData.id}}" class="btn evaluate" data-obj="{{item}}" bind:tap="jumpEvaluate">评价</view>
+          </view>
+        </view>
+      </view>
+      <view class="loadAllLine" wx:if="{{evalingOrder.isDataAll}}">
+        <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
+      </view>
+    </van-tab>
+    <van-tab title="已评价">
+      <view class="itemView" wx:for="{{evaledOrder.dataList}}" wx:for-item="item" wx:key="*this">
+        <!-- <view class="topTitle">{{item.repairName}}</view> -->
+        <view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
+          <view class="showImg" style="background: no-repeat center/cover url({{IMG_NAME + item.visibleImg}});"></view>
+          <view class="rightView">
+            <view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
+            <view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
+            <view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
+          </view>
+        </view>
+        <view class="bottomLine"></view>
+        <view class="bottomView">
+          <view class="status">{{item.statusName}}</view>
+          <view class="btnView">
+            <view class="btn">分享
+              <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="loadAllLine" wx:if="{{evaledOrder.isDataAll}}">
+        <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
+      </view>
+    </van-tab>
+    <van-tab title="无效单">
+      <view class="itemView" wx:for="{{invalidOrder.dataList}}" wx:for-item="item" wx:key="*this">
+        <!-- <view class="topTitle">{{item.repairName}}</view> -->
+        <view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
+          <view class="showImg" style="background: no-repeat center/cover url({{IMG_NAME + item.visibleImg}});"></view>
+          <view class="rightView">
+            <view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
+            <view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
+            <view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
+          </view>
+        </view>
+        <view class="bottomLine"></view>
+        <view class="bottomView">
+          <view class="status">{{item.statusName}}</view>
+          <view class="btnView">
+            <view class="btn">分享
+              <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="loadAllLine" wx:if="{{invalidOrder.isDataAll}}">
+        <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
+      </view>
+    </van-tab>
+  </van-tabs>
+
+
+  <!-- tabBar -->
+  <view class="tab-bar">
+    <view wx:for="{{tabBarList}}" wx:key="index" class="tab-bar-item {{item.bulge?'bulge':''}}" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
+      <view wx:if="item.bulge" class="tab-bar-bulge"></view>
+      <image class="image" src="{{tabBarParam.selected === index ? item.selectedIconPath : item.iconPath}}"></image>
+      <view class="tab-bar-view" style="color: {{tabBarParam.selected === index ? tabBarParam.selectedColor : tabBarParam.color}}">{{item.text}}</view>
+    </view>
+  </view>
+
+  <!-- 提示框 -->
+  <van-dialog id="van-dialog" />
+  <!-- 提示框 -->
+  <van-notify id="van-notify" />
 
 </view>

miniprogram/pages/reportRepair/repair/case/case.js

@@ -1,7 +1,6 @@
 const app = getApp()
 
 import Notify from '@vant/weapp/notify/notify';
-import Dialog from '@vant/weapp/dialog/dialog';
 
 import {
   selfFormatTimeYMDHMS,
@@ -144,7 +143,7 @@ Page({
       flowHandleRq(data).then(res => {
         console.log('flowHandleRq', res);
         if (res.code == 0) {
-          app.vantNotifySuccess(Notify, res.msg)
+          app.vantNotifySuccess(Notify, '工单已接收')
           _this.getDetail(_this.data.id)
         } else {
           app.vantNotifyErr(Notify, res.msg)

miniprogram/pages/reportRepair/repair/case/case.json

@@ -6,7 +6,6 @@
         "van-uploader": "@vant/weapp/uploader/index",
         "van-checkbox": "@vant/weapp/checkbox/index",
         "van-checkbox-group": "@vant/weapp/checkbox-group/index",
-        "van-notify": "@vant/weapp/notify/index",
+        "van-notify": "@vant/weapp/notify/index"
-        "van-dialog": "@vant/weapp/dialog/index"
     }
 }

miniprogram/pages/reportRepair/repair/case/case.wxml

@@ -140,6 +140,5 @@
     </view>
 
 </view>
-<van-dialog id="van-dialog" />
 <!-- 消息通知 -->
 <van-notify id="van-notify" />

miniprogram/pages/reportRepair/repair/index/index.js

@@ -107,7 +107,7 @@ Page({
         console.log('tabClickSwitch', e);
         let _this = this;
         _this.setData({
-            tabTitle: e.target.dataset.type
+            tabTitle: e.currentTarget.dataset.type
         })
     },
 

miniprogram/pages/reportRepair/repair/index/index.wxml

@@ -12,19 +12,19 @@
     <view class="menuView">
         <view class="title">工单管理</view>
         <view class="itemListView">
-            <view class="itemView">
+            <view class="itemView" bind:tap="tabClickSwitch" data-type="wait">
                 <view class="circle1 blueColor">
                     <view class="circle2 blueCenterColor">{{workerNumber.wait}}</view>
                 </view>
                 <view class="name">待完成</view>
             </view>
-            <view class="itemView">
+            <view class="itemView" bind:tap="tabClickSwitch" data-type="working">
                 <view class="circle1 cyanColor">
                     <view class="circle2 cyanCenterColor">{{workerNumber.working}}</view>
                 </view>
                 <view class="name">进行中</view>
             </view>
-            <view class="itemView">
+            <view class="itemView" bind:tap="tabClickSwitch" data-type="close">
                 <view class="circle1 greenColor">
                     <view class="circle2 greenCenterColor">{{workerNumber.close}}</view>
                 </view>
@@ -43,7 +43,6 @@
         <view class="caseView" wx:for="{{waitOrder.dataList}}" wx:for-item="item" wx:key="*this" data-obj="{{item}}" bind:tap="jumpCase">
             <view class="content ellipsisFont">{{item.name}}发起一个工单</view>
             <view class="time">{{item.createTime}}</view>
-            <view class="status"></view>
         </view>
         <view class="loadAllLine" wx:if="{{waitOrder.isDataAll}}">
             <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
@@ -54,7 +53,6 @@
         <view class="caseView" wx:for="{{workOrder.dataList}}" wx:for-item="item" wx:key="*this" data-obj="{{item}}" bind:tap="jumpCase">
             <view class="content ellipsisFont">{{item.name}}发起一个工单</view>
             <view class="time">{{item.createTime}}</view>
-            <view class="status"></view>
         </view>
         <view class="loadAllLine" wx:if="{{workOrder.isDataAll}}">
             <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
@@ -65,7 +63,6 @@
         <view class="caseView" wx:for="{{closeOrder.dataList}}" wx:for-item="item" wx:key="*this" data-obj="{{item}}" bind:tap="jumpCase">
             <view class="content ellipsisFont">{{item.name}}发起一个工单</view>
             <view class="time">{{item.createTime}}</view>
-            <view class="status"></view>
         </view>
         <view class="loadAllLine" wx:if="{{closeOrder.isDataAll}}">
             <van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>