Skip to content

S
SuperMan
Commit 6ec74580 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents da7a86fa f8fc47ba
Hide whitespace changes
Inline Side-by-side
Showing with 2789 additions and 26 deletions
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @ 6ec74580
......@@ -277,6 +277,8 @@
<template>
<div class="CapitalDetail">
<span class="Ca_Span">{{$t('fnc.zjdbodan')}}</span>
<p v-show="huijiShow" @click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)" style="color: #3980C8;font-size:12px;text-align:right;cursor: pointer;width:830px;margin-bottom:20px">凭证打印</p>
<div class="clearfix">
<div class="Co_oderleft">
<div class="Ca_leftOrder">
......@@ -635,14 +637,35 @@ export default {
GetDetail:{
AuditSteps:[]
},
endDate: ''
endDate: '',
huijiShow:false,
}
},
create(){
created(){
let userinfo = this.getLocalStorage();
this.bossID = userinfo.EmployeeId;
let ActionMenuCode=userinfo.ActionMenuCode;
if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
this.huijiShow=true;
}
console.log("huijiShow",this.huijiShow)
},
methods:{
goPrintPageNew(type,id,Merge,OrderSource){
if(type===1){
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { type: type,id:id,isKehu:0,Merge:Merge,OrderSource:OrderSource?OrderSource:-1,Capital:1}
});
window.open(routeData.href, "_blank");
}else{
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { type: type,id:id,Merge:Merge,OrderSource:OrderSource?OrderSource:-1,Capital:1}
});
window.open(routeData.href, "_blank");
}
},
inited (viewer){
this.$viewer = viewer
},
......
src/components/FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue 0 → 100644
View file @ 6ec74580
<style scoped>
p{margin: 0;}
.Receipt_box{color: #c94052;width: 100%;background-color: rgba(245, 245, 245, 1);position: relative;margin-top: 15px;}
.Receipt_box tr th{color: #c94052}
.Receipt_box.color_blur tr th{color: #106BAF}
.Receipt_box.color_blur{color: #106BAF;}
.Receipt_box.color_blur .rb_stit span{display: inline-block;border-bottom: 2px solid #106BAF;padding: 0 20px}
.rb_tit{font-size: 16px;text-align: center;margin-bottom: 20px;}
.rb_stit{font-size: 14px;text-align: center}
.rb_stit span{display: inline-block;border-bottom: 2px solid #C94052;padding: 0 20px}
.rb_top_row{display: flex;justify-content: space-between;font-size: 12px;}
.rb_top_row span._r_name{color: #333333}
.rb_top_row span._r_bold{font-weight: bold}
.rb_top_row ._r_time span{color: #333333}
._r_mb5{margin-bottom: 5px;}
.Receipt_table{width: 100%;font-size: 14px;text-align: center}
.Receipt_table th{font-weight: 200 !important}
.Receipt_table tr th,.Receipt_table tr td{background-color: white}
._r_mt10{margin-top: 10px;}
.Receipt_box.color_blur{color: #106BAF;}
.Receipt_box.color_blur .rb_stit span{display: inline-block;border-bottom: 2px solid #106BAF;padding: 0 20px}
._color_b{color: #333333 !important;font-size: 12px}
._font_size12{font-size: 12px !important}
._r_IsPublic{
padding-left: 15px;
}
._guanlian{
font-size: 12px;
color: gray;
}
._guanlian span{
font-size: 14px;
color: #333333;
}
._yewudanju{
position: absolute;
text-align: right;
font-size: 12px;
right: 15px;
top: 15px;
}
._jump_page{
cursor: pointer;
text-decoration: underline;
}
i{
font-style: initial;
}
.Receipt_box._PrintPageStyle tr th{color: #333333}
.Receipt_box._PrintPageStyle{color: #333333;}
.Receipt_box._PrintPageStyle .rb_stit span{border-bottom: 2px solid #333333;}
.Receipt_box._PrintPageStyle{color: #333333;}
.Receipt_box._PrintPageStyle .rb_stit span{border-bottom: 2px solid #333333;}
._border_color_r{
border-color: #c94052;
}
._border_color_b{
border-color: #106BAF;
}
._border_color_p{
border-color: #333333;
}
.Receipt_box .rb_stit span._rb_stit_print{
padding: 0;
padding-top: 10px;
border: none;
}
._sanjiao_{
position: absolute;
top: 0px;
left: 0px;
width: 0px;
height: 0px;
border-top: 20px solid #e73828;
border-bottom: 20px solid transparent;
border-left: 20px solid #e73828;
border-right: 20px solid transparent;
}
._sanjiao_:after{
content: '合';
position: absolute;
top: -15px;
left: -14px;
white-space: nowrap;
color: #FFFFFF;
font-size: 12px;
}
._border_1{
border:1px solid #333;
padding: 15px;
margin-bottom: 20px;
}
</style>
<template v-if="GetDetail&&GetDetail.DetailList.length>0">
<div class="Receipt_box" :class="[GetDetail.Type==1?'':'color_blur',isPrintPage?'_PrintPageStyle':'']" :style="{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
<div v-show="disabled">
<div class="_border_1" v-for="(val,index) in loopNumN" :key="index">
<div class="_sanjiao_"></div>
<p class="rb_tit">{{GetDetail.CompanyName}}</p>
<table class="Receipt_table" border="1" :class="[GetDetail.Type==1?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']" :bordercolor="GetDetail.Type==1?'#c94052':'#106BAF'" style="border-collapse:collapse;">
<tr>
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('visa.v_tuanhao')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
<!--<th rowspan="2">数量</th>-->
<!--<th rowspan="2">单 价</th>-->
<th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="5">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th rowspan="2">{{$t('fnc.zhidanren')}}</th>
</tr>
<tr>
<th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="68">{{$t('fnc.bweibi')}}</th>
<th width="68">到账</th>
<th width="48">手续费</th>
</tr>
<template v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length">
<tr v-for="(item) in GetDetail.MergeDetailList" class="_color_b">
<td height="34px">{{item.BName}}</td>
<td height="34px">
<template v-for="tc in item.TCIDAndTCNUMList">
<p class="_jump_page" @click="jumpPage('productQuery',tc.TCID,1)">{{tc.TCNUM}}({{tc.TCID}})</p>
</template>
</td>
<td height="34px">{{item.FinanceId}}</td>
<td height="34px">{{item.CostTypeName}}</td>
<!--<td height="34px">{{item.Number}}</td>-->
<!--<td height="34px">{{item.UnitPrice}}</td>-->
<td height="34px">{{item.CurrencyName}}</td>
<td height="34px">{{item.OriginalMoney}}</td>
<td height="34px">{{item.Rate}}</td>
<td height="34px">{{item.Money}}</td>
<td height="34px">{{item.PayMoney}}</td>
<td height="34px">{{item.Fee}}</td>
<td height="34px" style="max-width: 120px;">{{item.Remark}}</td>
<td height="34px">{{item.EmName}}</td>
</tr>
</template>
<tr v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length<2">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<!--<td height="34px"></td>-->
<!--<td height="34px"></td>-->
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length<3">
<td height="34px"></td>
<td height="34px"></td>
<!--<td height="34px"></td>-->
<!--<td height="34px"></td>-->
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length<4">
<td height="34px"></td>
<td height="34px"></td>
<!--<td height="34px"></td>-->
<!--<td height="34px"></td>-->
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<!--v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0"-->
<tr v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0">
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="11" class="_color_b">
<template v-for="(item,index) in GetDetail.MergeBankList">
<p class="_fex_cen clearfix"><span class="_bold">{{item.Alias}}-</span><span class="_bank_name">{{item.TypeName}}-</span><span class="_bank_type" :class="item.AccountType=='对私'?'':'_bank_type2'">{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span></p>
</template>
</td>
</tr>
<tr v-if="GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.wbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="4" class="_color_b">{{GetDetail.Merge.WBMoney==''?$t('fnc.ling'):GetDetail.WBChineseMoney}}（{{GetDetail.Merge.WBMoney}}）</td>
<td height="34px" class="">{{$t('fnc.bwbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="6" class="_color_b">{{GetDetail.Merge.Money==''?$t('fnc.ling'):GetDetail.ChineseMoney}}（{{GetDetail.Merge.Money}}）</td>
</tr>
<tr class="_huik_info" v-if="GetDetail.Type==1&&GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.huikuanren')}}</td>
<td height="34px" colspan="4">
<span class="_color_b _font_size12">{{GetDetail.Merge.RemitterNameV2}}</span>
</td>
<td height="34px" class="">{{$t('fnc.hkshijian')}}</td>
<td height="34px" colspan="6">
<span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
</td>
</tr>
<tr class="_huik_info" v-else-if="GetDetail.Type!=1&&GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.jiaoyiriqi')}}</td>
<td height="34px" colspan="11">
<span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
</td>
</tr>
</table>`
</div>
</div>
<div v-show="!disabled">
<div class="_border_1" v-for="(val,index) in loopNumN" :key="index">
<div class="_sanjiao_"></div>
<p class="rb_tit">
<el-input size="small" style="width:auto" v-model="GetDetail.CompanyName" placeholder="请输入"></el-input>
</p>
<table class="Receipt_table" border="1" :class="[GetDetail.Type==1?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']" :bordercolor="GetDetail.Type==1?'#c94052':'#106BAF'" style="border-collapse:collapse;">
<tr>
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('visa.v_tuanhao')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
<!--<th rowspan="2">数量</th>-->
<!--<th rowspan="2">单 价</th>-->
<th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="5">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th rowspan="2">{{$t('fnc.zhidanren')}}</th>
</tr>
<tr>
<th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="68">{{$t('fnc.bweibi')}}</th>
<th width="68">到账</th>
<th width="48">手续费</th>
</tr>
<template v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length">
<tr v-for="(item) in GetDetail.MergeDetailList" class="_color_b">
<td height="34px">
<el-input size="small" style="width:auto" v-model="item.BName" placeholder="请输入"></el-input>
</td>
<td height="34px">
<template v-for="tc in item.TCIDAndTCNUMList">
<p class="_jump_page">
<el-input size="small" style="width:auto" v-model="tc.TCNUM" placeholder="请输入"></el-input>
<el-input size="small" style="width:auto" v-model="tc.TCID" placeholder="请输入"></el-input>
</p>
</template>
</td>
<td height="34px">{{item.FinanceId}}</td>
<td height="34px">{{item.CostTypeName}}</td>
<!--<td height="34px">{{item.Number}}</td>-->
<!--<td height="34px">{{item.UnitPrice}}</td>-->
<td height="34px">
<el-input size="small" style="width:auto" v-model="item.CurrencyName" placeholder="请输入"></el-input>
</td>
<td height="34px">{{item.OriginalMoney}}</td>
<td height="34px">{{item.Rate}}</td>
<td height="34px">{{item.Money}}</td>
<td height="34px">{{item.PayMoney}}</td>
<td height="34px">{{item.Fee}}</td>
<td height="34px" style="max-width: 120px;">
<el-input size="small" style="width:auto" v-model="item.Remark" placeholder="请输入"></el-input>
</td>
<td height="34px">{{item.EmName}}</td>
</tr>
</template>
<tr v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length<2">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<!--<td height="34px"></td>-->
<!--<td height="34px"></td>-->
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length<3">
<td height="34px"></td>
<td height="34px"></td>
<!--<td height="34px"></td>-->
<!--<td height="34px"></td>-->
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length<4">
<td height="34px"></td>
<td height="34px"></td>
<!--<td height="34px"></td>-->
<!--<td height="34px"></td>-->
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<!--v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0"-->
<tr v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0">
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="11" class="_color_b">
<template v-for="(item,index) in GetDetail.MergeBankList">
<p class="_fex_cen clearfix">
<span class="_bold">
<el-input size="small" style="width:auto" v-model="item.Alias" placeholder="请输入"></el-input>
-
<el-input size="small" style="width:auto" v-model="item.TypeName" placeholder="请输入"></el-input>
-
<el-input size="small" style="width:auto" v-model="item.AccountType" placeholder="请输入"></el-input>
<el-input size="small" style="width:auto" v-model="item.BankNo" placeholder="请输入"></el-input>
</span>
<!-- {{item.Alias}}-</span><span class="_bank_name">{{item.TypeName}}-</span>
<span class="_bank_type" :class="item.AccountType=='对私'?'':'_bank_type2'">
{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span>
{{item.BankNo?'-':''}} <span>{{item.BankNo}} -->
</p>
</template>
</td>
</tr>
<tr v-if="GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.wbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="4" class="_color_b">{{GetDetail.Merge.WBMoney==''?$t('fnc.ling'):GetDetail.WBChineseMoney}}（{{GetDetail.Merge.WBMoney}}）</td>
<td height="34px" class="">{{$t('fnc.bwbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="6" class="_color_b">{{GetDetail.Merge.Money==''?$t('fnc.ling'):GetDetail.ChineseMoney}}（{{GetDetail.Merge.Money}}）</td>
</tr>
<tr class="_huik_info" v-if="GetDetail.Type==1&&GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.huikuanren')}}</td>
<td height="34px" colspan="4">
<span class="_color_b _font_size12">{{GetDetail.Merge.RemitterNameV2}}</span>
</td>
<td height="34px" class="">{{$t('fnc.hkshijian')}}</td>
<td height="34px" colspan="6">
<span class="_color_b _font_size12">
<el-input size="small" style="width:auto" v-model="GetDetail.Merge.TradeDateV2" placeholder="请输入"></el-input>
</span>
</td>
</tr>
<tr class="_huik_info" v-else-if="GetDetail.Type!=1&&GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.jiaoyiriqi')}}</td>
<td height="34px" colspan="11">
<span class="_color_b _font_size12">
<el-input size="small" style="width:auto" v-model="GetDetail.Merge.TradeDateV2" placeholder="请输入"></el-input>
</span>
</td>
</tr>
</table>
</div>
</div>
</div>
</template>
<script>
export default {
props:["ID","width","color","isPrintPage","name","disabled","loopNumN"], //接收参数 ID width color
data(){
return{
loading:false,
// GetDetail:{DetailList:null},
EmployeeId:'',
EndDate:'',
StartDate:'',
GetDetail: {}
}
},methods:{
jumpPage(path,id,type){
if(type==1){
// let routeData = this.$router.resolve({
// name: path,
// query: { id:id,orderID:this.GetDetail.OrderID,isShow:false}
// });
// window.open(routeData.href, "_blank");
this.$router.push({
name: path,
query: { id:id,orderID:this.GetDetail.OrderID,isShow:false,blank:'y'}
})
}else if(type==2){
// let routeData = this.$router.resolve({
// name: path,
// query: { starTime:this.StartDate,endTime:this.EndDate,EmployeeId:this.EmployeeId}
// });
// window.open(routeData.href, "_blank");
this.$router.push({
name: path,
query: { starTime:this.StartDate,endTime:this.EndDate,EmployeeId:this.EmployeeId,blank:'y'}
})
}
},
Financial_post_GetDetail(id){ //获取单据详情
if(!id) return
this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
})
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.Money)
data.WBChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.WBMoney)
data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100)
data.Merge.TradeDateV2 = new Date(data.Merge.TradeDateV2).Format('yyyy-MM-dd')
data.AuditSteps.reverse()
this.GetDetail = data;
this.loading=false
this.$set(this.$data,"GetDetail",data);
}
}, err => {})
},
},mounted(){
const myDate = new Date();
let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
let month = myDate.getMonth()+1; //获取当前月份(0-11,0代表1月)
let dateS = myDate.getDate(); //获取当前日(1-31)
this.StartDate = yaer + '-' + month + '-' + '01';
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
},
deep: true
},
ID:{
handler: function(val, oldVal) {
this.ID = val
this.Financial_post_GetDetail(this.ID)
},
deep: true
}
}
}
</script>
src/components/FinancialModule/FinancialSubmodule/myCapital.vue 0 → 100644
View file @ 6ec74580
<style>
.CapitalDetail .Ca_Span{
display:block;
padding-left: 10px;
font-size:14px;
margin-bottom:20px;
color:#333333;
border-left:3px solid #E95252;
}
.CapitalDetail .Ca_leftOrder{
width:100%;
height:auto;
padding:15px 0;
background-color: #fff;
}
.CapitalDetail .Ca_title{
margin:auto;
font-size:16px;
margin-top:20px;
color:#333333;
text-align: center;
}
.CapitalDetail .Ca_t2{
width:100%;
font-size:14px;
text-align: center;
margin-bottom: -8px;
}
.CapitalDetail .Ca_line{
width:110px;
height:3px;
margin:8px auto 10px;
border-top:1px solid #777373;
border-bottom:2px solid;
/* border-bottom:1px solid #333333; */
}
.CapitalDetail .collection_Order{
width:100%;
height:36px;
font-size:12px;
line-height: 35px;
padding:0 20px;
border-bottom:1px dashed #BFBFBF;
}
.CapitalDetail .Ca_comColor{
color:#BE525D;
}
.CapitalDetail .Ca_comSize{
font-size: 14px;
}
.CapitalDetail .Co_oderRight{
float:right;
}
.CapitalDetail .Ca_diaobo{
width:100%;
height:35px;
font-size:12px;
line-height: 35px;
padding:0 20px;
}
.collection_Table,.pay_Table{
width:96%;
margin:auto;
padding:0 20px;
font-size:14px;
}
.collection_Table th{
font-size:12px;
color:#BE525D;
}
.collection_Table td,.collection_Table th{
border: 1px solid #BE525D;
text-align: center;
height:44px;
padding:0 5px;
}
.pay_Table th{
font-size:12px;
color:#1273BC;
}
.pay_Table td,.pay_Table th{
border: 1px solid #1273BC;
text-align: center;
height:44px;
padding:0 5px;
}
.CapitalDetail .Ca_comLinediv{
width:96%;
min-height:80px;
margin:auto;
font-size:12px;
border-bottom: 1px dashed #BFBFBF;
}
.CapitalDetail .Ca_comBlueColor{
color:#1273BC;
}
.CapitalDetail textarea{
border:none;
border-bottom:1px solid #666666;
}
.CapitalDetail .Ca_payBtn{
color:#1273BC;
border-color:#1273BC;
}
.CapitalDetail .Ca_cashier{
width:25%;
float:left;
}
.CapitalDetail .Ca_popDiv{
width:100%;
height:52px;
line-height: 52px;
padding:0 20px;
font-size:12px;
display: flex;
justify-content: space-between;
}
.Ca_popDiv p{
display: inline-block;
}
.Ca_popDiv p:last-child{
float:right;
margin-right:0;
}
.CapitalDetail .Cafujian{
width:100%;
min-height: 50px;
margin-top:20px;
}
.Cafujian>div{
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210,210,210,1);
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.Cafujian>div .icon-guanbi1{
display: inline-block;
margin-left: 15px;
color:#fff;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
.Cafujian>div .icon-guanbi1:hover{
color:#c94052;
font-size:12px;
}
.Cafujian>div img{
width:100%;
height:100%;
}
.CapitalDetail .Ca_rightFile{
float:left;
width:300px;
/* height:500px; */
border:1px solid red;
}
.CapitalDetail .Ca_description{
width:600px;
min-height: 30px;
display: inline-block;
margin-top:30px;
font-size: 14px;
}
.CapitalDetail .Ca_remarkSpan{
display: inline-block;
height: 30px;
vertical-align: top;
margin-top: 30px;
}
.Cafujian .icon-excel{
text-align: center;
font-size: 38px;
color: green;
line-height: 75px;
}
.CapitalDetail .Ca_AccountInfo{
width:100%;
padding:0 20px;
text-align:left;
}
.w830px{width: 830px;padding: 0;margin: 0;}
._tit2{
border:none;
background-color: white;
border: 1px solid #DDDDDD;
}
._tit._tit2>p{
padding-left: 10px;
font-size: 14px;
color: #000;
padding: 8px 15px;
display: flex;
justify-content: space-between;
}
._tit._tit2 ._rotate{
transform:rotate(180deg);
}
._tit._tit2 ._btn{
font-size: 12px;
color: #333333;
cursor: pointer;
}
._tit._tit2 ._btn:hover{
color: #E95252;
}
._tit._tit2 ._btn .iconfont{
font-size: 12px;
display: inline-block;
margin-left: 10px;
}
._tit._tit2 ._text{
border-left: 3px solid #e95252;
padding-left: 10px;
}
.w600px{
width: 600px;
padding: 15px;
margin: 0 auto;
}
.CapitalDetail ._conten,.CapitalDetail ._process{margin-top: 20px;width: 830px;}
._process{background-color: white;padding: 20px 15px;position: relative;}
._process_box{border-top: 1px dashed #BFBFBF;padding-top: 30px;padding-bottom: 40px;}
._pb_son{position: relative;padding-left: 75px;min-height: 100px;padding-bottom: 30px}
._left_radius{width: 40px;height: 40px;border-radius: 50%;text-align: center;line-height: 40px;background-color: #2BBB7E;color: white;font-size: 12px;position: absolute;left: 15px;z-index: 2;}
._left_radius_err{background-color: #E95252 !important;}
._left_radius_sus{background-color: #1273BC !important;}
._pb_son::after{content: '';width: 4px;height: 100%;background-color: #2BBB7E;display: inline-block;position: absolute;clear: both;left: 33px;top: 0;z-index: 1}
._pb_son._none_after::after{content: '';display: none}
._pb_son._bohui_after::after{background-color: #E95252 !important;display: inline-block}
._status_color_f{background-color: #8B8B8B !important}
._right_content ._name ._n{font-size: 14px;color: #333333;font-weight: bold;}
._right_content ._name ._m{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #E95252;margin-left: 5px;border-radius: 4px;}
._right_content ._name ._sm{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #FF9600;margin-left: 5px;border-radius: 4px;font-weight: 100;}
._right_content ._name ._sn{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #2BBB7E;margin-left: 5px;border-radius: 4px;}
._right_content ._time,._time{font-size: 12px;color: #666666;padding-top: 5px;}
._right_content ._pp_info,._textarea{border-radius: 4px; border: 1px solid #E5E5E5;background:rgba(245,245,245,1);font-size: 12px;color: #333333;padding: 12px 14px;margin-top: 13px;position: relative;}
._right_content ._pp_info:before{display:block;content:'';border-width:8px 8px 8px 8px;border-style:solid;border-color: transparent transparent #dedede transparent;position:absolute;left:10px;top:-16px;}
._mgt_15{margin-top: 15px;}
._more ._right_content .iconfont{color: #AAAAAA}
._more ._right_content ._name ._n{font-size: 14px;color: #333333;font-weight: bold;padding-left: 3px;}
._info_img ul{padding: 10px 0}
._info_img ul li{float: left;position: relative;cursor: pointer}
._info_img ul li:hover ._see_img{opacity: 1;}
._info_img ul li img{width:88px;height:59px;}
._see_img{position: absolute;top: 0;width: 100%;height: 59px;padding-top: 16px;line-height: 34px;text-align: center;background-color: rgba(2, 2, 2, 0.3);display: inherit;opacity: 0;transition: all linear .5s}
._see_img i.iconfont{display: inline-block;width: 32px;height: 32px;border-radius: 50%;color: #FFFFFF !important;background-color: rgba(255, 255, 255, 0.5);}
._show_img_box{position: fixed; background: rgba(0,0,0,.6); left: 0; top:0; width: 100%; height: 100%; z-index: 999; text-align: center;overflow: auto;}
._textarea{width: 690px;height: 50px;background-color: white}
._upload_box ul li{float: left;height:82px;width:143px;padding:20px 20px 20px 0;text-align: center;position: relative;cursor: pointer;margin-right: 10px;}
._upload_box ul li img{height:82px;width:143px;}
._upload_box ul li:hover ._delete_img{opacity: 1;}
._delete_img{position: absolute;top: 20px;height:82px;width:143px;line-height: 34px;text-align: center;background-color: rgba(2, 2, 2, 0.6);display: inherit;opacity: 0;transition: all linear .5s}
._delete_img i.iconfont{display: inline-block;width: 32px;height: 32px;border-radius: 50%;color: #E95252 !important;background-color:rgba(251, 251, 251, 0.9); margin-top: 26px;}
._radio_lsit{padding-top: 15px}
._upload_tips{font-size: 12px;position: absolute;top: 66%;width: 100%;left: 0;text-align: center;color: #949494;}
._log_t{padding: 10px;}
._time_n{float: right;}
.myCapital{
border:1px solid #333;
}
</style>
<template>
<div class="CapitalDetail">
<div class="11" v-show="disabled">
<div v-for="(val,index) in loopNumN" :key="index" style="margin-bottom:20px">
<div class="Co_oderleft myCapital">
<div class="Ca_leftOrder">
<div class="Ca_title">{{dataList.CompanyName}}</div>
<div class="Ca_t2">{{dataList.FinanceName}}
<i v-if="index===0">{{$t('fnc.yewulian')}}</i>
<i v-if="index===1">{{$t('fnc.kuaijilian')}}</i>
</div>
<div class="clearfix collection_Order">
<div class="Co_oderleft">
<span>{{$t('hotel.hotel_SerialNumber')}}：</span><span class="Ca_comSize">{{dataList.FrID}}</span>
<div class="Co_oderRight">
<span>{{$t('fnc.zhibiao')}}：</span><span class="Ca_comSize">{{dataList.CreateDate}}</span>
</div>
</div>
</div>
<div v-for="item in dataList.SBankList">
<div class="clearfix Ca_diaobo">
<div class="Co_oderRight" style="margin:10px 0;">
<span class="Ca_comColor">{{$t('fnc.dbriqi')}}：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
</div>
</div>
<table class="collection_Table" style="border-collapse: collapse;">
<tr>
<th width="100">{{$t('fnc.skfangshi')}}</th>
<th width="300">{{$t('fnc.acc')}}</th>
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>汇兑收益</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>{{item.TypeName}}</td>
<td>
<div class="Ca_AccountInfo">{{item.Alias}}-{{item.AccountType}}-{{item.BankNo}}</div>
</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>
<span v-if="item.IsExChange==1">是</span>
<span v-if="item.IsExChange==0">否</span>
</td>
<td>{{item.Money}}</td>
</tr>
</table>
<div class="clearfix Ca_comLinediv">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div>
<div class="Cafujian clearfix" v-if="item.isShow">
<template v-for="(file,fIndex) in item.vorcherInos">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Content" @click="showImg(file.Content)">
</div>
</div>
<div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)">
</div>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
</div>
</template>
</div>
</div>
</div>
<div v-for="item in dataList.FBankList">
<div class="clearfix Ca_diaobo">
<div class="Co_oderRight" style="margin:10px 0;">
<span class="Ca_comBlueColor">{{$t('fnc.dbriqi')}}：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
</div>
</div>
<table class="pay_Table" style="border-collapse: collapse;">
<tr>
<th width="100">{{$t('fnc.fkfangshi')}}</th>
<th width="300">{{$t('fnc.acc')}}</th>
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>汇兑损失</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>{{item.TypeName}}</td>
<td>
<div class="Ca_AccountInfo">{{item.Alias}}-{{item.AccountType}}-{{item.BankNo}}</div>
</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>
<span v-if="item.IsExChange==1">是</span>
<span v-if="item.IsExChange==0">否</span>
</td>
<td>{{item.Money}}</td>
</tr>
</table>
<div class="clearfix Ca_comLinediv" style="width:100%;padding:0 20px;">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div>
<div class="Cafujian clearfix" v-if="item.isShow">
<template v-for="(file,fIndex) in item.vorcherInos">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Content" @click="showImg(file.Content)">
</div>
</div>
<div v-if="file.Type==1">
<div class="iconfont _wenjian_P" :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFileT(file)">
</div>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
</div>
</template>
</div>
</div>
</div>
<div class="Ca_popDiv" v-if="dataList.AuditSteps!=''">
<template v-for="(item,index) in dataList.AuditSteps">
<p>{{item.AuditDescription}}：
<template v-if="item.Status===2">
<span class="_r_name" v-if="s.AuditStatus==2" v-for="(s,si) in item.AuditRecordList">{{s.AuditName}} </span>
</template>
</p>
</template>
</div>
</div>
</div>
</div>
</div>
<div class="22" v-show="!disabled">
<div v-for="(val,index) in loopNumN" :key="index" style="margin-bottom:20px">
<div class="Co_oderleft myCapital">
<div class="Ca_leftOrder">
<div class="Ca_title">
<el-input size="small" style="width:auto" v-model="dataList.CompanyName" placeholder="请输入"></el-input>
</div>
<div class="Ca_t2">
<el-input size="small" style="width:auto" v-model="dataList.FinanceName" placeholder="请输入"></el-input>
<i v-if="index===0">{{$t('fnc.yewulian')}}</i>
<i v-if="index===1">{{$t('fnc.kuaijilian')}}</i>
</div>
<div class="clearfix collection_Order">
<div class="Co_oderleft">
<span>{{$t('hotel.hotel_SerialNumber')}}：</span><span class="Ca_comSize">{{dataList.FrID}}</span>
<div class="Co_oderRight">
<span>{{$t('fnc.zhibiao')}}：</span><span class="Ca_comSize">{{dataList.CreateDate}}</span>
</div>
</div>
</div>
<div v-for="item in dataList.SBankList">
<div class="clearfix Ca_diaobo">
<div class="Co_oderRight" style="margin:10px 0;">
<span class="Ca_comColor">{{$t('fnc.dbriqi')}}：</span><span class="Ca_comSize">
<el-input size="small" style="width:auto" v-model="item.AllotDate" placeholder="请输入"></el-input>
</span>
</div>
</div>
<table class="collection_Table" style="border-collapse: collapse;">
<tr>
<th width="100">{{$t('fnc.skfangshi')}}</th>
<th width="300">{{$t('fnc.acc')}}</th>
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>汇兑收益</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>
<el-input size="small" style="width:auto" v-model="item.TypeName" placeholder="请输入"></el-input>
</td>
<td>
<div class="Ca_AccountInfo">
<el-input size="small" style="width:auto" v-model="item.Alias" placeholder="请输入"></el-input>
-
<el-input size="small" style="width:auto" v-model="item.AccountType" placeholder="请输入"></el-input>
-
<el-input size="small" style="width:auto" v-model="item.BankNo" placeholder="请输入"></el-input>
</div>
</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>
<span v-if="item.IsExChange==1">是</span>
<span v-if="item.IsExChange==0">否</span>
</td>
<td>{{item.Money}}</td>
</tr>
</table>
<div class="clearfix Ca_comLinediv">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">
<el-input size="small" style="width:auto" v-model="item.Description" placeholder="请输入"></el-input>
</div>
</div>
</div>
<div v-for="item in dataList.FBankList">
<div class="clearfix Ca_diaobo">
<div class="Co_oderRight" style="margin:10px 0;">
<span class="Ca_comBlueColor">{{$t('fnc.dbriqi')}}：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
</div>
</div>
<table class="pay_Table" style="border-collapse: collapse;">
<tr>
<th width="100">{{$t('fnc.fkfangshi')}}</th>
<th width="300">{{$t('fnc.acc')}}</th>
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>汇兑损失</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>
<el-input size="small" style="width:auto" v-model="item.TypeName" placeholder="请输入"></el-input>
</td>
<td>
<div class="Ca_AccountInfo">
<el-input size="small" style="width:auto" v-model="item.Alias" placeholder="请输入"></el-input>
-
<el-input size="small" style="width:auto" v-model="item.AccountType" placeholder="请输入"></el-input>
-
<el-input size="small" style="width:auto" v-model="item.BankNo" placeholder="请输入"></el-input>
</div>
</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>
<span v-if="item.IsExChange==1">是</span>
<span v-if="item.IsExChange==0">否</span>
</td>
<td>{{item.Money}}</td>
</tr>
</table>
<div class="clearfix Ca_comLinediv" style="width:100%;padding:0 20px;">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">
<el-input size="small" style="width:auto" v-model="item.Description" placeholder="请输入"></el-input>
</div>
</div>
</div>
<div class="Ca_popDiv" v-if="dataList.AuditSteps!=''">
<template v-for="(item,index) in dataList.AuditSteps">
<p>{{item.AuditDescription}}：
<template v-if="item.Status===2">
<span class="_r_name" v-if="s.AuditStatus==2" v-for="(s,si) in item.AuditRecordList">{{s.AuditName}} </span>
</template>
</p>
</template>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
props:["ID","width","color","isPrintPage","name","disabled","loopNumN","disabled","loopNumN"], //接收参数 ID width color
data(){
return {
msg:{
ID:0
},
imageOptions:{
navbar:false,
title:false
},
dataList:[],
images:[],
tableShow:false,
AuditListData:{
AuditList:[]
},
bossID:null,
GetDetail:{
AuditSteps:[]
},
endDate: '',
}
},
created(){
let userinfo = this.getLocalStorage();
this.bossID = userinfo.EmployeeId;
},
methods:{
goPrintPageNew(type,id,Merge,OrderSource){
if(type===1){
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { type: type,id:id,isKehu:0,Merge:Merge,OrderSource:OrderSource?OrderSource:-1,Capital:1}
});
window.open(routeData.href, "_blank");
}else{
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { type: type,id:id,Merge:Merge,OrderSource:OrderSource?OrderSource:-1,Capital:1}
});
window.open(routeData.href, "_blank");
}
},
inited (viewer){
this.$viewer = viewer
},
getList(id){
if(!id){
return;
}
this.apipost('Financial_get_GetFundTransfer',{ID:id}, res => {
if(res.data.resultCode == 1) {
this.dataList = res.data.data;
this.GetDetail = JSON.parse(JSON.stringify(this.dataList));
this.GetDetail.AuditSteps = [];
if(this.dataList.Status==2){
let len = this.dataList.AuditSteps.length - 1;
let sLen = this.dataList.AuditSteps[len].AuditRecordList[this.dataList.AuditSteps[len].AuditRecordList.length-1];
let begTime = this.dataList.AuditSteps[0].AuditRecordList[0].AduitDate;
let enTime = sLen && sLen.AduitDate ? sLen.AduitDate : begTime;
let newTime = this.$commonUtils.formatMsgTime2(begTime,enTime);
this.endDate = newTime.replace("前","");
}
this.dataList.AuditSteps.forEach(y=>{
if(y.Sort>0){
y.contentTips = y.AuditDescription+(y.AuditWay=='2'? this.$t('fnc.huiqian') : this.$t('fnc.huoqian'));
this.AuditListData.AuditList.push(y);
}
this.GetDetail.AuditSteps.push(y);
});
let arr=[];
let AuditSteps=[];
AuditSteps = arr.concat(this.dataList.AuditSteps);
AuditSteps.reverse();
this.dataList.AuditSteps=AuditSteps;
this.dataList.SBankList.forEach(x => {
x.comText = this.$t('fnc.xsfujian');
x.isShow = false;
});
this.dataList.FBankList.forEach(x => {
x.comText = this.$t('fnc.xsfujian');
x.isShow = false;
});
}else{
this.Error(res.data.message);
}
}, err => {})
},
AuditOrRefund(){
this.MsgBus.$emit('msg');
},
showFuFileList(item){
if(item.comText==this.$t('fnc.ycfujian')){
item.comText=this.$t('fnc.xsfujian');
}else{
item.comText=this.$t('fnc.ycfujian')
}
if(item.isShow){
item.isShow=false;
}else{
item.isShow=true;
}
this.$forceUpdate();
},
//删除附件
deleteUploadFile(){
},
//显示大图
showImg(obj){
let isExsit=false
this.images.forEach(x=>{
if(x==obj)
isExsit=true
})
if(!isExsit) {
this.images.push(obj)
} else {
this.$viewer.view(this.images.indexOf(obj))
}
this.$viewer.show()
},
//预览文件
showUpLoadFileT(i){
if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
this.previewPDF(i.Content)
}else{
window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Content)
}
},
},
mounted(){
this.ID = this.$route.query.id;
this.getList(this.ID);
}
}
</script>
src/components/PrintPageN.vue
View file @ 6ec74580
......@@ -37,7 +37,7 @@
<template v-loading="loading">
<div class="_PrintPage">
<div class="_PrintPage_box">
<template v-if="type==='2'&&(Merge==='0' || Merge==='1' ||Merge===null)">
<template v-if="type==='2'&&(Merge==='0' ||Merge===null)">
<div class="SetDiv">
<span @click="disabled=false">编辑</span>
<span @click="disabled=true">保存</span>
......@@ -60,22 +60,39 @@
<my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-GZ-Bill>
</div>
</template>
<!-- <template v-if="Merge==='1'">
<div class="_border_1" v-for="(item,index) in loopNumN">
<my-HB-Bill v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill>
</div>
</template> -->
<template v-if="Merge==='1'">
<div class="SetDiv">
<span @click="disabled2=false">编辑</span>
<span @click="disabled2=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in 1">
<my-HB-Bill :loopNumN="loopNumN" :disabled.sysc="disabled2" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill>
</div>
</template>
<template v-if="CapitalState">
<div class="SetDiv">
<span @click="disabled3=false">编辑</span>
<span @click="disabled3=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in 1">
<my-Capital :loopNumN="loopNumN" :disabled.sysc="disabled3" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-Capital>
</div>
</template>
</div>
</div>
</template>
<script>
import myBill from "./FinancialModule/FinancialSubmodule/BillModuleNew.vue";
import myrbvBill from "./FinancialModule/FinancialSubmodule/ReceivablesModuleNew.vue";
import myhrBill from "./FinancialModule/FinancialSubmodule/MergeBillModule.vue";
import myhrBill from "./FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue";
import myGZBill from "./FinancialModule/FinancialSubmodule/GZBillModule.vue";
import myCapital from "./FinancialModule/FinancialSubmodule/myCapital.vue";
export default {
data(){
return{
disabled3:true,
disabled2:true,
disabled1:true,
disabled:true,
loading:true,
......@@ -88,13 +105,15 @@ export default {
loopNumN:this.$route.query.isKehu==='1'?3:2,
loopNumT:2,
Merge:null,
OrderSource:-1
OrderSource:-1,
CapitalState:false,
}
},components:{
'my-Bill': myBill,
'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill,
'my-GZ-Bill': myGZBill
'my-GZ-Bill': myGZBill,
'my-Capital':myCapital
},methods:{
numAdd(){
this.num = this.num + 1
......@@ -107,6 +126,10 @@ export default {
this.isKehu = this.$route.query.isKehu;
this.Merge = this.$route.query.Merge;
this.OrderSource = this.$route.query.OrderSource;
if(this.$route.query.Capital){
this.CapitalState=true;
}
}
}
</script>
src/components/administrative/AssetsSystem/AssetsShenpi.vue 0 → 100644
View file @ 6ec74580
<template>
<div class="approvalDetails" v-loading="pageLoad">
<div style="width:80%;margin:0 auto;">
<!-- <div style="border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle" style="float:inherit">详情</span>
<span @click="backTo" class="backTo" style="">返回</span>
</div> -->
<div style="margin-top:30px;background:rgba(255,255,255,1);border-radius:10px;padding:20px;position:relative;">
<el-row class="HeaderDiv" style="border-bottom:1px solid #E2E4EB;padding-bottom:20px">
<span class="underline"></span>
<el-col :span="12" style="position:relative;padding-left:50px">
<span class="titleSpan">
<span>{{GetDetail.FirstStr}}</span>
</span>
<p class="c11 f14">{{GetDetail.TemplateName}}</p>
</el-col>
<el-col class="StateCol" :span="12" style="text-align:right;padding-top:15px">
<span v-if="GetDetail.AuditStatus==1" class="spz">{{GetDetail.AuditStatusName}}</span>
<span v-if="GetDetail.AuditStatus==2 || GetDetail.AuditStatus==4" class="ytg">{{GetDetail.AuditStatusName}}</span>
<span v-if="GetDetail.AuditStatus==3 || GetDetail.AuditStatus==5" class="wtg">{{GetDetail.AuditStatusName}}</span>
</el-col>
</el-row>
<el-row class="zcInfo">
<el-col :span="12">
<span>来源 :</span>
<span>{{GetDetail.SourceName}}</span>
</el-col>
<el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5" :span="12">
<span>申请人 :</span>
<span>{{GetDetail.EmName}}</span>
</el-col>
<el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5" :span="12">
<span>公司 :</span>
<span>{{GetDetail.BranchName}}</span>
</el-col>
<el-col v-if="GetDetail.Source==5" :span="12">
<span>调入公司 :</span>
<span>{{GetDetail.InBranchName}}</span>
</el-col>
<el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5" :span="12">
<span>部门 :</span>
<span>{{GetDetail.DepartmentName}}</span>
</el-col>
<el-col :span="12">
<span>单号 :</span>
<span>{{GetDetail.OrderCode}}</span>
</el-col>
<el-col :span="12">
<span>时间 :</span>
<span v-if="GetDetail.Time!=''">{{GetDetail.Time}}</span>
<span v-if="GetDetail.BackTime!=''">{{GetDetail.BackTime}}</span>
</el-col>
<el-col :span="12">
<span>备注 :</span>
<span>{{GetDetail.Remark}}</span>
</el-col>
</el-row>
<p class="f12 c11" style="margin-top:25px">资产清单</p>
<table style="margin-top:10px" class="zcmyTable noHoverTable" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>资产编号</th>
<th>资产名称</th>
<th>品牌名称</th>
<th>分类名称</th>
<th>型号</th>
</thead>
<tbody>
<tr v-for="(item,index) in GetDetail.DetailList" :key="index">
<td><span @click="getCheckDes(item)" style="text-decoration: underline;cursor: pointer;">{{item.PropertyNum}}</span></td>
<td>{{item.PropertyName}}</td>
<td>{{item.BrandName}}</td>
<td>{{item.CategoryName}}</td>
<td>{{item.PropertyModel}}</td>
</tr>
<tr v-show="GetDetail.DetailList.length==0">
<td colspan="4" align="center">暂无数据</td>
</tr>
</tbody>
</table>
</div>
<div style="margin-top:30px;background:rgba(255,255,255,1);border-radius:10px;padding:20px;position:relative;">
<ul class="allStep" style="position:relative;">
<li v-for="(item,index) in GetDetail.AuditSteps" :key="index">
<div>
<span v-if="index!=0" class="line"></span>
<span class="circle">
<img src="../../../assets/img/step2.png" alt="">
</span>
<span style="display:inline-block;position:relative;top:20px">
<div>{{item.AuditDescription}}</div>
<div style="margin-top:10px;color:#28CACC">{{item.AuditWayName}}</div>
</span>
</div>
</li>
<el-popover
popper-class="detailsIT_Journal"
width="250"
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">流程日志</p>
<ul class="changLogList" v-if="danjuList.length>0">
<li class="changLogList_l" v-for="(log,li) in danjuList">
<span style="background-color: #47BF8C" class="_radius_green"></span>
<p> <span class="_color_blue">{{log.UpdateBy}}</span> <span style="float:right" class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.Content}}</p>
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
</ul>
</div>
</div>
<span slot="reference" class="rizhi underline">单据操作日志</span>
</el-popover>
</ul>
<div class="_process clearfix">
<div class="_process_box">
<template v-for="(item,index) in GetDetail.AuditSteps">
<div class="_pb_son" :class="{_none_after:(item.NextStep==1||item.Status==4),_bohui_after:(GetDetail.Status==3 && !IsBoHui && index===GetDetail.AuditSteps.length-1)}" v-if="item.Sort==0 || (item.Status==1 && item.NextStep==1) || (item.Status==2 && item.Sort!=0) || (item.Status==4)">
<div class="_left_radius" v-if="item.Sort==0">发起</div>
<div class="_left_radius _left_radius_sus" v-if="item.NextStep==1">
<span v-if="item.SpecialNode==2">待签</span>
<span v-else>待审</span>
</div>
<div class="_left_radius" v-if="item.Sort!=0 && item.Status==2">
<span v-if="item.SpecialNode==2">已签</span>
<span v-else>通过</span>
</div>
<div class="_left_radius _left_radius_err" v-else-if="item.Status==4">驳回</div>
<div class="_right_content" v-if="item.AuditWay==2 || item.AuditWay==3">
<p class="_name">
<span class="_n">{{item.AuditDescription}}<span class="_sm">({{item.AuditWay==2?'会签':'或签'}})</span></span>
</p>
<div class="_more _mgt_15" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus==2">
<div class="_right_content">
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sn" v-if="son.AuditStatus==2">
<span v-if="item.SpecialNode==2">已签</span>
<span v-else>通过</span>
</span>
<span class="_time _time_n">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<div class="_pp_info" v-if="son.AuditStatus!=1 && item.SpecialNode!=2">
<p>{{!son.Remark || son.Remark==''?'无' : son.Remark}}</p>
<div class="_info_img" v-if="son.ImageList!=null&&son.AuditStatus==2" >
<ul class="clearfix" v-if="son.ImageList.length&&son.ImageList.length>=1">
<li v-for="(img,imgI) in son.ImageList">
<img v-if="!img" src="../../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(son,2)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
</ul>
</div>
</div>
<div v-if="son.SignImage!=''">
<img style="height: 82px;width: 143px;margin-top:10px;border: 1px solid #eee" :src="son.SignImage">
</div>
</div>
</div>
<div class="_more _mgt_15" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus!=2">
<div class="_right_content" v-if="item.AuditWay==2&&son.AuditStatus!=2">
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sn" v-if="son.AuditStatus==2">
<span v-if="item.SpecialNode==2">已签</span>
<span v-else>通过</span>
</span>
<span class="_m" v-else-if="son.AuditStatus==4">驳回</span>
<span class="_sm" v-else-if="son.AuditStatus==1">
<span v-if="item.SpecialNode==2">待签</span>
<span v-else>待审</span>
</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1">
<p>{{!son.Remark || son.Remark==''?'无' : son.Remark}}</p>
<div class="_info_img" v-if="son.ImageList!=null&&item.Status!=1" >
<ul class="clearfix" v-if="son.ImageList.length&&son.ImageList.length>=1">
<li v-for="(img,imgI) in son.ImageList">
<img v-if="!img" src="../../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(son,2)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
</ul>
</div>
</div>
<div v-if="son.SignImage!=''">
<img style="height: 82px;width: 143px;margin-top:10px;border: 1px solid #eee" :src="son.SignImage">
</div>
</div>
<div class="_right_content" v-else-if="item.AuditWay==3 && son.AuditStatus==1">
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sm" v-if="item.Status==2 && item.Sort!=0">通过</span>
<span class="_m" v-else-if="item.Status==4">驳回</span>
<span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">待审</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1">
<p>{{!son.Remark || son.Remark==''?'无' : son.Remark}}</p>
<div class="_info_img" v-if="son.ImageList!=null&&item.Status!=1" >
<ul class="clearfix" v-if="son.ImageList.length&&son.ImageList.length>=1">
<li v-for="(img,imgI) in son.ImageList">
<img v-if="!img" src="../../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(son)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
</ul>
</div>
</div>
</div>
<div class="_right_content" v-else-if="item.AuditWay==3 && son.AuditStatus==4">
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sm" v-if="item.Status==2 && item.Sort!=0">通过</span>
<span class="_m" v-else-if="item.Status==4">驳回</span>
<span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">待审</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p>
<div class="_info_img" v-if="son.ImageList!=null&&item.Status!=1" >
<ul class="clearfix" v-if="son.ImageList.length&&son.ImageList.length>=1">
<li v-for="(img,imgI) in son.ImageList">
<img v-if="!img" src="../../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(son)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
</ul>
</div>
</div>
<div v-if="son.SignImage!=''">
<img style="height: 82px;width: 143px;margin-top:10px;border: 1px solid #eee" :src="son.SignImage">
</div>
</div>
</div>
</div>
<div class="_right_content" v-else>
<div class="_more" v-for="(son,sindex) in item.AuditRecordList">
<p class="_name">
<span class="_n">{{son.AuditName}}<span class="_sm">{{item.AuditDescription}}</span></span>
<span class="_time _time_n" v-if="item.NextStep!=1">{{son.AduitDate}}</span>
</p>
<div class="_right_content">
<div class="_pp_info" v-if="item.NextStep!=1 && item.SpecialNode!=2">
<p>{{son.Remark==''?'无':son.Remark}}</p>
<div class="_info_img" v-if="son.ImageList!=null" >
<ul class="clearfix" v-if="son.ImageList.length&&son.ImageList.length>=1">
<li v-for="(img,imgI) in son.ImageList">
<img v-if="!img" src="../../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(son)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
<!-- beizhu -->
<textarea v-if="item.NextStep==1 && compType=='shenpi' && item.SpecialNode!=2" class="_textareaNew" v-model="addMsg.AuditDescription" placeholder="请输入..."></textarea>
<!-- 签名(当前审核人是否需要签名) -->
<div v-if="GetDetail.Is_CanAudit==1 && item.NextStep==1 && item.SpecialNode!=0 && compType=='shenpi'" style="margin:10px 0;padding:10px 0 0 0">
<p>
<span @click="signState=true" class="signSpan f12">签名</span>
</p>
<div v-show="addMsg.SignImage!=''">
<img style="height: 82px;width: 143px;margin-top:10px;border:1px solid rgb(238, 238, 238)" :src="addMsg.SignImage">
</div>
</div>
</div>
</template>
<div v-if="GetDetail.Is_CanAudit==1 && compType=='shenpi' && !needSign" class="_upload_box basefix" style="margin-bottom:20px;">
<ul class="clearfix">
<li v-for="(img,imgIndex) in uploadImgList" :key="imgIndex">
<img :src="img" alt="">
<div class="_delete_img" @click="deleteImg(imgIndex)">
<i style="color:#FFA475" class="iconfont icon-shanchu"></i>
</div>
</li>
<li v-if="uploadImgList.length<10">
<el-upload
action=""
class="avatar-uploader"
:http-request="uploadFileBtn"
:show-file-list="false"
:multiple="true"
:limit="10">
<i class="el-icon-plus avatar-uploader-icon"></i>
<span class="_upload_tips f12">最多可上传10张图片</span>
</el-upload>
</li>
</ul>
</div>
<div class="_pb_son" :class="GetDetail.AuditStatus==1?'_none_after':''" v-if="GetDetail.AuditStatus==1">
<div class="_left_radius" >结束</div>
<div class="_right_content">
<p class="_time">累计耗时：{{endDate}}</p>
</div>
</div>
<div v-if="GetDetail.Is_CanAudit==1 && compType=='shenpi'" class="button" style="padding-left:15px;margin-top:20px">
<span v-if="needSign" @click="approvalOrder(1)" class="tongguo" >保存</span>
<div v-if="!needSign" style="display:inline-block">
<span @click="approvalOrder(1)" class="tongguo" >通过</span>
<span @click="approvalOrder(2)" class="bohui" >驳回</span>
</div>
</div>
<!-- 申请人审批 -->
</div>
</div>
</div>
<!-- 签名 -->
<div class="Sign" :class="signState?'zindex':''">
<div class="signature">
<p class="f14" style="padding:10px 10px 10px 0">签名
<span @click="CloseSign" style="float:right" class="el-icon-close"></span>
</p>
<div class="signatureBox">
<div class="canvasBox" ref="canvasHW">
<canvas ref="canvasF" @touchstart='touchStart' @touchmove='touchMove' @touchend='touchEnd' @mousedown="mouseDown" @mousemove="mouseMove" @mouseup="mouseUp"></canvas>
<div class="button" style="text-align:center;margin-top:20px">
<span @click="commit" class="bohui" >提交</span>
<span @click="overwrite" class="tongguo" >重写</span>
</div>
</div>
</div>
</div>
</div>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails>
</el-dialog>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
</div>
</div>
</template>
<script>
import CheckDetails from "@/components/administrative/AssetsSystem/CheckDetails.vue";
export default {
name: 'approvalDetails',
components: {
CheckDetails
},
data(){
return{
images:[],
imageOptions:{
navbar:false,
title:false
},
pageLoad:false,
danjuList:[],
tableData:[],
GetDetail:{
AuditSteps:[],
DetailList:[],
},
IsBoHui:false,
uploadImgList:[],
addMsg:{
AuditDescription:'',
ImageList:[],
UseReceiveId:0,
AuditType:'',
SignImage:'',
},
compType:'',
backto:'',
showTable:'',
danjuMsg:{
pageIndex:1,
pageSize:20,
ResourceId:'',
Type:1,
},
imgSrc:'',
stageInfo:'',
imgUrl:'',
client: {},
points: [],
canvasTxt: null,
startX: 0,
startY: 0,
moveY: 0,
moveX: 0,
endY: 0,
endX: 0,
w: null,
h: null,
isDown: false,
isViewAutograph: this.$route.query.isViews > 0,
contractSuccess: this.$route.query.contractSuccess,
signState:false,
needSign:false,
endDate:'',
PropertyId:'',
CheckDetailState:false,
}
},
created(){
if(this.$route.query.compType){
this.compType=this.$route.query.compType;
}
this.backto=this.$route.query.backto?this.$route.query.backto:'';
this.showTable=this.$route.query.showTable?this.$route.query.showTable:'';
if(this.$route.query.Id){
this.addMsg.UseReceiveId=this.$route.query.Id;
this.danjuMsg.ResourceId=this.$route.query.Id;
}
this.getDetail();
this.getdanjuList();
},
mounted(){
let canvas = this.$refs.canvasF
canvas.height = this.$refs.canvasHW.offsetHeight - 100
canvas.width = this.$refs.canvasHW.offsetWidth - 10
this.canvasTxt = canvas.getContext('2d')
this.stageInfo = canvas.getBoundingClientRect()
},
methods:{
inited (viewer){
this.$viewer = viewer
},
showImg(obj, type){
this.images=[];
if(obj.ImageList && obj.ImageList.length>0){
this.images=obj.ImageList;
}
this.$viewer.show()
},
getCheckDes(item){
this.PropertyId=item.PropertyId;
this.CheckDetailState=true;
setTimeout(()=>{
this.$refs.mychild.InitData(this.PropertyId);
},10)
},
CloseSign(){
this.signState=false;
},
// 签名
//重写
overwrite() {
this.canvasTxt.clearRect(0, 0, this.$refs.canvasF.width, this.$refs.canvasF.height)
this.points = []
},
//提交签名
commit() {
this.addMsg.SignImage =this.$refs.canvasF.toDataURL();
this.signState=false;
},
mouseDown(ev) {
ev = ev || event
ev.preventDefault()
if (1) {
let obj = {
x: ev.offsetX,
y: ev.offsetY
}
this.startX = obj.x
this.startY = obj.y
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.points.push(obj)
this.isDown = true
}
},
mouseMove(ev) {
ev = ev || event
ev.preventDefault()
if (this.isDown) {
let obj = {
x: ev.offsetX,
y: ev.offsetY
}
this.moveY = obj.y
this.moveX = obj.x
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.startY = obj.y
this.startX = obj.x
this.points.push(obj)
}
},
mouseUp(ev) {
ev = ev || event
ev.preventDefault()
if (1) {
let obj = {
x: ev.offsetX,
y: ev.offsetY
}
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.points.push(obj)
this.points.push({x: -1, y: -1})
this.isDown = false
}
},
//mobile
touchStart(ev) {
ev = ev || event
ev.preventDefault()
if (ev.touches.length == 1) {
let obj = {
x: ev.targetTouches[0].clienX,
y: ev.targetTouches[0].clientY,
}
this.startX = obj.x
this.startY = obj.y
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.points.push(obj)
}
},
touchMove(ev) {
ev = ev || event
ev.preventDefault()
if (ev.touches.length == 1) {
let obj = {
x: ev.targetTouches[0].clientX - this.stageInfo.left,
y: ev.targetTouches[0].clientY - this.stageInfo.top
}
this.moveY = obj.y
this.moveX = obj.x
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.startY = obj.y
this.startX = obj.x
this.points.push(obj)
}
},
touchEnd(ev) {
ev = ev || event
ev.preventDefault()
if (ev.touches.length == 1) {
let obj = {
x: ev.targetTouches[0].clientX - this.stageInfo.left,
y: ev.targetTouches[0].clientY - this.stageInfo.top
}
this.canvasTxt.beginPath()
this.canvasTxt.moveTo(this.startX, this.startY)
this.canvasTxt.lineTo(obj.x, obj.y)
this.canvasTxt.stroke()
this.canvasTxt.closePath()
this.points.push(obj)
}
},
// 签名结束
backTo(){
if(this.showTable!=''){
this.$router.push({
path: "/" + this.backto,
query:{
showTable:this.showTable
}
});
}else{
this.$router.push({
path: "/" + this.backto
});
}
},
getdanjuList(){
this.apiJavaPost("/api/property/GetAuditChangeLogPageList",this.danjuMsg,
res => {
if (res.data.resultCode === 1) {
let data=res.data.data.pageData;
data.forEach(x=>{
x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
})
this.danjuList=data;
} else {
this.Error(res.data.message);
}
},
null
);
},
approvalOrder(num){
if(this.GetDetail.Is_AuditSelf==1){
this.Error("制单人跟审核人不能相同哟，请转交!");
return;
}
if(this.needSign){
if(this.addMsg.SignImage==""){
this.Error("请签名！");
return;
}
}
this.addMsg.AuditType=num;
this.addMsg.ImageList=this.uploadImgList;
this.apiJavaPost("/api/property/AuditOrRefund",this.addMsg,
res => {
console.log("res",res)
if (res.data.resultCode ==1) {
this.getDetail();
this.Success(res.data.message);
this.addMsg={
AuditDescription:'',
ImageList:[],
UseReceiveId:'',
AuditType:'',
SignImage:'',
}
// this.reload();
} else {
this.Error(res.data.message);
}
},
null
);
},
deleteImg(i){ // 删除
this.uploadImgList.splice(i,1)
},
uploadFileBtn(file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
this.$message.warning('文件大小不能超过10M！')
return
}
// 1 文档 2 数据 3 图片
let typeArr=[
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
{stringArr:'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',type:1},
]
let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x=>{
if(x.stringArr.indexOf(ft)!='-1')
{
fileTypeNumber=x.type;
typeOk = true;
}
})
if (!typeOk) return this.$message.error('请上传图片、word、excel类型的文件！');
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
let obj = this.domainManager().ViittoFileUrl + x.data.FilePath
this.uploadImgList.push(obj)
this.$message.success('上传成功')
}, 1);
},
getDetail(){
this.pageLoad=true;
this.apiJavaPost("/api/property/GetPropertyAuditDetail",{UseReceiveId:this.addMsg.UseReceiveId},
res => {
this.pageLoad=false;
if (res.data.resultCode === 1) {
let data=res.data.data;
this.GetDetail=res.data.data;
if(data.AuditStatus==1){
let len = data.AuditSteps.length - 1;
let sLen = data.AuditSteps[len].AuditRecordList[data.AuditSteps[len].AuditRecordList.length-1];
let begTime = data.AuditSteps[0].AuditRecordList[0].AduitDate;
let enTime = sLen && sLen.AduitDate ? sLen.AduitDate : begTime;
let newTime = this.$commonUtils.formatMsgTime2(begTime,enTime);
this.endDate = newTime.replace("前","");
}
let list = [];
for ( let i = 0; i < this.GetDetail.AuditSteps.length ; i++ ){
list.push(this.GetDetail.AuditSteps[i]);
if(this.GetDetail.AuditSteps[i].Status==4){
this.IsBoHui = true;
break;
}
if(this.GetDetail.AuditSteps[i].NextStep==1 && this.GetDetail.AuditSteps[i].SpecialNode==2){
this.needSign = true;
break;
}
}
this.GetDetail.FirstStr=this.GetDetail.SourceName.slice(0,1)
this.GetDetail.AuditSteps = list;
} else {
this.Error(res.data.message);
}
},
null
);
},
},
}
</script>
<style>
/* myTable */
.approvalDetails .zcmyTable{
width: 100%;
font-size: 12px;
border-collapse: collapse;
font-family: "宋体"!important;
}
.approvalDetails .zcmyTable thead th{
color:#A6C6C6;
padding-left: 20px;
height: 50px;
line-height: 50px;
font-weight:bold;
text-align: left;
}
.approvalDetails .zcmyTable thead tr{
background:transparent!important;
}
.approvalDetails .zcmyTable .hoverSpan1{
left: -20px;
}
.approvalDetails .zcmyTable .hoverSpan2{
right: -20px;
}
.approvalDetails .zcmyTable .commonStyle{
height:100%;
background:#fff;
position: absolute;
width: 20px;
top:0;
display: none;
}
.approvalDetails .zcmyTable tr{
background:#fff;
border-bottom: 4px solid #F8FAFB;
cursor: pointer;
}
.approvalDetails .noHoverTable tr{
border-bottom:none!important;
}
.approvalDetails .zcmyTable .trNobottom{
border-top: 4px solid #F8FAFB!important;
border-bottom:none!important;
}
.approvalDetails .zcmyTable tbody tr:hover{
box-shadow:0px 0 20px 0px rgba(176,176,176,0.2);
transition: transform .5s ease;
/* transform: scaleX(1.02); */
}
.approvalDetails .noHoverTable tbody tr:hover{
box-shadow:0 0 0 transparent!important;
}
.approvalDetails .zcmyTable tbody tr:hover .commonStyle{
display: block;
transition: transform .5s ease;
box-shadow:0px 0px 0px 0px rgba(176,176,176,0.2);
}
.approvalDetails .zcmyTable tbody tr:hover td{
border-radius:0!important;
}
.approvalDetails .zcmyTable tbody tr:first-child td:first-child{
border-radius:20px 0 0 0;
}
.approvalDetails .zcmyTable tbody tr:first-child td:last-child{
border-radius:0 20px 0 0;
}
.approvalDetails .zcmyTable tbody tr:last-child td:first-child{
border-radius:0 0 0 20px;
}
.approvalDetails .zcmyTable tbody tr:last-child td:last-child{
border-radius:0 0 20px 0;
}
.approvalDetails .zcmyTable tr td{
position: relative;
padding:11px 0 11px 20px;
}
.approvalDetails .f14{
font-size:14px;
}
.approvalDetails .basefix:after {
clear: both;
content: '.';
display: block;
height: 0;
overflow: hidden;
}
.approvalDetails li{
list-style: none;
}
.approvalDetails .viewer{display: none !important;}
.approvalDetails ._pp_info ._info_img li:hover ._see_img{
opacity: 1;
}
.approvalDetails ._pp_info ._see_img .icon-sousuo{
color:#fff!important;
}
.approvalDetails ._pp_info ._see_img{
position: absolute;
top: 0;
width: 100%;
height: 100%;
line-height: 120px;
text-align: center;
background-color: rgba(2, 2, 2, 0.4);
display: inherit;
opacity: 0;
left:0;
-webkit-transition: all linear .4s;
transition: all linear .4s;
}
.approvalDetails ._pp_info ._info_img li img{
width: 100%;
height: 100%;
}
.approvalDetails ._pp_info ._info_img li{
display: inline-block;
width:120px;
height:120px;
overflow:hidden;
position: relative;
cursor: pointer;
}
.approvalDetails ._pp_info ._info_img{
margin-top:10px;
}
.approvalDetails ._pb_son:last-child::after{
display: none;
}
.approvalDetails .signSpan{
display: inline-block;
width: 100px;
height: 34px;
line-height: 34px;
border-radius: 22px;
text-align: center;
cursor: pointer;
font-size: 12px;
font-family: "宋体";
background: #FFA475;
color: #fff;
}
.approvalDetails{
position: relative;
background: #fff;
}
.approvalDetails .zindex{
z-index: 9999!important;
opacity: 1!important;
}
.approvalDetails .signature{
width:600px;
background: #fff;
padding:15px;
border-radius: 20px;
cursor: pointer;
}
.approvalDetails .Sign{
position: fixed;
width:100%;
height:100%;
top:0;
left:0;
background: rgba(0,0,0,.4);
z-index: -500;
display: flex;
align-items: center;
justify-content: center;
opacity: 0;
}
.approvalDetails .Sign .signatureBox {
width: 100%;
height: 300px;
box-sizing: border-box;
overflow: hidden;
background: #fff;
z-index: 100;
display: flex;
flex-direction: column;
margin-top:20px;
padding:0 20px;
box-sizing: border-box;
}
.Sign .canvasBox {
box-sizing: border-box;
flex: 1;
}
.approvalDetails .Sign canvas {
border: 1px solid #7d7d7d;
}
.approvalDetails .Sign .btnBox {
padding: 10px;
text-align: center;
}
.approvalDetails .Sign .btnBox button:first-of-type {
background: transparent;
border-radius: 4px;
height: 40px;
width: 80px;
font-size: 14px;
}
.approvalDetails .Sign .btnBox button:last-of-type {
background: #71b900;
color: #fff;
border-radius: 4px;
height: 40px;
width: 80px;
font-size: 14px;
}
.approvalDetails ._textareaNew{
width: 80%;
height: 50px;
background-color: white;
border-radius: 4px;
border: 1px solid #E5E5E5;
font-size: 12px;
color: #333333;
padding: 12px 14px;
margin-top: 13px;
position: relative;
}
.approvalDetails ._upload_tips{font-size: 12px;position: absolute;top: 71%;width: 100%;left: 0;text-align: center;color: #949494;}
.approvalDetails ._pb_son._none_after::after{content: '';display: none}
.approvalDetails .avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 143px;
height: 82px;
line-height: 82px;
text-align: center;
}
.approvalDetails .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.approvalDetails ._delete_img{position: absolute;top: 0px;height:82px;width:143px;line-height: 34px;text-align: center;background-color: rgba(2, 2, 2, 0.6);display: inherit;opacity: 0;transition: all linear .5s}
.approvalDetails ._delete_img i.iconfont{display: inline-block;width: 32px;height: 32px;border-radius: 50%;color: #E95252 !important;background-color:rgba(251, 251, 251, 0.9); margin-top: 26px;}
.approvalDetails ._upload_box ul li{float: left;height:82px;width:143px;padding:0px 20px 20px 0;text-align: center;position: relative;cursor: pointer;margin-right: 10px;}
.approvalDetails ._upload_box ul li img{height:82px;width:143px;}
.approvalDetails ._upload_box ul li:hover ._delete_img{opacity: 1;}
.approvalDetails .button span{
display: inline-block;
width:120px;
height:40px;
line-height:40px;
border-radius:22px;
text-align: center;
cursor: pointer;
font-size: 12px;
font-family: "宋体";
margin-right: 20px;
}
.approvalDetails .tongguo{
background:rgba(0,210,214,1);
color:#fff;
}
.approvalDetails .bohui{
border:1px solid rgba(0,210,214,1);
color:rgba(0,210,214,1);
}
.approvalDetails ._zhuan_msg{
font-size: 12px;
margin-top:10px;
padding-bottom: 10px;
}
.approvalDetails ._zhuan_msg span{
display: inline-block;
margin-right: 5px;
color: #696969;
}
.approvalDetails ._zhuan_msg span:last-child{
margin-left: 5px;
}
.approvalDetails ._zhuan_msg p:nth-child(2){
color: #696969;
}
.approvalDetails ._zhuan_msg ._color_green{
color: #00D2D6
}
.approvalDetails ._right_content ._name ._n{font-size: 14px;color: #333333;font-weight: bold;}
.approvalDetails ._right_content ._name ._m{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #E95252;margin-left: 5px;border-radius: 4px;}
.approvalDetails ._right_content ._name ._sm{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #FF9600;margin-left: 5px;border-radius: 4px;font-weight: 100;}
.approvalDetails ._right_content ._name ._sn{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #00D2D6;margin-left: 5px;border-radius: 4px;}
.approvalDetails ._right_content ._time,.approvalDetails ._time{font-size: 12px;color: #666666;padding-top: 5px;}
.approvalDetails ._right_content ._pp_info,.approvalDetails ._textarea{border-radius: 10px; background:rgba(245,245,245,1);font-size: 12px;color: #333333;padding: 12px 14px;margin-top: 13px;position: relative;width:80%}
.approvalDetails ._right_content ._pp_info:before{display:block;content:'';border-width:8px 8px 8px 8px;border-style:solid;border-color: transparent transparent rgba(245,245,245,1) transparent;position:absolute;left:10px;top:-16px;}
.approvalDetails ._mgt_15{margin-top: 15px;}
.approvalDetails ._more ._right_content .iconfont{color: #AAAAAA}
.approvalDetails ._more ._right_content ._name ._n{font-size: 14px;color: #333333;font-weight: bold;padding-left: 3px;}
.approvalDetails ._pb_son{position: relative;padding-left: 75px;min-height: 100px;padding-bottom: 10px;border-top:1px solid #fff}
.approvalDetails ._left_radius{z-index:1;width: 40px;height: 40px;border-radius: 50%;text-align: center;line-height: 40px;background-color: #00D2D6;color: white;font-size: 12px;position: absolute;left: 15px;}
.approvalDetails ._left_radius_err{background-color: #E95252 !important;}
.approvalDetails ._left_radius_sus{background-color: #FFA475 !important;}
.approvalDetails ._pb_son::after{content: '';width: 4px;height: 100%;background-color: #00D2D6;display: inline-block;position: absolute;clear: both;left: 33px;top: 0;}
.approvalDetails ._pb_son._none_after::after{content: '';display: none}
.approvalDetails ._pb_son._bohui_after::after{background-color: #E95252 !important;display: inline-block}
.approvalDetails ._process_box{padding-top: 30px;padding-bottom: 40px;}
.approvalDetails ._process{margin-top: 20px}
.approvalDetails .rightDiv .FirstName{
width:40px;
height:40px;
line-height:40px;
background:rgba(40,202,204,0.3);
color:#28CACC;
border-radius:50%;
text-align: center;
display: inline-block;
font-size: 18px;
}
.approvalDetails .stepItem .rightDiv{
width: 100%;
background:rgba(255,255,255,1);
box-shadow:0px 2px 5px 0px rgba(176,176,176,0.1);
border-radius:10px;
}
.approvalDetails .stepItem ._left_radius{
width: 16px;
height: 16px;
border-radius: 50%;
text-align: center;
position: absolute;
left: 0;
z-index: 2;
}
.approvalDetails .stepItem{
position: relative;
padding-left: 75px;
min-height: 100px;
padding-bottom: 30px;
}
.approvalDetails .rizhi{
font-size:12px;
font-family:"宋体";
font-weight:400;
text-decoration:underline;
color:rgba(166,198,198,1);
position: absolute;
right: 0;
cursor: pointer;
}
.approvalDetails .allStep li .line{
width:57px;
display: inline-block;
border-bottom: 1px dashed #FFA475;
margin:0 10px;
position: relative;
top: -7px;
}
.approvalDetails .allStep li{
display: inline-block;
font-size: 12px;
font-family: "宋体";
}
.approvalDetails .allStep .circle img{
width: 100%;
height: 100%;
}
.approvalDetails .allStep .circle .circleSpan{
display: inline-block;
width:16px;
height:16px;
background:rgba(232,232,232,1);
border-radius:50%;
}
.approvalDetails .allStep .circle{
display: inline-block;
width:16px;
height:16px;
border-radius:50%;
}
.approvalDetails .zcInfo .el-col {
font-size: 12px;
margin-top: 20px;
color:#111111;
}
.approvalDetails .zcInfo .el-col span:nth-child(1){
color:#999999;
display: inline-block;
width: 85px;
}
.approvalDetails .HeaderDiv .underline{
display: block;
width:101px;
height:2px;
position: absolute;
bottom: 0;
background: #00D2D6;
}
.approvalDetails .titleSpan{
position: absolute;
left: 0;
}
.approvalDetails .titleSpan span{
display: inline-block;
width:44px;
height:44px;
line-height:44px;
background:rgba(40,202,204,0.3);
border-radius:50%;
font-size: 20px;
color: #28CACC;
text-align: center;
}
.approvalDetails .StateCol span{
width:60px;
height:26px;
line-height:26px;
border-radius:8px;
display: inline-block;
color:#fff;
text-align: center;
font-size: 12px;
font-family: "宋体";
}
.approvalDetails .StateCol .spz{
background:rgba(114,184,255,1);
}
.approvalDetails .StateCol .ytg{
background:#00D2D6;
}
.approvalDetails .StateCol .wtg{
background:#FFA475;
}
</style>
src/components/administrative/AssetsSystem/CheckDetails.vue 0 → 100644
View file @ 6ec74580
<template>
<div class="CheckDetails basefix">
<div class="left">
<el-carousel v-if="datainfo.ImageList.length>0" height="500px">
<el-carousel-item style="display:flex;align-items:center" v-for="(item,index) in datainfo.ImageList" :key="index">
<img style="width:100%;" :src="item" alt="">
</el-carousel-item>
</el-carousel>
<img v-else style="width:100%;height:500px;border: 1px solid #ccc;" src="../../../assets/img/Travelslider.png" alt="">
</div>
<div class="right overflowY" style="height:500px">
<div class="baseTitle f12">使用信息</div>
<div class="desItem">
<p>使用人</p>
<p>
<span v-if="datainfo.EmName && datainfo.EmName!=''">{{datainfo.EmName}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>领取时间</p>
<p>{{datainfo.GetTime}}</p>
</div>
<div class="baseTitle f12">基本信息</div>
<div class="baseDiv">
<div class="desItem">
<p>资产名称</p>
<p>{{datainfo.Name}}</p>
</div>
<div class="desItem">
<p>资产分类</p>
<p>
<span v-if="datainfo.CategoryName && datainfo.CategoryName!=''">{{datainfo.CategoryName}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>品牌</p>
<p>{{datainfo.BrandName}}</p>
</div>
<div class="desItem">
<p>型号</p>
<p>
<span v-if="datainfo.PropertyModel && datainfo.PropertyModel!=''">{{datainfo.PropertyModel}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>单位</p>
<p>
<span v-if="datainfo.Units && datainfo.Units!=''">{{datainfo.Units}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>序列号</p>
<p>
<span v-if="datainfo.SerialNumber && datainfo.SerialNumber!=''">{{datainfo.SerialNumber}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>购置日期</p>
<p>{{datainfo.BuyDate}}</p>
</div>
<div class="desItem">
<p>购置方式</p>
<p>{{datainfo.BuyTypeName}}</p>
</div>
<div class="desItem">
<p>金额</p>
<p>
<span v-if="datainfo.Money && datainfo.Money!=''">{{datainfo.Money}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>使用类型</p>
<p>{{datainfo.UseStatusName}}</p>
</div>
<div class="desItem">
<p>公司</p>
<p>
<span v-if="datainfo.BranchName && datainfo.BranchName!=''">{{datainfo.BranchName}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>备注</p>
<p>
<span v-if="datainfo.Remark && datainfo.Remark!=''">{{datainfo.Remark}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>供应商</p>
<p>
<span v-if="datainfo.SupplierName && datainfo.SupplierName!=''">{{datainfo.SupplierName}}</span>
<span v-else>无</span>
</p>
</div>
</div>
<div class="baseTitle f12">操作记录</div>
<table class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" >
<thead>
<th>类型</th>
<th>内容</th>
<th>签名图片</th>
<th>操作人/时间</th>
</thead>
<tbody>
<tr v-for="(item, index) in OperationList" :key="index">
<td>{{ item.TypeName }}</td>
<td>{{ item.Content }}</td>
<td>
<img
v-if="item.SignImage && item.SignImage != ''"
style="height: 45px;width: 55px;"
:src="item.SignImage"
alt=""
/>
<span class="c99" v-else>-</span>
</td>
<td>
<p>{{ item.CreateBy }}</p>
<p>{{ item.CreateDate }}</p>
</td>
</tr>
<tr v-show="OperationList.length == 0">
<td colspan="4" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total"
>
</el-pagination>
</div>
</div>
</template>
<script>
export default {
name: '',
data(){
return{
msg: {
pageIndex: 1,
pageSize: 5,
PropertyId: ""
},
OperationList:[],
total:0,
datainfo:{
ImageList:[],
},
PropertyId:'',
}
},
created(){
},
mounted(){
},
methods:{
InitData(id){
this.PropertyId=id;
this.msg.PropertyId=id;
this.getOperation();
this.getDataInfo();
},
currentChange(val) {
this.msg.pageIndex = val;
this.getOperation();
},
getOperation() {
this.apiJavaPost(
"/api/property/GetPropertyLogPageList",
this.msg,
res => {
this.OperationLoad = false;
if (res.data.resultCode === 1) {
this.OperationList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
getDataInfo(){
this.apiJavaPost(
"/api/property/GetPropertyInfo",
{Id:this.PropertyId},
res => {
this.OperationLoad = false;
if (res.data.resultCode === 1) {
this.datainfo = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
},
}
</script>
<style scoped>
.myTable{
width: 100%;
font-size: 12px;
border-collapse: collapse;
font-family: "宋体"!important;
}
.myTable thead th{
color:#A6C6C6;
padding-left: 20px;
height: 50px;
line-height: 50px;
font-weight:bold;
text-align: left;
}
.myTable thead tr{
background:transparent!important;
}
.myTable .hoverSpan1{
left: -20px;
}
.myTable .hoverSpan2{
right: -20px;
}
.myTable .commonStyle{
height:100%;
background:#fff;
position: absolute;
width: 20px;
top:0;
display: none;
}
.miniTable tr td{
padding:6px 0 6px 20px!important;
}
.myTable tr{
background:#fff;
border-bottom: 4px solid #F8FAFB;
cursor: pointer;
}
.noHoverTable tr{
border-bottom:none!important;
}
.myTable .trNobottom{
border-top: 4px solid #F8FAFB!important;
border-bottom:none!important;
}
.myTable tbody tr:hover{
box-shadow:0px 0 20px 0px rgba(176,176,176,0.2);
transition: transform .5s ease;
/* transform: scaleX(1.02); */
}
.noHoverTable tbody tr:hover{
box-shadow:0 0 0 transparent!important;
}
.myTable tbody tr:hover .commonStyle{
display: block;
transition: transform .5s ease;
box-shadow:0px 0px 0px 0px rgba(176,176,176,0.2);
}
.myTable tbody tr:hover td{
border-radius:0!important;
}
.myTable tbody tr:first-child td:first-child{
border-radius:20px 0 0 0;
}
.myTable tbody tr:first-child td:last-child{
border-radius:0 20px 0 0;
}
.myTable tbody tr:last-child td:first-child{
border-radius:0 0 0 20px;
}
.myTable tbody tr:last-child td:last-child{
border-radius:0 0 20px 0;
}
.myTable tr td{
position: relative;
padding:11px 0 11px 20px;
}
.overflowY{
overflow-y: scroll;
height: 100%;
box-sizing: border-box;
position: relative;
}
.CheckDetails .baseDiv .desItem:nth-child(3n){
margin-right:0;
}
.CheckDetails .desItem p:first-child{
margin-bottom: 4px;
}
.CheckDetails .desItem{
display: inline-block;
background: #fff;
box-sizing: border-box;
border-radius: 10px;
width: 200px;
margin:10px 10px 10px 0;
padding:6px 10px;
}
.CheckDetails .baseTitle{
padding:5px 0;
border-bottom: 1px dashed #ccc;
margin-bottom:10px
}
.CheckDetails>div{
float: left;
font-size: 12px;
}
.CheckDetails .left{
width:440px;
box-sizing: border-box;
padding:25px;
}
.CheckDetails .right{
width: 660px;
padding:0 10px 0 15px;
box-sizing: border-box;
}
</style>
src/components/index.vue
View file @ 6ec74580
......@@ -1956,19 +1956,33 @@ export default {
},25)
}
},
LogSetReadStatus(s) {
this.apipost(
"SystemLog_post_LogSetReadStatus",
{ LogId: s.ID },
r => {
if (s.Link) {
this.goUrl(s.Link);
}
this.IM_bodyIsShow = false;
this.refreshSysNoteDate();
},
null
);
LogSetReadStatus(s) {
if(s.Type==7){
let path="AssetsShenpi"
let routeData = this.$router.resolve({
name: path,
query: {
Id:28,
compType:'shenpi'
}
})
window.open(routeData.href, '_blank')
}
else{
this.apipost(
"SystemLog_post_LogSetReadStatus",
{ LogId: s.ID },
r => {
if (s.Link) {
this.goUrl(s.Link);
}
this.IM_bodyIsShow = false;
this.refreshSysNoteDate();
},
null
);
}
},
refreshSysNoteDate(add) {
this.sysMsgList = [];
......
src/plug/index.js
View file @ 6ec74580
......@@ -111,6 +111,8 @@ export default {
//域名管理对象
Vue.prototype.domainManager = function () {
let domainUrl = '';
// domainUrl = "http://192.168.2.66:8025";
domainUrl = "http://192.168.2.17:8083";
domainUrl = "http://192.168.2.214:8082";
let locationName = window.location.hostname;
......@@ -150,7 +152,7 @@ export default {
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
//文件站点
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.17:8087",
// javaUrl:"http://192.168.2.215:9000",
//Java接口本站文件流下载地址
......@@ -412,7 +414,7 @@ export default {
})
} else if (res.resultCode == 10005) {
this.$router.go(-1)
} else if (res.data.data.isJumpTwoCode == 1) {
} else if (res.data.data && res.data.data.isJumpTwoCode == 1) {
this.$router.push({
path: '/clientConfirm'
})
......
src/router/config.js
View file @ 6ec74580
......@@ -297,6 +297,7 @@ export default {
title: '部门管理'
},
},
{
path: '/userManagement', //员工管理
name: 'userManagement',
......@@ -4362,6 +4363,14 @@ export default {
title: '财务凭证打印页面'
},
},
{
path: '/AssetsShenpi', //资产管理审批
name: 'AssetsShenpi',
component: resolve => require(['@/components/administrative/AssetsSystem/AssetsShenpi'], resolve),
meta: {
title: '资产管理'
},
},
{
path: '/supplierIndex', //供应商首页
......
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