Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
banManager
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
余苗苗
banManager
Commits
34ed3557
Commit
34ed3557
authored
May 22, 2019
by
余苗苗
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
根据UI修改
parent
3f78a99c
Changes
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
666 additions
and
296 deletions
+666
-296
addOrder.html
new/order/addOrder.html
+2
-2
index.html
new/order/index.html
+34
-17
addAll.js
new/order/js/addAll.js
+2
-2
addOne.js
new/order/js/addOne.js
+1
-1
beCompleting.js
new/order/js/beCompleting.js
+86
-59
beRighting.js
new/order/js/beRighting.js
+97
-71
deliver.js
new/order/js/deliver.js
+9
-10
hasDone.js
new/order/js/hasDone.js
+83
-72
refuse.js
new/order/js/refuse.js
+7
-8
settlePrice.js
new/order/js/settlePrice.js
+15
-17
order.css
new/order/order.css
+267
-34
main.css
new/static/css/main.css
+61
-3
logo-back.png
new/static/images/logo-back.png
+0
-0
order-set1.png
new/static/images/order-set1.png
+0
-0
order-set2.png
new/static/images/order-set2.png
+0
-0
jquery.js
new/static/js/jquery.js
+2
-0
No files found.
new/order/addOrder.html
View file @
34ed3557
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<link
rel=
"stylesheet"
href=
"./../static/css/main.css"
>
<link
rel=
"stylesheet"
href=
"./../static/css/main.css"
>
<link
rel=
"stylesheet"
href=
"./order.css"
>
<link
rel=
"stylesheet"
href=
"./order.css"
>
<link
rel=
"stylesheet"
href=
"./../static/css/animate.css"
>
<link
rel=
"stylesheet"
href=
"./../static/css/animate.css"
>
<link
rel=
"stylesheet"
href=
"https://at.alicdn.com/t/font_1195086_
r8hwtw2voe
.css"
>
<link
rel=
"stylesheet"
href=
"https://at.alicdn.com/t/font_1195086_
k054bf1kprn
.css"
>
</head>
</head>
<body>
<body>
<div
id=
"app"
>
<div
id=
"app"
>
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
components
:
{
commonHeader
,
addOne
,
addAll
},
components
:
{
commonHeader
,
addOne
,
addAll
},
data
:
function
()
{
data
:
function
()
{
return
{
return
{
activeIndex
:
'1'
,
tabindex
:
'1'
,
active_header
:
'./
order
.html'
,
activeIndex
:
'1'
,
tabindex
:
'1'
,
active_header
:
'./
../order/index
.html'
,
menus
:[
menus
:[
{
name
:
'逐条新建'
,
value
:
'1'
,
icon
:
'iconzhutiaoxinjian'
},
{
name
:
'逐条新建'
,
value
:
'1'
,
icon
:
'iconzhutiaoxinjian'
},
{
name
:
'智能新建'
,
value
:
'2'
,
icon
:
'iconzhinengxinjian'
},
{
name
:
'智能新建'
,
value
:
'2'
,
icon
:
'iconzhinengxinjian'
},
...
...
new/order/index.html
View file @
34ed3557
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<link
rel=
"stylesheet"
href=
"./../static/css/main.css"
>
<link
rel=
"stylesheet"
href=
"./../static/css/main.css"
>
<link
rel=
"stylesheet"
href=
"./order.css"
>
<link
rel=
"stylesheet"
href=
"./order.css"
>
<link
rel=
"stylesheet"
href=
"./../static/css/animate.css"
>
<link
rel=
"stylesheet"
href=
"./../static/css/animate.css"
>
<link
rel=
"stylesheet"
href=
"https://at.alicdn.com/t/font_1195086_
r8hwtw2voe
.css"
>
<link
rel=
"stylesheet"
href=
"https://at.alicdn.com/t/font_1195086_
k054bf1kprn
.css"
>
</head>
</head>
<body>
<body>
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
<el-menu-item
:index=
"item.value"
:key=
'index'
v-for=
'(item,index) in menus'
>
<el-menu-item
:index=
"item.value"
:key=
'index'
v-for=
'(item,index) in menus'
>
<i
:class=
"'iconfont '+item.icon"
></i>
<i
:class=
"'iconfont '+item.icon"
></i>
{{item.name}}
{{item.name}}
<div
class=
"order-number"
v-if=
'item.number>0'
>
{{item.number}}
</div>
</el-menu-item>
</el-menu-item>
</el-menu>
</el-menu>
</div>
</div>
...
@@ -33,24 +34,32 @@
...
@@ -33,24 +34,32 @@
<el-option
:label=
"item.label"
:value=
"item.value"
:key=
'item.label'
v-for=
'(item,index) in search.options2'
></el-option>
<el-option
:label=
"item.label"
:value=
"item.value"
:key=
'item.label'
v-for=
'(item,index) in search.options2'
></el-option>
</el-select>
</el-select>
<el-input
class=
"seach-input"
v-model=
'search.name'
prefix-icon=
"el-icon-search"
placeholder=
'请输入项目名、合作商名查询'
></el-input>
<el-input
class=
"seach-input"
v-model=
'search.name'
prefix-icon=
"el-icon-search"
placeholder=
'请输入项目名、合作商名查询'
></el-input>
<el-button
type=
'primary'
class=
'firstbackgroud_blue '
>
搜索
</el-button>
<el-button
type=
'primary'
class=
'firstbackgroud_blue
firstborder_blue
'
>
搜索
</el-button>
<span
class=
'button-icon'
><i
class=
'iconfont iconloudou'
></i></span>
<span
class=
'button-icon'
><i
class=
'iconfont iconloudou'
></i></span>
<span
class=
'button-icon'
><i
class=
'iconfont iconpaixu'
></i></span>
<span
class=
'button-icon'
v-popover:popover2
><i
class=
'iconfont iconpaixu'
></i></span>
<el-button
type=
'primary'
class=
'firstbackgroud_blue addbutton'
@
click=
'creatOrder()'
>
新建工单
</el-button>
<el-button
type=
'primary'
class=
'firstbackgroud_blue firstborder_blue addbutton'
@
click=
'creatOrder()'
>
新建工单
</el-button>
<el-popover
ref=
"popover2"
placement=
"bottom"
title=
""
width=
"120"
trigger=
"click"
>
<div
class=
"popover-box"
>
<div
v-for=
"(item,index) in filters"
:key=
'index'
>
{{item.name}}
</div>
</div>
</el-popover>
</div>
</div>
<div
class=
"all-orders-box"
>
<div
class=
"all-orders-box"
>
<div
class=
"all-order-content"
>
<div
class=
"all-order-content"
>
<div
class=
"all-order-box thirdbackground_blue"
v-for=
'(item,index) in tableData'
:key=
'index'
@
click=
'checkDetail(item)'
>
<div
class=
"all-order-box thirdbackground_blue"
v-for=
'(item,index) in tableData'
:key=
'index'
@
click=
'checkDetail(item)'
>
<div
class=
"all-box-top firsttext_font"
>
<div
class=
"all-box-top firsttext_font"
>
<span
class=
'type firstbackgroud_blue'
>
保内
</span>
<span
:class=
"item.id==1?'type1':'type2'"
>
保内
</span>
美的洗衣机--清理
美的洗衣机--清理
<div
class=
"all-box-topright firsttext_blue"
>
<div
class=
"all-box-topright firsttext_blue"
>
<i
class=
'iconfont iconfenpei'
@
click
.
stop=
''
></i>
<i
class=
'iconfont iconfenpei'
@
click
.
stop=
''
></i>
<span
v-if=
"item.id=='1'"
>
<span
v-if=
"item.id=='1'"
>
<i
class=
'iconfont iconxing'
@
click
.
stop=
''
></i>
<i
class=
'iconfont iconxing
start1
'
@
click
.
stop=
''
></i>
</span>
</span>
<span
v-else
>
<span
v-else
>
<i
class=
'iconfont iconloudou1'
@
click
.
stop=
''
></i>
<i
class=
'iconfont iconloudou1
start2
'
@
click
.
stop=
''
></i>
</span>
</span>
<i
class=
'iconfont iconxiaoxi1'
@
click
.
stop=
''
></i>
<i
class=
'iconfont iconxiaoxi1'
@
click
.
stop=
''
></i>
...
@@ -90,7 +99,6 @@
...
@@ -90,7 +99,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"table_bottm"
>
<div
class=
"table_bottm"
>
<el-pagination
@
current-change=
"handleCurrentChange"
background
:current-page=
"table.current_page"
:page-sizes=
"[10, 20, 30, 40]"
:page-size=
"10"
layout=
"sizes, prev, pager, next,total"
:page-size=
"15"
:pager-count=
"table.page_count"
:total=
"table.total"
>
<el-pagination
@
current-change=
"handleCurrentChange"
background
:current-page=
"table.current_page"
:page-sizes=
"[10, 20, 30, 40]"
:page-size=
"10"
layout=
"sizes, prev, pager, next,total"
:page-size=
"15"
:pager-count=
"table.page_count"
:total=
"table.total"
>
...
@@ -105,6 +113,7 @@
...
@@ -105,6 +113,7 @@
</body>
</body>
<!-- 先引入 Vue -->
<!-- 先引入 Vue -->
<script
src=
"https://unpkg.com/vue/dist/vue.js"
></script>
<script
src=
"https://unpkg.com/vue/dist/vue.js"
></script>
<script
src=
"./../static/js/jquery.js"
></script>
<!-- 引入组件库 -->
<!-- 引入组件库 -->
<script
src=
"https://unpkg.com/element-ui/lib/index.js"
></script>
<script
src=
"https://unpkg.com/element-ui/lib/index.js"
></script>
<script
src=
"./../static/js/common.js"
></script>
<script
src=
"./../static/js/common.js"
></script>
...
@@ -123,15 +132,15 @@
...
@@ -123,15 +132,15 @@
return
{
return
{
activeIndex
:
'9'
,
tabindex
:
'9'
,
modal
:
null
,
active_header
:
'./../order/index.html'
,
activeIndex
:
'9'
,
tabindex
:
'9'
,
modal
:
null
,
active_header
:
'./../order/index.html'
,
menus
:[
menus
:[
{
name
:
'待派单'
,
value
:
'1'
,
icon
:
'iconfenpei'
},
{
name
:
'待派单'
,
value
:
'1'
,
icon
:
'iconfenpei'
,
number
:
10
},
{
name
:
'未分配'
,
value
:
'2'
,
icon
:
'iconmulufenpei'
},
{
name
:
'未分配'
,
value
:
'2'
,
icon
:
'iconmulufenpei'
,
number
:
10
},
{
name
:
'未预约'
,
value
:
'3'
,
icon
:
'iconweiyuyue'
},
{
name
:
'未预约'
,
value
:
'3'
,
icon
:
'iconweiyuyue'
,
number
:
10
},
{
name
:
'未完工'
,
value
:
'4'
,
icon
:
'iconweiwangong'
},
{
name
:
'未完工'
,
value
:
'4'
,
icon
:
'iconweiwangong'
,
number
:
10
},
{
name
:
'超约未完工'
,
value
:
'5'
,
icon
:
'iconchaoshiweiwangong'
},
{
name
:
'超约未完工'
,
value
:
'5'
,
icon
:
'iconchaoshiweiwangong'
,
number
:
10
},
{
name
:
'未确认'
,
value
:
'6'
,
icon
:
'iconquequan'
},
{
name
:
'未确认'
,
value
:
'6'
,
icon
:
'iconquequan'
,
number
:
10
},
{
name
:
'已退回'
,
value
:
'7'
,
icon
:
'iconyituihui'
},
{
name
:
'已退回'
,
value
:
'7'
,
icon
:
'iconyituihui'
,
number
:
10
},
{
name
:
'取消工单'
,
value
:
'8'
,
icon
:
'iconguanbi'
},
{
name
:
'取消工单'
,
value
:
'8'
,
icon
:
'iconguanbi'
,
number
:
0
},
{
name
:
'所有工单'
,
value
:
'9'
,
icon
:
'iconquanbugongdan'
},
{
name
:
'所有工单'
,
value
:
'9'
,
icon
:
'iconquanbugongdan'
,
number
:
0
},
],
],
search
:{
search
:{
type
:
''
,
time
:
''
,
options1
:[],
options2
:[],
name
:
''
type
:
''
,
time
:
''
,
options1
:[],
options2
:[],
name
:
''
...
@@ -144,6 +153,14 @@
...
@@ -144,6 +153,14 @@
{
id
:
'5'
,
statusText
:
'已完成'
},
{
id
:
'5'
,
statusText
:
'已完成'
},
{
id
:
'6'
,
statusText
:
'已退回'
}
{
id
:
'6'
,
statusText
:
'已退回'
}
],
],
filters
:[
{
id
:
'1'
,
name
:
'创建时间'
},
{
id
:
'2'
,
name
:
'用户地址'
},
{
id
:
'3'
,
name
:
'用户电话'
},
{
id
:
'4'
,
name
:
'授权点'
},
{
id
:
'5'
,
name
:
'预约时间'
},
{
id
:
'6'
,
name
:
'完工时间'
},
],
table
:{
table
:{
current_page
:
1
,
page_count
:
7
,
total
:
100
,
current_page
:
1
,
page_count
:
7
,
total
:
100
,
},
},
...
...
new/order/js/addAll.js
View file @
34ed3557
...
@@ -3,7 +3,7 @@ var addAll={
...
@@ -3,7 +3,7 @@ var addAll={
<div>
<div>
<div class="add-order-rightTitle">
<div class="add-order-rightTitle">
新建工单
新建工单
<el-button
type="primary" plain size='mini' style='float:right;margin-top:20px
' @click='reback()'>返回</el-button>
<el-button
plain class="plain-bt" size='mini' style='float:right;margin-top:20px;
' @click='reback()'>返回</el-button>
</div>
</div>
<div class="add-order-content">
<div class="add-order-content">
<div class="title">
<div class="title">
...
@@ -11,7 +11,7 @@ var addAll={
...
@@ -11,7 +11,7 @@ var addAll={
(信息之间用空格或换行,系统会自动匹配并完成工单创建.)
(信息之间用空格或换行,系统会自动匹配并完成工单创建.)
</div>
</div>
<el-input class='textarea' type="textarea" :autosize="{ minRows: 10, maxRows: 26}" placeholder="" v-model="inputValue"></el-input>
<el-input class='textarea' type="textarea" :autosize="{ minRows: 10, maxRows: 26}" placeholder="" v-model="inputValue"></el-input>
<el-button
type="primary" size='mini' style=' '
>确定</el-button>
<el-button
class="save" style="margin-left:0"
>确定</el-button>
</div>
</div>
</div>`
,
</div>`
,
props
:
{
props
:
{
...
...
new/order/js/addOne.js
View file @
34ed3557
...
@@ -3,7 +3,7 @@ var addOne={
...
@@ -3,7 +3,7 @@ var addOne={
<div >
<div >
<div class="add-order-rightTitle">
<div class="add-order-rightTitle">
新建工单
新建工单
<el-button
type="primary"
plain size='mini' style='float:right;margin-top:20px' @click='reback()'>返回</el-button>
<el-button
class="plain-bt"
plain size='mini' style='float:right;margin-top:20px' @click='reback()'>返回</el-button>
</div>
</div>
<div class="add-order-content">
<div class="add-order-content">
<el-form :model="addData.form" :rules="addData.rules" ref="form1" label-width="100px" class="inputword" >
<el-form :model="addData.form" :rules="addData.rules" ref="form1" label-width="100px" class="inputword" >
...
...
new/order/js/beCompleting.js
View file @
34ed3557
// 待完工
var
beCompleting
=
{
var
beCompleting
=
{
template
:
`<el-dialog :title="dialog.title" :visible.sync="dialog.show" custom-class='order-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'>
template
:
`
<el-tabs v-model="dialog.tab" type="card" @tab-click="handleClick">
<el-dialog :visible.sync="dialog.show" custom-class='order-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'>
<el-tab-pane label="详情" name="1" >
<div slot='title' class="el-dialog__title">
<h2>派单信息</h2>
<i class="iconfont icongongdan"></i>
<div class='order-detail-tab'>
{{dialog.title}}
<p>
</div>
用 户: <span>张女士 13711387865</span>
<el-tabs v-model="dialog.tab" type="card" @tab-click="handleClick">
</p>
<el-tab-pane label="详情" name="1" >
<p>地 址:<span>广东深圳福田深南大道招商银行大厦1101</span></p>
<h2 class="line-left">派单信息</h2>
<p>产 品:<span>格力 空调 KFR-35GW/NhEaB1W (安装1台)</span></p>
<div class='order-detail-tab'>
<p>授权点:<span>唯修汇(张师傅 13644442222)</span></p>
<p>
<p>描述:<span>请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽</span></p>
用 户: <span>张女士 13711387865</span>
</div>
</p>
<h2>工单履历</h2>
<p>地 址:<span>广东深圳福田深南大道招商银行大厦1101</span></p>
<div>
<p>产 品:<span>格力 空调 KFR-35GW/NhEaB1W (安装1台)</span></p>
<div class="order-detail-steps" style="">
<p>授权点:<span>唯修汇(张师傅 13644442222)</span></p>
<el-steps direction="vertical" :active="1">
<p>描述:<span>请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽</span></p>
<el-step title="客服:结算确权 " description='03-13 18:30:02'></el-step>
<el-step title="张师傅:完工" description=' 03-13 18:30:02'></el-step>
<el-step title="张师傅:改预约时间(03-13 10:00),备注:用户明天回 " description='03-13 18:30:02'></el-step>
<el-step title="张师傅:改预约时间(03-12 11:00),备注:用户出差不在家,已经协调修改预约时间" description='03-13 18:30:02'></el-step>
<el-step title="客服:结算确权" description='03-13 18:30:02'></el-step>
<el-step title="系统:派单给唯修汇 " description='03-13 18:30:02'></el-step>
</el-steps>
</div>
</div>
</div>
<h2 class="line-left">工单履历</h2>
</el-tab-pane>
<div>
<el-tab-pane label="反馈" name="2">
<div class="order-detail-steps" style="">
<div class="order-request-box">
<el-steps direction="vertical" :active="1">
<div class="order-detail-response">
<el-step title="客服:结算确权 " description='03-13 18:30:02' icon='1'>
<div v-for='(item,index) in resdata.talks' :key='index'>
<i class="iconfont iconshixinyuanxing" slot="icon"></i>
<el-row v-if='item.type==1' class="right-response">
</el-step>
<el-col :span="22">
<el-step title="张师傅:完工" description=' 03-13 18:30:02'>
<div class="right-response-text" >{{item.value}}</div>
<i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step>
</el-col>
<el-step title="张师傅:改预约时间(03-13 10:00),备注:用户明天回 " description='03-13 18:30:02'>
<el-col :span="2">
<i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step>
<img src="../static/images/man.jpg" alt="" width="42px" height="42px">
</el-step>
</el-col>
<el-step title="张师傅:改预约时间(03-12 11:00),备注:用户出差不在家,已经协调修改预约时间" description='03-13 18:30:02'>
</el-row>
<i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step>
<el-row v-if='item.type==0' class="left-response">
</el-step>
<el-col :span="2">
<el-step title="客服:结算确权" description='03-13 18:30:02'>
<img src="../static/images/women.jpg" alt="" width="42px" height="42px">
<i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step>
</el-col>
</el-step>
<el-col :span="22">
<el-step title="系统:派单给唯修汇 " description='03-13 18:30:02'>
<div class="left-response-text" >{{item.value}}</div>
<i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step>
</el-col>
</el-step>
</el-row>
</el-steps>
<div v-if='item.type==2' class="timestep">2019-5-16-09</div>
</div>
</div>
</div>
</div>
<div class="order-detail-request">
</el-tab-pane>
<div class="plus" style=''>
<el-tab-pane label="反馈" name="2">
<el-upload title="点击选取或更换图片" :action="uploadApi" name="img" :show-file-list="false" :on-success="handleAvatarSuccess1" :before-upload="beforeAvatarUpload1" :on-error='uploaderror'>
<div class="order-request-box">
<i class='el-icon-plus' ></i>
<div class="order-detail-response">
<div v-for='(item,index) in resdata.talks' :key='index'>
<el-row v-if='item.type==1' class="right-response">
<el-col :span="22">
<div class="right-response-text right_triangle_border" >
<div class="popup">
<span></span>
{{item.value}}
</div>
</div>
</el-col>
<el-col :span="2">
<img src="../static/images/man.jpg" alt="" width="42px" height="42px">
</el-col>
</el-row>
<el-row v-if='item.type==0' class="left-response">
<el-col :span="2">
<img src="../static/images/women.jpg" alt="" width="42px" height="42px">
</el-col>
<el-col :span="22">
<div class="left-response-text left_triangle_border" >
<div class="popup">
<span><em></em></span>
{{item.value}}
</div>
</div>
</el-col>
</el-row>
<div v-if='item.type==2' class="timestep">2019-5-16-09</div>
</div>
</div>
<div class="order-detail-request">
<div class="plus" style=''>
<el-upload title="点击选取或更换图片" :action="uploadApi" name="img" :show-file-list="false" :on-success="handleAvatarSuccess1" :before-upload="beforeAvatarUpload1" :on-error='uploaderror'>
<i class='el-icon-plus' ></i>
</el-upload>
</el-upload>
</div>
<el-input class='order-input-area' v-model='resdata.inputValue'></el-input>
<el-button style="margin-left:10px">发送</el-button>
</div>
</div>
<el-input class='order-input-area' v-model='resdata.inputValue'></el-input>
<el-button style="margin-left:10px">发送</el-button>
</div>
</div>
</div>
</el-tab-pane>
</el-tab-pane>
</el-tabs>
</el-tabs>
</el-dialog>`
,
</el-dialog> `
,
props
:
{
props
:
{
//父组件调用时传进来的参数
//父组件调用时传进来的参数
modalData
:
Object
modalData
:
Object
...
...
new/order/js/beRighting.js
View file @
34ed3557
This diff is collapsed.
Click to expand it.
new/order/js/deliver.js
View file @
34ed3557
// 派单弹窗
var
Deliver
=
{
var
Deliver
=
{
template
:
`
template
:
`
<el-dialog :title="dialog.title" width='4
20px' :visible.sync="dialog.show" custom-class='settle-dialog animated slideInRight
' @close="handleClose" :append-to-body="true" :show-close='true'>
<el-dialog :title="dialog.title" width='4
44px' :visible.sync="dialog.show" custom-class='deliver-dialog
' @close="handleClose" :append-to-body="true" :show-close='true'>
<div class="dialog-content">
<div class="dialog-content">
<el-form ref="form" :model="form" label-width="130px">
<div class="deliver-dialog-title">可派授权点:</div>
<el-form-item label="可派授权点:">
<el-select v-model="form.address" placeholder="请选择">
<el-select v-model="form.address" placeholder="请选择">
<el-option v-for="item in form.options" :key="item.value" :label="item.label" :value="item.value">
<el-option v-for="item in form.options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form>
<div class="bt-center">
<div class="bt-center">
<el-button class='background-blue text-white
' >确定派单
</el-button>
<el-button class='background-blue text-white
firstborder_blue' >确定
</el-button>
</div>
</div>
</div>
</div>
</el-dialog>`
,
</el-dialog>`
,
...
...
new/order/js/hasDone.js
View file @
34ed3557
This diff is collapsed.
Click to expand it.
new/order/js/refuse.js
View file @
34ed3557
var
VRefuse
=
{
var
VRefuse
=
{
template
:
`
template
:
`
<el-dialog :title="dialog.title" width='4
20px' :visible.sync="dialog.show" custom-class='settle-dialog animated slideInRight
' @close="handleClose" :append-to-body="true" :show-close='true'>
<el-dialog :title="dialog.title" width='4
44px' :visible.sync="dialog.show" custom-class='deliver-dialog
' @close="handleClose" :append-to-body="true" :show-close='true'>
<div class="dialog-content">
<div class="dialog-content">
<h2 style="margin-bottom:10px">打回后,需重新完工!</h2>
<div style="margin-bottom:20px;font-size: 19px;font-weight: bold;line-height:1.6;">
<el-form ref="form" :model="form" label-width="60px">
工单(<span style="color:#5874D8">GLDQ0019211237</span>)打回后,需要重新进行完工!
<el-form-item label="备注:">
</div>
<el-input v-model='form.remark'></el-input>
<div class="deliver-dialog-title">备注:</div>
</el-form-item>
<el-input v-model='form.remark' type='textarea'></el-input>
</el-form>
<div class="bt-center">
<div class="bt-center">
<el-button class='
background-blue
text-white' >确定打回</el-button>
<el-button class='
firstbackgroud_red
text-white' >确定打回</el-button>
</div>
</div>
</div>
</div>
</el-dialog>`
,
</el-dialog>`
,
...
...
new/order/js/settlePrice.js
View file @
34ed3557
var
settlePrice
=
{
var
settlePrice
=
{
template
:
`
template
:
`
<el-dialog :title="dialog.title" width='4
20px' :visible.sync="dialog.show" custom-class='settle-dialog animated slideInRight
' @close="handleClose" :append-to-body="true" :show-close='true'>
<el-dialog :title="dialog.title" width='4
44px' :visible.sync="dialog.show" custom-class='deliver-dialog
' @close="handleClose" :append-to-body="true" :show-close='true'>
<div class="dialog-content">
<div class="dialog-content">
<el-row class="text_center" style="margin-bottom:10px">
<el-row class=" deliver-dialog-title" style="margin-bottom:10px">
<el-col :span="12">(基本)安装--新机安装</el-col>
<el-col :span="3"><span >基本:</span></el-col>
<el-col :span="4">1</el-col>
<el-col :span="9" class="firsttext_font"><span>安装--新机安装</span></el-col>
<el-col :span="8">¥200</el-col>
<el-col :span="4" class="firsttext_font">1</el-col>
<el-col :span="8" class="firsttext_font">¥200</el-col>
</el-row>
</el-row>
<el-form ref="form" :model="form" label-width="120px">
<div class="deliver-dialog-title">调整金额:</div>
<el-form-item label="调整金额:">
<el-input v-model='form.price'></el-input>
<el-input v-model='form.price'></el-input>
<div class="deliver-dialog-title">调整说明:</div>
</el-form-item>
<el-input v-model='form.remark'></el-input>
<el-form-item label="调整说明:">
<div class="deliver-dialog-title">合计金额(元):</div>
<el-input v-model='form.remark'></el-input>
<el-input v-model='form.total_price'></el-input>
</el-form-item>
<el-form-item label="合计金额:">
¥{{200}}
</el-form-item>
</el-form>
<div class="bt-center">
<div class="bt-center">
<el-button class='background-blue text-white' >确定结算</el-button>
<el-button class='background-blue text-white' >确定结算</el-button>
</div>
</div>
...
@@ -34,7 +32,7 @@ var settlePrice={
...
@@ -34,7 +32,7 @@ var settlePrice={
show
:
true
,
title
:
'确权结算'
,
tab
:
'1'
,
show
:
true
,
title
:
'确权结算'
,
tab
:
'1'
,
},
},
form
:{
form
:{
remark
:
''
,
price
:
''
remark
:
''
,
price
:
''
,
total_price
:
''
}
}
}
}
},
},
...
...
new/order/order.css
View file @
34ed3557
...
@@ -17,6 +17,9 @@
...
@@ -17,6 +17,9 @@
line-height
:
64px
;
line-height
:
64px
;
border-bottom
:
1px
solid
#ececec
;
border-bottom
:
1px
solid
#ececec
;
}
}
.order-left
.order-menu
.el-menu-item
.order-number
{
float
:
right
;
}
.order-menu
.el-menu-item.is-active
{
.order-menu
.el-menu-item.is-active
{
background-color
:
#eef1fa
!important
;
background-color
:
#eef1fa
!important
;
position
:
relative
;
position
:
relative
;
...
@@ -72,7 +75,8 @@
...
@@ -72,7 +75,8 @@
overflow
:
auto
;
overflow
:
auto
;
}
}
.all-order-content
{
.all-order-content
{
width
:
1180px
;
width
:
1178px
;
padding-left
:
2px
;
/*height: 100%;*/
/*height: 100%;*/
position
:
relative
;
position
:
relative
;
}
}
...
@@ -86,11 +90,23 @@
...
@@ -86,11 +90,23 @@
height
:
42px
;
height
:
42px
;
line-height
:
42px
;
line-height
:
42px
;
}
}
.all-box-top
.type
{
.all-box-top
.type1
{
font-size
:
14px
;
color
:
#ffffff
;
padding
:
6px
;
margin-right
:
10px
;
background
:
url('../static/images/order-set1.png')
;
background-size
:
100%
100%
;
margin-left
:
-2px
;
}
.all-box-top
.type2
{
font-size
:
14px
;
font-size
:
14px
;
color
:
#ffffff
;
color
:
#ffffff
;
padding
:
3px
6px
;
padding
:
6px
;
margin-right
:
10px
;
margin-right
:
10px
;
background
:
url('../static/images/order-set2.png')
;
background-size
:
100%
100%
;
margin-left
:
-2px
;
}
}
.all-box-topright
{
.all-box-topright
{
float
:
right
;
float
:
right
;
...
@@ -107,6 +123,9 @@
...
@@ -107,6 +123,9 @@
margin-right
:
20px
;
margin-right
:
20px
;
font-size
:
20px
;
font-size
:
20px
;
}
}
.all-box-topright
i
.start2
{
color
:
#50B5FC
}
.all-box-bottom
{
.all-box-bottom
{
background
:
#ffffff
;
background
:
#ffffff
;
height
:
62px
;
height
:
62px
;
...
@@ -156,27 +175,74 @@
...
@@ -156,27 +175,74 @@
right
:
0
;
right
:
0
;
}
}
/*弹窗*/
/*弹窗*/
.el-dialog__wrapper
{
overflow
:
hidden
!important
;
}
.order-detail
{
.order-detail
{
width
:
720px
;
width
:
720px
;
height
:
670px
;
height
:
638px
;
float
:
right
;
}
}
.el-dialog__wrapper
{
.order-detail
.jiesuan
{
overflow
:
hidden
!important
;
height
:
530px
;
overflow
:
auto
;
}
}
.order-detail
h2
{
.order-detail
h2
{
padding-left
:
2
0px
;
padding-left
:
3
0px
;
}
}
.order-detail
.el-tabs--card
>
.el-tabs__header
{
.order-detail
.el-tabs--card
>
.el-tabs__header
{
padding
:
0
20px
;
padding
:
0
20px
;
background
:
#eef1fa
;
}
.order-detail
.el-tabs--card
>
.el-tabs__header
.el-tabs__item
{
background
:
#f5f5f5
;
margin-bottom
:
-1px
;
margin-right
:
5px
;
border-top-left-radius
:
5px
;
border-top-right-radius
:
5px
;
border
:
1px
solid
#BFCAEB
;
}
.order-detail
.el-tabs--card
>
.el-tabs__header
.el-tabs__item.is-active
{
background
:
#ffffff
;
border
:
1px
solid
#5874d8
;
border-bottom
:
#ffffff
;
color
:
#5874d8
;
}
.order-detail
.el-tabs--card
>
.el-tabs__header
.el-tabs__nav
{
border
:
none
;
}
/*步骤条*/
.order-detail
.el-step__icon.is-text
{
border
:
none
;
color
:
#C0C4CC
;
}
.order-detail
.order-detail-steps
i
{
font-size
:
12px
;
}
.order-detail
.el-step__title.is-wait
,
.order-detail
.el-step__title.is-process
{
color
:
#333333
;
font-weight
:
normal
;
}
.order-detail
.el-step__description.is-process
{
color
:
#C0C4CC
;
}
.order-detail
.el-tabs__header
{
border
:
none
;
}
}
.order-detail
.el-dialog__body
{
.order-detail
.el-dialog__body
{
padding
:
30px
0
;
padding
:
0
;
}
}
.order-detail
.el-dialog__header
{
.order-detail
.el-dialog__header
{
background
:
#6C8BF8
;
background
:
#eef1fa
;
}
.order-detail
.el-dialog__header
.el-dialog__title
{
color
:
#5874d8
;
font-size
:
18px
;
}
}
.order-detail
.el-dialog__header
.el-dialog__title
,
.order-detail
.el-dialog__header
.el-dialog__headerbtn
i
{
.order-detail
.el-dialog__header
.el-dialog__headerbtn
i
{
color
:
#ffffff
;
color
:
#8F97A4
;
font-size
:
14px
;
}
}
.order-detail
.order-detail-tab
{
.order-detail
.order-detail-tab
{
margin-top
:
5px
;
margin-top
:
5px
;
...
@@ -214,13 +280,13 @@
...
@@ -214,13 +280,13 @@
height
:
54px
;
height
:
54px
;
}
}
.order-detail
.order-detail-request
.plus
{
.order-detail
.order-detail-request
.plus
{
border
:
1px
solid
#333
;
border
:
2px
solid
#999999
;
width
:
30px
;
width
:
30px
;
height
:
30px
;
height
:
30px
;
margin-top
:
10
px
;
margin-top
:
8
px
;
margin-left
:
20px
;
margin-left
:
20px
;
float
:
left
;
float
:
left
;
border-radius
:
5px
;
border-radius
:
5px
;
}
}
.order-detail
.order-detail-request
.plus
i
{
.order-detail
.order-detail-request
.plus
i
{
font-size
:
29px
;
font-size
:
29px
;
...
@@ -263,21 +329,81 @@
...
@@ -263,21 +329,81 @@
border-radius
:
50%
;
border-radius
:
50%
;
}
}
.order-detail
.order-detail-response
.right-response-text
{
.order-detail
.order-detail-response
.right-response-text
{
background
:
#ececed
;
/*margin-top: 4px;*/
margin-top
:
4px
;
/*padding: 8px 10px;*/
padding
:
8px
10px
;
max-width
:
380px
;
max-width
:
380px
;
float
:
right
;
float
:
right
;
border-radius
:
5px
;
border-radius
:
5px
;
}
.order-detail
.right_triangle_border
{
position
:
relative
;
}
.order-detail
.right_triangle_border
.popup
{
background
:
#eef1fa
;
padding
:
8px
10px
;
border-radius
:
4px
;
position
:
relative
;
top
:
0
;
right
:
0
;
font-size
:
12px
;
line-height
:
1.5
;
}
.order-detail
.right_triangle_border
.popup
span
{
display
:
block
;
width
:
0
;
height
:
0
;
border-width
:
5px
0
5px
5px
;
border-style
:
solid
;
border-color
:
transparent
transparent
transparent
#eef1fa
;
position
:
absolute
;
top
:
35%
;
right
:
-5px
;
}
}
.order-detail
.order-detail-response
.left-response-text
{
.order-detail
.order-detail-response
.left-response-text
{
background
:
#ececed
;
background
:
#ffffff
;
margin-top
:
4px
;
max-width
:
380px
;
padding
:
8px
10px
;
float
:
left
;
max-width
:
380px
;
color
:
#666666
;
float
:
left
;
border-radius
:
5px
;
}
}
.order-detail
.left_triangle_border
{
position
:
relative
;
}
.order-detail
.left_triangle_border
.popup
{
background
:
#ffffff
;
padding
:
8px
10px
;
border-radius
:
4px
;
position
:
relative
;
top
:
0
;
left
:
0
;
border
:
1px
solid
#e2e2e2
;
font-size
:
12px
;
line-height
:
1.5
;
}
.order-detail
.left_triangle_border
.popup
span
{
display
:
block
;
width
:
0
;
height
:
0
;
border-width
:
5px
5px
5px
0
;
border-style
:
solid
;
border-color
:
transparent
#e2e2e2
transparent
transparent
;
position
:
absolute
;
top
:
35%
;
left
:
4px
;
margin-left
:
-10px
;
}
.order-detail
.left_triangle_border
.popup
em
{
width
:
0
;
height
:
0
;
border-width
:
5px
5px
5px
0
;
border-style
:
solid
;
border-color
:
transparent
#ffffff
transparent
transparent
;
position
:
absolute
;
top
:
-5px
;
left
:
1px
;
margin-bottom
:
12px
;
}
.order-detail
.order-detail-response
.timestep
{
.order-detail
.order-detail-response
.timestep
{
font-size
:
12px
;
font-size
:
12px
;
color
:
#999
;
color
:
#999
;
...
@@ -319,8 +445,29 @@
...
@@ -319,8 +445,29 @@
background-color
:
#d3dce6
;
background-color
:
#d3dce6
;
}
}
.order-carousel
{
.order-carousel
{
width
:
260
px
;
height
:
135
px
;
margin
:
auto
;
margin
:
auto
;
padding
:
0
100px
;
position
:
relative
;
}
.order-carousel-content
{
/*width: 520px;*/
/*border: 1px solid #ececec;*/
margin
:
auto
;
height
:
135px
;
overflow
:
hidden
;
}
.order-carousel
i
:nth-child
(
1
)
{
position
:
absolute
;
left
:
0
;
top
:
35%
;
font-size
:
28px
;
}
.order-carousel
i
:nth-child
(
2
)
{
position
:
absolute
;
right
:
20px
;
top
:
35%
;
font-size
:
28px
;
}
}
/*******************************范围start******************************/
/*******************************范围start******************************/
.order-detail-tab
.tag
{
.order-detail-tab
.tag
{
...
@@ -378,7 +525,7 @@
...
@@ -378,7 +525,7 @@
width
:
3px
;
width
:
3px
;
height
:
20px
;
height
:
20px
;
left
:
0
;
left
:
0
;
top
:
20
px
;
top
:
18
px
;
background
:
#50B5FC
background
:
#50B5FC
}
}
.add-order-right
{
.add-order-right
{
...
@@ -437,7 +584,7 @@
...
@@ -437,7 +584,7 @@
.add-order-right
.add-order-content
form
.el-radio
{
.add-order-right
.add-order-content
form
.el-radio
{
margin-right
:
0
;
margin-right
:
0
;
}
}
.add-order-right
.add-order-content
form
.save
{
.add-order-right
.add-order-content
.save
{
background
:
#5774D8
;
background
:
#5774D8
;
color
:
#ffffff
;
color
:
#ffffff
;
width
:
115px
;
width
:
115px
;
...
@@ -449,6 +596,8 @@
...
@@ -449,6 +596,8 @@
font-family
:
PingFangSC-Medium
;
font-family
:
PingFangSC-Medium
;
font-weight
:
500
;
font-weight
:
500
;
color
:
#8F97A4
;
color
:
#8F97A4
;
line-height
:
1.6
;
margin-top
:
10px
;
}
}
.add-order-right
.add-order-content
.title
span
{
.add-order-right
.add-order-content
.title
span
{
color
:
#5B76D1
;
color
:
#5B76D1
;
...
@@ -479,4 +628,88 @@
...
@@ -479,4 +628,88 @@
.bt-center
{
.bt-center
{
text-align
:
center
;
text-align
:
center
;
margin-top
:
20px
;
margin-top
:
20px
;
}
/*******派单弹框start************/
.deliver-dialog
{
height
:
492px
;
}
.deliver-dialog
.el-dialog__header
{
background
:
#ffffff
;
padding-left
:
30px
;
}
.deliver-dialog
.el-dialog__header
.el-dialog__title
{
color
:
#5B76D1
;
font-size
:
24px
;
font-family
:
PingFangSC-Medium
;
font-weight
:
500
;
line-height
:
35px
}
.deliver-dialog
.el-dialog__header
.el-dialog__headerbtn
i
{
color
:
#8F97A4
;
font-size
:
14px
;
}
.deliver-dialog
.el-dialog__body
{
padding
:
30px
;
}
.deliver-dialog
.deliver-dialog-title
{
font-size
:
7px
;
font-family
:
PingFangSC-Medium
;
font-weight
:
500
;
color
:
rgba
(
143
,
151
,
164
,
1
);
line-height
:
35px
;
}
.deliver-dialog
select
{
}
.deliver-dialog
.el-input__inner
,
.deliver-dialog
.el-input
{
width
:
360px
;
height
:
36px
;
font-size
:
12px
;
}
.deliver-dialog
.bt-center
{
position
:
absolute
;
bottom
:
40px
;
left
:
0
;
right
:
0
;
}
.deliver-dialog
.bt-center
button
{
width
:
180px
;
border-clo
}
/*******派单弹框end************/
/*******确权结算************/
.beRighting-bt
{
position
:
absolute
;
bottom
:
20px
;
left
:
0
;
right
:
0
;
text-align
:
center
;
}
.beRighting-bt
button
{
width
:
180px
;
}
.beRighting-bt
button
:nth-child
(
1
)
{
margin-right
:
140px
;
}
.order-detail
.swiper-container
{
width
:
100%
;
height
:
100%
;
}
.order-detail
.swiper-slide
{
text-align
:
center
;
font-size
:
18px
;
background
:
#fff
;
/* Center slide text vertically */
display
:
-webkit-box
;
display
:
-ms-flexbox
;
display
:
-webkit-flex
;
display
:
flex
;
-webkit-box-pack
:
center
;
-ms-flex-pack
:
center
;
-webkit-justify-content
:
center
;
justify-content
:
center
;
-webkit-box-align
:
center
;
-ms-flex-align
:
center
;
-webkit-align-items
:
center
;
align-items
:
center
;
}
}
\ No newline at end of file
new/static/css/main.css
View file @
34ed3557
...
@@ -58,6 +58,9 @@ button,.el-button{
...
@@ -58,6 +58,9 @@ button,.el-button{
.firsttext_blue
{
.firsttext_blue
{
color
:
#5874d8
color
:
#5874d8
}
}
.firstborder_blue
{
border
:
1px
solid
#5874d8
;
}
.secondbackground_blue
{
.secondbackground_blue
{
background
:
#50b5fc
background
:
#50b5fc
}
}
...
@@ -116,7 +119,7 @@ button,.el-button{
...
@@ -116,7 +119,7 @@ button,.el-button{
.el-dialog__wrapper
{
.el-dialog__wrapper
{
overflow
:
hidden
!important
;
overflow
:
hidden
!important
;
}
}
.el-dialog__body
{
/*
.el-dialog__body{
padding:30px 0 !important;
padding:30px 0 !important;
}
}
.el-dialog__header{
.el-dialog__header{
...
@@ -124,7 +127,7 @@ button,.el-button{
...
@@ -124,7 +127,7 @@ button,.el-button{
}
}
.el-dialog__header .el-dialog__title, .el-dialog__header .el-dialog__headerbtn i{
.el-dialog__header .el-dialog__title, .el-dialog__header .el-dialog__headerbtn i{
color: #ffffff !important;
color: #ffffff !important;
}
}
*/
.header
{
.header
{
height
:
60px
;
height
:
60px
;
/*background:rgba(112,141,241,1);*/
/*background:rgba(112,141,241,1);*/
...
@@ -135,7 +138,10 @@ button,.el-button{
...
@@ -135,7 +138,10 @@ button,.el-button{
margin
:
auto
;
margin
:
auto
;
}
}
.header-logo
{
.header-logo
{
width
:
198px
;
height
:
100%
;
background
:
rgba
(
72
,
109
,
237
,
1
);
float
:
left
;
width
:
198px
;
height
:
100%
;
background
:
url('../images/logo-back.png')
;
background-size
:
100%
100%
;
float
:
left
;
}
}
.header-logo
img
{
.header-logo
img
{
margin-top
:
10px
;
margin-top
:
10px
;
...
@@ -235,4 +241,56 @@ ul .iconfont {
...
@@ -235,4 +241,56 @@ ul .iconfont {
background
:
rgb
(
113
,
194
,
85
);
background
:
rgb
(
113
,
194
,
85
);
top
:
5px
;
top
:
5px
;
left
:
0
;
left
:
0
;
}
.el-popover
{
min-width
:
80px
!important
;
padding
:
12px
0
!important
;
}
.el-popover
.popover-box
{
line-height
:
2.4
;
color
:
#8F97A4
;
}
.el-popover
.popover-box
div
{
cursor
:
pointer
;
padding-left
:
12px
;
}
.el-popover
.popover-box
div
:hover
{
background
:
#eef1fa
;
}
.line-left
{
position
:
relative
;
}
.line-left
:before
{
position
:
absolute
;
content
:
''
;
width
:
4px
;
height
:
16px
;
top
:
1px
;
left
:
20px
;
background
:
#50B5FC
;
}
.triangle-left
{
position
:
relative
;
}
.triangle-left
:before
{
position
:
absolute
;
content
:
""
;
width
:
20px
;
height
:
20px
;
left
:
0
;
background
:
red
;
}
/****表单样式************/
.el-form-item.is-required
:not
(
.is-no-asterisk
)
.el-form-item__label-wrap
>
.el-form-item__label
:before
,
.el-form-item.is-required
:not
(
.is-no-asterisk
)>
.el-form-item__label
:after
{
content
:
'*'
;
color
:
#F56C6C
;
margin-right
:
4px
;
}
.el-form-item.is-required
:not
(
.is-no-asterisk
)
.el-form-item__label-wrap
>
.el-form-item__label
:before
,
.el-form-item.is-required
:not
(
.is-no-asterisk
)>
.el-form-item__label
:before
{
content
:
''
;
}
.plain-bt
{
border
:
1px
solid
#5874d8
;
color
:
#5874d8
;
background
:
#f5f5f5
;
}
}
\ No newline at end of file
new/static/images/logo-back.png
0 → 100644
View file @
34ed3557
1.78 KB
new/static/images/order-set1.png
0 → 100644
View file @
34ed3557
1.09 KB
new/static/images/order-set2.png
0 → 100644
View file @
34ed3557
1.09 KB
new/static/js/jquery.js
0 → 100644
View file @
34ed3557
This diff is collapsed.
Click to expand it.
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