Merge remote-tracking branch 'origin/master'

jiangping

2025-02-26 4e2e52b766d87fc528d02bdebc1757c3dda8c596

 h5/pages/staff/task/vDangetAppr.vue

@@ -1,5 +1,5 @@
<template>

   <view class="main_app">

   <view class="main_app" :style="{height: windowHeight  + 'px'}">

      <view class="status_wrap">

         <view class="name">{{ info.categoryName }}</view>

         <view v-if="info.status == '0'" class="status">{{ statusMap[info.status] }}</view>

@@ -113,6 +113,7 @@
            </view>

         </view>

      </view>

      <view v-if="info.status == 0 && info.checkUserId == userInfo.memberId" style="height: 90rpx;border: 1px solid red;"></view>
      <view class="emyty"></view>

      <view class="main_footer" v-if="info.status == 0 && info.checkUserId == userInfo.memberId">

         <view v-if="info.status == 0 && info.checkUserId == userInfo.memberId" class="btn" @click="handleBack">退回</view>

@@ -254,21 +255,22 @@
      </u-popup>

      <!-- 转交 -->

      <u-popup :show="isShowTransfer" :round="10" safeAreaInsetBottom mode="bottom" @close="isShowTransfer = false">

         <view class="appr_modal">

         <view class="appr_modal tran_modal">

            <view class="title">选择员工</view>

            <view class="search_inp df_ac">

               <image class="mr12 search" src="@/static/ic_search@2x.png" mode="widthFix"></image>

               <input v-model="transferModel.name" @blur="getMemList()" type="text" placeholder="搜索部门/人员"

               <input v-model="transferModel.queryParam" @focus="showKeyboard = true" @blur="showKeyboard = false" @confirm="getMemList()" type="text" placeholder="搜索人员姓名"

                  placeholder-style="color: #999999;" />

            </view>

            <view class="mt24 placeholder6">共{{ memberList.length }}条数据</view>
            <view class="member_list">

               <view class="mt24 placeholder6">共{{ memberList.length }}条数据</view>

					
               <view v-for="item in memberList" :key="item.id" class="line">

                  <image v-if="item.faceImgFull" :src="item.faceImgFull" class="avatar"></image>

                  <span v-else class="img_name">{{ item.name && item.name.slice(0, 1) }}</span>

                  <image v-if="item.faceImg" :src="item.faceImg" class="avatar"></image>

                  <span v-else class="img_name">{{ item.realname && item.realname.slice(0, 1) }}</span>

                  <view class="content">

                     <view class="info">

                        <text class="name">{{ item.name }}</text>

                        <text class="name">{{ item.realname }}</text>

                        <!-- <text class="tag">tag</text> -->

                     </view>

                     <view class="depart">{{ item.companyName }}</view>

@@ -280,7 +282,7 @@
               </view>

               <view class="empty"></view>

            </view>

            <view class="Transfer_footer">

            <view v-if="!showKeyboard" class="Transfer_footer">

               <view class="btn" @click="isShowTransfer = fales">取消</view>

               <view class="btn active" @click="enterTransfer">确认转交</view>

            </view>

@@ -307,7 +309,7 @@
import {

   hiddenDangerDetail,

   uploadUrl,

   findHiddenAreaMemberList,

   userPagePost,

   dealHiddenDanger,

   transferHiddenDanger,

   findListFlowDanger

@@ -323,7 +325,8 @@
         flowList: [],



         id: '',

         type: '',

         type: '',
         windowHeight: '',

         cateList: [{

            name: '访客申请',

            id: 0

@@ -374,13 +377,17 @@


         videoPlay: false,

         videoContext: null,

         videoUrl: ''

         videoUrl: '',
         showKeyboard: false,

      }

   },

   onLoad(op) {

   onLoad(op) {
      const result = uni.getWindowInfo()

      this.windowHeight = result.windowHeight

      uni.setStorageSync('ywinfo', {})

      this.id = op.id

      this.getDetail()

      this.getDetail()
      // this.handleTransfer()

   },

   methods: {

      priviewImage(url) {

@@ -432,7 +439,7 @@
         findListFlowDanger({

            hiddenDangerId: id

         }).then(res => {

            this.flowList = res.data

            this.flowList = res.data || []

         })

      },

      onSubmit() {

@@ -481,7 +488,7 @@
               icon: 'none'

            })

         transferHiddenDanger({

            checkUserId: transferParam.id,

            checkUserId: transferParam.memberId,

            id

         }).then(res => {

            if (res.code === 200) {

@@ -503,11 +510,11 @@
         this.isShowTransfer = true

         this.getMemList()

      },

      getMemList() {

         findHiddenAreaMemberList({

            ...this.transferModel,

            // id: this.info.areaId,

            ...this.pagination

      getMemList() {
         userPagePost({
            ...this.transferModel,
            querySpecial: 1, type: 2, companyType: 1,workStatus:0
			
         }).then(res => {

            this.memberList = res.data || []

         })

@@ -829,7 +836,7 @@
.main_app {

   background-color: #fff;

   padding-bottom: 0;



   position: relative;

   .flow_title {

      font-weight: 600;

      font-size: 32rpx;

@@ -838,14 +845,13 @@
   }



   .flow_wrap {

      padding: 30rpx 0 90rpx;



      padding: 30rpx 0 30rpx;

      background-color: #fff;

      .list {

         .item {

            display: flex;

            margin-bottom: 48rpx;

            position: relative;



            .separate {

               position: absolute;

               width: 4rpx;

@@ -1073,7 +1079,6 @@
         display: flex;

         margin-bottom: 20rpx;

         flex-wrap: wrap;



         .img_wrap {

            margin-top: 24rpx;

            width: 156rpx;

@@ -1156,7 +1161,7 @@
      width: 100%;

      z-index: 9999;

      left: 0;

      padding: 30rpx 10rpx 60rpx;

      padding: 10rpx 10rpx 30rpx;

      display: flex;

      justify-content: space-between;

      background: #ffffff;

@@ -1290,7 +1295,9 @@
         }

      }

   }



   .tran_modal{
      height: 1260rpx;
   }

   .emyty {

      width: 750rpx;

      height: 20rpx;

@@ -1329,9 +1336,9 @@
}



.member_list {

   height: 920rpx;

   height: 900rpx;

   overflow: auto;



   // border: 1px solid;

   .line {

      display: flex;

      align-items: center;