Commit 12428907 authored by qddidi's avatar qddidi

update xichong

parent 4f303692
...@@ -24,7 +24,6 @@ document.onkeydown = document.onkeyup = document.onkeypress = function(event) { ...@@ -24,7 +24,6 @@ document.onkeydown = document.onkeyup = document.onkeypress = function(event) {
var e = event || window.event || arguments.callee.caller.arguments[0]; var e = event || window.event || arguments.callee.caller.arguments[0];
if (e && e.keyCode == 123) { if (e && e.keyCode == 123) {
e.returnValue = false; e.returnValue = false;
return (false); return (false);
} }
......
<template> <template>
<div> <div>
<div class="tim">
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.timestamp"
:timestamp2="123">
{{activity.content}}
<p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p>
<p style="font-size:13px;color:#909399" v-show="activity.examineRemark">原因:{{activity.examineRemark}}</p>
</el-timeline-item>
</el-timeline>
</div>
<h2 class="imtil">基础信息</h2> <h2 class="imtil">基础信息</h2>
<div class="wrap"> <div class="wrap">
<div class="masks"></div> <div class="masks"></div>
...@@ -108,6 +125,7 @@ import { Loading } from 'element-ui'; ...@@ -108,6 +125,7 @@ import { Loading } from 'element-ui';
export default { export default {
data(){ data(){
return{ return{
activities:[],
itmebs:"", itmebs:"",
show:'', show:'',
old:"原姓名", old:"原姓名",
...@@ -279,6 +297,7 @@ export default { ...@@ -279,6 +297,7 @@ export default {
} }
}, },
created(){ created(){
this.activities=JSON.parse(sessionStorage.getItem("progress"))
this.show=this.$route.params.show this.show=this.$route.params.show
this.show=this.$route.params.show this.show=this.$route.params.show
if(this.$route.params.info){ if(this.$route.params.info){
...@@ -377,6 +396,15 @@ export default { ...@@ -377,6 +396,15 @@ export default {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.tim{
width: 180px;
position: fixed;
right: 0;
top: 30%;
border-radius: 10px;
background:#ffffff
}
.masks{ .masks{
width: 100%; width: 100%;
height: 100%; height: 100%;
......
<template> <template>
<div> <div>
<div class="tim">
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.timestamp"
:timestamp2="123">
{{activity.content}}
<p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p>
<p style="font-size:13px;color:#909399" v-show="activity.examineRemark">原因:{{activity.examineRemark}}</p>
</el-timeline-item>
</el-timeline>
</div>
<h2 class="imtil">基础信息</h2> <h2 class="imtil">基础信息</h2>
<div class="wrap"> <div class="wrap">
<div v-if="!this.show" class="masks"></div> <div v-if="!this.show" class="masks"></div>
...@@ -162,6 +179,7 @@ ...@@ -162,6 +179,7 @@
export default { export default {
data() { data() {
return { return {
activities:[],
test: "sadgsdg", test: "sadgsdg",
itmebs: "", itmebs: "",
bb: false, bb: false,
...@@ -361,6 +379,7 @@ ...@@ -361,6 +379,7 @@
}, },
}, },
created() { created() {
this.activities=JSON.parse(sessionStorage.getItem("progress"))
if (typeof (this.$route.params.insCan) !== "undefined" && this.$route.params.insCan.info) { if (typeof (this.$route.params.insCan) !== "undefined" && this.$route.params.insCan.info) {
this.show = this.$route.params.insCan.show; this.show = this.$route.params.insCan.show;
sessionStorage.setItem("insCanInfo", this.$route.params.insCan.info); sessionStorage.setItem("insCanInfo", this.$route.params.insCan.info);
...@@ -402,7 +421,16 @@ ...@@ -402,7 +421,16 @@
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.tim{
width: 180px;
position: fixed;
right: 0;
top: 30%;
z-index: 100;
border-radius: 10px;
background:#ffffff
}
.masks { .masks {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
...@@ -83,6 +83,23 @@ ...@@ -83,6 +83,23 @@
<el-button type="success" @click="pass"><i class="el-icon-circle-check"></i> 审核通过</el-button> <el-button type="success" @click="pass"><i class="el-icon-circle-check"></i> 审核通过</el-button>
<el-button type="danger" @click="nopass"><i class="el-icon-circle-close"></i> 审核不通过</el-button> <el-button type="danger" @click="nopass"><i class="el-icon-circle-close"></i> 审核不通过</el-button>
</div> </div>
<div class="tim">
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.timestamp"
:timestamp2="123">
{{activity.content}}
<p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p>
<p style="font-size:13px;color:#909399" v-show="activity.examineRemark">原因:{{activity.examineRemark}}</p>
</el-timeline-item>
</el-timeline>
</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -93,6 +110,7 @@ import { Loading } from 'element-ui'; ...@@ -93,6 +110,7 @@ import { Loading } from 'element-ui';
export default { export default {
data(){ data(){
return{ return{
activities:[],
form:{ form:{
"name":"", "name":"",
"bank_photo":"", "bank_photo":"",
...@@ -271,6 +289,7 @@ export default { ...@@ -271,6 +289,7 @@ export default {
} }
}, },
created(){ created(){
this.activities=JSON.parse(sessionStorage.getItem("progress"))
this.show=this.$route.params.show this.show=this.$route.params.show
if(this.$route.params.info){ if(this.$route.params.info){
sessionStorage.setItem("info",this.$route.params.info) sessionStorage.setItem("info",this.$route.params.info)
...@@ -309,6 +328,17 @@ export default { ...@@ -309,6 +328,17 @@ export default {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.tim{
border: 1px solid lightgray;
padding: 10px;
width: 180px;
position: fixed;
right: 0;
top: 30%;
border-radius: 10px;
background:#ffffff
}
.masks{ .masks{
width: 100%; width: 100%;
height: 100%; height: 100%;
......
<template> <template>
<div> <div>
<div class="tim">
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.timestamp"
:timestamp2="123">
{{activity.content}}
<p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p>
<p style="font-size:13px;color:#909399" v-show="activity.examineRemark">原因:{{activity.examineRemark}}</p>
</el-timeline-item>
</el-timeline>
</div>
<h2 class="imtil">基础信息</h2> <h2 class="imtil">基础信息</h2>
<div class="wrap"> <div class="wrap">
<div class="masks"></div> <div class="masks"></div>
...@@ -102,6 +119,7 @@ ...@@ -102,6 +119,7 @@
export default { export default {
data() { data() {
return { return {
activities:[],
itmebs: "", itmebs: "",
show: "", show: "",
bb: false, bb: false,
...@@ -277,6 +295,7 @@ ...@@ -277,6 +295,7 @@
}, },
}, },
created() { created() {
this.activities=JSON.parse(sessionStorage.getItem("progress"))
if (typeof (this.$route.params.supPay) !== "undefined" && this.$route.params.supPay.info) { if (typeof (this.$route.params.supPay) !== "undefined" && this.$route.params.supPay.info) {
this.show = this.$route.params.supPay.show; this.show = this.$route.params.supPay.show;
sessionStorage.setItem("supPayInfo", this.$route.params.supPay.info); sessionStorage.setItem("supPayInfo", this.$route.params.supPay.info);
...@@ -328,7 +347,15 @@ ...@@ -328,7 +347,15 @@
top: 0; top: 0;
z-index: 200 z-index: 200
} }
.tim{
width: 180px;
position: fixed;
right: 0;
top: 30%;
border-radius: 10px;
background:#ffffff
}
.form { .form {
float: left; float: left;
width: 45%; width: 45%;
......
...@@ -210,8 +210,8 @@ ...@@ -210,8 +210,8 @@
}); });
}, },
//流程 //流程
progress(d,s){ progress(d,s,c){
console.log(s) sessionStorage.removeItem("progress")
this.activities=[] this.activities=[]
var data={ var data={
recordId:s.id, recordId:s.id,
...@@ -226,6 +226,7 @@ ...@@ -226,6 +226,7 @@
color:'#0bbd87', color:'#0bbd87',
size: 'large' size: 'large'
}) })
}else{ }else{
this.activities.push({ this.activities.push({
...@@ -243,10 +244,16 @@ ...@@ -243,10 +244,16 @@
examineRemark:res.data[i].examineRemark?res.data[i].examineRemark:'', examineRemark:res.data[i].examineRemark?res.data[i].examineRemark:'',
color:'black' color:'black'
}) })
return
} }
} }
} }
sessionStorage.setItem("progress",JSON.stringify(this.activities))
if(c==1){
this.toRouter(d,s)
}
}).catch((res)=>{ }).catch((res)=>{
}) })
...@@ -264,6 +271,7 @@ ...@@ -264,6 +271,7 @@
} }
Loading.service(); Loading.service();
this.$api.getlist.getlist(data).then((res) => { this.$api.getlist.getlist(data).then((res) => {
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close(); loadingInstance.close();
...@@ -286,7 +294,11 @@ ...@@ -286,7 +294,11 @@
}, },
//审核 //审核
handle(s,d){ handle(s,d){
if(d.recordtype=="参保登记"){ this.progress(s,d,1)
},
toRouter(s,d){
if(d.recordtype=="参保登记"){
sessionStorage.setItem("recordId",this.tableData[s].recordId) sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({ this.$router.push({
name:"参保登记审核", name:"参保登记审核",
......
<template> <template>
<div> <div>
<div class="tim">
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.timestamp"
:timestamp2="123">
{{activity.content}}
<p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p>
<p style="font-size:13px;color:#909399" v-show="activity.examineRemark">原因:{{activity.examineRemark}}</p>
</el-timeline-item>
</el-timeline>
</div>
<h2 class="imtil">基础信息</h2> <h2 class="imtil">基础信息</h2>
<div class="wrap"> <div class="wrap">
<div class="masks"></div> <div class="masks"></div>
...@@ -96,6 +113,7 @@ ...@@ -96,6 +113,7 @@
itmebs: "", itmebs: "",
show: "", show: "",
bb: false, bb: false,
activities:[],
form: { form: {
bank_Account: "", bank_Account: "",
bank_Name: "", bank_Name: "",
...@@ -265,6 +283,7 @@ ...@@ -265,6 +283,7 @@
} }
}, },
created() { created() {
this.activities=JSON.parse(sessionStorage.getItem("progress"))
if (typeof(this.$route.params.traRel) !== "undefined" && this.$route.params.traRel.info) { if (typeof(this.$route.params.traRel) !== "undefined" && this.$route.params.traRel.info) {
this.show = this.$route.params.traRel.show; this.show = this.$route.params.traRel.show;
sessionStorage.setItem("traRelInfo", this.$route.params.traRel.info); sessionStorage.setItem("traRelInfo", this.$route.params.traRel.info);
...@@ -339,4 +358,13 @@ ...@@ -339,4 +358,13 @@
.imtil { .imtil {
padding: 0 0 20px 0 padding: 0 0 20px 0
} }
.tim{
width: 180px;
position: fixed;
right: 0;
top: 30%;
border-radius: 10px;
background:#ffffff
}
</style> </style>
<template> <template>
<div> <div>
<div class="tim">
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.timestamp"
:timestamp2="123">
{{activity.content}}
<p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p>
<p style="font-size:13px;color:#909399" v-show="activity.examineRemark">原因:{{activity.examineRemark}}</p>
</el-timeline-item>
</el-timeline>
</div>
<h2 class="imtil">基础信息</h2> <h2 class="imtil">基础信息</h2>
<div class="wrap"> <div class="wrap">
<div class="masks"></div> <div class="masks"></div>
...@@ -296,6 +313,7 @@ ...@@ -296,6 +313,7 @@
} }
}, },
created() { created() {
this.activities=JSON.parse(sessionStorage.getItem("progress"))
if (typeof(this.$route.params.treApp) !== "undefined" && this.$route.params.treApp.info) { if (typeof(this.$route.params.treApp) !== "undefined" && this.$route.params.treApp.info) {
this.show = this.$route.params.treApp.show; this.show = this.$route.params.treApp.show;
sessionStorage.setItem("treAppInfo", this.$route.params.treApp.info); sessionStorage.setItem("treAppInfo", this.$route.params.treApp.info);
...@@ -339,7 +357,16 @@ ...@@ -339,7 +357,16 @@
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.tim{
width: 180px;
position: fixed;
right: 0;
top: 30%;
z-index: 100;
border-radius: 10px;
background:#ffffff
}
.masks { .masks {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
<template> <template>
<div> <div>
<div class="tim">
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.timestamp"
:timestamp2="123">
{{activity.content}}
<p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p>
<p style="font-size:13px;color:#909399" v-show="activity.examineRemark">原因:{{activity.examineRemark}}</p>
</el-timeline-item>
</el-timeline>
</div>
<h2 class="imtil">基础信息</h2> <h2 class="imtil">基础信息</h2>
<div class="wrap"> <div class="wrap">
<div class="masks"></div> <div class="masks"></div>
...@@ -99,6 +116,7 @@ ...@@ -99,6 +116,7 @@
export default { export default {
data() { data() {
return { return {
activities:[],
itmebs: "", itmebs: "",
show: "", show: "",
bb: false, bb: false,
...@@ -272,6 +290,7 @@ ...@@ -272,6 +290,7 @@
} }
}, },
created() { created() {
this.activities=JSON.parse(sessionStorage.getItem("progress"))
if (typeof(this.$route.params.upgReo) !== "undefined" && this.$route.params.upgReo.info) { if (typeof(this.$route.params.upgReo) !== "undefined" && this.$route.params.upgReo.info) {
this.show = this.$route.params.upgReo.show; this.show = this.$route.params.upgReo.show;
sessionStorage.setItem("upgReoInfo", this.$route.params.upgReo.info); sessionStorage.setItem("upgReoInfo", this.$route.params.upgReo.info);
...@@ -310,7 +329,15 @@ ...@@ -310,7 +329,15 @@
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.tim{
width: 180px;
position: fixed;
right: 0;
top: 30%;
border-radius: 10px;
background:#ffffff
}
.masks { .masks {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment