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

liukangdong

2024-06-11 3668d4433f8db668ff506fcfb0488e7f40ff8382

 admin/src/components/business/OperaCarUseBookWindow.vue

@@ -12,7 +12,7 @@
            <div class="time">提交时间：{{model.createDate}}</div>
          </div>
          <span class="right"  v-if="model.status === 0">申请中</span>
          <span class="right"  v-if="model.status === 1">待审批</span>
          <span class="right"  v-if="model.status === 1">审批中</span>
          <span class="right" style="background:#53b76f " v-if="model.status === 2">审批通过</span>
          <span class="right" style="background:#dc362e " v-if="model.status === 3">审批不通过</span>
          <span class="right" style="background:#dc362e " v-if="model.status === 4">已取消</span>
@@ -65,59 +65,46 @@
        <div class="side_title">审批流程</div>
        <div class="list"  v-if="model.approveDateVO !=null && model.approveDateVO.approveList !=null">
          <div class="item" v-for="(item,index) in model.approveDateVO.approveList" :key="item.id">
            <div class="separate" v-if="(model.approveDateVO.copyList !=null && model.approveDateVO.copyList.length>0) || (index < model.approveDateVO.approveList.length-1)"></div>
            <div class="separate" v-if=" (index < model.approveDateVO.approveList.length-1)"></div>
            <div class="info">
              <i class="el-icon-success icon1" v-if="(item.status ==2)"></i>
              <i class="el-icon-question icon" v-if="(item.status==1)"></i>
              <i class="el-icon-error icon2" v-if="(item.status==3)"></i>
              <i class="el-icon-question icon3" v-if="(item.status==null || item.status==0 )"></i>
              <div style="display: inline" v-if="item.approveType ===0">
              <img src="@/assets/icons/ic_tongguo.png"   class="iconnew" v-if="( item.status ==2)"/>
              <img src="@/assets/icons/ic_dangqian.png"   class="iconnew"  v-if="( item.status==1)"/>
              <img src="@/assets/icons/ic_jujue.png"  class="iconnew"  v-if="( item.status==3)"/>
              <img src="@/assets/icons/ic_grey.png"  class="iconnew" v-if=" (item.status==null || item.status==0 )"/>
              <div style="display: inline" v-if="item.approveType !=1">
                <img v-if="item.faceImg!=null && item.faceImg !=''" :src="item.faceImg" class="avatar" alt="" />
                <img v-if="item.faceImg ==null ||item.faceImg ==''"  src="@/assets/avatar/man.png" class="avatar" alt="" />
              </div>
              <div style="display: inline" v-if="item.approveType ===1">
                <img  src="@/assets/avatar/man.png" class="avatar" alt="" />
              <div style="display: inline" v-if="item.approveType  == 1">
                <img  v-if="item.type !=1"  src="@/assets/icons/ic_duoren.png" class="avatar" alt="" />
                <img v-if="item.type == 1"  src="@/assets/icons/ic_chaosong.png" class="avatar" alt="" />
              </div>
              <div class="content">
                <div class="line">
                  <div class="name">{{ item.title}}</div>
                  <div class="time">{{ item.createDate }}</div>
                  <div class="time">{{ item.checkDate }}</div>
                </div>
                <div class="line">
                  <div class="company">
                    {{ item.createUserName }} {{ item.companyName }}
                    {{ item.memberName }}
                    <div style="display: inline" v-if="item.statusInfo!=null && item.statusInfo!=''">
                       <span class="status-green">{{item.statusInfo||''}}</span>）
                       （<span class="status-green">{{item.statusInfo ||''}}</span>）
                    </div>
                  </div>
                </div>
              </div>
            </div>
            <div class="remark">
              {{ item.checkInfo ||'水电费反反复复反反复复方法方法方法方法方法方法方法方法方法方法方法方法发发发' }}
            <div v-if="item.approveType != 1 && item.checkInfo !=null && item.checkInfo !=''" class="remark">
              {{ item.checkInfo || '' }}
            </div>
            <div v-if="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" alt="" />
                <span > {{item1.memberName}}</span>
              </div>
            </div>
          </div>
<!--          <div class="item"   v-if="model.approveDateVO.copyList !=null && model.approveDateVO.copyList.length">
            <div class="info">
              <i class="el-icon-question icon3"></i>
              <img v-if="1===2" :src="faceImg" class="avatar" alt="" />
              <img v-if="1===1"  src="@/assets/avatar/man.png" class="avatar" alt="" />
              <div class="content">
                <div class="line">
                  <div class="name">抄送</div>
                  <div class="time"></div>
                </div>
                <div class="line">
                  <div class="company">
                    {{ 'aaa' }} {{ 'aaaad' }}
                    <div style="display: inline">
                      （<span class="status-green">{{'sdf'}}</span>）
                    </div>
                  </div>
                </div>
              </div>
            </div>
          </div>-->
        </div>
      </div>
    </div>
