Merge remote-tracking branch 'origin/master'

jiangping

2025-04-18 015b4f31cebbecf6f6da760ed2f8af3da721e802

 h5/pages/workOrder/workOrder.vue

@@ -23,16 +23,21 @@
            <view class="report_list_row_icon">
               <image src="/static/tabbar/nav_gongdan_sel@2x.png" mode="widthFix"></image>
            </view>
            <view class="report_list_row_info" v-if="[0,3].includes(item.type)">
            <view class="report_list_row_info" v-if="[0].includes(item.type)">
               <text>{{titleType(item.type)}}</text>
               <text>{{userType(item.memberType)}}-{{item.memberNames}} {{item.happenTime}}/{{item.locationName}}/{{item.typeName}}</text>
               <text>{{userType(item.memberType)}}-{{item.memberNames}} {{item.happenTime.substring(0, 16)}}/{{item.locationName}}/{{item.typeName}}</text>
               <text>{{item.submitDate.substring(0, 16)}}</text>
            </view>
            <view class="report_list_row_info" v-else-if="[3].includes(item.type)">
               <text>{{titleType(item.type)}}</text>
               <text>{{item.happenTime.substring(0, 16)}}/{{item.locationName}}/{{item.typeName}}</text>
               <text>{{item.submitDate.substring(0, 16)}}</text>
            </view>
            <view class="report_list_row_info1" v-else>
               <text>DCA</text>
               <text>{{item.typeName || '-'}}/{{item.categoryName || '-'}}</text>
               <text>符合：{{item.dcaYesNum}} 不符合：{{item.dcaNoNum}}</text>
               <text>{{item.createDate}}</text>
               <text>{{item.createDate.substring(0, 16)}}</text>
            </view>
            <view class="report_list_row_dian success" v-if="[3,4,5].includes(item.status)"></view>
            <view class="report_list_row_dian error" v-else-if="[0,1,2].includes(item.status)"></view>
@@ -115,9 +120,20 @@
         };
      },
      onLoad() {
         this.getList()
         this.getLocation()
         this.getLocation1()
      },
      onShow() {
         this.$nextTick(() => {
            this.$refs.pengTree._hide()
            this.$refs.pengTree1._hide()
         })
         this.show = false
         this.show1 = false
         this.search.page = 1
         this.search.next = true
         this.list = []
         this.getList()
      },
      onReachBottom() {
         this.getList()
@@ -134,7 +150,7 @@
            this.$refs.pengTree._hide()
         },
         // 位置
         selectAddress(e) {
         selectAddress1(e) {
            this.localtionId = e[0].id
            this.locationName = e[0].name
            this.search.page = 1
@@ -164,7 +180,6 @@
               page: this.search.page,
               model: {
                  myWorkOrder: 1,
                  memberId: this.userInfo.id,
                  type: this.typeId,
                  dealStatus: this.statusId,
                  localtionId: this.localtionId
@@ -232,7 +247,7 @@
            if (type === 0) {
               return 'SHE事件上报'
            } else if (type === 3) {
               return '跌绊滑事件'
               return '跌绊滑事件上报'
            }
         }
      }