Skip to content

S
SuperMan
Commit 3193f355 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents e9b4bd5f 7758cddb
Hide whitespace changes
Inline Side-by-side
Showing with 340 additions and 14 deletions
src/assets/common/lang/en.js
View file @ 3193f355
......@@ -1139,6 +1139,7 @@ export const fnc = {
yjfkuanriqi: 'Expected payment date',
qxzrqshijian: 'Select date time',
fjshuoming: 'Additional note',
refundtype: 'Refund type',
fygsbumen: 'Expenses are attributed to the Department',
gnpiaowu: 'Domestic ticketing',
jpshouzhi: 'Ticket revenue and expenditure',
......@@ -1381,6 +1382,7 @@ export const tips = {
baocunchenggong: 'Saved successfully',
wjdxbncgsz: 'File size must not exceed 10M!',
qsctpian: 'Please upload pictures!',
fileTwo: 'Please upload at least 2 attachments！',
shangchuanzhong: 'Up and in...',
scchenggong: 'Upload success',
znsJPGPNGgs: ' Can only be jpg png format!',
......@@ -1609,6 +1611,7 @@ export const rule = {
qxzyjfkshijian: 'Please select an estimated time of payment!',
qxzfkduixiang: 'Please select the payment object!',
qxzkhmingcheng: 'Please select a customer name!',
qxzrefundType: 'Please select the refund type!',
qxzfkdzhanghu: 'Please select payment account',
qxzxybsheren: 'Please select the next auditor',
qxzzdbumen: 'Please select the documentation department!',
......
src/assets/common/lang/jp.js
View file @ 3193f355
......@@ -1083,6 +1083,7 @@ export const fnc = {
yjfkuanriqi:'予定支払期日は、',
qxzrqshijian:'日付選択時間',
fjshuoming:'附加説明',
refundtype: '払戻タイプ',
fygsbumen:'費用帰属部門',
gnpiaowu:'国内チケット業務',
jpshouzhi:'航空券収支',
......@@ -1329,6 +1330,7 @@ export const tips = {
baocunchenggong: '保存に成功する',
wjdxbncgsz: 'ファイルサイズは10Mを超えてはいけません!',
qsctpian: '画像をアップロードしてください!',
fileTwo: '少なくとも2つの添付ファイルをアップロードしてください！',
shangchuanzhong: 'アップロード中...',
scchenggong: 'アップロード成功',
znsJPGPNGgs: 'jpg png形式しかありません!',
......@@ -1557,6 +1559,7 @@ export const rule = {
qxzyjfkshijian: '予定支払い時間を選択してください!',
qxzfkduixiang: '支払い対象に选択してください!',
qxzkhmingcheng: 'お客様の名前をお選びください!',
qxzrefundType: '返金タイプを選択してください!',
qxzfkdzhanghu: '決済口座を選択してください。',
qxzxybsheren: '次の査読者を選択してください。',
qxzzdbumen:'制単部門を選択してください!',
......
src/assets/common/lang/zh-tw.js
View file @ 3193f355
......@@ -1129,6 +1129,7 @@ export const fnc = {
yjfkuanriqi: '預計付款日期',
qxzrqshijian: '選擇日期時間',
fjshuoming: '附加說明',
refundtype: '退款類型',
fygsbumen: '費用歸屬部門',
gnpiaowu: '國內票務',
jpshouzhi: '機票收支',
......@@ -1371,6 +1372,7 @@ export const tips = {
baocunchenggong: '保存成功',
wjdxbncgsz: '文件大小不能超過10M！',
qsctpian: '請上傳圖片！',
fileTwo: '請至少上傳2份附件！',
shangchuanzhong: '上傳中…',
scchenggong: '上傳成功',
znsJPGPNGgs: '只能是jpg png格式！',
......@@ -1598,6 +1600,7 @@ export const rule = {
qxzyjfkshijian: '請選擇預計付款時間！',
qxzfkduixiang: '請選擇付款對象！',
qxzkhmingcheng: '請選擇客戶名稱！',
qxzrefundType: '請選擇退款類型!',
qxzfkdzhanghu: '請選擇付款帳戶',
qxzxybsheren: '請選擇下一步稽核人',
qxzzdbumen:'請選擇制單部門！',
......
src/assets/common/lang/zh.js
View file @ 3193f355
......@@ -1142,6 +1142,7 @@ export const fnc = {
yjfkuanriqi: '预计付款日期',
qxzrqshijian: '选择日期时间',
fjshuoming: '附加说明',
refundtype: '退款类型',
fygsbumen: '费用归属部门',
gnpiaowu: '国内票务',
jpshouzhi: '机票收支',
......@@ -1384,6 +1385,7 @@ export const tips = {
baocunchenggong: '保存成功',
wjdxbncgsz: '文件大小不能超过10M！',
qsctpian: '请上传图片！',
fileTwo: '请至少上传2份附件！',
shangchuanzhong: '上传中...',
scchenggong: '上传成功',
znsJPGPNGgs: '只能是 jpg png格式!',
......@@ -1612,6 +1614,7 @@ export const rule = {
qxzyjfkshijian: '请选择预计付款时间!',
qxzfkduixiang: '请选择付款对象!',
qxzkhmingcheng: '请选择客户名称!',
qxzrefundType: '请选择退款类型!',
qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门！',
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 3193f355
......@@ -2249,6 +2249,8 @@ class="w135 _border_b_1">
<!--代收/代付公司-->
<HelpBranch v-if="GetDetail.HelpBranchId>-1"
:helpBranchData="helpBranchData" ></HelpBranch>
<!--退款类型-->
<RefundType v-if="GetDetail.RefundType>0" :refundTypestr="GetDetail.RefundTypeStr"></RefundType>
</div>
</template>
<script>
......@@ -2279,7 +2281,7 @@ class="w135 _border_b_1">
import ClientBankAccount from "./components/ClientBankAccount.vue";
import HelpBranch from "./components/HelpBranch.vue";
import HandFeeDetails from "./HandFee/HandFeeDetails.vue";
import RefundType from "./components/RefundType.vue";
export default {
data() {
return {
......@@ -2506,7 +2508,8 @@ class="w135 _border_b_1">
RollCall,
OrderReceivablesAccount,
ClientBankAccount,
HelpBranch
HelpBranch,
RefundType
},
methods: {
// 单据详情
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 3193f355
......@@ -811,11 +811,11 @@
<template v-if="this.userId==2739 || this.userId==3038 || this.userId==2604 || this.userId==955|| this.userId==2786">
<el-dropdown-item><span @click="ToPICDetial()">PIC资金预算</span></el-dropdown-item>
<el-dropdown-item><span @click="ToYFDetial()">压房明细</span></el-dropdown-item>
<el-dropdown-item><span @click="ToHotelNoFDetial()">酒店临期未制单</span></el-dropdown-item>
<el-dropdown-item><span @click="outerVisible4=true">车资回送费分摊</span></el-dropdown-item>
</template>
<template v-if="ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1">
<el-dropdown-item><span @click="openAirPayDialog()">机票今日应付款</span></el-dropdown-item>
<el-dropdown-item><span @click="ToHotelNoFDetial()">酒店临期未制单</span></el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 3193f355
......@@ -1592,6 +1592,10 @@
<!--代收/代付公司-->
<HelpBranch v-if="GetDetail.HelpBranchId>-1" :helpBranchData="helpBranchData"></HelpBranch>
<!--退款类型-->
{{GetDetail.RefundType}}
<RefundType v-if="GetDetail.RefundType>0" :refundTypestr="GetDetail.RefundTypeStr"></RefundType>
<!--供应商信息-->
<ClientBankAccount v-if="isClientBankAccount" :GetDetail="GetDetail" :clientBankAccountData="clientBankAccountData"
:ClientBankAccountTop="ClientBankAccountTop" @ClosePopup="isClientBankAccount=false"
......@@ -1629,6 +1633,7 @@
import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue";
import ClientBankAccount from "./components/ClientBankAccount.vue";
import HelpBranch from "./components/HelpBranch.vue";
import RefundType from "./components/RefundType.vue";
export default {
data() {
return {
......@@ -1751,7 +1756,8 @@
RollCall,
OrderReceivablesAccount,
ClientBankAccount,
HelpBranch
HelpBranch,
RefundType
},
created() {
// // crm自动登陆传过来的参数
......@@ -2806,7 +2812,7 @@
.PlatformChangeFrIds.length > 0)) {
this.isClientBankAccount = true;
}
if (data.Type == 2 && data.HelpBranchId > -1) {
if ((data.Type == 2 && data.HelpBranchId > -1)||data.RefundType>0) {
this.ClientBankAccountTop = 1;
}
this.clientBankAccountData = {
......@@ -2872,6 +2878,8 @@
this.chongJudge(data)
this.GetDetail = data;
console.log("this.GetDetail",this.GetDetail);
if (data.TemplateId == 27 && data.Course_Name && data.OrderID > 0 && data.TCIDList && data.TCIDList
.length > 0) {
this.getReceivablesAccount(this.GetDetail.OrderID)
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 3193f355
......@@ -370,6 +370,35 @@
.page_addFD .rb_top_row input {
font-size: 12px;
}
.AC_complaintList {
padding: 10px 0 0 0;
height: auto;
overflow: hidden;
}
.AC_complaintList .t {
padding: 4px 0 0 0;
}
.AC_complaintList .t,
.AC_complaintList ul {
float: left;
}
.AC_complaintList ul li {
border: 1px solid #ccc;
padding: 4px 8px;
float: left;
margin: 0 5px 5px 0;
cursor: pointer;
}
.AC_complaintList ul li:hover {
border: 1px #d81e06 solid;
}
.AC_complaintList ul li.checked {
border: 1px #d81e06 solid;
}
</style>
<template>
......@@ -1022,6 +1051,17 @@
</span>
</div>
</div>
<div class="AC_complaintList" style="width:100%;display: flex;" v-if="isShowFinanceRefund">
<div class="t" style="width:90%;color:#333333;font-size:12px;display: flex;"><span style=" margin-right: 10px; margin-top: 5px;color:#1273BC;">{{$t('fnc.refundtype')}}</span>
<ul >
<li v-for="subItem in FinanceRefundEnumList.RefundEnumList" @click="getTheme(subItem)" :class="{'checked':subItem.isCheck}">
{{subItem.Name}}
</li>
</ul>
</div>
</div>
<div class="_remark">
<p>{{$t('system.label_info')}}</p>
<textarea v-model="Description">
......@@ -1122,11 +1162,6 @@
<button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button>
</div>
</div>
<div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=[]">
<div
style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;">
......@@ -1153,6 +1188,7 @@
</div>
</template>
<script>
import SpecialList from '../SalesModule/SpecialList.vue';
import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
export default {
data() {
......@@ -1168,6 +1204,8 @@
detailCurrDis: false,
Description: "",
ClientKingdeeAccountList: [],
FinanceRefundEnumList:{},
isShowFinanceRefund:false,
KingdeeClientIDCheck: false,
msg: {
FrID: 0,
......@@ -1203,6 +1241,7 @@
GuestInfoList: [],
LineName: 0,
KingdeeClientID: '', //垫付对象的id
RefundType:0,//退款类型
},
detailList: {
ID: 0,
......@@ -1900,6 +1939,17 @@
} else {
this.msg.ClientType = 0;
}
//2025-07-29 add by:W
if(this.isShowFinanceRefund){
if(this.msg.RefundType==0||this.msg.RefundType==undefined){
return this.$message.error(this.$t('rule.qxzrefundType'));
}
console.log("this.msg.vorcherInos",this.saveMsg);
if(this.msg.RefundType==5&&this.saveMsg.length<2){
return this.$message.error(this.$t('tips.fileTwo'));
}
}
// IsPublic 2 现金 IsLeader 0 临时领队
if (this.msg.IsPublic < 2 && this.IsLeader === 1) {
if (this.msg.ClientID === '') return this.$message.error(this.$t('rule.qxzkhmingcheng'));
......@@ -2281,6 +2331,7 @@
show: false,
}
this.chooseHandFee()
this.GetShowFinanceRefund();
},
chages(e) { //处理输入框不能输入问题
this.$forceUpdate()
......@@ -2697,6 +2748,7 @@
this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
}
this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id);
this.GetFinanceRefundEnumList(this.msg.RefundType);
this.msg.PayDate = this.msg.PayDate;
this.msg.detailList = [];
this.FinancialFlowTemplate_post_GetProcessList(data.TemplateId);
......@@ -3182,7 +3234,56 @@
}
}, err => {})
}
},
//选取主题内容
getTheme(item) {
item.isCheck = !item.isCheck;
this.msg.RefundType =0;
if(item.isCheck){
this.msg.RefundType = item.Id;
}
this.FinanceRefundEnumList.RefundEnumList.forEach(x => {
if (x.Id!=item.Id) {
x.isCheck=false;
}
})
this.$forceUpdate(); // 不推荐，尽量用 this.$set
},
GetFinanceRefundEnumList(RefundType){
this.apipost('Financial_post_GetFinanceRefundEnumService', {}, res => {
if (res.data.resultCode == 1) {
this.FinanceRefundEnumList = res.data.data;
if(this.FinanceRefundEnumList.RefundEnumList!=null&&this.FinanceRefundEnumList.RefundEnumList.length>0){
this.FinanceRefundEnumList. RefundEnumList.forEach(item => {
if(RefundType==item.Id){
item.isCheck = true;
}
else{
item.isCheck = false;
}
});
this.$forceUpdate(); // 不推荐，尽量用 this.$set
}
this.GetShowFinanceRefund();
}
}, err => {})
},
GetShowFinanceRefund(){
if(this.FinanceRefundEnumList.RefundProcessIdList!=null&&this.FinanceRefundEnumList.RefundProcessIdList.length>0){
this.FinanceRefundEnumList.RefundProcessIdList.forEach(item=>{
if(this.msg.TemplateId==item.TemplateId){
if(item.Type==1){
this.isShowFinanceRefund=true;
}
else{
if(this.allPrice<0){this.isShowFinanceRefund=true;}
}
}
});
}
},
},
created() {
var that = this;
......@@ -3243,6 +3344,7 @@
}
}
this.getCustomerIdList()
this.GetFinanceRefundEnumList(0);
},
mounted() {
......@@ -3334,7 +3436,8 @@
},
components: {
"my-FlowChartModule": myFlowChartModule
"my-FlowChartModule": myFlowChartModule,
SpecialList
}
}
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 3193f355
......@@ -363,6 +363,35 @@
font-weight: bold;
padding: 0 0 10px 0;
}
.AC_complaintList {
padding: 10px 0 0 0;
height: auto;
overflow: hidden;
}
.AC_complaintList .t {
padding: 4px 0 0 0;
}
.AC_complaintList .t,
.AC_complaintList ul {
float: left;
}
.AC_complaintList ul li {
border: 1px solid #ccc;
padding: 4px 8px;
float: left;
margin: 0 5px 5px 0;
cursor: pointer;
}
.AC_complaintList ul li:hover {
border: 1px #d81e06 solid;
}
.AC_complaintList ul li.checked {
border: 1px #d81e06 solid;
}
</style>
<template>
......@@ -796,6 +825,15 @@
</span>
</div>
</div>
<div class="AC_complaintList" style="width:100%;display: flex;" v-if="isShowFinanceRefund">
<div class="t" style="width:90%;color:#333333;font-size:12px;display: flex;"><span style=" margin-right: 10px; margin-top: 5px;color:#1273BC;">{{$t('fnc.refundtype')}}</span>
<ul >
<li v-for="subItem in FinanceRefundEnumList.RefundEnumList" @click="getTheme(subItem)" :class="{'checked':subItem.isCheck}">
{{subItem.Name}}
</li>
</ul>
</div>
</div>
<div class="_remark">
<p>{{$t('system.label_info')}}</p>
<textarea v-model="Description">
......@@ -977,6 +1015,8 @@
DepositCustomer: null,
ContractCustomer: null,
Description: '',
FinanceRefundEnumList:{},
isShowFinanceRefund:false,
msg: {
Course_Name: '',
PayReceipt_No: null,
......@@ -1018,6 +1058,7 @@
TCIDAndTCNUMList: [],
CallType: 0,
Type: 0,
RefundType:0,//退款类型
},
AccountNumber: '',
queryAccMsg: {
......@@ -1696,6 +1737,17 @@
}
}
}
//2025-07-29 add by:W
if(this.isShowFinanceRefund){
if(this.msg.RefundType==0||this.msg.RefundType==undefined){
return this.$message.error(this.$t('rule.qxzrefundType'));
}
console.log("this.msg.vorcherInos",this.saveMsg);
if(this.msg.RefundType==5&&this.saveMsg.length<2){
return this.$message.error(this.$t('tips.fileTwo'));
}
}
if (this.Handmsg != null) {
this.msg.ReFinanceId = this.Handmsg.ReFinanceId;
if (this.Handmsg.TCNUM) {
......@@ -1988,6 +2040,7 @@
})
if(this.AdvanceObjList.length==0 && (this.IsAdvance==1||this.IsAdvance==2)){this.getAdvanceToIdList(0,true);}
}
this.GetShowFinanceRefund();
},
getcommission() { //计算手续费 满足平台账户 而且是结算方式为百分比 SettlementType=1
let obj = null
......@@ -2214,6 +2267,7 @@
} else if (this.$route.query.companyID) {
this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
}
this.GetFinanceRefundEnumList(this.msg.RefundType);
this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id);
this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.getLocalStorage().RB_Department_Id : this.msg
.RB_Depart_Id;
......@@ -2384,6 +2438,7 @@
this.$message.error(res.data.message);
}
this.AccountType_post_GetList();
}, err => {})
},
admin_get_DepartmentGetList(Bid, T) { // 获取部门
......@@ -2605,7 +2660,55 @@
}
}, err => {})
}
},
//选取主题内容
getTheme(item) {
item.isCheck = !item.isCheck;
this.msg.RefundType =0;
if(item.isCheck){
this.msg.RefundType = item.Id;
}
this.FinanceRefundEnumList.RefundEnumList.forEach(x => {
if (x.Id!=item.Id) {
x.isCheck=false;
}
})
this.$forceUpdate(); // 不推荐，尽量用 this.$set
},
GetFinanceRefundEnumList(RefundType){
this.apipost('Financial_post_GetFinanceRefundEnumService', {}, res => {
if (res.data.resultCode == 1) {
this.FinanceRefundEnumList = res.data.data;
if(this.FinanceRefundEnumList.RefundEnumList!=null&&this.FinanceRefundEnumList.RefundEnumList.length>0){
this.FinanceRefundEnumList. RefundEnumList.forEach(item => {
if(RefundType==item.Id){
item.isCheck = true;
}
else{
item.isCheck = false;
}
});
this.$forceUpdate(); // 不推荐，尽量用 this.$set
}
this.GetShowFinanceRefund();
}
}, err => {})
},
GetShowFinanceRefund(){
if(this.FinanceRefundEnumList.RefundProcessIdList!=null&&this.FinanceRefundEnumList.RefundProcessIdList.length>0){
this.FinanceRefundEnumList.RefundProcessIdList.forEach(item=>{
if(this.msg.TemplateId==item.TemplateId){
if(item.Type==1){
this.isShowFinanceRefund=true;
}
else{
if(this.allPrice<0){this.isShowFinanceRefund=true;}
}
}
});
}
},
},
created() {
let that = this;
......@@ -2647,7 +2750,7 @@
}
}
this.GetFinanceRefundEnumList(0);
},
mounted() {
this.getCustomerIdList();
......
src/components/FinancialModule/components/RefundType.vue 0 → 100644
View file @ 3193f355
<style scoped>
.HelpBranch-form{
width: 330px;
position: fixed;
z-index: 1;
right: 16px;
top: 100px;
background: #fff;
padding: 14px 26px 14px 13px;
border-radius: 8px;
}
.OrderReceivablesAccount-title{
font-size: 18px;
font-weight: bold;
padding: 0 0 10px 0;
}
.OrderReceivablesAccount-center>div{
/* display: flex;
flex-wrap: nowrap; */
padding: 0 0 10px 0;
font-size: 14px;
}
.OrderReceivablesAccount-center>div:last-child{
padding: 0;
}
.OrderReceivablesAccount-center>div>span{
/* color: #949695; */
width: 70px;
display: inline-block;
margin-right: 10px;
text-align: right;
/* flex-shrink: 0; */
}
.OrderReceivablesAccount-contract{
display: flex;
flex-wrap: wrap;
}
.ClosePopup{
position: fixed;
right: 30px;
top: 110px;
z-index: 3;
font-size: 20px;
cursor: pointer;
}
</style>
<template>
<div class="HelpBranch-form" >
<div class="OrderReceivablesAccount-center">
<div ><span>{{$t('fnc.refundtype')}}：</span><span style="color:red;width:auto;">{{refundTypestr}}</span> </div>
</div>
</div>
</template>
<script>
export default {
props:['refundTypestr'],
data() {
return {
}
},
created() {
console.log("refundTypestr",this.refundTypestr);
},
methods: {
},
mounted() {
}
}
</script>
src/components/FinancialModule/domestic/OPsalesCommissiondetails.vue
View file @ 3193f355
......@@ -103,6 +103,7 @@
<th>{{$t('sm.company')}}</th>
<th>{{$t('admin.admin_Department')}}</th>
<th>{{$t('visaT.sale')}}</th>
<th>{{$t('objFill.tuanduilx')}}</th>
<th>{{$t('objFill.v101.FinancialModule.tuanxinx')}}</th>
<th>{{$t('objFill.v101.FinancialModule.tuanlirun')}}</th>
<!-- <th>{{$t('hotel.order_Number')}}</th> -->
......@@ -119,7 +120,13 @@
<td>{{item.BranchName}}</td>
<td>{{item.DeptName}}</td>
<td>{{item.UserName}}</td>
<td>
<td>{{(item.SingleOrderType==1?$t('objFill.baoche'):$t('active.cl_team'))}}</td>
<td v-if="item.SingleOrderType==1">
<span style="cursor: pointer;text-decoration: underline;" @click="goCarInfo(item.SingleOrderId)">
{{item.SingleOrderId}}
</span>
</td>
<td v-else>
<div>{{item.OutBranchName}}</div>
<span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">
{{item.TCNUM}}({{item.TCID}})
......@@ -361,8 +368,17 @@
tab: '团队收支'//团控列表
}
});
},
goCarInfo(OrderId) { //跳转到团队列表
this.$router.push({
path: 'CharterOrderListOP',//TravelControlList
query: {
OrderId: OrderId,
OrderType: 3,
blank: "y",
}
});
}
}
}
......
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