Skip to content

C
confucius
Commit 0ea6512b authored by 吴春's avatar 吴春
Browse files
Options

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

parents 1d53df33 eebde6a9
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 63 deletions
src/components/sale/orderlist.vue
View file @ 0ea6512b
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
</div> </div>
<div v-if="item.CourseSubjectName"> <div v-if="item.CourseSubjectName">
所属科目：<span style="color:green;">{{ 所属科目：<span style="color:green;">{{
item.CourseSubjectName item.CourseSubjectName
}}</span> }}</span>
</div> </div>
<div v-if="item.JoinType == 2" style="color:red;cursor:pointer"> <div v-if="item.JoinType == 2" style="color:red;cursor:pointer">
...@@ -645,7 +645,11 @@ ...@@ -645,7 +645,11 @@
</div> </div>
<div class="col"> <div class="col">
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>收款单据：</span> <div class="col row justify-between">
<span>收款单据：</span>
<span v-if="AuthorityObj.Finance_RefundCreate&&item.Income>0"
style="color: #2961FE;cursor: pointer;" @click="clickRefund(1)">原路退款</span>
</div>
<q-btn flat size="xs" icon="edit" v-if=" <q-btn flat size="xs" icon="edit" v-if="
AuthorityObj.isShowFinanceBtn && AuthorityObj.isShowFinanceBtn &&
AuthorityObj.isShowEdit && AuthorityObj.isShowEdit &&
...@@ -658,31 +662,33 @@ ...@@ -658,31 +662,33 @@
"> ">
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="showChooseStudent = true" /> @click="showChooseStudent = true" />
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div style="width:500px;max-height:400px;overflow-y:auto;">
<table class="Contract_Table">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="(subItem,subIndex) in item.GuestList" :key="subIndex">
<td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
</td>
<td>{{ subItem.GuestName }}</td>
<td>{{ subItem.ContractNo }}</td>
<td>{{ subItem.ContractStatusStr }}</td>
</tr>
</table>
</div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 1)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
</template> </template>
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div style="width:500px;max-height:400px;overflow-y:auto;">
<table class="Contract_Table">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="(subItem,subIndex) in item.GuestList" :key="subIndex">
<td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
</td>
<td>{{ subItem.GuestName }}</td>
<td>{{ subItem.ContractNo }}</td>
<td>{{ subItem.ContractStatusStr }}</td>
</tr>
</table>
</div>
<q-btn v-if="!IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 1)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
<q-btn v-if="IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 1,'原路')" label="确定原路退款"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x, j) in item.FinanceList" :key="j" :style="{ <div class="finance row" v-for="(x, j) in item.FinanceList" :key="j" :style="{
...@@ -708,7 +714,11 @@ ...@@ -708,7 +714,11 @@
</div> </div>
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>付款单据：</span> <div class="col row justify-between">
<span>付款单据：</span>
<span v-if="AuthorityObj.Finance_RefundCreate&&item.Income>0"
style="color: #2961FE;cursor: pointer;" @click="clickRefund(2)">转账退款</span>
</div>
<q-btn flat size="xs" icon="edit" v-if=" <q-btn flat size="xs" icon="edit" v-if="
AuthorityObj.isShowFinanceBtn && AuthorityObj.isShowFinanceBtn &&
AuthorityObj.isShowEdit && AuthorityObj.isShowEdit &&
...@@ -721,31 +731,33 @@ ...@@ -721,31 +731,33 @@
"> ">
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="showChooseStudent = true" /> @click="showChooseStudent = true" />
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div style="width:500px;max-height:400px;overflow-y:auto;">
<table class="Contract_Table">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="(subItem,subIndex) in item.GuestList" :key="subIndex+500000">
<td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
</td>
<td>{{ subItem.GuestName }}</td>
<td>{{ subItem.ContractNo }}</td>
<td>{{ subItem.ContractStatusStr }}</td>
</tr>
</table>
</div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 2)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
</template> </template>
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div style="width:500px;max-height:400px;overflow-y:auto;">
<table class="Contract_Table">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="(subItem,subIndex) in item.GuestList" :key="subIndex+500000">
<td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
</td>
<td>{{ subItem.GuestName }}</td>
<td>{{ subItem.ContractNo }}</td>
<td>{{ subItem.ContractStatusStr }}</td>
</tr>
</table>
</div>
<q-btn v-if="!IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 2)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
<q-btn v-if="IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 2,'学费退回')" label="确定转账退款"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x, j) in item.RefundFinanceList" <div class="finance row" v-for="(x, j) in item.RefundFinanceList"
...@@ -1370,7 +1382,8 @@ ...@@ -1370,7 +1382,8 @@
isShowContract: false, isShowContract: false,
imgViewUrl: "", imgViewUrl: "",
imgViewList: [], imgViewList: [],
initialIndex: 0 initialIndex: 0,
IsRefund: 0,
}; };
}, },
created() { created() {
...@@ -1387,6 +1400,7 @@ ...@@ -1387,6 +1400,7 @@
if (x.FunctionCode == "Edit_Order") { if (x.FunctionCode == "Edit_Order") {
this.isEditOrder = true; this.isEditOrder = true;
} }
this.AuthorityObj[x.FunctionCode] = x.FunctionCode
}); });
} }
}, },
...@@ -1414,6 +1428,10 @@ ...@@ -1414,6 +1428,10 @@
}, },
mounted() {}, mounted() {},
methods: { methods: {
clickRefund(type){
this.IsRefund = type
this.showChooseStudent = true
},
//点击合同编号预览 //点击合同编号预览
getShowContract(item) { getShowContract(item) {
this.isShowPop = false; this.isShowPop = false;
...@@ -1797,7 +1815,7 @@ ...@@ -1797,7 +1815,7 @@
}); });
}, },
//财务单据 //财务单据
chanceType(obj, type) { chanceType(obj, type,name) {
let TCIDARR = []; let TCIDARR = [];
if (obj && obj.OrderType == 2) { if (obj && obj.OrderType == 2) {
//留学就业订单 //留学就业订单
...@@ -1872,17 +1890,20 @@ ...@@ -1872,17 +1890,20 @@
type = 1; type = 1;
orderObj.OtherType = 59; //59 教育 留学订单返佣 收入 2022-06-08 hk orderObj.OtherType = 59; //59 教育 留学订单返佣 收入 2022-06-08 hk
} }
let query = {
Type: type,
companyID: obj.ClassSchoolId,
path: "",
blank: "y",
orderObj: JSON.stringify(orderObj),
tradeWay: obj.tradeWay,
GuestId: guestId,
searchTitle: name?name:''
}
this.IsRefund = 0
this.$router.push({ this.$router.push({
path: "/financial/financalDocument/ChoiceAddFinancialDocuments", path: "/financial/financalDocument/ChoiceAddFinancialDocuments",
query: { query
Type: type,
companyID: obj.ClassSchoolId,
path: "",
blank: "y",
orderObj: JSON.stringify(orderObj),
tradeWay: obj.tradeWay,
GuestId: guestId
}
}); });
}, },
chanceType_lx(obj) { chanceType_lx(obj) {
......
src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue
View file @ 0ea6512b
...@@ -524,7 +524,6 @@ ...@@ -524,7 +524,6 @@
this.platformAccount = this.$route.query.platformAccount ? this.$route.query.platformAccount : 0; this.platformAccount = this.$route.query.platformAccount ? this.$route.query.platformAccount : 0;
this.searchVal = this.$route.query.searchTitle ? this.$route.query.searchTitle : ''; this.searchVal = this.$route.query.searchTitle ? this.$route.query.searchTitle : '';
// searchVal
if (this.$route.query.visaType) { if (this.$route.query.visaType) {
this.visaShowTab = true; this.visaShowTab = true;
......
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