Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
蒋勇
zhichan
Commits
1f224422
Commit
1f224422
authored
Dec 19, 2019
by
刘泽奇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
7eeac592
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
60 additions
and
33 deletions
+60
-33
igirl-channel-jdweb/app/front/entry/public/css/pagecom.css
+0
-0
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.html
+12
-9
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.js
+4
-0
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.css
+30
-12
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.html
+1
-1
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
+8
-7
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
+5
-4
No files found.
igirl-channel-jdweb/app/front/entry/public/css/pagecom.css
View file @
1f224422
This source diff could not be displayed because it is too large. You can
view the blob
instead.
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.html
View file @
1f224422
...
...
@@ -39,6 +39,13 @@
</el-option>
</el-select>
</div>
<div><span>
交付状态:
</span>
<el-select
v-model=
"checkedStatus"
placeholder=
"请选择"
>
<el-option
v-for=
"item in DeliveryStatus"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</el-select>
</div>
<div><span>
下单时间:
</span>
<div
class=
"block"
>
<span
class=
"demonstration"
></span>
...
...
@@ -54,13 +61,7 @@
<div><span>
申请人:
</span>
<el-input
v-model=
"name"
placeholder=
"请输入内容"
></el-input>
</div>
<div><span>
交付状态:
</span>
<el-select
v-model=
"checkedStatus"
placeholder=
"请选择"
>
<el-option
v-for=
"item in DeliveryStatus"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</el-select>
</div>
<!-- <div><span>付款状态:</span>
<el-select v-model="paymentStatus" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
...
...
@@ -118,7 +119,8 @@
<el-table-column
prop=
"nclOneCodes"
label=
"类别"
>
<template
slot-scope=
"scope"
>
<el-tooltip
placement=
"top"
:content=
"scope.row.nclOneCodes"
>
<p
solt=
"content"
>
{{scope.row.nclOneCodes ?\'第\'+scope.row.nclOneCodes+\'类\': "---"}}
<p
solt=
"content"
>
{{scope.row.nclOneCodes ?\'第\'+scope.row.nclOneCodes+\'类\': "---"}}
</p>
</el-tooltip>
</template>
...
...
@@ -150,7 +152,8 @@
<el-table-column
prop=
"deliveryStatusName"
label=
"交付状态"
class-name=
"dsqcl"
>
<template
slot-scope=
"scope"
>
<el-tooltip
placement=
"top"
:content=
"scope.row.deliveryStatusName"
>
<p
solt=
"content"
>
{{scope.row.deliveryStatusName ? scope.row.deliveryStatusName : \'---\'}}
<p
solt=
"content"
>
{{scope.row.deliveryStatusName ? scope.row.deliveryStatusName : \'---\'}}
</p>
</el-tooltip>
</template>
...
...
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.js
View file @
1f224422
...
...
@@ -31,6 +31,10 @@
],
DeliveryStatus
:
[
{
value
:
'dfwsfw'
,
label
:
'待服务商服务'
},
{
value
:
'dsccl'
,
label
:
'待上传材料'
},
...
...
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.css
View file @
1f224422
.wrapper-bg
{
.wrapper-bg
{
width
:
100%
;
background
:
rgb
(
236
,
238
,
243
);
}
.jdindentdetail-warpper
{
background
:
#fff
;
max-width
:
1320px
;
max-width
:
1320px
;
margin
:
0
auto
;
}
...
...
@@ -59,6 +60,12 @@
padding
:
0
20px
;
}
#selftmreg
.el-tag
{
margin
:
5px
0px
;
background
:
none
;
border-radius
:
0
;
}
.jdindentdetail-nav
{
box-sizing
:
border-box
;
padding-top
:
17px
;
...
...
@@ -518,38 +525,41 @@
.jdindentdetail-diag
.el-dialog__header
{
border-bottom
:
1px
solid
#E8E8E8
;
}
.jdindentdetail-warpper
.categoryFrom
.el-form-item__error
{
left
:
0
!important
;
}
}
.jdindentdetail-diag
.el-drawer__open
.el-drawer.rtl
{
.jdindentdetail-diag
.el-drawer__open
.el-drawer.rtl
{
width
:
66%
;
}
.jdindentdetail-drawer
.selftmreg_main
.el-form-item
{
.jdindentdetail-drawer
.selftmreg_main
.el-form-item
{
margin-bottom
:
20px
!important
;
}
.popannouncementsText
{
.popannouncementsText
{
line-height
:
26px
;
margin
:
0
auto
;
font-size
:
14px
;
font-family
:
PingFangSC-Regular
;
font-weight
:
400
;
color
:
rgba
(
74
,
74
,
74
,
1
);
color
:
rgba
(
74
,
74
,
74
,
1
);
width
:
100%
;
padding
:
0
20px
;
}
#steps
{
#steps
{
display
:
block
;
}
#steps
>
div
{
#steps
>
div
{
width
:
170px
;
}
.btnBottom
>
span
{
.btnBottom
>
span
{
position
:
absolute
;
bottom
:
0px
;
left
:
0px
;
...
...
@@ -560,11 +570,18 @@
border-top
:
1px
solid
#dee0ed
;
z-index
:
9999
;
}
.btnBottom
>
span
>
button
{
.btnBottom
>
span
>
button
{
border-radius
:
100px
!important
;
}
.el-dialog__wrapper
{
.el-dialog__wrapper
{
cursor
:
pointer
;
}
.eltag-item
{
margin
:
5px
0px
;
background
:
none
;
border-radius
:
0
;
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.html
View file @
1f224422
...
...
@@ -443,7 +443,7 @@
<br
/>
<br
/>
<span
v-for=
"(nclThree,index2) in nclone.nclThree"
>
<el-tag
key=
"nclThree.code"
closable=
"true"
<el-tag
class=
"eltag-item"
key=
"nclThree.code"
closable=
"true"
@
close=
"closeTag(nclThree,index,index2)"
>
{{nclThree.code}}
{{nclThree.name}}
...
...
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
View file @
1f224422
...
...
@@ -39,6 +39,13 @@
</el-option>
</el-select>
</div>
<div><span>
交付状态:
</span>
<el-select
v-model=
"checkedStatus"
placeholder=
"请选择"
>
<el-option
v-for=
"item in DeliveryStatus"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</el-select>
</div>
<div><span>
下单时间:
</span>
<div
class=
"block"
>
<span
class=
"demonstration"
></span>
...
...
@@ -54,13 +61,7 @@
<div><span>
申请人:
</span>
<el-input
v-model=
"name"
placeholder=
"请输入内容"
></el-input>
</div>
<div><span>
交付状态:
</span>
<el-select
v-model=
"checkedStatus"
placeholder=
"请选择"
>
<el-option
v-for=
"item in DeliveryStatus"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</el-select>
</div>
<!-- <div><span>付款状态:</span>
<el-select v-model="paymentStatus" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
...
...
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
View file @
1f224422
...
...
@@ -32,6 +32,10 @@
],
DeliveryStatus
:
[
{
value
:
'dfwsfw'
,
label
:
'待服务商服务'
},
{
value
:
'dsccl'
,
label
:
'待上传材料'
},
...
...
@@ -60,10 +64,7 @@
value
:
'ywc'
,
label
:
'已完成'
},
{
value
:
'dfwsfw'
,
label
:
'待服务商服务'
},
],
indentInfo
:
{
...
...
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