Skip to content

S
SuperMan
Commit 2a567bb2 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 38803b85
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 780 deletions
src/assets/css/DMC.css
View file @ 2a567bb2
......@@ -16,6 +16,7 @@
margin-top: 30px;
font-size: 12px;
min-width: 1200px;
overflow-y: auto;
}
.changInfo .resource-baseinfo {
float: left;
......@@ -93,7 +94,7 @@
position: relative;
top: 1px;
}
.changInfo .re-img {
width: 140px;
height: 93px;
......@@ -151,7 +152,7 @@
border-radius: 10px;
position: absolute;
text-align: center;
line-height: 93px;
line-height: 93px;
top: 0;
}
.changInfo .reimg-add:hover .ad-one {
......@@ -242,12 +243,12 @@
.changInfo .el-form-item__label {
width: 100px;
}
.changInfo .jiudianyouhuiDiv .el-form-item__label{
width: 72px;
font-size: 12px;
}
.changInfo .el-form-item__error {
left: 100px;
}
......@@ -390,4 +391,4 @@
outline: none;
cursor: pointer;
border: 1px solid #e95252;
}
\ No newline at end of file
}
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 2a567bb2
......@@ -163,7 +163,7 @@
<th width="">{{$t('fnc.yueacc')}}</th>
</tr>
<tr>
<td :colspan="7">{{$t('fnc.a_qcyue')}}：期初余额</td>
<td :colspan="7">{{$t('fnc.a_qcyue')}}</td>
<td></td>
<td></td>
<td> {{ moneyFormat(RStartMoney) }} </td>
......@@ -177,8 +177,11 @@
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td> {{ item.BName }} </td>
<td>
<!-- <td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
</td> -->
<td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
<td>
<p v-if="item.CostTypeList&&item.CostTypeList.length"> <span v-for="(i,o) in item.CostTypeList">{{ i }} </span> </p>
......@@ -196,13 +199,13 @@
{{ item.AccountNumber }}
</td>
<td>
收入：{{ item.Type === 1 ? moneyFormat(item.OriginalMoney) : '' }}
{{ item.Type === 1 ? moneyFormat(item.OriginalMoney) : '' }}
</td>
<td>
支出： {{ item.Type === 2 ? moneyFormat(item.OriginalMoney) : '' }}
{{ item.Type === 2 ? moneyFormat(item.OriginalMoney) : '' }}
</td>
<td>
余额：{{ moneyFormat(item.enRSMoney) }}
{{ moneyFormat(item.enRSMoney) }}
</td>
<td>
{{item.Rate}}
......@@ -794,6 +797,21 @@ export default {
this.payMsg.Type = '';
this.payMsg.AccountId = '';
},
goUrlNew(item){
let status=false;
if(item.CostTypeList){
item.CostTypeList.forEach(cost=>{
if(cost=="资金调拨"){
status=true;
}
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
},
......@@ -933,12 +951,11 @@ export default {
}else if(x.Type===2){//支出
this.bZhi = this.bZhi + x.Money;
this.wZhi = this.bZhi + x.OriginalMoney;
this.wZhi = this.wZhi + x.OriginalMoney;
endRStartMoney = endRStartMoney - x.OriginalMoney;
endStartMoney = endStartMoney - x.Money;
x.enRSMoney = endRStartMoney;
x.enSMoney = endStartMoney;
console.log("this.wZhi",this.wZhi);
}
x.check = false;
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 2a567bb2
......@@ -159,7 +159,10 @@
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td>{{ item.BName }}</td>
<td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td>
<!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
<td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
<td>
<p>{{item.CostTypeName}}</p>
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }} ( <span> {{ son.TCID }} </span> )</span> </p>
......@@ -442,6 +445,21 @@ export default {
}
},methods:{
goUrlNew(item){
let status=false;
if(item.CostTypeList){
item.CostTypeList.forEach(cost=>{
if(cost=="资金调拨"){
status=true;
}
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
},
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 2a567bb2
......@@ -156,7 +156,11 @@
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td>{{ item.BName }}</td>
<td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td>
<!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
<td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
<td>
<p>{{item.CostTypeName}}</p>
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }}</span> </p>
......@@ -433,6 +437,21 @@ export default {
}
},methods:{
goUrlNew(item){
let status=false;
if(item.CostTypeList){
item.CostTypeList.forEach(cost=>{
if(cost=="资金调拨"){
status=true;
}
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
},
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 2a567bb2
......@@ -157,8 +157,11 @@
</tr>
<tr v-for=" ( item , index ) in DataList " v-if=" item.Type !== 4">
<td> {{ item.BName }} </td>
<td>
<!-- <td>
<span class="cursorpointer" :class=" item.Type == 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
</td> -->
<td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
<td>
<p> {{ item.CostTypeName }} </p>
......@@ -464,6 +467,21 @@ export default {
}
},methods:{
goUrlNew(item){
let status=false;
if(item.CostTypeList){
item.CostTypeList.forEach(cost=>{
if(cost=="资金调拨"){
status=true;
}
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
},
......
src/components/SalesModule/addPassenger.vue
View file @ 2a567bb2
This diff is collapsed.
src/components/Supplier/HotelInfo.vue
View file @ 2a567bb2
<style>
@import "../../assets/css/DMC.css";
.title{width: 100%;display: -webkit-box;margin-top: 20px }
.tu_img{width: 100%;display: -webkit-box;padding: 20px 50px}
</style>
<template>
<div class="flexOne changInfo">
<div class="resource-content clearfix">
<el-form :model="addMsg" :rules="rules" ref="addMsg">
<div class="resource-content clearfix" :style="{height:(orderHight-90) + 'px'}">
<el-form :model="addMsg" :rules="rules" ref="addMsg">
<div class="resource-baseinfo">
<span class="resource-lititle">{{$t('hotel.hotel_baseinfo')}}</span>
<el-form-item :label="$t('hotel.hotel_name')" prop="Name">
......@@ -72,8 +74,8 @@
</el-select>
</span>
</div>
<span class="resource-lititle sheshi">酒店优惠 <el-button icon="el-icon-plus" circle @click="addAir"></el-button>
</span>
<!-- <span class="resource-lititle sheshi">酒店优惠 <el-button icon="el-icon-plus" circle @click="addAir"></el-button>-->
<!-- </span>-->
<div class="jiudianyouhuiDiv">
<el-row v-for="(list,index) in addMsg.DiscountList" :key="index">
......@@ -116,7 +118,7 @@
</el-form-item>
</el-col>
<el-col :span="6" style='padding-top: 5px;'>
</el-col>
</el-row> -->
</div>
......@@ -215,42 +217,54 @@
<el-switch v-model="addMsg.IsHavearking" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
</div>
<span class="resource-lititle">{{$t('hotel.hotel_imgintroduce')}}</span>
<div class="resource-list">
<div class="resource-imglist clearfix">
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" />
<div class="imgzhe">
<div class="re-delte"><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
</div>
<div class="title">
<span class="resource-lititle" style="margin-left: 30px">{{$t('hotel.hotel_imgintroduce')}}</span>
</div>
<div class="tu_img">
<div class="resource-list">
<div class="resource-imglist clearfix">
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" />
<div class="imgzhe">
<div class="re-delte"><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
<i class="iconfont icon-zuoyi"></i>
<!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
<i class="iconfont icon-zuoyi"></i>
</div>
<div class="re-delte" @click.stop="ExchangeImg(index,1)" v-if="index!=HotelImageArray.length-1&&item.ShowPath">
<i class="iconfont icon-youyi"></i>
</div> -->
</div>
<div class="re-delte" @click.stop="ExchangeImg(index,1)" v-if="index!=HotelImageArray.length-1&&item.ShowPath">
<i class="iconfont icon-youyi"></i>
</div> -->
</div>
</div>
</div>
<div class="add-img">
<div class="reimg-add">
<i class="iconfont icon-img_haha"></i>
<div class="ad-one">
<div class="re-upload">
<el-upload class="upload-demo" :http-request="UploadImage" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<i class="iconfont icon-img_bdsc"></i>
</el-upload>
<div class="add-img">
<div class="reimg-add">
<i class="iconfont icon-img_haha"></i>
<div class="ad-one">
<div class="re-upload">
<el-upload class="upload-demo" :http-request="UploadImage" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<i class="iconfont icon-img_bdsc"></i>
</el-upload>
</div>
<div class="re-find" @click="addImgOpen"><i class="iconfont icon-img_cz"></i></div>
</div>
<div class="re-find" @click="addImgOpen"><i class="iconfont icon-img_cz"></i></div>
</div>
</div>
</div>
</div>
</div>
</el-form>
<div class="btn-list" style="width: 350px;position: fixed;right: 20px;top:50px">
<span class="common-lefttit"></span>
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div>
</div>
<el-dialog custom-class="resourceImgAdd" title="选择图片" center :visible.sync="addimg">
<DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:imgType="1">
</DMCchooseImg>
......@@ -258,11 +272,7 @@
<el-dialog custom-class="mapList" title="地图选址" center :visible.sync="selectAddress">
<googleMap @refList="googleMap" v-bind:address="addMsg.Address" @headCallBack="headCall"></googleMap>
</el-dialog>
<div class="btn-list">
<span class="common-lefttit"></span>
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
......@@ -399,7 +409,8 @@
pattern: this.$commonUtils.Regex.el_isInteger,
message: "请输入正确的数字"
}]
}
},
orderHight:1000,
};
},
components: {
......@@ -853,6 +864,9 @@
},
mounted() {
var orderHight = document.body.clientHeight
console.log(orderHight);
this.orderHight = orderHight;
let userInfo = this.getLocalStorage()
//有权限操作的部门
if (userInfo.RB_Department_Id == 240 || userInfo.RB_Department_Id == 1 || userInfo.RB_Department_Id == 3 ||
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 2a567bb2
......@@ -2012,14 +2012,14 @@
<div>
<span>发票单据：</span>
<span v-for="(item2,index2) in childItem.InvoiceApplyList" :key="index2">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3"
class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 "
class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-if="item2.InvoiceApplyState === 6" class="groupTourOrder_tickets_blue"
@click="goIisDetail(item2.ID)">{{item2.ID}}</span>
<span v-else-if="item2.InvoiceApplyState === 1 || item2.InvoiceApplyState === 3"
class="groupTourOrder_tickets_green" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
<span v-else-if="item2.InvoiceApplyState === 5 || item2.InvoiceApplyState === 4 "
class="groupTourOrder_tickets_red" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
<span v-else-if="item2.InvoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.ID)">{{item2.ID}}</span>
</span>
<span v-if="childItem.InvoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
</div>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 2a567bb2
......@@ -212,7 +212,10 @@
<td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;text-decoration:underline;" :title="item.orderId"
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}</p>
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;text-decoration: none;display: inline-block;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" title="点击跳转到团控列表" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''"
style="color:red">({{item.leaveStr}})</span></p>
......
src/components/systemManagement/currencyManagement.vue deleted 100644 → 0
View file @ 38803b85
This diff is collapsed.
src/router/config.js
View file @ 2a567bb2
......@@ -865,6 +865,14 @@ export default {
title: '币种管理'
},
},
{
path: '/HistoryRateQuery', //历史汇率查询
name: 'HistoryRateQuery',
component: resolve => require(['@/components/systemManagement/HistoryRateQuery'], resolve),
meta: {
title: '历史汇率'
},
},
{
path: '/transportCostsManagement', //联运成本管理
name: 'transportCostsManagement',
......
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