Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
confucius
Commits
74002a22
Commit
74002a22
authored
Jun 10, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
f53d7dac
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
52 deletions
+16
-52
index.js
src/api/finance/index.js
+0
-11
orderlist.vue
src/components/sale/orderlist.vue
+11
-6
studyOrder-form.vue
src/components/sale/studyOrder-form.vue
+4
-34
studyjob.vue
src/pages/sale/studyjob.vue
+1
-1
No files found.
src/api/finance/index.js
View file @
74002a22
...
...
@@ -71,14 +71,3 @@ export function getStockOutPageList(data) {
});
}
/**
* 根据 班级编号获取插班报名配置信息
*
*/
export
function
queryChaClassInfo
(
data
)
{
return
request
({
url
:
'/order/GetChaClassInfo'
,
method
:
'post'
,
data
})
}
src/components/sale/orderlist.vue
View file @
74002a22
...
...
@@ -706,7 +706,7 @@
</editorder-form>
<!--修改留学就业订单-->
<studyorder-form
v-if=
"isShowSt
t
udyOrderForm"
:save-obj=
"orderObj"
:orderType=
"orderObj.OrderType"
<studyorder-form
v-if=
"isShowStudyOrderForm"
:save-obj=
"orderObj"
:orderType=
"orderObj.OrderType"
@
close=
"closeOrderSaveForm"
@
success=
"refreshOrder"
:modityOrderType=
"newModityOrderType"
>
</studyorder-form>
...
...
@@ -810,7 +810,7 @@
data
()
{
return
{
isShowEditOrderForm
:
false
,
//是否显示订单修改
isShowSt
tudyOrderForm
:
false
,
//是否显示留学就业订单
isShowSt
udyOrderForm
:
false
,
//是否显示留学就业订单
isShowRemarkOrderForm
:
false
,
//是否线下修改订单备注
isShowTransOrderForm
:
false
,
//是否显示转交订单
isShowBackClassForm
:
false
,
//是否显示退课申请
...
...
@@ -1080,16 +1080,24 @@
//关闭订单修改
closeOrderSaveForm
()
{
this
.
isShowEditOrderForm
=
false
;
this
.
isShowStudyOrderForm
=
false
;
},
//显示修改订单
editOrder
(
item
)
{
this
.
orderObj
=
item
;
this
.
isShowEditOrderForm
=
true
;
//课程订单
if
(
item
.
OrderType
==
1
)
{
this
.
isShowEditOrderForm
=
true
;
}
else
{
//留学就业订单
this
.
isShowStudyOrderForm
=
true
;
}
},
//刷新页面
refreshOrder
()
{
this
.
isShowEditOrderForm
=
false
;
this
.
isShowMoney
=
false
;
this
.
isShowStudyOrderForm
=
false
;
//调用父页面成功方法
this
.
$emit
(
'success'
);
},
...
...
@@ -1148,8 +1156,6 @@
orderObj
.
OtherType
=
29
;
orderObj
.
ReFinanceId
=
obj
.
OfferId
;
}
if
(
obj
.
OrderType
==
1
&&
this
.
chooseStudent
==
""
)
{
this
.
$q
.
notify
({
icon
:
'close'
,
...
...
@@ -1254,7 +1260,6 @@
this
.
$emit
(
'success'
);
}
}).
catch
(()
=>
{
})
},
takeContractTwo
(
item
,
subItem
)
{
...
...
src/components/sale/studyOrder-form.vue
View file @
74002a22
...
...
@@ -11,24 +11,8 @@
<q-input
filled
stack-label
maxlength=
"100"
:dense=
"false"
v-model=
"OrderMsg.GuestNum"
type=
"number"
@
input=
"countPrice"
class=
"col-12"
label=
"人数"
:rules=
"[val => !!val || '请填写人数']"
:disable=
"modityOrderType==2"
/>
<template
v-if=
"modityOrderType==1"
>
<q-input
filled
stack-label
:dense=
"false"
v-model=
"OrderMsg.Unit_Price"
:disable=
"IsShowUpPrice==true?false:true"
@
blur=
"countPrice"
class=
"col-12"
label=
"成交单价"
:rules=
"[val => !!val || '请填成交单价']"
/>
<q-toggle
v-model=
"IsShowUpPrice"
label=
"高于定价收生"
class=
"q-mb-md"
/>
</
template
>
<
template
v-if=
"modityOrderType==2"
>
<q-input
filled
stack-label
:dense=
"false"
v-model=
"OrderMsg.Unit_Price"
:disable=
"true"
@
blur=
"countPrice"
class=
"col-12"
label=
"成交单价"
:rules=
"[val => !!val || '请填成交单价']"
/>
</
template
>
<
template
v-if=
"modityOrderType==3"
>
<q-input
filled
stack-label
:dense=
"false"
v-model=
"OrderMsg.Unit_Price"
@
blur=
"countPrice"
class=
"col-12"
label=
"成交单价"
:rules=
"[val => !!val || '请填成交单价']"
/>
<q-input
filled
stack-label
v-if=
"OrderMsg.OrderType==1"
:dense=
"false"
maxlength=
"10"
@
keyup
.
native=
"checkPrice(OrderMsg,'PreferPrice')"
v-model=
"OrderMsg.PreferPrice"
class=
"col-12 q-pb-lg"
label=
"应收"
/>
</
template
>
<q-input
filled
stack-label
:dense=
"false"
v-model=
"OrderMsg.Unit_Price"
:disable=
"true"
@
blur=
"countPrice"
class=
"col-12"
label=
"成交单价"
:rules=
"[val => !!val || '请填成交单价']"
/>
<q-select
:disable=
"modityOrderType==2"
standout=
"bg-primary text-white"
option-value=
"Id"
option-label=
"Name"
v-model=
"OrderMsg.OrderSource"
:options=
"SourceEnumList"
emit-value
map-options
class=
"q-pb-lg"
label=
"客人来源"
/>
...
...
@@ -116,8 +100,7 @@
OldPreferPrice
:
0
,
//原实际应收
ClassHour
:
1
//已上课时
},
IsShowUpPrice
:
false
,
//是否显示高于定价
StepPriceList
:
[],
UnitPrice
:
0
,
SourceEnumList
:
[],
//订单来源
EmployeeList
:
[],
//员工列表
...
...
@@ -136,14 +119,7 @@
}
],
isHaveModify
:
false
,
//已上课时
CourseList
:
[{
Id
:
1
,
Name
:
'第一课'
},
{
Id
:
2
,
Name
:
'第二课'
}]
}
},
created
()
{
...
...
@@ -160,14 +136,9 @@
}
},
mounted
()
{
console
.
log
(
this
.
modityOrderType
,
'modityOrderType'
);
this
.
initData
()
},
methods
:
{
//判断是否禁用
checkIsDisable
()
{
},
//订单性质切换
OrderNatureChange
()
{
if
(
this
.
OrderMsg
.
OrderNature
==
1
)
{
...
...
@@ -198,7 +169,6 @@
this
.
OrderMsg
.
OrderNature
=
res
.
Data
.
OrderInfo
.
OrderNature
;
this
.
OrderMsg
.
OldPreferPrice
=
res
.
Data
.
OrderInfo
.
OldPreferPrice
;
this
.
UnitPrice
=
this
.
OrderMsg
.
Unit_Price
;
this
.
StepPriceList
=
res
.
Data
.
StepPriceList
;
this
.
IsShowEditOrder
=
true
;
}
})
...
...
src/pages/sale/studyjob.vue
View file @
74002a22
...
...
@@ -120,7 +120,7 @@
<q-dialog
v-model=
"showForm"
persistent
>
<quotationstudy-form
:obj=
"null"
@
save=
"showForm=false"
></quotationstudy-form>
</q-dialog>
<studyorderForm
v-if=
"isShowOrderForm"
:save-obj=
"studyObj"
:orderType=
"2"
@
close=
"cloStudyform"
<studyorderForm
v-if=
"isShowOrderForm"
:save-obj=
"studyObj"
:orderType=
"2"
:modityOrderType=
"1"
@
close=
"cloStudyform"
@
save=
"refreshPage()"
></studyorderForm>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment