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
Expand all Show 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 @@ ...@@ -277,6 +277,8 @@
<template> <template>
<div class="CapitalDetail"> <div class="CapitalDetail">
<span class="Ca_Span">{{$t('fnc.zjdbodan')}}</span> <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="clearfix">
<div class="Co_oderleft"> <div class="Co_oderleft">
<div class="Ca_leftOrder"> <div class="Ca_leftOrder">
...@@ -635,14 +637,35 @@ export default { ...@@ -635,14 +637,35 @@ export default {
GetDetail:{ GetDetail:{
AuditSteps:[] AuditSteps:[]
}, },
endDate: '' endDate: '',
huijiShow:false,
} }
}, },
create(){ created(){
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
this.bossID = userinfo.EmployeeId; this.bossID = userinfo.EmployeeId;
let ActionMenuCode=userinfo.ActionMenuCode;
if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
this.huijiShow=true;
}
console.log("huijiShow",this.huijiShow)
}, },
methods:{ 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){ inited (viewer){
this.$viewer = viewer this.$viewer = viewer
}, },
......
src/components/PrintPageN.vue
View file @ 6ec74580
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<template v-loading="loading"> <template v-loading="loading">
<div class="_PrintPage"> <div class="_PrintPage">
<div class="_PrintPage_box"> <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"> <div class="SetDiv">
<span @click="disabled=false">编辑</span> <span @click="disabled=false">编辑</span>
<span @click="disabled=true">保存</span> <span @click="disabled=true">保存</span>
...@@ -60,22 +60,39 @@ ...@@ -60,22 +60,39 @@
<my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-GZ-Bill> <my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-GZ-Bill>
</div> </div>
</template> </template>
<!-- <template v-if="Merge==='1'"> <template v-if="Merge==='1'">
<div class="_border_1" v-for="(item,index) in loopNumN"> <div class="SetDiv">
<my-HB-Bill v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill> <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>
</template> --> <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>
</div> </div>
</template> </template>
<script> <script>
import myBill from "./FinancialModule/FinancialSubmodule/BillModuleNew.vue"; import myBill from "./FinancialModule/FinancialSubmodule/BillModuleNew.vue";
import myrbvBill from "./FinancialModule/FinancialSubmodule/ReceivablesModuleNew.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 myGZBill from "./FinancialModule/FinancialSubmodule/GZBillModule.vue";
import myCapital from "./FinancialModule/FinancialSubmodule/myCapital.vue";
export default { export default {
data(){ data(){
return{ return{
disabled3:true,
disabled2:true,
disabled1:true, disabled1:true,
disabled:true, disabled:true,
loading:true, loading:true,
...@@ -88,13 +105,15 @@ export default { ...@@ -88,13 +105,15 @@ export default {
loopNumN:this.$route.query.isKehu==='1'?3:2, loopNumN:this.$route.query.isKehu==='1'?3:2,
loopNumT:2, loopNumT:2,
Merge:null, Merge:null,
OrderSource:-1 OrderSource:-1,
CapitalState:false,
} }
},components:{ },components:{
'my-Bill': myBill, 'my-Bill': myBill,
'my-RVB-Bill':myrbvBill, 'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill, 'my-HB-Bill':myhrBill,
'my-GZ-Bill': myGZBill 'my-GZ-Bill': myGZBill,
'my-Capital':myCapital
},methods:{ },methods:{
numAdd(){ numAdd(){
this.num = this.num + 1 this.num = this.num + 1
...@@ -107,6 +126,10 @@ export default { ...@@ -107,6 +126,10 @@ export default {
this.isKehu = this.$route.query.isKehu; this.isKehu = this.$route.query.isKehu;
this.Merge = this.$route.query.Merge; this.Merge = this.$route.query.Merge;
this.OrderSource = this.$route.query.OrderSource; this.OrderSource = this.$route.query.OrderSource;
if(this.$route.query.Capital){
this.CapitalState=true;
}
} }
} }
</script> </script>
src/components/administrative/AssetsSystem/AssetsShenpi.vue 0 → 100644
View file @ 6ec74580
This diff is collapsed.
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
...@@ -1957,6 +1957,18 @@ export default { ...@@ -1957,6 +1957,18 @@ export default {
} }
}, },
LogSetReadStatus(s) { 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( this.apipost(
"SystemLog_post_LogSetReadStatus", "SystemLog_post_LogSetReadStatus",
{ LogId: s.ID }, { LogId: s.ID },
...@@ -1969,6 +1981,8 @@ export default { ...@@ -1969,6 +1981,8 @@ export default {
}, },
null null
); );
}
}, },
refreshSysNoteDate(add) { refreshSysNoteDate(add) {
this.sysMsgList = []; this.sysMsgList = [];
......
src/plug/index.js
View file @ 6ec74580
...@@ -111,6 +111,8 @@ export default { ...@@ -111,6 +111,8 @@ export default {
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
// domainUrl = "http://192.168.2.66:8025";
domainUrl = "http://192.168.2.17:8083";
domainUrl = "http://192.168.2.214:8082"; domainUrl = "http://192.168.2.214:8082";
let locationName = window.location.hostname; let locationName = window.location.hostname;
...@@ -150,7 +152,7 @@ export default { ...@@ -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", 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', 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", // javaUrl:"http://192.168.2.215:9000",
//Java接口本站文件流下载地址 //Java接口本站文件流下载地址
...@@ -412,7 +414,7 @@ export default { ...@@ -412,7 +414,7 @@ export default {
}) })
} else if (res.resultCode == 10005) { } else if (res.resultCode == 10005) {
this.$router.go(-1) this.$router.go(-1)
} else if (res.data.data.isJumpTwoCode == 1) { } else if (res.data.data && res.data.data.isJumpTwoCode == 1) {
this.$router.push({ this.$router.push({
path: '/clientConfirm' path: '/clientConfirm'
}) })
......
src/router/config.js
View file @ 6ec74580
...@@ -297,6 +297,7 @@ export default { ...@@ -297,6 +297,7 @@ export default {
title: '部门管理' title: '部门管理'
}, },
}, },
{ {
path: '/userManagement', //员工管理 path: '/userManagement', //员工管理
name: 'userManagement', name: 'userManagement',
...@@ -4362,6 +4363,14 @@ export default { ...@@ -4362,6 +4363,14 @@ export default {
title: '财务凭证打印页面' title: '财务凭证打印页面'
}, },
}, },
{
path: '/AssetsShenpi', //资产管理审批
name: 'AssetsShenpi',
component: resolve => require(['@/components/administrative/AssetsSystem/AssetsShenpi'], resolve),
meta: {
title: '资产管理'
},
},
{ {
path: '/supplierIndex', //供应商首页 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