Skip to content

S
SuperMan
Commit d9d80734 authored by 吴春's avatar 吴春
Browse files
Options

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

parents b39bf65d d413f172
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1243 additions and 1277 deletions
src/components/FinancialModule/FinancialDocuments.vue
View file @ d9d80734
......@@ -1924,7 +1924,6 @@
Type: fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
console.log("this.importData[this.importDataIndex]",this.importData[this.importDataIndex]);
this.$message.success(this.$t('tips.scchenggong'))
}, 1);
},
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ d9d80734
......@@ -2706,7 +2706,6 @@
if(data.Type==2&&data.HelpBranchId>-1){
this.ClientBankAccountTop=1;
}
console.log("this.ClientBankAccountTop",this.ClientBankAccountTop);
this.clientBankAccountData={
AccountHolder:data.AccountHolder,
AccountNumber:data.AccountNumber,
......
src/components/FinancialModule/HelpBranch/components/bindListData.vue
View file @ d9d80734
......@@ -242,7 +242,6 @@
let OriginalMoneyClosed = 0
let HandlingChargeMoneyClosed = 0
this.frIds= this.dataList.map(row => row.FrID).join(',')
console.log(" this.frIds",this.frIds);
this.dataList.forEach(x=>{
if(x.Type==2){
......
src/components/FinancialModule/MonthlyCostStatement/components/selectListData.vue
View file @ d9d80734
......@@ -242,8 +242,8 @@
});
}else{
let orderObj = {
CostType: this.OriginalMoneyClosed!=0?1547:null,
CostType2: this.isHandlingChargeThe!=0?1547:null,
CostType: this.OriginalMoneyClosed!=0?1863:null,
CostType2: this.isHandlingChargeThe!=0?1863:null,
CostType3: this.isHandlingChargeThe!=0&&this.balanceMoney!=0?114:null,//114转账手续费
HandlingChargeMoney: this.isHandlingChargeThe!=0?this.HandlingChargeMoneyThe:null,//手续费
balanceMoney: this.isHandlingChargeThe!=0&&this.balanceMoney!=0?this.balanceMoney:null,//差额
......@@ -259,7 +259,7 @@
name: 'ChoiceAddFinancialDocuments',
query: {
'Type': 1,
'searchTitle': '月结',
'searchTitle': '月结到账',
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
}
......
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @ d9d80734
......@@ -43,18 +43,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="制单人员：">
<el-select filterable v-model='msg.UpdateBy' class="">
......@@ -91,7 +79,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <el-col :span="4">
<el-form-item :label="$t('fnc.dxleixing')">
<el-select filterable v-model='msg.ClientType'
@change="ClaerClientAccountList(),msg.ClientID=''" class="">
......@@ -100,7 +88,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="4">
<el-form-item :label="$t('fnc.fkduixiang')">
<el-select
......@@ -126,17 +114,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="排序：">
<el-select filterable v-model='msg.Sort' >
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="团期"></el-option>
<el-option key="1" value="1" label="汇款日期"></el-option>
<el-option key="2" value="2" label="单号"></el-option>
<el-option key="3" value="3" label="交易流水号"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="金额：">
<div style="display: flex;flex-direction: row;flex-wrap: nowrap;">
......@@ -207,7 +184,7 @@
<el-option key="66" value="66" label="门票"></el-option>
<el-option key="67" value="67" label="车辆"></el-option>
<el-option key="62" value="62" label="签证"></el-option>
<el-option key="5" value="5" label="日本车行"></el-option>
<el-option key="80" value="80" label="日本车行"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -216,6 +193,29 @@
<el-input v-model="msg.ReFinanceId"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="排序：">
<el-select filterable v-model='msg.Sort' >
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="团期"></el-option>
<el-option key="1" value="1" label="汇款日期"></el-option>
<el-option key="2" value="2" label="单号"></el-option>
<el-option key="3" value="3" label="交易流水号"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注查询：">
<el-input v-model="msg.Remark"></el-input>
......
src/components/FinancialModule/RecPayQuery.vue
View file @ d9d80734
......@@ -1209,7 +1209,6 @@
this.HelpBranchMsg.HelpBranchId = item.HelpBranchId;
this.HelpBranchMsg.Type=item.Type;
this.HelpBranchMsg.RB_Branch_Id=item.RB_Branch_Id;
console.log("item",item);
if(item.Type==1){
this.dialogTitle="修改代收公司";
this.dialogTitle1="代收公司";
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ d9d80734
......@@ -1872,7 +1872,6 @@
let feeObj = this.msg.detailList.find(x=>{
return x.CostTypeId==114 && x.CurrencyId==3 && (x.UnitPrice==550 || x.UnitPrice==275 ||x.UnitPrice==183 ||x.UnitPrice==184 ||x.UnitPrice==137.5)
})
console.log(this.msg.detailList);
if(feeObj){
confirmMsg.push("从2024.1.1起制单，对于转账手续费将从原单剥离，系统自动生成独立手续费关联单据！");
}
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ d9d80734
......@@ -1561,6 +1561,7 @@
//从电商过来的参数处理
this.msg.OrderSource = this.orderObj.OrderSource ? this.orderObj.OrderSource : 0;
this.msg.OtherType = this.orderObj.OtherType ? this.orderObj.OtherType : 0;
this.msg.ReFinanceIds = this.orderObj.ReFinanceIds ? this.orderObj.ReFinanceIds : '';
this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0;
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
......@@ -1649,8 +1650,6 @@
},
Financial_post_Set(){
console.log(this.msg,'=====------msg')
// return
this.loading = true;
this.apipost('Financial_post_Set', this.msg, res => {
if (res.data.resultCode == 1) {
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ d9d80734
......@@ -380,7 +380,7 @@
{{item.PriceTeamTypeName&&item.PriceTeamTypeName=='单地接'?item.PriceTeamTypeName:'单团'}}
</label>
</div>
<div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.OutBranchName}}</div>
<div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.UnionBranchName}}</div>
<div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
<div class="d12" style="float:none;margin:3px auto;">
<p>
......
src/plug/index.js
View file @ d9d80734
......@@ -184,6 +184,7 @@ export default {
crmUrl: crmUrl,
crmRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8081/#/",
PptUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://ppt.oytour.com" : "http://localhost:8080",
CarUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://ppt.oytour.com" : "http://localhost:8082",
};
return obj;
},
......
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