Skip to content

C
company_app
提交 5920d7d6 作者: 毛细亚
操作

更新样式

上级 0c77d7c8
正在显示 包含 65 行增加 和 159 行删除
src/views/components/ApplyRecords/AreaTransferApply.vue
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
v-infinite-scroll="paperScroll" v-infinite-scroll="paperScroll"
:infinite-scroll-disabled="!isMoreRecord" :infinite-scroll-disabled="!isMoreRecord"
:infinite-scroll-immediate="false" :infinite-scroll-immediate="false"
class="mailListScroll" class="terminaListAreaScroll"
> >
<!-- 举报申请 --> <!-- 举报申请 -->
<div class="scrollMain" v-if="terminaList.length > 0"> <div class="scrollMain" v-if="terminaList.length > 0">
...@@ -516,12 +516,8 @@ export default { ...@@ -516,12 +516,8 @@ export default {
} }
} }
.mailListScroll { .terminaListAreaScroll {
width: 100%; width: 100%;
height: calc(100% - 220px);
overflow-y: auto;
overflow-x: hidden;
.scrollMain { .scrollMain {
width: 100%; width: 100%;
height: auto; height: auto;
......
src/views/components/ApplyRecords/TerminaTranfer.vue
<template> <template>
<div class="terminaList"> <div class="TerminaTranfer">
<div class="TerminaTranferContent">
<div class="addApply rowFlex spaceBetween"> <div class="addApply rowFlex spaceBetween">
<span></span> <span></span>
<el-button <el-button type="primary" icon="el-icon-plus" size="small"
type="primary" @click="(showaddAreaTransfer = true, areaTransferItem = {})">新增转端申请</el-button>
icon="el-icon-plus"
size="small"
@click="(showaddAreaTransfer = true,areaTransferItem = {})"
>新增转端申请</el-button>
</div> </div>
<el-form <el-form ref="taskForm" :model="terminaForm" label-position="top" class="terminaListForm" label-width="85px">
ref="taskForm"
:model="terminaForm"
label-position="top"
class="terminaListForm"
label-width="85px"
>
<el-form-item label="审批状态"> <el-form-item label="审批状态">
<el-select <el-select v-model="terminaForm.approval_status" style="width:95%;" clearable placeholder="请选择审批状态"
v-model="terminaForm.approval_status" @change="filterChange">
style="width:95%;" <el-option v-for="item in approvalList" :key="item.value" :label="item.label" :value="item.value">
clearable
placeholder="请选择审批状态"
@change="filterChange"
>
<el-option
v-for="item in approvalList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<selectDate <selectDate :default-value="dateValue" :type="true" style="width: 95%" @result="createResult" />
:default-value="dateValue"
:type="true"
style="width: 95%"
@result="createResult"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div <div v-infinite-scroll="paperScroll" :infinite-scroll-disabled="!isMoreRecord" :infinite-scroll-immediate="false"
v-infinite-scroll="paperScroll" class="TerminaTranferScroll">
:infinite-scroll-disabled="!isMoreRecord"
:infinite-scroll-immediate="false"
class="mailListScroll"
>
<!-- 举报申请 --> <!-- 举报申请 -->
<div v-if="terminaList.length>0" class="scrollMain"> <div v-if="terminaList.length > 0" class="scrollMain">
<div <div v-for="(item, index) in terminaList" :key="index" class="terminaContent"
v-for="(item, index) in terminaList" @click="terminaProcess(item, index)">
:key="index"
class="terminaContent"
@click="terminaProcess(item, index)"
>
<div class="terminaItem rowFlex spaceBetween columnCenter"> <div class="terminaItem rowFlex spaceBetween columnCenter">
<div class="terminaItemLeft"> <div class="terminaItemLeft">
<p><span class="label">角色名称:</span><span class="value">{{ item.role_name }}</span></p> <p><span class="label">角色名称:</span><span class="value">{{ item.role_name }}</span></p>
...@@ -66,64 +34,27 @@ ...@@ -66,64 +34,27 @@
<p> <p>
<span class="label">登记时间:</span><span class="value">{{ item.create_time || '' }}</span> <span class="label">登记时间:</span><span class="value">{{ item.create_time || '' }}</span>
</p> </p>
<p><span class="label">转端状态:</span><span class="value">{{ item.trans_check_status_text || '-' }}</span></p> <p><span class="label">转端状态:</span><span class="value">{{ item.trans_check_status_text || '-' }}</span>
</p>
</div> </div>
<div class="terminaItemRight columnFlex columnCenter"> <div class="terminaItemRight columnFlex columnCenter">
<el-button <el-button v-if="item.approval_status == 3 && item.related_request_id == 0" type="primary" size="mini"
v-if="item.approval_status== 3 && item.related_request_id == 0" style="margin-bottom:15px;" @click.stop="resubmitApproval(item)">重新提交</el-button>
type="primary" <img v-if="item.approval_status == 1" :src="shenpi1" class="icon" />
size="mini" <img v-else-if="item.approval_status == 2" :src="shenpi2" class="icon" />
style="margin-bottom:15px;" <img v-else-if="item.approval_status == 3" :src="shenpi6" class="icon" />
@click.stop="resubmitApproval(item)" <img v-else-if="item.approval_status == 4" :src="shenpi4" class="icon" />
>重新提交</el-button> <img v-else-if="item.approval_status == 5" :src="shenpi5" class="icon" />
<img
v-if="item.approval_status == 1"
:src="shenpi1"
class="icon"
/>
<img
v-else-if="item.approval_status == 2"
:src="shenpi2"
class="icon"
/>
<img
v-else-if="item.approval_status == 3"
:src="shenpi6"
class="icon"
/>
<img
v-else-if="item.approval_status == 4"
:src="shenpi4"
class="icon"
/>
<img
v-else-if="item.approval_status == 5"
:src="shenpi5"
class="icon"
/>
</div> </div>
</div> </div>
<!-- 审批进度 --> <!-- 审批进度 -->
<el-collapse-transition> <el-collapse-transition>
<div <div v-if="item.showStep" class="terminaProcessList">
v-if="item.showStep" <el-steps direction="vertical" :active="item.current" finish-status="success">
class="terminaProcessList" <el-step v-for="(items, indexs) in item.terminaProcessList" :key="'trans_item_' + indexs"
> :title="items.node_name">
<el-steps
direction="vertical"
:active="item.current"
finish-status="success"
>
<el-step
v-for="(items, indexs) in item.terminaProcessList"
:key="'trans_item_' + indexs"
:title="items.node_name"
>
<template slot="description"> <template slot="description">
<div <div v-if="items" class="trans-follow-1 card-style">
v-if="items"
class="trans-follow-1 card-style"
>
<div class="follow-item"> <div class="follow-item">
<span class="follow-info-label label-font"> <span class="follow-info-label label-font">
{{ items.node_sort !== '0' ? '审批人:' : '登记人:' }} {{ items.node_sort !== '0' ? '审批人:' : '登记人:' }}
...@@ -131,32 +62,22 @@ ...@@ -131,32 +62,22 @@
<span class="info-value value-font"> <span class="info-value value-font">
{{ Array.isArray(items.user_name) ? items.user_name[0] : items.user_name }} {{ Array.isArray(items.user_name) ? items.user_name[0] : items.user_name }}
</span> </span>
<el-tooltip <el-tooltip v-if="Array.isArray(items.user_name) && items.user_name.length > 1" class="item"
v-if="Array.isArray(items.user_name) && items.user_name.length > 1" effect="dark" :content="items.user_name.slice(1).join('、')" placement="top">
class="item"
effect="dark"
:content="items.user_name.slice(1).join('、')"
placement="top"
>
<span class="info-value value-font info-value-color"> <span class="info-value value-font info-value-color">
{{ `+${items.user_name.length - 1}` }} {{ `+${items.user_name.length - 1}` }}
</span> </span>
</el-tooltip> </el-tooltip>
</div> </div>
<div <div v-if="items.node_sort !== '0' || items.node_name === '系统'" class="follow-item">
v-if="items.node_sort !== '0' || items.node_name === '系统'"
class="follow-item"
>
<span class="follow-info-label label-font"> <span class="follow-info-label label-font">
审批结果: 审批结果:
</span> </span>
<span <span class="info-value value-font"
class="info-value value-font" :class="items.current < indexs ? '' : switchStateTag(items.approval_result)">
:class="items.current < indexs ? '' : switchStateTag(items.approval_result)" {{ items.current < indexs ? '' : items.approval_result_text == '通过' ? '完成' :
> items.approval_result_text }} </span>
{{ items.current < indexs ? '' : items.approval_result_text=='通过' ? '完成' : items.approval_result_text }}
</span>
</div> </div>
<div class="follow-item"> <div class="follow-item">
<span class="follow-info-label label-font"> <span class="follow-info-label label-font">
...@@ -168,8 +89,7 @@ ...@@ -168,8 +89,7 @@
</div> </div>
<div <div
v-if="(items.node_sort !== '0' || items.node_name === '系统') && items.approval_result === '2'" v-if="(items.node_sort !== '0' || items.node_name === '系统') && items.approval_result === '2'"
class="follow-item" class="follow-item">
>
<span class="follow-info-label label-font"> <span class="follow-info-label label-font">
驳回原因: 驳回原因:
</span> </span>
...@@ -180,8 +100,7 @@ ...@@ -180,8 +100,7 @@
<div <div
v-if="items.node_sort === item.terminaProcessList[item.terminaProcessList.length - 1].node_sort + '' && items.approval_result === '1' && items.node_sort !== '0'" v-if="items.node_sort === item.terminaProcessList[item.terminaProcessList.length - 1].node_sort + '' && items.approval_result === '1' && items.node_sort !== '0'"
class="follow-item-remark follow-item" class="follow-item-remark follow-item">
>
<span class="follow-info-label label-font"> <span class="follow-info-label label-font">
处理结果: 处理结果:
</span> </span>
...@@ -191,22 +110,16 @@ ...@@ -191,22 +110,16 @@
</div> </div>
<div <div
v-if="items.node_name !== '系统' && items.extra_attribution && items.extra_attribution.remark" v-if="items.node_name !== '系统' && items.extra_attribution && items.extra_attribution.remark"
class="info-item-remark" class="info-item-remark">
>
<div style="display: flex;"> <div style="display: flex;">
<span class="info-label remark-label">详情:</span> <span class="info-label remark-label">详情:</span>
<span <span class="preview-btn" @click.stop="previewRemark(items.extra_attribution.remark)">
class="preview-btn"
@click.stop="previewRemark(items.extra_attribution.remark)"
>
<i class="el-icon-view"></i> <i class="el-icon-view"></i>
点击查看大图 点击查看大图
</span> </span>
</div> </div>
<div <div class="remark-value"
class="remark-value" v-html="formatImg(items.extra_attribution && items.extra_attribution.remark ? items.extra_attribution.remark : '')">
v-html="formatImg(items.extra_attribution && items.extra_attribution.remark ? items.extra_attribution.remark : '')"
>
</div> </div>
</div> </div>
</div> </div>
...@@ -221,23 +134,15 @@ ...@@ -221,23 +134,15 @@
<noContent /> <noContent />
</div> </div>
</div> </div>
<el-dialog </div>
:visible.sync="dialogRemarkVisible" <el-dialog :visible.sync="dialogRemarkVisible" append-to-body title="查看大图" custom-class="remake-dialog">
append-to-body
title="查看大图"
custom-class="remake-dialog"
>
<div class="remake-box"> <div class="remake-box">
<div v-html="dialogRemake"></div> <div v-html="dialogRemake"></div>
</div> </div>
</el-dialog> </el-dialog>
<!-- 编辑误操作 --> <!-- 编辑误操作 -->
<TerminalTransferDialog <TerminalTransferDialog v-if="showaddAreaTransfer" :visible.sync="showaddAreaTransfer"
v-if="showaddAreaTransfer" :area-transfer-item="areaTransferItem" @updateList="updateList" />
:visible.sync="showaddAreaTransfer"
:area-transfer-item="areaTransferItem"
@updateList="updateList"
/>
</div> </div>
</template> </template>
<script> <script>
...@@ -457,18 +362,25 @@ export default { ...@@ -457,18 +362,25 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.terminaList { .TerminaTranfer {
width: 100%;
height: 100%;
.TerminaTranferContent{
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
.terminaListForm{ overflow-x: hidden;
::v-deep .el-form-item__label{ }
.terminaListForm {
::v-deep .el-form-item__label {
font-weight: 400; font-weight: 400;
} }
} }
.addApply { .addApply {
margin-top: 15px; margin-top: 15px;
} }
.taskForm { .taskForm {
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 10px; margin-bottom: 10px;
...@@ -521,19 +433,17 @@ export default { ...@@ -521,19 +433,17 @@ export default {
} }
} }
.mailListScroll { .TerminaTranferScroll {
width: 100%; width: 100%;
height: calc(100% - 220px);
overflow-y: auto;
overflow-x: hidden;
.scrollMain { .scrollMain {
width: 100%; width: 100%;
height: auto; height: auto;
margin-bottom: 40px; margin-bottom: 40px;
padding: 0 10px; padding: 0 10px;
.terminaContent { .terminaContent {
width:100%; width: 100%;
} }
//举报申请 //举报申请
...@@ -629,7 +539,7 @@ export default { ...@@ -629,7 +539,7 @@ export default {
width: 1px; width: 1px;
} }
::v-deep .el-step > .is-success { ::v-deep .el-step>.is-success {
color: #409EFF; color: #409EFF;
border-color: #409EFF; border-color: #409EFF;
...@@ -638,11 +548,11 @@ export default { ...@@ -638,11 +548,11 @@ export default {
} }
} }
::v-deep .el-step__main > .is-success { ::v-deep .el-step__main>.is-success {
color: #409EFF; color: #409EFF;
} }
::v-deep .el-step > .is-process { ::v-deep .el-step>.is-process {
color: #409EFF; color: #409EFF;
border-color: #409EFF; border-color: #409EFF;
...@@ -651,7 +561,7 @@ export default { ...@@ -651,7 +561,7 @@ export default {
} }
} }
::v-deep .el-step__main > .is-process { ::v-deep .el-step__main>.is-process {
color: #409EFF; color: #409EFF;
} }
...@@ -777,7 +687,7 @@ export default { ...@@ -777,7 +687,7 @@ export default {
height: 80px; height: 80px;
} }
&:hover > .preview-pic { &:hover>.preview-pic {
z-index: 100; z-index: 100;
} }
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论