@@ -130,6 +117,7 @@
    <el-dialog
        append-to-body
        title="同意申请"
        style="text-align: center"
        class="dialogCl"
        :visible.sync="isShowProblem"
        width="480px"
@@ -162,6 +150,7 @@
    <el-dialog
        append-to-body
        title="拒绝申请"
        style="text-align: center"
        class="dialogCl"
        :visible.sync="isBackProblem"
        width="600px"
@@ -188,6 +177,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { driveList } from '@/api/business/member'
import { approveDo } from '@/api/business/approve'
import { mapState } from 'vuex'
export default {
  name: 'OperaCarUseBookWindow',
@@ -227,12 +217,13 @@
        if (!valid) {
          return
        }
        this.$dialog.actionConfirm('操作确认', '您确认提交该隐患处理情况吗？')
        this.$dialog.actionConfirm('操作确认', '您确认同意该申请吗？')
          .then(() => {
            this.dealing = true
            this.api.dealHiddenDanger({
              id: this.dataId,
              status: 1,
            approveDo({
              objId: this.dataId,
              objType: this.model.type == 1?4:3,
              status: 2,
              driverId: this.dealForm.driveId,
              checkInfo: this.dealForm.checkInfo
            })
@@ -252,26 +243,22 @@
        if (!valid) {
          return
        }
        this.$dialog.actionConfirm('操作确认', '您确认退回该隐患处理情况吗？')
          .then(() => {
            this.dealing = true
            this.api.dealHiddenDanger({
              id: this.dataId,
              status: 2,
              checkInfo: this.backForm.checkInfo
        approveDo({
              objId: this.dataId,
              objType: this.model.type == 1?4:3,
              status: 3,
              checkInfo: this.dealForm.checkInfo
          }).then(res => {
              this.$tip.apiSuccess('退回成功')
              this.getDetail()
              this.isBackProblem = false
            })
              .then(res => {
                this.$tip.apiSuccess('退回成功')
                this.getDetail()
                this.isBackProblem = false
              })
              .catch(e => {
              })
              .finally(() => {
                this.dealing = false
              })
            .catch(e => {
            })
            .finally(() => {
              this.dealing = false
            })
          })
      })
    },
    open (title, target) {
      this.title = title
@@ -311,14 +298,6 @@
</script>

<style lang="scss" scoped>
.side_title{
  font-weight: 600;
  font-size: 18px;
  color: #111111;
  margin-bottom: 20px;
  margin-left: 20px;
  margin-top: 20px;
}
.upload_box {
  width: 84px;
  height: 84px;
@@ -337,7 +316,14 @@
    font-size: 12px;
  }
}

.side_title{
  font-weight: 600;
  font-size: 18px;
  color: #111111;
  margin-bottom: 20px;
  margin-left: 20px;
  margin-top: 20px;
}
.modal_wrap {
  display: flex;
  height: 100%;
@@ -451,8 +437,34 @@
          position: absolute;
          border-left: 2px dashed #cccccc;
          left: 31px;
          height: calc(100% - 24px);
          top: 46px;
          height: calc(100% - 36px);
          top: 49px;
        }
        .avatar {
          width: 40px;
          height: 40px;
          border-radius: 50%;
          margin: 0 12px 0 16px;
          //border: 1px solid;
        }
        .childList{
          display: flex;
          flex-wrap: wrap;
          margin-left: 100px;
        }
        .company {
          font-size: 13px;
          color: #888888;
          .status {
            color: #00ba67;
          }
        }
        .m_content{
          display: flex;
          flex-direction: column;
          align-items: center;
          justify-content: center;
          margin-bottom: 4px;
        }
        .info {
          display: flex;
@@ -476,18 +488,15 @@
            color: #dc362e;
            font-size: 24px;
          }
          .iconnew{
            width: 24px;
            height: 24px;
          }
          .icon3 {
            position: relative;
            z-index: 11;
            color:gray;
            font-size: 24px;
          }
          .avatar {
            width: 40px;
            height: 40px;
            border-radius: 50%;
            margin: 0 12px 0 16px;
            border: 1px solid;
          }
          .content {
            flex: 1;
@@ -504,13 +513,6 @@
              .time {
                color: #888888;
              }
              .company {
                font-size: 13px;
                color: #888888;
                .status {
                  color: #00ba67;
                }
              }
            }
          }
        }
@@ -519,8 +521,9 @@
          border-radius: 4px;
          padding: 13px 15px;
          color: #666666;
          margin-left: 120px;
          margin-left: 100px;
        }

      }
    }
  }