Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-11-05 50353c2ae43cdddb8433358f4ba66bef30c5d628

 admin/src/views/task/visReportDetail.vue

@@ -3,19 +3,17 @@
    <div class="modal_wrap">
      <div class="modal_content">
        <div class="header">
          <img v-if="info.businessStatus == '3'" class="head_bg" src="@/assets/task/bg_shenhe_fail@2x.png"
          <img v-if="info.businessStatus == '3'" class="head_bg" src="@/assets/task/bg_shenhe_fail@2x.png" alt="">
          <img v-else-if="info.businessStatus == '2'" class="head_bg" src="@/assets/task/bg_shenhe_pass@2x.png" alt="">
          <img v-else-if="info.businessStatus == '4'" class="head_bg" src="@/assets/task/bg_shenhe_chexiao@2x.png"
            alt="">
          <img v-else-if="info.businessStatus == '2'" class="head_bg"
            src="@/assets/task/bg_shenhe_pass@2x.png" alt="">
          <img v-else-if="info.businessStatus == '4'" class="head_bg" src="@/assets/task/bg_shenhe_chexiao@2x.png" alt="">
          <img v-else class="head_bg" src="@/assets/task/bg_shenhe@2x.png" alt="">
          <div class="left">
            <div class="h1">{{ cateList[type] }}</div>
            <div class="time">提交时间：{{ info.createDate }}</div>
          </div>
          <div class="right"
            :class="{ scs: info.businessStatus == '2', msg: info.businessStatus == '3' }">{{
              statusMap[info.businessStatus] }}</div>
          <div class="right" :class="{ scs: info.businessStatus == '2', msg: info.businessStatus == '3' }">{{
            statusMap[info.businessStatus] }}</div>
        </div>
        <div class="info">
          <div class="title">访客报备信息</div>
@@ -83,7 +81,7 @@
                    <div style="display: inline" v-if="item.statusInfo != null && item.statusInfo != ''">
                      （<span :class="{ padding: item.statusInfo == '处理中' || item.status == '1' }">{{
                        item.statusInfo || ""
                        }}</span>）
                      }}</span>）
                    </div>
                  </div>
                </div>
@@ -96,7 +94,7 @@
            " class="remark">
              {{ item.checkInfo || "" }}
            </div>
            <div v-if="item.approveType == 1" class="childList">
            <div v-if="item.approveType == 0 || item.type == 1 || item.approveType == 1" class="childList">
              <div class="m_content company" v-for="item1 in item.approveList" :key="item1.id">
                <img v-if="item1.faceImg != null && item1.faceImg != ''" :src="item1.faceImg" class="avatar" alt="" />
                <img v-if="item1.faceImg == null || item1.faceImg == ''" src="@/assets/avatar/man.png" class="avatar"
@@ -238,7 +236,7 @@
          })
      })
    },
    close(){
    close() {
      this.isShowModal = false
      this.$emit('close')
    },
@@ -246,6 +244,18 @@
      const { id } = this
      getVisitedReDetail({ id }).then(res => {
        this.info = res
        if (this.info.approveDateVO && this.info.approveDateVO.approveList.length > 0) {
          this.info.approveDateVO.approveList.forEach(item => {
            if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
              item.title = item.approveList[0].title
              item.faceImg = item.approveList[0].faceImg
              item.memberName = item.approveList[0].memberName
              item.statusInfo = item.approveList[0].statusInfo
              item.status = item.approveList[0].status
              item.approveList = []
            }
          })
        }
      })
    },
    handleAppr(val) {
@@ -463,7 +473,7 @@
          color: #888888;

          .status {
            color: #00ba67;
            color: $primaryColor;
          }
        }