Skip to content

S
SuperMan
Commit 4b26a847 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 74d820b4 7503f814
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 44 deletions
src/components/FinancialModule/CapitalAllocation.vue
View file @ 4b26a847
......@@ -15,7 +15,7 @@
.page_CapitalAllocation .page_CapitalAllocation_list {
width: 100%;
}
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.editedit{
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.el-icon-edit{
width: 30px;
height: 30px;
display: inline-block;
......@@ -27,9 +27,9 @@
cursor: pointer;
outline: none;
}
.page_CapitalAllocation i.edit{background-color: #00C6FF;font-size: 16px;}
.page_CapitalAllocation i.edit:hover{background-color: #59daff}
.page_CapitalAllocation i.edit:active{background-color: #00b8ec}
.page_CapitalAllocation i.el-icon-edit{background-color: #00C6FF;font-size: 16px;}
.page_CapitalAllocation i.el-icon-edit:hover{background-color: #59daff}
.page_CapitalAllocation i.el-icon-edit:active{background-color: #00b8ec}
.page_CapitalAllocation i.icon-sousuo{background-color: #47BF8C;}
.page_CapitalAllocation i.icon-sousuo:hover{background-color: #66bb97}
.page_CapitalAllocation i.icon-sousuo:active{background-color: #35ab79}
......@@ -190,7 +190,7 @@
</el-popover>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="(item.Status===1 || item.Status===3) && item.CreateBy===EmId && item.InOrNotProcess===-1">
<i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top">
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 4b26a847
......@@ -88,6 +88,7 @@
templateID: null,
DepartID: null,
EmployeeId: null,
OrderSource: null,
}
},methods:{
goUrl(path,id,Name,Type,IsUploadPic) {
......@@ -142,43 +143,53 @@
},
Financial_post_GetList(){ //获取
this.apipost('Financial_post_GetList',{},res=>{
if(res.data.resultCode==1){
let data = res.data.data;
console.log("data",data);
if(data){
data.forEach(x => {
if(x.Type==1){
this.collectList.push(x);
}else if (x.Type==2){
// if(this.active===2){
// if(x.Id!=11){
// this.payList.push(x);
// }
// }else{
this.payList.push(x);
// }
}else if (x.Type==7){
this.GZList.push(x);
}
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
if (x.Id === 33 || x.Id === 48) {
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
// 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50
// 如果不是吴珊，只显示49
if (this.OrderSource === '5' && this.showTab === '2') {
if (x.Id === 49 || x.Id === 50){
x.bigShow = false
if (x.Id === 49){
x.bigShow = true
} else {
x.bigShow = false
}
} else if (x.Id === 48) {
if (this.EmployeeId === 1725) {
} else if (x.Id === 50 && this.EmployeeId === 639){
x.bigShow = true
} else {
x.bigShow = false
}
console.log('if',x.Id,x.bigShow)
} else {
x.bigShow = false
console.log('else',x.Id,x.bigShow)
}
} else {
x.bigShow = true
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
if (x.Id === 33 || x.Id === 48) {
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
x.bigShow = true
} else {
x.bigShow = false
}
} else if (x.Id === 48) {
if (this.EmployeeId === 1725) {
x.bigShow = true
} else {
x.bigShow = false
}
}
} else {
x.bigShow = true
}
}
if(x.Type==1){
this.collectList.push(x);
}else if (x.Type==2){
this.payList.push(x);
}else if (x.Type==7){
this.GZList.push(x);
}
});
}
......@@ -199,8 +210,9 @@
this.DepartID = userInfo.RB_Department_Id;
this.EmployeeId = userInfo.EmployeeId;
this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
this.Financial_post_GetList();
this.OrderSource = this.$route.query.OrderSource ? this.$route.query.OrderSource : null
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
if(this.showTab==1){
this.GetList = this.collectList;
} else if(this.showTab==3){
......@@ -210,6 +222,7 @@
}
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj;
this.Financial_post_GetList();
},components: {
"my-FlowChartModule": myFlowChartModule
}
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 4b26a847
......@@ -535,7 +535,7 @@
</td>
<td class="_icon_btn">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"></i>
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type,item.FrID,true,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
<i class="iconfont icon-sousuo" v-if='item.Type!==4' @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
......@@ -1382,8 +1382,19 @@ export default {
goUrlAdd(path){
this.$router.push({ name: path,query:{blank:'y',tab:'选择财务单据类型'} })
},
goEit(path,type,id,edit,Conditon,pageIndex){
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
goEit(type,id,edit,Conditon,pageIndex){
let path = '';
if (type === 1) {
path = 'addReceivablesDocuments'
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
} else if (type === 2) {
path = 'addFinancialDocuments'
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
} else if (type === 4) {
path = 'addCapitalAllocation'
this.$router.push({ name: path,query:{"id":id,"edit":1,blank:'y',tab:'修改财务单据'} })
}
// this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
}
},
watch:{
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 4b26a847
......@@ -713,6 +713,21 @@ Vue.component("GuestNum", {
}
}
});
Vue.component("ManNum", {
// 人数
template: `<span>{{rowData.ManNum}}/{{rowData.WoManNum}}</span>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
}
});
Vue.component("Transport", {
// 是否联运团
template: `<span><span v-if="rowData.Is_Transport==='是'" style="color: red;">{{rowData.Is_Transport}}</span><span v-else>{{rowData.Is_Transport}}</span></span>`,
......@@ -986,6 +1001,24 @@ export default {
isResize: true,
componentName: "GuestNum"
},
{
field: "ManNum",
title: "男/女",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "ManNum"
},
{
field: "AgeAvg",
title: "平均年龄",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YaoQingHan",
formatter: this.moneyFormat,
......@@ -1126,6 +1159,16 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YongJinShouRuAvg",
formatter: this.moneyFormat,
title: "平均佣金收入",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YingFu",
formatter: this.moneyFormat,
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ 4b26a847
......@@ -509,6 +509,8 @@
<button class="normalBtn" type="button" @click="showDiv">{{$t('pub.addBtn')}}</button>
<button class="normalBtn importBtn" type="button" @click="outerVisible=true">导入营销数据</button>
<a class="hollowFixedBtn downBtn" :href="downList">下载模板</a>
<button class="hollowFixedBtn" type="button" style="display:none;"
@click="DownLoadShop()">导出</button>
</li>
</ul>
</div>
......@@ -847,6 +849,19 @@
googleMap: googleMap
},
methods: {
//下载Excel
DownLoadShop() {
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
};
let fileName = "购物店单据导出" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("shop_get_downloadShopFinaceList", qMsg, fileName,
res => {
this.loading = false;
});
},
//上传购物店图片
UploadImage(file) {
let newArr = [];
......
src/components/administrative/Announcement.vue
View file @ 4b26a847
......@@ -42,7 +42,7 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>{{$t('adm.adm_theme')}}</th>
<th>{{$t('adm.adm_Ceilingsituation')}}</th>
<!-- <th>{{$t('adm.adm_Ceilingsituation')}}</th> -->
<th>{{$t('adm.adm_ublicationstatus')}}</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<th>{{$t('fnc.caozuoriqi')}}</th>
......@@ -50,7 +50,7 @@
</tr>
<tr v-for="(item,index) in DataList" v-loading='loading'>
<td>{{item.Title}}</td>
<td>{{item.Is_top==0?'':$t('adm.adm_roofset')}}</td>
<!-- <td>{{item.Is_top==0?'':$t('adm.adm_roofset')}}</td> -->
<td>{{item.Status | noticeFormat(item.Status)}}</td>
<td>{{item.UpdateName}}</td>
<td>{{item.UpdateTime|dateFormat(item.UpdateTime)}}</td>
......@@ -62,12 +62,12 @@
<el-tooltip v-if="item.Status=='0'" class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button @click='updateNotice(item.Id)' type="primary" icon="el-icon-edit" ></el-button>
</el-tooltip>
<el-tooltip v-if="item.Is_top==0&&item.Status=='1'" class="item" effect="dark" :content="$t('adm.adm_roof')" placement="top-start">
<!-- <el-tooltip v-if="item.Is_top==0&&item.Status=='1'" class="item" effect="dark" :content="$t('adm.adm_roof')" placement="top-start">
<el-button @click="setTop(item.Id)" type="primary" icon="iconfont icon-control-top" ></el-button>
</el-tooltip>
<el-tooltip v-if="item.Is_top==1&&item.Status=='1'" class="item" effect="dark" :content="$t('adm.adm_exitroof')" placement="top-start">
</el-tooltip> -->
<!-- <el-tooltip v-if="item.Is_top==1&&item.Status=='1'" class="item" effect="dark" :content="$t('adm.adm_exitroof')" placement="top-start">
<el-button @click="setTop(item.Id)" type="primary" icon="iconfont icon-control-bottom" ></el-button>
</el-tooltip>
</el-tooltip> -->
<el-tooltip v-if="item.Status=='1'" class="item" effect="dark" :content="$t('adm.adm_chehui')" placement="top-start">
<el-button @click='reCallNotice(item.Id)' type="warning" icon="el-icon-delete"></el-button>
</el-tooltip>
......
src/components/administrative/ExaminationStatistics.vue
View file @ 4b26a847
......@@ -339,6 +339,7 @@ export default {
this.columns.push(department);
this.columns.push(userName);
this.columns.push(periods);
this.columns.push(LllegalModifyRemarkCount);
this.columns.push(rejectCount);
this.columns.push(receivedPeopleCount);
this.columns.push(orderCount);
......@@ -347,7 +348,7 @@ export default {
this.columns.push(leaveEarlyCount);
this.columns.push(complainCount);
this.columns.push(discountPrice);
this.columns.push(LllegalModifyRemarkCount);
this.isReady = true;
},
sortChange(param) {
......
src/components/dmc/manager/teamRevenueExpenditure.vue
View file @ 4b26a847
......@@ -450,7 +450,8 @@
'path': 'teamRevenueExpenditure',
'companyID': this.msgList[0].OutBranchId,
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
'orderObj': JSON.stringify(orderObj),
'OrderSource': _orderSource,
}
});
},
......
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