Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gdtel-gztel-school-center-ui
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
吴学德
gdtel-gztel-school-center-ui
Commits
95c7ea5e
Commit
95c7ea5e
authored
Jan 28, 2021
by
罗承锋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改宽带、移动订单页面
parent
8eb5529b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
172 additions
and
44 deletions
+172
-44
src/api/school-center/orderAPI.js
+7
-2
src/views/school-center/order/order.vue
+125
-3
src/views/school-center/order/orderView.vue
+39
-33
src/views/school-center/schoolmanager/schoolmanagement.vue
+1
-6
No files found.
src/api/school-center/orderAPI.js
View file @
95c7ea5e
...
...
@@ -5,6 +5,10 @@ const prefix = '/manager/ciop/';
let
orderList
=
(
params
)
=>
postAction
(
prefix
+
"order/list"
,
params
);
let
download
=
(
params
)
=>
postAction
(
prefix
+
"order/download"
,
params
);
// 更新订单信息
let
updateSendType
=
(
params
)
=>
postAction
(
prefix
+
"order/updateSendType"
,
params
);
let
updateIccid
=
(
params
)
=>
postAction
(
prefix
+
"order/updateIccid"
,
params
);
// 宽带订单
let
broadBandList
=
(
params
)
=>
postAction
(
prefix
+
"order/broadBandOrder"
,
params
);
...
...
@@ -17,7 +21,6 @@ let downloadMoBanKD = (params) => downFilePost(prefix + "order/downloadMoBanKD"
let
downloadMoBanYZK
=
(
params
)
=>
downFilePost
(
prefix
+
"order/downloadMoBanYZK"
,
params
);
let
editOrder
=
(
params
)
=>
postAction
(
prefix
+
"order/editOrder"
,
params
);
//报表
let
reportList
=
(
params
)
=>
postAction
(
prefix
+
"order/getHhrOrderInfo"
,
params
);
let
reportDownload
=
(
params
)
=>
downFilePost
(
prefix
+
"order/outputHhrOrder"
,
params
);
...
...
@@ -36,5 +39,7 @@ export {
reportList
,
reviewStudentIdCard
,
reportDownload
,
editOrder
editOrder
,
updateSendType
,
updateIccid
}
src/views/school-center/order/order.vue
View file @
95c7ea5e
...
...
@@ -301,7 +301,12 @@
</div>
</a-carousel>
</div>
<div>
<a-button
v-show=
"orderInfo.sendType == null || orderInfo.sendType == ''"
@
click=
"openConfigSendType()"
type=
"primary"
>
配送方式
</a-button>
<a-button
v-show=
"orderInfo.businessIccid == null || orderInfo.businessIccid == ''"
@
click=
"openConfigIccidFun"
type=
"primary"
>
配置iccid
</a-button>
<a-button
@
click=
"showReview()"
type=
"primary"
>
审核学生证
</a-button>
</div>
<a-divider
orientation=
"left"
>
受理信息
</a-divider>
<a-row>
<a-col
:span=
"6"
>
...
...
@@ -445,6 +450,33 @@
</a-row>
</a-modal>
<a-modal
title=
"配送方式"
:visible=
"configSendType"
@
ok=
"configSendTypeOk"
@
cancel=
"configSendTypeCancel"
html-type=
"submit"
width=
"256px"
>
<div>
<a-radio-group
v-model=
"reviewSendType.sendType"
@
change=
"changeSendType"
>
<a-radio
value=
"快递"
>
快递
</a-radio>
<a-radio
value=
"送货上门"
>
送货上门
</a-radio>
</a-radio-group>
</div>
</a-modal>
<a-modal
title=
"配置iccid"
:visible=
"openIccidConfig"
@
ok=
"iccidConfigOk"
@
cancel=
"iccidConfigCancel"
html-type=
"submit"
width=
"256px"
>
<div>
<span>
iccid:
</span><a-input
v-model=
"iccidParam.businessIccid"
placeholder=
"请输入iccid"
/>
<span>
办理号码:
</span><a-input
v-model=
"iccidParam.businessNumber"
placeholder=
"请输入办理号码"
/>
</div>
</a-modal>
<a-modal
title=
"置为异常单"
:visible=
"setAbnormal"
@
ok=
"setAbnormalOk"
...
...
@@ -685,7 +717,9 @@
downloadMoBanKD
,
downloadMoBanYZK
,
reviewStudentIdCard
,
editOrder
editOrder
,
updateIccid
,
updateSendType
}
from
"../../../api/school-center/orderAPI"
;
import
{
cloneObject
,
exportFile
}
from
"@/utils/util"
;
import
moment
from
"moment"
;
...
...
@@ -711,9 +745,20 @@
checkFail
:
""
,
studentCardCheckStatus
:
""
},
reviewSendType
:
{
id
:
''
,
sendType
:
''
,
},
openIccidConfig
:
false
,
iccidParam
:
{
id
:
''
,
businessIccid
:
''
,
businessNumber
:
''
},
options
,
review
:
false
,
imgShow
:
false
,
configSendType
:
false
,
imgStype
:
{
width
:
"300px"
,
heigth
:
"300px"
},
baseUrl
:
"https://raw.githubusercontent.com/vueComponent/ant-design-vue/master/components/vc-slick/assets/img/react-slick/"
,
...
...
@@ -845,6 +890,79 @@
this
.
handleSubmit3
();
}
},
openConfigIccidFun
()
{
this
.
openIccidConfig
=
true
;
this
.
iccidParam
.
id
=
this
.
orderInfo
.
id
;
this
.
iccidParam
.
businessIccid
=
this
.
orderInfo
.
businessIccid
;
this
.
iccidParam
.
businessNumber
=
this
.
orderInfo
.
businessNumber
;
},
iccidConfigOk
()
{
let
obj
=
cloneObject
(
this
.
iccidParam
);
updateIccid
(
obj
).
then
(
res
=>
{
if
(
res
.
state
==
"success"
)
{
this
.
$notification
.
success
({
message
:
"更新成功!"
,
description
:
""
,
duration
:
4
});
this
.
search
();
}
else
{
this
.
$notification
.
error
({
message
:
"更新失败!"
,
description
:
""
,
duration
:
4
});
}
});
this
.
iccidConfigClear
();
},
iccidConfigCancel
()
{
this
.
iccidConfigClear
();
},
iccidConfigClear
()
{
this
.
openIccidConfig
=
false
;
this
.
iccidParam
.
id
=
''
;
this
.
iccidParam
.
businessNumber
=
''
;
this
.
iccidParam
.
businessIccid
=
''
;
},
changeSendType
(
e
)
{
this
.
reviewSendType
.
sendType
=
e
.
target
.
value
;
},
configSendTypeOk
()
{
// 配置发送
let
obj
=
cloneObject
(
this
.
reviewSendType
);
updateSendType
(
obj
).
then
(
res
=>
{
if
(
res
.
state
==
"success"
)
{
this
.
$notification
.
success
({
message
:
"更新成功!"
,
description
:
""
,
duration
:
4
});
this
.
search
();
}
else
{
this
.
$notification
.
error
({
message
:
"更新失败!"
,
description
:
""
,
duration
:
4
});
}
});
this
.
configSendTypeClear
();
},
configSendTypeCancel
()
{
this
.
configSendTypeClear
();
},
configSendTypeClear
()
{
this
.
configSendType
=
false
;
this
.
reviewSendType
.
id
=
''
;
this
.
reviewSendType
.
sendType
=
''
;
},
openConfigSendType
()
{
this
.
configSendType
=
true
;
this
.
reviewSendType
.
id
=
this
.
orderInfo
.
id
;
this
.
reviewSendType
.
sendType
=
this
.
orderInfo
.
sendType
;
},
showReview
()
{
this
.
review
=
true
;
},
...
...
@@ -1080,7 +1198,9 @@
company
:
""
,
studentCardCheckStatus
:
""
,
kdOrderId
:
""
,
orderStatus
:
""
orderStatus
:
""
,
sendType
:
""
,
businessIccid
:
""
};
this
.
visible
=
false
;
this
.
edit
=
false
;
...
...
@@ -1139,7 +1259,9 @@
company
:
data
.
company
,
studentCardCheckStatus
:
data
.
studentCardCheckStatus
,
kdOrderId
:
data
.
kdOrderId
,
orderStatus
:
data
.
orderStatus
orderStatus
:
data
.
orderStatus
,
sendType
:
data
.
sendType
,
businessIccid
:
data
.
businessIccid
};
this
.
selectOrderHis
(
data
.
id
);
if
(
type
==
1
){
...
...
src/views/school-center/order/orderView.vue
View file @
95c7ea5e
...
...
@@ -164,10 +164,10 @@
<p
:style=
"pStyle"
>
基础信息
</p>
<a-row>
<a-col
:span=
"12"
>
<p>
订单号:{{orderInfo.
orderseq
}}
</p>
<p>
订单号:{{orderInfo.
kdOrderId
}}
</p>
</a-col>
<a-col
:span=
"12"
>
<p>
下单时间:{{orderInfo.order
d
ate | dayjs}}
</p>
<p>
下单时间:{{orderInfo.order
D
ate | dayjs}}
</p>
</a-col>
</a-row>
<a-row>
...
...
@@ -185,7 +185,7 @@
<p
v-if=
"orderInfo.status=='100'"
>
订单状态:未支付
</p>
</a-col>
<a-col
:span=
"12"
>
<p>
产品名称:{{orderInfo.product
n
ame }}
</p>
<p>
产品名称:{{orderInfo.product
N
ame }}
</p>
</a-col>
</a-row>
<a-row>
...
...
@@ -193,20 +193,20 @@
<p>
套餐:{{orderInfo.orderSetMeal}}
</p>
</a-col>
<a-col
:span=
"12"
>
<p>
产品价格:{{orderInfo.web
ordera
mount}}
</p>
<p>
产品价格:{{orderInfo.web
OrderA
mount}}
</p>
</a-col>
</a-row>
<a-row>
<a-col
:span=
"12"
>
<p>
客户姓名:{{orderInfo.order
n
ame}}
</p>
<p>
客户姓名:{{orderInfo.order
N
ame}}
</p>
</a-col>
<a-col
:span=
"12"
>
<p>
联系电话:{{orderInfo.order
p
hone}}
</p>
<p>
联系电话:{{orderInfo.order
P
hone}}
</p>
</a-col>
</a-row>
<a-row>
<a-col
:span=
"12"
>
<p>
身份证号:{{orderInfo.
ordernumber
}}
</p>
<p>
身份证号:{{orderInfo.
idCard
}}
</p>
</a-col>
<a-col
:span=
"12"
>
<p>
学生证号:{{orderInfo.orderCustomerStudentId}}
</p>
...
...
@@ -246,7 +246,7 @@
<p>
预留字段1:
</p>
</a-col>
<a-col
:span=
"12"
>
<p>
预留字段2
:{{orderInfo.orderRf2 }}
</p>
<p>
融合受理时间
:{{orderInfo.orderRf2 }}
</p>
</a-col>
</a-row>
<a-divider
/>
...
...
@@ -256,7 +256,7 @@
<p>
支付平台:{{orderInfo.ipay}}
</p>
</a-col>
<a-col
:span=
"12"
>
<p>
支付方式:{{orderInfo.pay
t
ype }}
</p>
<p>
支付方式:{{orderInfo.pay
T
ype }}
</p>
</a-col>
</a-row>
<a-row>
...
...
@@ -269,15 +269,15 @@
</a-row>
<a-row>
<a-col
:span=
"12"
>
<p>
智能平台订单号:{{orderInfo.order
seqt
hd}}
</p>
<p>
智能平台订单号:{{orderInfo.order
SeqT
hd}}
</p>
</a-col>
<a-col
:span=
"12"
>
<p>
穗易付订单号 :{{orderInfo.order
reqtrans
eq}}
</p>
<p>
穗易付订单号 :{{orderInfo.order
ReqtranS
eq}}
</p>
</a-col>
</a-row>
<a-row>
<a-col
:span=
"12"
>
<p>
接入商:{{orderInfo.customer
i
d}}
</p>
<p>
接入商:{{orderInfo.customer
I
d}}
</p>
</a-col>
</a-row>
</a-drawer>
...
...
@@ -382,6 +382,7 @@
//表示
return
broadBandList
(
Object
.
assign
(
params
,
obj
)).
then
(
res
=>
{
let
data
=
{}
console
.
log
(
res
);
if
(
res
.
state
!==
'success'
)
{
this
.
$message
.
error
(
"查询失败!"
,
5
);
this
.
emptyText
.
emptyText
=
'查询失败!'
...
...
@@ -399,6 +400,7 @@
totalCount
:
res
.
data
.
total
}
}
console
.
log
(
data
);
return
data
})
}
...
...
@@ -411,22 +413,24 @@
},
onClose
()
{
this
.
orderInfo
=
{
orderseq
:
''
,
productname
:
''
,
kdOrderId
:
''
,
orderSeq
:
''
,
productName
:
''
,
orderSetMeal
:
''
,
orderUniversityName
:
''
,
order
n
ame
:
''
,
order
d
ate
:
''
,
order
N
ame
:
''
,
order
D
ate
:
''
,
status
:
''
,
orderRegion
:
''
,
ipay
:
''
,
paytype
:
''
,
payType
:
''
,
idCard
:
''
,
weborderamount
:
''
,
orderPaymentTime
:
''
,
order
reqtrans
eq
:
''
,
customer
i
d
:
''
,
order
p
hone
:
''
,
order
n
umber
:
''
,
order
ReqtranS
eq
:
''
,
customer
I
d
:
''
,
order
P
hone
:
''
,
order
N
umber
:
''
,
orderCustomerType
:
''
,
orderCustomerStudentId
:
''
,
orderCustomerRemarks
:
''
,
...
...
@@ -434,29 +438,31 @@
orderCustomerPwd
:
''
,
uptranseq
:
''
,
expenses
:
''
,
orderseq
t
hd
:
''
,
orderseq
T
hd
:
''
,
orderRf2
:
''
}
this
.
visible
=
false
;
},
showDrawer
(
data
){
this
.
orderInfo
=
{
orderseq
:
data
.
orderseq
,
productname
:
data
.
productname
,
kdOrderId
:
data
.
kdOrderId
,
orderSeq
:
data
.
orderSeq
,
productName
:
data
.
productName
,
orderSetMeal
:
data
.
orderSetMeal
,
orderUniversityName
:
data
.
orderUniversityName
,
order
name
:
data
.
ordern
ame
,
order
date
:
data
.
orderd
ate
,
order
Name
:
data
.
orderN
ame
,
order
Date
:
data
.
orderD
ate
,
status
:
data
.
status
,
orderRegion
:
data
.
orderRegion
,
ipay
:
data
.
ipay
,
paytype
:
data
.
paytype
,
weborderamount
:
data
.
weborderamount
,
payType
:
data
.
payType
,
idCard
:
data
.
idCard
,
webOrderAmount
:
data
.
webOrderAmount
,
orderPaymentTime
:
data
.
orderPaymentTime
,
order
reqtranseq
:
data
.
orderreqtrans
eq
,
customer
id
:
data
.
customeri
d
,
order
phone
:
data
.
orderp
hone
,
order
number
:
data
.
ordern
umber
,
order
ReqtranSeq
:
data
.
orderReqtranS
eq
,
customer
Id
:
data
.
customerI
d
,
order
Phone
:
data
.
orderP
hone
,
order
Number
:
data
.
orderN
umber
,
orderCustomerType
:
data
.
orderCustomerType
,
orderCustomerStudentId
:
data
.
orderCustomerStudentId
,
orderCustomerRemarks
:
data
.
orderCustomerRemarks
,
...
...
@@ -464,7 +470,7 @@
orderCustomerPwd
:
data
.
orderCustomerPwd
,
uptranseq
:
data
.
uptranseq
,
expenses
:
data
.
expenses
,
orderseq
thd
:
data
.
orderseqt
hd
,
orderseq
Thd
:
data
.
orderseqT
hd
,
orderRf2
:
data
.
orderRf2
}
this
.
visible
=
true
;
...
...
src/views/school-center/schoolmanager/schoolmanagement.vue
View file @
95c7ea5e
...
...
@@ -629,8 +629,6 @@
}
this
.
package
=
head
;
}
console
.
log
(
this
.
package
);
console
.
log
(
this
.
packageName
);
}
})
...
...
@@ -727,8 +725,6 @@
Vue
.
delete
(
this
.
modifyForm
,
'endDate'
);
this
.
modifyForm
.
greaterFifty
=
values
.
greaterFifty
==
undefined
?
""
:
values
.
greaterFifty
this
.
modifyForm
.
greaterHundred
=
values
.
greaterHundred
==
undefined
?
""
:
values
.
greaterHundred
console
.
log
(
this
.
buttons
);
console
.
log
(
this
.
buttons
.
indexOf
(
"isRecv"
)
!=
-
1
);
this
.
modifyForm
.
isShowrh
=
(
this
.
modifyForm
.
buttons
.
indexOf
(
"isShowrh"
)
>
-
1
)
?
1
:
0
;
this
.
modifyForm
.
isShowband
=
(
this
.
modifyForm
.
buttons
.
indexOf
(
"isShowband"
)
>
-
1
)
?
1
:
0
;
this
.
modifyForm
.
netPhone
=
(
this
.
modifyForm
.
buttons
.
indexOf
(
"netPhone"
)
>
-
1
)
?
1
:
0
;
...
...
@@ -748,11 +744,10 @@
this
.
modifyForm
.
udBtn
=
(
this
.
modifyForm
.
buttons
.
indexOf
(
"udBtn"
)
>
-
1
)
?
1
:
0
;
this
.
chosePages
.
forEach
(
value
=>
{
if
(
value
!=
undefined
){
if
(
value
!=
undefined
&&
this
.
modifyForm
.
chosePages
.
indexOf
(
value
)
==
-
1
){
this
.
modifyForm
.
chosePages
=
value
+
","
+
this
.
modifyForm
.
chosePages
}
})
//插入数据
if
(
this
.
modifyForm
.
id
==
""
){
for
(
let
key
in
this
.
modifyForm
)
{
...
...
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