Skip to content

S
SuperMan
Commit 7d702c52 authored by Mac's avatar Mac
Browse files
Options

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

parents 171eaa42 1aa96b6b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2696 additions and 3136 deletions
package-lock.json
View file @ 7d702c52
This diff is collapsed.
package.json
View file @ 7d702c52
......@@ -15,7 +15,7 @@
"@riophae/vue-treeselect": "0.0.38",
"@xkeshi/vue-barcode": "^1.0.0",
"ali-oss": "^5.3.1",
"axios": "^0.18.0",
"axios": "^0.19.0",
"browser-md5-file": "^1.0.0",
"child_process": "^1.0.2",
"co": "^4.6.0",
......@@ -30,6 +30,7 @@
"lrz": "^4.9.40",
"moment": "^2.24.0",
"node-sass": "^4.11.0",
"particleground-light": "^1.0.6",
"pdfjs-dist": "^2.0.489",
"pinyin": "^2.8.3",
"qrcode": "^1.2.2",
......@@ -37,7 +38,7 @@
"vue": "^2.5.2",
"vue-amap": "^0.5.6",
"vue-draggable-resizable": "^1.7.2",
"vue-echarts-v3": "^1.0.19",
"vue-echarts-v3": "^2.0.1",
"vue-i18n": "^7.6.0",
"vue-quill-editor": "^3.0.6",
"vue-treeselect": "^1.0.7",
......@@ -62,7 +63,7 @@
"babel-preset-stage-2": "^6.22.0",
"chalk": "^2.4.2",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.28.11",
"css-loader": "^2.1.1",
"eslint": "^4.15.0",
"eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0",
......@@ -79,7 +80,7 @@
"less": "^3.9.0",
"less-loader": "^4.1.0",
"node-notifier": "^5.1.2",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"ora": "^1.2.0",
"portfinder": "^1.0.13",
"postcss-import": "^11.0.0",
......@@ -90,14 +91,14 @@
"shelljs": "^0.7.6",
"style-loader": "^0.21.0",
"uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^0.5.9",
"url-loader": "^2.0.0",
"vue-easytable": "^1.7.2",
"vue-loader": "^13.3.0",
"vue-router": "^3.0.1",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.9.0",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-dev-server": "^2.9.1",
"webpack-merge": "^4.1.0"
},
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 7d702c52
......@@ -136,7 +136,7 @@
<li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> -->
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export()"/>
</li>
</ul>
</div>
......@@ -472,8 +472,10 @@ export default {
count:0,
allBPrice:0,
allWPrice:0,
userInfo:{},
}
},created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId);
......@@ -502,6 +504,13 @@ export default {
}
},methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=1;
var fileName = "现金账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
addChuNaFun(){ // 添加出纳按钮点击事件
let count = 0;
let allBPrice = 0;
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 7d702c52
......@@ -130,7 +130,7 @@
<li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/> -->
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li>
</ul>
</div>
......@@ -415,8 +415,11 @@ export default {
count:0,
allBPrice:0,
allWPrice:0,
userInfo:{},
}
},created(){
},
created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId);
......@@ -445,6 +448,13 @@ export default {
}
},methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=2;
var fileName = "银行账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){
let status=false;
if(item.CostTypeList){
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 7d702c52
......@@ -127,7 +127,7 @@
<li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/> -->
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li>
</ul>
</div>
......@@ -407,8 +407,10 @@ export default {
count:0,
allBPrice:0,
allWPrice:0,
userInfo:{},
}
},created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId);
......@@ -437,6 +439,13 @@ export default {
}
},methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=3;
var fileName = "平台账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){
let status=false;
if(item.CostTypeList){
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 7d702c52
......@@ -119,7 +119,7 @@
<li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> -->
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li>
</ul>
</div>
......@@ -202,12 +202,21 @@
</tr>
<tr>
<td :colspan="5">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td></td>
<!-- <td></td>
<td></td>
<td> {{ moneyFormat(endRStartMoney) }} </td>
<td></td>
<td></td>
<td></td>
<td> {{ moneyFormat(endStartMoney) }} </td> -->
<td> {{ moneyFormat(wShou) }} </td>
<td> {{ moneyFormat(wZhi) }} </td>
<td> {{ moneyFormat(endRStartMoney) }} </td>
<td></td>
<td> {{ moneyFormat(bShou) }} </td>
<td> {{ moneyFormat(bZhi) }} </td>
<td> {{ moneyFormat(endStartMoney) }} </td>
</tr>
</table>
......@@ -436,8 +445,15 @@ export default {
count:0,
allBPrice:0,
allWPrice:0,
userInfo:{},
wShou:0,
wZhi:0,
bShou:0,
bZhi:0,
}
},created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId);
......@@ -467,6 +483,13 @@ export default {
}
},methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=4;
var fileName = "奖金池账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){
let status=false;
if(item.CostTypeList){
......@@ -574,23 +597,35 @@ export default {
}
this.endStartMoney = '';
this.endRStartMoney ='';
this.bShou = 0;
this.wShou = 0;
this.bZhi = 0;
this.wZhi = 0;
this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
if(res.data.resultCode==1){
let data = res.data.data;
if(data.length){
this.StartMoney = data[0].StartMoney?data[0].StartMoney:0; // 外币
this.RStartMoney = data[0].StartMoney?data[0].StartMoney:0; // 本位币
let endStartMoney = 0,
endRStartMoney = 0;
this.RStartMoney = data[0].RStartMoney?data[0].RStartMoney:0; // 本位币
let endStartMoney = this.StartMoney;
let endRStartMoney = this.RStartMoney;
data.forEach( ( x , i ) => {
if(x.Type==1){
endRStartMoney = endStartMoney + x.OriginalMoney;
// endRStartMoney = endStartMoney + x.OriginalMoney;
// endStartMoney = endStartMoney + x.Money;
// x.enRSMoney = endRStartMoney;
// x.enSMoney = endStartMoney;
this.bShou = this.bShou + x.Money;
this.wShou = this.wShou + x.OriginalMoney;
endRStartMoney = endRStartMoney + x.OriginalMoney;
endStartMoney = endStartMoney + x.Money;
x.enRSMoney = endRStartMoney;
x.enRSMoney = endRStartMoney;//外币收入
x.enSMoney = endStartMoney;
}else if(x.Type==2){
endRStartMoney = endStartMoney - x.OriginalMoney;
this.bZhi = this.bZhi + x.Money;
this.wZhi = this.wZhi + x.OriginalMoney;
endRStartMoney = endRStartMoney - x.OriginalMoney;
endStartMoney = endStartMoney - x.Money;
x.enRSMoney = endRStartMoney;
x.enSMoney = endStartMoney;
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ 7d702c52
......@@ -368,6 +368,8 @@
<div class="approval_page_content">
<div class="approval_person_content">
<span class="approval_span_type">{{$t('fnc.mrspliucheng')}}</span>
<span style="float:right"><el-button @click="Auditshow=true,EditAudit()" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button></span>
<div class="approval_person_list fl">
<span class="approval_person_list_tit">{{$t('fnc.mrspiren')}}</span>
<div class="padding_l88">
......@@ -494,6 +496,25 @@
<button class="normalBtn" type="primary" @click="saveAuditUser">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<el-dialog
title="修改审批人"
:visible.sync="Auditshow"
width="400px">
<div>
<ul>
<li v-for="(item,index) in myAuditList" :key="index+500" style="margin-bottom:10px">
<span style="display:inline-block;width:90px">{{item.AuditDescription}}</span>
<el-input v-model.number="item.Sort" size="mini" style="width:200px"></el-input>
</li>
</ul>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="dialogVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="AuditSort">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -504,7 +525,8 @@ export default {
components: { Treeselect },
data(){
return{
accListShow: true,
Auditshow:false,
accListShow: true,
TemplateId:0,
radio:1,
addMsg:{
......@@ -566,7 +588,7 @@ export default {
name:"分公司OP"
},
],
accListMsg:[],
accListMsg:[],
SpecialNodeSelectType:'',
AuditDescription:'',
AuditWay:2,
......@@ -666,7 +688,8 @@ export default {
filterText2(val) {
this.$refs.treeUser.filter(val);
}
},created(){
},
created(){
let userInfo=this.getLocalStorage();
this.TemplateId = this.$route.query.id;
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
......@@ -679,7 +702,8 @@ export default {
this.addMsg.RB_BranchId = this.$route.query.Branch_Id;
};
}
},mounted(){
},
mounted(){
this.getCompanyList();
this.getMaxDepartmentTierList();
......@@ -690,7 +714,31 @@ export default {
}
this.getFinancialFlowTemplate_post_GetNodeList();
this.getRole()
},methods:{
},
methods:{
AuditSort(){
let sum=0;
let sortnum=0;
for(let i=0;i<this.myAuditList.length;i++){
let id=this.myAuditList[i].Sort;
sum+=i+1;
sortnum+=this.myAuditList[i].Sort;
}
if(sum!=sortnum){
this.Error("请输入连续的排序！")
return;
}
this.myAuditList.sort(
this.$commonUtils.createComprisonFunction("Sort")
);
this.Auditshow=false;
},
EditAudit(){
// console.log("myAuditList",this.myAuditList)
},
handleCheckAllChangeAcc(val) {
this.accListMsg = val ? [1,2,3,4] : [];
this.isIndeterminate = false;
......
src/components/Hotel/roomQuery.vue
View file @ 7d702c52
......@@ -167,8 +167,9 @@
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
{{childItem.NewHotelName}}
<span class="colorE95252">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
<template v-if="childItem.OPState==1">[OP-OK]</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}
</template>
</span>
</p>
......
src/components/Restaurant/FoodOrder.vue
View file @ 7d702c52
......@@ -214,6 +214,12 @@ export default {
this.currentPage = 1;
},
getList() {
if(!this.msg.startDate){
this.msg.startDate="";
}
if(!this.msg.endDate){
this.msg.endDate="";
}
this.loading = true;
this.apiJavaPost("/api/erp/dining/getDiningOrder", this.msg, res => {
this.loading = false;
......
src/components/Supplier/HotelQueryList.vue
View file @ 7d702c52
......@@ -89,7 +89,7 @@
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer">
<div>
{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
<input type="button" class="normalBtn" style="margin-left:0;height:22px;padding:0 10px;" @click="getLogsList(scope.row.HotelId)" value="操作日志"/>
......@@ -116,7 +116,7 @@
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge"
<div class="Hotel_kong Com_hoteldiv"
>
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div>
......@@ -653,11 +653,6 @@
</script>
<style>
.Hq_duoge {
cursor: pointer;
text-decoration: underline;
}
.HqCom_bottom .ql-container {
min-height: 100px;
}
......
src/components/Supplier/roomQuery.vue
View file @ 7d702c52
......@@ -148,9 +148,9 @@
<td>
<span style="color:red;">
<template v-if="childItem.SupplierId==UserInfo.SupplierId">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}</template>
</template>
</span>
</td>
......
src/components/SupplierIndex.vue
View file @ 7d702c52
......@@ -4,7 +4,7 @@
<div class="nav-left">
<img class="GroupPic" src="../assets/img/daxiang.png" />
</div>
<div class="nav-middle">
<div class="nav-middle SupplierIndex_Nav">
<ul class="clearfix" :style="{width:`${allWindowWidth}px`}">
<li v-for="(item,index) in menuList" v-if="item.URL!=''" :class="{active:item.Id==chosenIndex}"
@click="goUrl(item.URL,item.Id,index)">
......@@ -136,7 +136,7 @@
<div style="width: 100%;min-height:200px; overflow-x: auto;padding:0 20px; " class="HotelQueryList"
v-loading="loading">
<div class="hotelProductManage2_tableBox" style="margin:20px 0;">
<div style="margin:20px 0">
<span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
......@@ -148,7 +148,7 @@
:height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer">
<div>
{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
</template>
......@@ -175,7 +175,7 @@
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge">
<div class="Hotel_kong Com_hoteldiv">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div>
<div class="Hotel_kong Com_hoteldiv">
......@@ -907,7 +907,9 @@
float: left;
z-index: 2019128;
}
.SupplierIndex_Nav ul li{
margin-left:20px;
}
.nav-middle ul li i {
font-size: 16px;
color: #a6adb4;
......@@ -1058,12 +1060,6 @@
top: 50px !important;
}
.Hq_duoge {
cursor: pointer;
text-decoration: underline;
}
.HqCom_bottom .ql-container {
min-height: 100px;
}
......
src/components/SupplierLogin.vue
View file @ 7d702c52
......@@ -31,7 +31,16 @@
.Supplier_Login .login-Div .loginBtn:hover {
background-color: #5182E4;
}
.Supplier_Login .login_back{
position: absolute!important;
width:100%;
height:60%;
top:0;
left:0;
}
.Supplier_Login .Supplier_loginDiv{
background-color:rgba(255,255,255,0.2)!important;
}
</style>
<template>
......@@ -43,8 +52,8 @@
</div>
</div>
</div>
<form class="login-Div">
<div class="login_back"></div>
<form class="login-Div Supplier_loginDiv">
<div v-if="isShow==1">
<div class="mainTitle">
<div class="login_Title">
......@@ -82,6 +91,7 @@
</template>
<script>
import Particle from 'particleground-light'
export default {
name: "login-box",
data() {
......@@ -108,6 +118,10 @@
};
},
mounted() {
new Particle(document.querySelector('.login_back'),{
dotColor: '#19294C',
lineColor: '#19294C'
})
this.init();
let that = this;
this.clock = setInterval(() => {
......
src/components/scenicSpot/ScenTicketOrder.vue
View file @ 7d702c52
......@@ -268,13 +268,18 @@ export default {
this.currentPage = 1;
},
getList() {
if(!this.msg.startDate){
this.msg.startDate="";
}
if(!this.msg.endDate){
this.msg.endDate="";
}
this.loading = true;
this.apiJavaPost("/api/erp/ticketCoupons/getTicketCouponsOrder", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
console.log(this.dataList,'datalist');
} else {
this.Error(res.data.message)
}
......
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