productDev/dmvisit.git

			@@ -65,53 +65,43 @@
			<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 < logList.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 ==0)"></i>
			<i class="el-icon-question icon" v-if="(item.status==2 \|\| item.status==5)"></i>
			<i class="el-icon-error icon2" v-if="(item.status==3 \|\|item.status==4 \|\| item.status==6 ) "></i>
			<i class="el-icon-question icon3" v-if="(item.status==3 \|\|item.status==4 \|\| item.status==6 ) "></i>
			<img v-if="item.avatar!=null && item.avatar !=''" :src="item.avatar" class="avatar" alt="" />
			<img v-if="item.avatar ==null \|\|item.avatar ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
			<img src="@/assets/icons/ic_tongguo.png" class="iconnew" v-if="(item.type !=1 &&item.status ==2)"/>
			<img src="@/assets/icons/ic_dangqian.png" class="iconnew" v-if="(item.type !=1 &&item.status==1)"/>
			<img src="@/assets/icons/ic_jujue.png" class="iconnew" v-if="(item.type !=1 &&item.status==3)"/>
			<img src="@/assets/icons/ic_grey.png" class="iconnew" v-if="item.type ==1 \|\| (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 v-if="item.status == 1" src="@/assets/icons/ic_chaosong.png" class="avatar" alt="" />
			<img v-if="item.status != 1" src="@/assets/icons/ic_duoren.png" class="avatar" alt="" />
			</div>
			<div class="content">
			<div class="line">
			<div class="name">{{ item.title}}</div>
			<div class="time">{{ item.createDate }}</div>3
			<div class="time">{{ item.checkDate }}</div>
			</div>
			<div class="line">
			<div class="company">
			{{ item.createUserName }} {{ item.companyName }}
			<div style="display: inline">
			（<span class="status-green">{{stausInfo}}</span>
			{{ item.memberName }}
			<div style="display: inline" v-if="item.statusInfo!=null && item.statusInfo!=''">
			<span class="status-green">{{item.statusInfo \|\|''}}</span>）
			</div>
			</div>
			</div>
			<div class="line">
			<div class="remark">
			{{ item.checkInfo \|\|'' }}
			</div>
			</div>
			</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="item.avatar!=null && item.avatar !=''" :src="item.avatar" class="avatar" alt="" />
			<img v-if="item.avatar ==null \|\|item.avatar ==''" 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">
			{{ item.createUserName }} {{ item.companyName }}
			<div style="display: inline">
			（<span class="status-green">{{stausInfo}}</span>
			</div>
			</div>
			</div>
			<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 style="display: inline" 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 style="display: inline-block"> {{item1.memberName}}</span>
			</div>
			</div>
			</div>
			@@ -127,6 +117,7 @@
			<el-dialog
			append-to-body
			title="同意申请"
			style="text-align: center"
			class="dialogCl"
			:visible.sync="isShowProblem"
			width="480px"
			@@ -159,6 +150,7 @@
			<el-dialog
			append-to-body
			title="拒绝申请"
			style="text-align: center"
			class="dialogCl"
			:visible.sync="isBackProblem"
			width="600px"
			@@ -449,7 +441,7 @@
			border-left: 2px dashed #cccccc;
			left: 31px;
			height: calc(100% - 24px);
			top: 46px;
			top: 34px;
			}
			.info {
			display: flex;
			@@ -473,6 +465,10 @@
			color: #dc362e;
			font-size: 24px;
			}
			.iconnew{
			width: 24px;
			height: 24px;
			}
			.icon3 {
			position: relative;
			z-index: 11;
			@@ -484,7 +480,7 @@
			height: 40px;
			border-radius: 50%;
			margin: 0 12px 0 16px;
			border: 1px solid;
			//border: 1px solid;
			}
			.content {
			flex: 1;
			@@ -518,6 +514,9 @@
			color: #666666;
			margin-left: 120px;
			}
			.childList {
			margin-left: 120px;
			}
			}
			}
			}