Skip to content

S
SuperMan
Commit 679e0c1d authored by 罗超's avatar 罗超
Browse files
Options

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

parents 7c69a783 30f1af94
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 17 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 679e0c1d
......@@ -2330,7 +2330,7 @@ export default {
if(this.RB_Post_Id!=5&&this.userId!=1648){
console.log(2);
data.forEach(item=>{
if(item.Name!="公社资金池" && item.Name!="水口资金池" && item.Name!="橡胶资金池" && item.Name!="地接部专户" && item.Name!="老挝购物店资金池"){
if(item.Name!="公社资金池" && item.Name!="水口资金池" && item.Name!="橡胶资金池" && item.Name!="老挝购物店资金池"){
this.AccList.push(item);
}
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 679e0c1d
......@@ -1038,7 +1038,7 @@ export default {
let dataList = res.data.data.pageData;
let newData = [];
dataList.forEach(x=>{
if(x.IsBatchAudit==0){
if(x.IsBatchAudit==0||x.Type==1){
newData.push(x);
}
})
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 679e0c1d
......@@ -523,6 +523,7 @@ tr._item_list td:last-child {
<el-option value="5" label="散卖机票"></el-option>
<el-option value="6" label="日本地接部专户"></el-option>
<el-option value="7" label="老挝地接部专户"></el-option>
<el-option value="8" label="票务部专户"></el-option>
</el-select>
</el-form-item>
</el-col>
......
src/components/SalesModule/addPassenger.vue
View file @ 679e0c1d
......@@ -739,11 +739,7 @@
required: true,
message: "请填写手机号码",
trigger: "blur"
},
{
pattern: /^1[123457890]\d{9}$/,
message: "正确的手机号码"
}
}
],
Nationality: [{
required: true,
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 679e0c1d
......@@ -722,7 +722,7 @@
<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary"
style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}}
</el-button>
<el-dropdown trigger="click" style="margin-bottom:5px;" v-if="CurrentUserInfo.RB_Branch_id==0">
<el-dropdown trigger="click" style="margin-bottom:5px;" v-if="CurrentUserInfo.RB_Branch_id==0||CurrentUserInfo.RB_Branch_id==1216">
<span class="el-dropdown-link">{{$t('pub.updateMsg')}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
......
src/components/systemManagement/CostType.vue
View file @ 679e0c1d
......@@ -98,6 +98,17 @@
color: red;
display: none;
}
.ct_Edit{
position: absolute;
right:10px;
top:5px;
color:#fff;
cursor: pointer;
z-index:999;
}
.ct_Edit:hover{
color:#E95252;
}
</style>
<template>
<div class="flexOne CostType">
......@@ -106,7 +117,7 @@
<el-row v-if="transitionShow2">
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.fylxmingcheng')">
<el-input placeholder="" v-model="msg.Name"></el-input>
<el-input placeholder="" v-model="msg.Name" @keyup.enter.native="initTableInfo()"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
......@@ -146,7 +157,7 @@
<button class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()">{{$t('pub.searchBtn')}}</button>
<!-- <button type="button" class="normalBtn" @click="outerVisible=true">导入</button>
<button type="button" class="normalBtn" @click="downMuban()">下载导入模板</button> -->
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn'),addFun()" >{{$t('pub.addBtn')}}</button>
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn'),addFun(),resetInfo()" >{{$t('pub.addBtn')}}</button>
<el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
......@@ -174,6 +185,9 @@
</p>
</div>
</div>
<div class="ct_Edit" @click="getEditInfo(item.ID)">
<i class="iconfont icon-xiugai"></i>
</div>
</div>
</div>
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-if="transitionShow" >
......@@ -345,7 +359,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.table_rank')+'：'">
<el-form-item :label="$t('system.table_rank')+'：'">
<el-input v-model="addMsg.Sort"></el-input>
</el-form-item>
</el-col>
......@@ -363,7 +377,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.sybumen') + '：'">
<el-form-item :label="$t('fnc.sybumen')">
<!--<el-select filterable v-model='addMsg.DepartmentID' @change="getPostList()">-->
<el-select filterable v-model='addMsg.DepartmentID' >
<el-option :label="$t('active.cl_tongyong')" :value='-1'></el-option>
......@@ -703,7 +717,6 @@
return url;
},
beforeAvatarUpload(file) {
console.log(file)
const excel = file.type === "application/vnd.ms-excel";
if (!excel) {
this.Error(this.$t('tips.shangchuanExcel'));
......@@ -904,6 +917,78 @@
this.msg.pageIndex=1;
this.currentPage = 1
},
//点击修改
getEditInfo(ID){
let msg = {
ID:ID
}
this.apipost('financeinfo_post_GetCostType',msg, res => {
if(res.data.resultCode == 1) {
this.addShow=true;
var dataList = res.data.data;
this.getPostList();
this.getDepartmentList();
this.getEmployeeList('all');
this.getPostList('all');
this.EmployeeIDList=[];
this.addMsg.ID = dataList.ID;
this.addMsg.Name = dataList.Name;
this.addMsg.Type = dataList.Type;
this.addMsg.Tier = dataList.Tier;
this.addMsg.ParentId = dataList.ParentId;
this.addMsg.IsShareAccount = dataList.IsShareAccount;
this.addMsg.Sort = dataList.Sort;
this.addMsg.Is_Report = dataList.Is_Report;
// this.addMsg = dataList;
if(dataList.DepartList.length>0){
dataList.DepartList.forEach(x=>{
switch(x.Type){
case 1:
this.addMsg.BranchId = x.departmentId;
break;
case 2:
this.addMsg.PostID = x.departmentId;
break;
case 3:
this.addMsg.DepartmentID = x.departmentId;
break;
case 4:
this.addMsg.EmployeeID = x.departmentId;
this.EmployeeIDList.push(x.departmentId);
break;
case 5:
this.addMsg.BranchId = -1;
this.addMsg.PostID = -1;
this.addMsg.DepartmentID = -1;
this.addMsg.EmployeeID = -1;
this.EmployeeIDList.push(-1);
}
})
}
} else {
this.Error(res.data.message);
}
}, err => {})
},
//重置表单
resetInfo(){
var msg = {
ID:0,
Name:'',
Type:1, // 1收 2支 3收支
Tier:1,
ParentId:'',
IsShareAccount:0,
Sort:'0',
BranchId:-1,
PostID:-1,
DepartmentID:-1,
EmployeeID: -1,
list:[],
Is_Report:0
}
this.addMsg = msg;
},
addFlightmodule(){//添加
this.addMsg.list = [];
if(this.addMsg.Tier===1){
......@@ -922,7 +1007,7 @@
if(this.addMsg.PostID&&this.addMsg.PostID!=-1){
let obj = {
ID:0,
Type:3,
Type:2,
departmentId:this.addMsg.PostID
}
this.addMsg.list.push(obj)
......@@ -930,7 +1015,7 @@
if(this.addMsg.DepartmentID&&this.addMsg.DepartmentID!=-1){
let obj = {
ID:0,
Type:2,
Type:3,
departmentId:this.addMsg.DepartmentID
}
this.addMsg.list.push(obj)
......@@ -999,6 +1084,8 @@
this.getDepartmentList('all');
this.getPostList('all');
this.getEmployeeList('all');
this.EmployeeIDList=[];
this.EmployeeIDList.push(-1);
}
},
mounted(){
......
src/components/systemManagement/lineManagement.vue
View file @ 679e0c1d
......@@ -565,6 +565,25 @@ input[type="number"] {
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="App图标">
<div class="TFimgList" style="width:50px;height:50px">
<img v-if="!addMsg.AppLineIcon" src="../../assets/img/bg_c3@3x.png">
<img v-else :src='addMsg.AppLineIcon'>
<div class="TFIMGzhe">
<div class="TFreupload">
<el-upload :file-list="fileList3" :http-request="uploadTest3" :multiple="true" :limit="2"
:on-change="handleChange3"
accept="image/jpeg, image/gif, image/png, image/bmp"
:show-file-list="false" action="">
<i class="iconfont icon-Edit"></i>
</el-upload>
</div>
</div>
</div>
</el-form-item>
</el-col>
<div class="LM_Btcontent">
<input type="button" class="normalBtn" @click="submitForm('addMsg')" :value="$t('pub.saveBtn')"/>
......@@ -653,6 +672,7 @@ input[type="number"] {
export default {
data() {
return {
fileList3:[],
fileList:[],
fileList2:[],
msg: {
......@@ -678,6 +698,7 @@ export default {
LineDirection:2,
BackgroundImage:"",
BroadsideImage:'',
AppLineIcon:"",
},
departCompany: "",
departDepartment: "",
......@@ -718,6 +739,10 @@ export default {
};
},
methods: {
handleChange3(file, fileList) {
this.fileList3 = fileList.slice(-1);
},
handleChange1(file, fileList) {
this.fileList = fileList.slice(-1);
......@@ -726,6 +751,15 @@ export default {
this.fileList2 = fileList.slice(-1);
},
uploadTest3(file) {
let newArr = [];
newArr.push(file.file);
let path = "/Upload/DMC/Icon/";
this.UploadSelfFileT(path, newArr, x => {
let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.addMsg.AppLineIcon = url;
});
},
uploadTest2(file) {
let newArr = [];
newArr.push(file.file);
......@@ -843,8 +877,9 @@ export default {
this.addMsg.IsShare = getInfo.isShare;
this.addMsg.Is_PacketGroup = getInfo.is_PacketGroup;
this.addMsg.LineDirection = getInfo.lineDirection;
this.addMsg.BackgroundImage = getInfo.BackgroundImage;
this.addMsg.BroadsideImage = getInfo.BroadsideImage;
this.addMsg.BackgroundImage = getInfo.backgroundImage;
this.addMsg.BroadsideImage = getInfo.broadsideImage;
this.addMsg.AppLineIcon = getInfo.appLineIcon;
},
deletelist(lineID) {
var that = this;
......
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