Skip to content

C
confucius
Commit f5502b8f authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 57abdd04
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 58 deletions
src/components/sale/orderlist.vue
View file @ f5502b8f
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" /> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent"> <q-popup-proxy v-if="showChooseStudent">
<q-banner> <q-banner>
<div style="width:500px;max-height:220px;overflow-y:auto;"> <div style="width:500px;max-height:400px;overflow-y:auto;">
<table class="Contract_Table"> <table class="Contract_Table">
<tr> <tr>
<th>选择</th> <th>选择</th>
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单" <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
style="min-width:70px;float:right;margin-top:10px" /> style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" /> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent"> <q-popup-proxy v-if="showChooseStudent">
<q-banner> <q-banner>
<div style="width:500px;max-height:220px;overflow-y:auto;"> <div style="width:500px;max-height:400px;overflow-y:auto;">
<table class="Contract_Table"> <table class="Contract_Table">
<tr> <tr>
<th>选择</th> <th>选择</th>
...@@ -411,7 +411,7 @@ ...@@ -411,7 +411,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单" <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
style="min-width:70px;float:right;margin-top:10px" /> style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
...@@ -600,7 +600,7 @@ ...@@ -600,7 +600,7 @@
<div class="col"> <div class="col">
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>收款单据：</span> <span>收款单据：</span>
<q-btn flat size="xs" icon="edit" :disable="true" v-if="AuthorityObj.isShowFinanceBtn" <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" /> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent"> <q-popup-proxy v-if="showChooseStudent">
<q-banner> <q-banner>
...@@ -621,7 +621,7 @@ ...@@ -621,7 +621,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单" <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
style="min-width:70px;float:right;margin-top:10px" /> style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
...@@ -657,7 +657,7 @@ ...@@ -657,7 +657,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单" <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
style="min-width:70px;float:right;margin-top:10px" /> style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
...@@ -1069,62 +1069,84 @@ ...@@ -1069,62 +1069,84 @@
}) })
}) })
}, },
//财务单据 //财务单据
chanceType(obj, type) { chanceType(obj) {
if (this.chooseStudent == "") { if (obj.OrderType == 1) {
this.$q.notify({ if (this.chooseStudent == "") {
icon: 'close', this.$q.notify({
color: 'accent', icon: 'close',
timeout: 2000, color: 'accent',
message: '请选择学生', timeout: 2000,
position: 'top' message: '请选择学生',
}) position: 'top'
return })
} return
let TCIDARR = [] }
//留学就业订单 let ContractNo = ''
if (obj && obj.OrderType == 2) { if (obj && obj.GuestList.length > 0) {
TCIDARR.push(obj.SourceId); obj.GuestList.forEach(x => {
} else { if (this.chooseStudent == x.Id) {
TCIDARR.push(obj.ClassId); ContractNo = x.ContractNo
} }
var orderObj = {} })
if (obj.OfferId > 0) { }
orderObj = { if (ContractNo == '') {
OrderID: obj.OrderId, this.$q.notify({
OrderSource: 17, icon: 'close',
Obj: {}, color: 'accent',
SourceID: 0, timeout: 2000,
TCIDList: TCIDARR, message: '领取合同后才能制单',
OtherType: 29, position: 'top'
ReFinanceId: obj.OfferId })
return
}
let TCIDARR = []
//留学就业订单
if (obj && obj.OrderType == 2) {
TCIDARR.push(obj.SourceId);
} else {
TCIDARR.push(obj.ClassId);
}
var orderObj = {}
if (obj.OfferId > 0) {
orderObj = {
OrderID: obj.OrderId,
OrderSource: 17,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR,
OtherType: 29,
ReFinanceId: obj.OfferId
}
} else {
orderObj = {
OrderID: obj.OrderId,
OrderSource: 17,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR
}
} }
} else { } else {
orderObj = { //留学就业订单
OrderID: obj.OrderId, if (obj && obj.OrderType == 2) {
OrderSource: 17, //财务单据类型【教育留学】
Obj: {}, orderObj.OrderSource = 18;
SourceID: 0,
TCIDList: TCIDARR
} }
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
query: {
"Type": type,
"companyID": obj.ClassSchoolId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'tradeWay': obj.tradeWay,
"GuestId": this.chooseStudent
}
});
} }
//留学就业订单
if (obj && obj.OrderType == 2) {
//财务单据类型【教育留学】
orderObj.OrderSource = 18;
}
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
query: {
"Type": type,
"companyID": obj.ClassSchoolId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'tradeWay': obj.tradeWay,
"GuestId": this.chooseStudent
}
});
}, },
//打开班级详情组件 //打开班级详情组件
getClassInfo(obj) { getClassInfo(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