Skip to content

S
SuperMan
Commit ed9de427 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 4fdacc6f 2fe0d4de
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 68 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ ed9de427
...@@ -320,12 +320,12 @@ ...@@ -320,12 +320,12 @@
<td height="26px"> <td height="26px">
<input v-model="da.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></input> <input v-model="da.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td> <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" :disabled="daIn === 0 && XSTC" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
<td height="26px"> <td height="26px">
<el-input v-model="da.UnitPrice" type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input> <el-input v-model="da.UnitPrice" type="text" :disabled="((msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK) || (daIn === 0 && XSTC)" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td height="26px"> <td height="26px">
<el-select filterable :disabled="detailCurrDis" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1"> <el-select filterable :disabled="detailCurrDis || (daIn === 0 && XSTC)" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
<el-option v-for='item in coinGetList' <el-option v-for='item in coinGetList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -662,6 +662,7 @@ export default { ...@@ -662,6 +662,7 @@ export default {
ZhuiJiaTK: false, ZhuiJiaTK: false,
SelectDisablsed:0, SelectDisablsed:0,
SelectState:false, SelectState:false,
XSTC: false,
} }
}, },
methods:{ methods:{
...@@ -1264,6 +1265,7 @@ export default { ...@@ -1264,6 +1265,7 @@ export default {
this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0; this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
this.detailList.Number = this.orderObj.CostType ? 1 : 0 this.detailList.Number = this.orderObj.CostType ? 1 : 0
this.msg.OtherType = this.orderObj.OtherType ? this.orderObj.OtherType:0; this.msg.OtherType = this.orderObj.OtherType ? this.orderObj.OtherType:0;
this.XSTC = this.orderObj.XSTC ? true : false
if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){ if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
this.Description = this.orderObj.laRemark?this.orderObj.laRemark:''; this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
} }
......
src/components/Login.vue
View file @ ed9de427
...@@ -235,7 +235,7 @@ export default { ...@@ -235,7 +235,7 @@ export default {
initData() { initData() {
//判断是否是线上环境 //判断是否是线上环境
if (!this.isOnline()) { if (!this.isOnline()) {
this.userInfo.name = "18117845617"; this.userInfo.name = "17602887190";
this.userInfo.password = "123456"; this.userInfo.password = "123456";
} }
this.userInfo.Domain =window.location.hostname this.userInfo.Domain =window.location.hostname
......
src/components/administrative/CommissionDetail.vue
View file @ ed9de427
...@@ -58,7 +58,9 @@ export default { ...@@ -58,7 +58,9 @@ export default {
CompanyList:[], CompanyList:[],
dataListTwo: [], dataListTwo: [],
stringPerons:'', stringPerons:'',
userInfo: {} userInfo: {},
companyID: '',
disabledCPSelect: false
}; };
}, },
methods: { methods: {
...@@ -133,7 +135,6 @@ export default { ...@@ -133,7 +135,6 @@ export default {
data.forEach(x => { data.forEach(x => {
x.disabled = false; x.disabled = false;
}); });
if(this.userInfo.RB_Branch_id!=0){ if(this.userInfo.RB_Branch_id!=0){
this.CompanyList = data.filter(x=>{ this.CompanyList = data.filter(x=>{
if(x.BName==this.userInfo.BranchName){ if(x.BName==this.userInfo.BranchName){
...@@ -161,24 +162,30 @@ export default { ...@@ -161,24 +162,30 @@ export default {
item.value = x.BName; item.value = x.BName;
companyList.push(item); companyList.push(item);
}); });
let company = { let company = {}
field: "bName", if(this.disabledCPSelect) {
title: "公司", company = {
width: 40, field: "bName",
titleAlign: "left", title: "公司",
columnAlign: "left", width: 40,
isResize: true, titleAlign: "left",
result: "", columnAlign: "left",
filterMultiple: false, isResize: true,
filters: companyList, };
type: "select" } else {
// filterMultiple: false, company = {
// filters: companyList, field: "bName",
// result: "", title: "公司",
// type: "select", width: 40,
// orderBy: "asc" titleAlign: "left",
// isFrozen:true columnAlign: "left",
}; isResize: true,
result: "",
filterMultiple: false,
filters: companyList,
type: "select"
};
}
let department = { let department = {
field: "departmentName", field: "departmentName",
title: "部门", title: "部门",
...@@ -293,13 +300,13 @@ export default { ...@@ -293,13 +300,13 @@ export default {
}; };
let remark = { let remark = {
field: "remark", field: "remark",
title: "备注", title: "销售留言",
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
width: 80, width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) { formatter: function(rowData, rowIndex, pagingIndex, field) {
return ``; return rowData.remark ? rowData.remark : ''
} }
}; };
let opera = { let opera = {
...@@ -415,6 +422,11 @@ export default { ...@@ -415,6 +422,11 @@ export default {
mounted() { mounted() {
this.msg.pageSize = 10000; //不分页 this.msg.pageSize = 10000; //不分页
this.msg.ParentId = this.$route.query.ParentId; this.msg.ParentId = this.$route.query.ParentId;
if(this.$route.query.companyID) {
this.companyID = this.$route.query.companyID;
this.msg.RB_Branch_Id = this.$route.query.companyID;
this.disabledCPSelect = true
}
let dt=new Date() let dt=new Date()
this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth()); this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth());
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
......
src/components/administrative/CommissionManagement.vue
View file @ ed9de427
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<el-button <el-button
type="primary" type="primary"
class="CM_look" class="CM_look"
@click="generalFinancacls" @click="generalFinancacls(item.branchMoney)"
icon="el-icon-plus" icon="el-icon-plus"
title="制单" title="制单"
circle circle
...@@ -169,12 +169,19 @@ export default { ...@@ -169,12 +169,19 @@ export default {
null null
); );
}, },
generalFinancacls(){ generalFinancacls(money){
let obj = {
CostType: 16,
Money: money,
CurrencyId: 1,
XSTC: 1,
}
let query = { let query = {
blank: "y", blank: "y",
tab: "新增付款单据", tab: "新增付款单据",
Type:2, Type:2,
IsUploadPic:1 IsUploadPic:1,
orderObj: JSON.stringify(obj)
} }
if(this.userInfo.RB_Branch_id==0) { if(this.userInfo.RB_Branch_id==0) {
query.id=28 query.id=28
......
src/components/dmc/manager/teamRevenueExpenditure.vue
View file @ ed9de427
...@@ -63,12 +63,12 @@ ...@@ -63,12 +63,12 @@
</td> </td>
<td>{{item.CreateDate}}</td> <td>{{item.CreateDate}}</td>
<td> <td>
<div v-for="childItem in item.TradeWayList"> <div v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span> 支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span> <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率：{{childItem.Rate}}</span> <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
</div> </div>
</td> </td>
<td> <td>
<span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span> <span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
</td> </td>
...@@ -122,12 +122,12 @@ ...@@ -122,12 +122,12 @@
</td> </td>
<td>{{item.CreateDate}}</td> <td>{{item.CreateDate}}</td>
<td> <td>
<div v-for="childItem in item.TradeWayList"> <div v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span> 支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span> <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率：{{childItem.Rate}}</span> <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
</div> </div>
</td> </td>
<td> <td>
<span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span> <span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
</td> </td>
...@@ -180,11 +180,13 @@ ...@@ -180,11 +180,13 @@
<span class="padding10" v-for="i in item.CostTypeList">{{i}}</span> <span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
</td> </td>
<td>{{item.CreateDate}}</td> <td>{{item.CreateDate}}</td>
<td><div v-for="childItem in item.TradeWayList"> <td>
支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span> <div v-for="childItem in item.TradeWayList">
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span> 支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
<span class="TB_Rate">汇率：{{childItem.Rate}}</span> <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
</div></td> <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
</div>
</td>
<td> <td>
<span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span> <span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
</td> </td>
...@@ -237,11 +239,13 @@ ...@@ -237,11 +239,13 @@
<span class="padding10" v-for="i in item.CostTypeList">{{i}}</span> <span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
</td> </td>
<td>{{item.CreateDate}}</td> <td>{{item.CreateDate}}</td>
<td><div v-for="childItem in item.TradeWayList"> <td>
支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span> <div v-for="childItem in item.TradeWayList">
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span> 支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
<span class="TB_Rate">汇率：{{childItem.Rate}}</span> <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
</div></td> <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
</div>
</td>
<td> <td>
<span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span> <span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
</td> </td>
...@@ -269,11 +273,11 @@ ...@@ -269,11 +273,11 @@
</tr> </tr>
</table> </table>
<p class="teamRevenueExpenditureTitle"> <p class="teamRevenueExpenditureTitle">
其它 其它
<span class="fr" style="margin-top: -8px;"> <span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(14,2)" /><input type="button" class="normalBtn" <input type="button" class="normalBtn" value="新增付款" @click="goUrl(14,2)" /><input type="button"
value="新增收款" @click="goUrl(14,1)" /> class="normalBtn" value="新增收款" @click="goUrl(14,1)" />
</span> </span>
</p> </p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable"> <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
...@@ -295,11 +299,13 @@ ...@@ -295,11 +299,13 @@
<span class="padding10" v-for="i in item.CostTypeList">{{i}}</span> <span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
</td> </td>
<td>{{item.CreateDate}}</td> <td>{{item.CreateDate}}</td>
<td><div v-for="childItem in item.TradeWayList"> <td>
支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span> <div v-for="childItem in item.TradeWayList">
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span> 支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
<span class="TB_Rate">汇率：{{childItem.Rate}}</span> <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
</div></td> <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
</div>
</td>
<td> <td>
<span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span> <span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
</td> </td>
...@@ -352,22 +358,20 @@ ...@@ -352,22 +358,20 @@
eatPay: 0, eatPay: 0,
ticketPay: 0, ticketPay: 0,
busPay: 0, busPay: 0,
otherPay:0, otherPay: 0,
} }
}, },
methods: { methods: {
//跳转到财务页面 //跳转到财务页面
goFinaceURL(id) goFinaceURL(id) {
{ this.$router.push({
this.$router.push({
name: 'FinancialDocumentsDetail', name: 'FinancialDocumentsDetail',
query: { query: {
'id': id, 'id': id,
'blank': 'y', 'blank': 'y',
} }
}); });
//http://www.test.com:8080/#/FinancialDocumentsDetail?id=2043 },
},
numberToWord(val) { numberToWord(val) {
switch (val) { switch (val) {
case 1: case 1:
...@@ -445,7 +449,7 @@ ...@@ -445,7 +449,7 @@
id = [49, 50, 57, 58] id = [49, 50, 57, 58]
} }
// 门票 // 门票
else if (_orderSource === 3 && _type === 2) { else if (_orderSource === 3 && _type === 2) {
id = [88, 89] id = [88, 89]
} }
TCIDARR.push(this.$route.query.id) TCIDARR.push(this.$route.query.id)
...@@ -456,7 +460,7 @@ ...@@ -456,7 +460,7 @@
SourceID: this.$route.query.id, SourceID: this.$route.query.id,
TCIDList: TCIDARR TCIDList: TCIDARR
} }
id=id.length>0?JSON.stringify(id):null; id = id.length > 0 ? JSON.stringify(id) : null;
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query: { query: {
......
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