Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
assets
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
黄媛媛
assets
Commits
9a97c946
Commit
9a97c946
authored
Oct 15, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
c8b52fa4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
2028 additions
and
2097 deletions
+2028
-2097
chukudan.vue
src/components/Materialman/chukudan.vue
+757
-743
groupEmpowerMan.vue
src/components/approval/groupEmpowerMan.vue
+169
-168
BulkImport.vue
src/components/assetsman/BulkImport.vue
+225
-237
outboundApplication.vue
src/components/assetsman/outboundApplication.vue
+85
-94
outboundDetails.vue
src/components/assetsman/outboundDetails.vue
+227
-230
outboundOperate.vue
src/components/assetsman/outboundOperate.vue
+29
-30
wlDetails.vue
src/components/global/wlDetails.vue
+164
-156
AssetsRecord.vue
src/components/report/AssetsRecord.vue
+281
-351
codePrint.vue
src/components/report/codePrint.vue
+91
-86
main.js
src/main.js
+0
-1
config.js
src/router/config.js
+0
-1
No files found.
src/components/Materialman/chukudan.vue
View file @
9a97c946
This diff is collapsed.
Click to expand it.
src/components/approval/groupEmpowerMan.vue
View file @
9a97c946
...
@@ -4,8 +4,10 @@
...
@@ -4,8 +4,10 @@
<span
class=
"pageTitle"
>
授权管理
</span>
<span
class=
"pageTitle"
>
授权管理
</span>
<div
class=
"groupempowerman"
>
<div
class=
"groupempowerman"
>
<span
class=
"ChangeTable"
>
<span
class=
"ChangeTable"
>
<span
@
click=
"msg.type=2,msg.pageIndex=1,msg.Status=0,getList()"
:class=
"msg.type==2?'spanActive':''"
>
集团
</span>
<span
@
click=
"msg.type=2,msg.pageIndex=1,msg.Status=0,getList()"
<span
@
click=
"msg.type=1,msg.pageIndex=1,msg.Status=0,getList()"
:class=
"msg.type==1?'spanActive':''"
>
个人用户
</span>
:class=
"msg.type==2?'spanActive':''"
>
集团
</span>
<span
@
click=
"msg.type=1,msg.pageIndex=1,msg.Status=0,getList()"
:class=
"msg.type==1?'spanActive':''"
>
个人用户
</span>
</span>
</span>
<span
class=
"ChangeTable"
style=
"margin-Top:10px"
>
<span
class=
"ChangeTable"
style=
"margin-Top:10px"
>
<span
@
click=
"msg.Status=0,msg.pageIndex=1,getList()"
:class=
"msg.Status==0?'spanActive':''"
>
全部
</span>
<span
@
click=
"msg.Status=0,msg.pageIndex=1,getList()"
:class=
"msg.Status==0?'spanActive':''"
>
全部
</span>
...
@@ -24,8 +26,7 @@
...
@@ -24,8 +26,7 @@
</div>
</div>
<div
class=
"padContent groupempowerman_list"
>
<div
class=
"padContent groupempowerman_list"
>
<vxe-table
stripe
style=
"margin-top:15px"
:loading=
"loading"
<vxe-table
stripe
style=
"margin-top:15px"
:loading=
"loading"
:data=
"tableData"
>
:data=
"tableData"
>
<vxe-table-column
title=
"状态"
>
<vxe-table-column
title=
"状态"
>
<template
v-slot=
"
{ row }">
<template
v-slot=
"
{ row }">
<span
v-if=
"row.Status==1"
>
待审核
</span>
<span
v-if=
"row.Status==1"
>
待审核
</span>
...
@@ -33,7 +34,7 @@
...
@@ -33,7 +34,7 @@
<span
v-if=
"row.Status==3"
>
已拒绝
</span>
<span
v-if=
"row.Status==3"
>
已拒绝
</span>
</
template
>
</
template
>
</vxe-table-column>
</vxe-table-column>
<vxe-table-column
field=
"DomainName"
title=
"集团域名"
></vxe-table-column>
<vxe-table-column
field=
"DomainName"
title=
"集团域名"
></vxe-table-column>
<vxe-table-column
field=
"Account"
title=
"账户"
v-if=
'msg.type==1'
></vxe-table-column>
<vxe-table-column
field=
"Account"
title=
"账户"
v-if=
'msg.type==1'
></vxe-table-column>
<vxe-table-column
field=
"MallBaseName"
title=
"小程序名字"
v-if=
'msg.type==1'
></vxe-table-column>
<vxe-table-column
field=
"MallBaseName"
title=
"小程序名字"
v-if=
'msg.type==1'
></vxe-table-column>
<vxe-table-column
field=
"TenantName"
title=
"商户名称"
v-if=
'msg.type==1'
></vxe-table-column>
<vxe-table-column
field=
"TenantName"
title=
"商户名称"
v-if=
'msg.type==1'
></vxe-table-column>
...
@@ -53,72 +54,64 @@
...
@@ -53,72 +54,64 @@
</vxe-table-column>
</vxe-table-column>
</vxe-table>
</vxe-table>
<el-pagination
<el-pagination
@
current-change=
"currentChange"
background
:page-size=
"msg.pageSize"
layout=
"prev, pager, next"
@
current-change=
"currentChange"
:current-page
.
sync=
"msg.pageIndex"
:total=
"total"
>
background
:page-size=
"msg.pageSize"
layout=
"prev, pager, next"
:current-page
.
sync=
"msg.pageIndex"
:total=
"total"
>
</el-pagination>
</el-pagination>
</div>
</div>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
"@riophae/vue-treeselect/dist/vue-treeselect.css"
;
import
"@riophae/vue-treeselect/dist/vue-treeselect.css"
;
export
default
{
export
default
{
name
:
'groupEmpowerMan'
,
name
:
'groupEmpowerMan'
,
components
:
{
components
:
{
},
},
data
()
{
data
()
{
return
{
return
{
showTable
:
0
,
showTable
:
0
,
tableData
:
[],
tableData
:
[],
loading
:
false
,
loading
:
false
,
total
:
0
,
total
:
0
,
msg
:{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
15
,
pageSize
:
15
,
type
:
2
,
type
:
2
,
Status
:
0
Status
:
0
},
},
rules
:{
rules
:
{
AuditEmId
:
[
AuditEmId
:
[{
{
required
:
true
,
message
:
'请选择转交人'
,
trigger
:
'change'
}
required
:
true
,
]
message
:
'请选择转交人'
,
trigger
:
'change'
}]
},
},
}
}
},
},
created
()
{
created
()
{
},
},
mounted
(){
mounted
()
{
console
.
log
(
2
)
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
goUrl
(
path
)
{
goUrl
(
path
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"/"
+
path
,
path
:
"/"
+
path
,
query
:
{
query
:
{}
}
});
});
},
},
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apiJavaPost
(
"/api/Authorize/GetMaterialPageList"
,
this
.
msg
,
this
.
apiJavaPost
(
"/api/Authorize/GetMaterialPageList"
,
this
.
msg
,
res
=>
{
res
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
tableData
=
res
.
data
.
data
.
pageData
;
this
.
tableData
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
@@ -130,16 +123,19 @@ export default {
...
@@ -130,16 +123,19 @@ export default {
this
.
msg
.
pageIndex
=
val
;
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
this
.
getList
();
},
},
agree
(
row
)
{
agree
(
row
)
{
this
.
$confirm
(
"同意审核!"
,
"提示"
,
{
this
.
$confirm
(
"同意审核!"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
cancelButtonText
:
"取消"
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
apiJavaPost
(
"/api/Authorize/UpdateAuthorize"
,{
ID
:
row
.
ID
,
Status
:
2
},
this
.
apiJavaPost
(
"/api/Authorize/UpdateAuthorize"
,
{
ID
:
row
.
ID
,
Status
:
2
},
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
msg
.
Status
=
2
this
.
msg
.
Status
=
2
this
.
getList
();
this
.
getList
();
this
.
Success
(
res
.
data
.
message
)
this
.
Success
(
res
.
data
.
message
)
}
else
{
}
else
{
...
@@ -153,16 +149,19 @@ export default {
...
@@ -153,16 +149,19 @@ export default {
this
.
$message
.
info
(
'已取消审核!'
)
this
.
$message
.
info
(
'已取消审核!'
)
});
});
},
},
refuse
(
row
)
{
refuse
(
row
)
{
this
.
$confirm
(
"是否拒绝?"
,
"提示"
,
{
this
.
$confirm
(
"是否拒绝?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
cancelButtonText
:
"取消"
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
apiJavaPost
(
"/api/Authorize/UpdateAuthorize"
,{
ID
:
row
.
ID
,
Status
:
3
},
this
.
apiJavaPost
(
"/api/Authorize/UpdateAuthorize"
,
{
ID
:
row
.
ID
,
Status
:
3
},
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
msg
.
Status
=
3
this
.
msg
.
Status
=
3
this
.
getList
();
this
.
getList
();
this
.
Success
(
res
.
data
.
message
)
this
.
Success
(
res
.
data
.
message
)
}
else
{
}
else
{
...
@@ -178,18 +177,20 @@ export default {
...
@@ -178,18 +177,20 @@ export default {
}
}
},
},
}
}
</
script
>
</
script
>
<
style
scoped
>
<
style
scoped
>
.spotquery
{
.spotquery
{
box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
}
.groupempowerman
{
.groupempowerman
{
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
align-items
:
flex-start
;
align-items
:
flex-start
;
}
}
</
style
>
</
style
>
src/components/assetsman/BulkImport.vue
View file @
9a97c946
This diff is collapsed.
Click to expand it.
src/components/assetsman/outboundApplication.vue
View file @
9a97c946
...
@@ -27,26 +27,17 @@
...
@@ -27,26 +27,17 @@
</el-select>
</el-select>
</li>
</li>
<li>
<li>
<el-input
<el-input
class=
"w200"
size=
"small"
v-model=
"msg.GoodsName"
placeholder=
"商品名称"
class=
"w200"
@
keyup
.
enter
.
native=
"msg.pageIndex=1,getList()"
></el-input>
size=
"small"
v-model=
"msg.GoodsName"
placeholder=
"商品名称"
@
keyup
.
enter
.
native=
"msg.pageIndex=1,getList()"
></el-input>
</li>
</li>
<li>
<li>
<el-input
<el-input
class=
"w200"
size=
"small"
v-model=
"msg.OrderNo"
placeholder=
"订单号"
class=
"w200"
@
keyup
.
enter
.
native=
"msg.pageIndex=1,getList()"
></el-input>
size=
"small"
v-model=
"msg.OrderNo"
placeholder=
"订单号"
@
keyup
.
enter
.
native=
"msg.pageIndex=1,getList()"
></el-input>
</li>
</li>
</ul>
</ul>
<div
class=
"overflowY"
>
<div
class=
"overflowY"
>
<table
style=
"margin-top:10px"
class=
"myTable noHoverTable"
v-loading=
"loading"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<table
style=
"margin-top:10px"
class=
"myTable noHoverTable"
v-loading=
"loading"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<thead>
<thead>
<th
width=
"75"
>
申请状态
</th>
<th
width=
"75"
>
申请状态
</th>
<th
width=
"75"
>
小程序名称
</th>
<th
width=
"75"
>
小程序名称
</th>
...
@@ -54,8 +45,8 @@
...
@@ -54,8 +45,8 @@
<th
width=
"75"
>
订单号
</th>
<th
width=
"75"
>
订单号
</th>
<th
>
出库名称
</th>
<th
>
出库名称
</th>
<th
>
出库规格
</th>
<th
>
出库规格
</th>
<th
width=
"75"
>
出库数量
</th>
<th
width=
"75"
>
出库数量
</th>
<th
width=
"75"
>
出库状态
</th>
<th
width=
"75"
>
出库状态
</th>
...
@@ -65,8 +56,10 @@
...
@@ -65,8 +56,10 @@
</thead>
</thead>
<tbody>
<tbody>
<template
v-for=
"(item,index1) in tableData"
>
<template
v-for=
"(item,index1) in tableData"
>
<tr
:class=
"index==0?'trNobottom':''"
v-for=
"(delist,index) in item.WarehouseOutGoodsList"
::key=
"index + '-only'"
>
<tr
:class=
"index==0?'trNobottom':''"
v-for=
"(delist,index) in item.WarehouseOutGoodsList"
<td
:class=
"index1==tableData.length-1?'lastTdLeft':''"
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
::key=
"index + '-only'"
>
<td
:class=
"index1==tableData.length-1?'lastTdLeft':''"
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
<span
class=
"ColorSpan greenSpan"
v-if=
"item.ApplyStatus==1"
>
待
</span>
<span
class=
"ColorSpan greenSpan"
v-if=
"item.ApplyStatus==1"
>
待
</span>
<span
class=
"ColorSpan redSpan"
v-if=
"item.ApplyStatus==2"
>
已
</span>
<span
class=
"ColorSpan redSpan"
v-if=
"item.ApplyStatus==2"
>
已
</span>
<span
class=
"ColorSpan purpleSpan"
v-if=
"item.ApplyStatus==3"
>
拒
</span>
<span
class=
"ColorSpan purpleSpan"
v-if=
"item.ApplyStatus==3"
>
拒
</span>
...
@@ -74,11 +67,11 @@
...
@@ -74,11 +67,11 @@
<td
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
{{
item
.
MallBaseName
}}
</td>
<td
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
{{
item
.
MallBaseName
}}
</td>
<td
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
{{
item
.
TenantName
}}
</td>
<td
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
{{
item
.
TenantName
}}
</td>
<td
>
{{
delist
.
OrderNo
}}
</td>
<td
>
{{
delist
.
OrderNo
}}
</td>
<td
>
{{
delist
.
NewGoodsName
}}
</td>
<td
>
{{
delist
.
NewGoodsName
}}
</td>
<td
>
{{
delist
.
NewSpecification
}}
</td>
<td
>
{{
delist
.
NewSpecification
}}
</td>
<td
>
{{
delist
.
NewNumber
}}
</td>
<td
>
{{
delist
.
NewNumber
}}
</td>
<td
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
<td
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
...
@@ -88,13 +81,18 @@
...
@@ -88,13 +81,18 @@
</td>
</td>
<td
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
{{
item
.
CreateDateStr
}}
</td>
<td
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
{{
item
.
CreateDateStr
}}
</td>
<td
:class=
"index1==tableData.length-1?'lastTdRight':''"
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
<td
:class=
"index1==tableData.length-1?'lastTdRight':''"
:rowspan=
"item.WarehouseOutGoodsList.length"
v-if=
"index==0"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看详情"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看详情"
placement=
"top"
>
<img
@
click=
"SeeDetails(item,'/outboundDetails')"
style=
"width:24px;height:24px;margin-right:10px;"
src=
"../../assets/img/chakan.png"
alt=
""
/>
<img
@
click=
"SeeDetails(item,'/outboundDetails')"
style=
"width:24px;height:24px;margin-right:10px;"
src=
"../../assets/img/chakan.png"
alt=
""
/>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"出库"
placement=
"top"
v-if=
"item.ApplyStatus==2&&(item.OutStatus==0||item.OutStatus==1)"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"出库"
placement=
"top"
<img
@
click=
"goUrl('outboundOperate',item.ID)"
style=
"width:24px;height:24px;margin-right:10px;"
src=
"../../assets/img/chuk.png"
alt=
""
v-if=
"item.ApplyStatus==2&&(item.OutStatus==0||item.OutStatus==1)"
/>
v-if=
"item.ApplyStatus==2&&(item.OutStatus==0||item.OutStatus==1)"
>
<img
@
click=
"goUrl('outboundOperate',item.ID)"
style=
"width:24px;height:24px;margin-right:10px;"
src=
"../../assets/img/chuk.png"
alt=
""
v-if=
"item.ApplyStatus==2&&(item.OutStatus==0||item.OutStatus==1)"
/>
</el-tooltip>
</el-tooltip>
</td>
</td>
...
@@ -107,13 +105,8 @@
...
@@ -107,13 +105,8 @@
</tbody>
</tbody>
</table>
</table>
</div>
</div>
<el-pagination
class=
"myPageBottom"
<el-pagination
class=
"myPageBottom"
@
current-change=
"currentChange"
background
:page-size=
"msg.pageSize"
@
current-change=
"currentChange"
:current-page
.
sync=
"msg.pageIndex"
layout=
"prev, pager, next"
:total=
"total"
>
background
:page-size=
"msg.pageSize"
:current-page
.
sync=
"msg.pageIndex"
layout=
"prev, pager, next"
:total=
"total"
>
</el-pagination>
</el-pagination>
...
@@ -174,11 +167,11 @@
...
@@ -174,11 +167,11 @@
msg
:
{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
15
,
pageSize
:
15
,
SupplierId
:
0
,
SupplierId
:
0
,
ApplyStatus
:
0
,
ApplyStatus
:
0
,
OutStatus
:
-
1
,
OutStatus
:
-
1
,
GoodsName
:
''
,
GoodsName
:
''
,
OrderNo
:
''
,
OrderNo
:
''
,
},
},
Updatemsg
:
{
Updatemsg
:
{
ID
:
0
,
ID
:
0
,
...
@@ -192,18 +185,15 @@
...
@@ -192,18 +185,15 @@
},
},
mounted
()
{
mounted
()
{
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
SeeDetails
(
item
,
path
)
{
SeeDetails
(
item
,
path
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
path
,
path
:
path
,
query
:
{
query
:
{
ID
:
item
.
ID
ID
:
item
.
ID
}
}
});
});
},
},
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
...
@@ -213,7 +203,6 @@
...
@@ -213,7 +203,6 @@
res
=>
{
res
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
console
.
log
(
res
,
'resss'
);
this
.
tableData
=
res
.
data
.
data
.
pageData
;
this
.
tableData
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
}
else
{
...
@@ -222,7 +211,6 @@
...
@@ -222,7 +211,6 @@
},
},
null
null
);
);
},
},
currentChange
(
val
)
{
currentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
msg
.
pageIndex
=
val
;
...
@@ -257,11 +245,11 @@
...
@@ -257,11 +245,11 @@
},
},
//跳转
//跳转
goUrl
(
path
,
ID
)
{
goUrl
(
path
,
ID
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"/"
+
path
,
path
:
"/"
+
path
,
query
:
{
query
:
{
ID
:
ID
ID
:
ID
}
}
});
});
}
}
...
@@ -310,18 +298,21 @@
...
@@ -310,18 +298,21 @@
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
}
}
.outBand_div
{
width
:
24px
;
.outBand_div
{
height
:
24px
;
width
:
24px
;
height
:
24px
;
border-radius
:
6px
;
border-radius
:
6px
;
text-align
:
center
;
text-align
:
center
;
line-height
:
24px
;
line-height
:
24px
;
background-color
:
#D7D6FF
;
background-color
:
#D7D6FF
;
color
:
#7B78FF
;
color
:
#7B78FF
;
display
:
inline-block
;
display
:
inline-block
;
}
}
.outboundApplication
.vxe-cell
{
.outboundApplication
.vxe-cell
{
display
:
flex
;
display
:
flex
;
margin
:
5px
0
;
margin
:
5px
0
;
}
}
</
style
>
</
style
>
src/components/assetsman/outboundDetails.vue
View file @
9a97c946
<
template
>
<
template
>
<div
class=
"outboundDetails"
>
<div
class=
"outboundDetails"
>
<div
class=
"routerTitle"
>
<div
class=
"routerTitle"
>
<span
class=
"pageTitle"
>
出库详情
<span
@
click=
"Backto"
style=
"position:relative;top:-5px"
class=
"backTo"
>
返回
</span></span>
<span
class=
"pageTitle"
>
出库详情
<span
@
click=
"Backto"
style=
"position:relative;top:-5px"
<span
class=
"backTo"
>
返回
</span></span>
style=
"display:inline-flex;align-items:center;cursor: pointer;"
<span
style=
"display:inline-flex;align-items:center;cursor: pointer;"
class=
"f12 cd6"
>
class=
"f12 cd6"
>
<span
style=
"margin-right:5px"
></span>
<span
style=
"margin-right:5px"
></span>
</span>
</span>
...
@@ -68,13 +66,12 @@
...
@@ -68,13 +66,12 @@
<!-- #e2e2e2 -->
<!-- #e2e2e2 -->
<div>
<div>
<vxe-table
stripe
style=
"margin-top:15px"
:loading=
"loading"
<vxe-table
stripe
style=
"margin-top:15px"
:loading=
"loading"
:data=
"tableData.WarehouseOutGoodsList"
>
:data=
"tableData.WarehouseOutGoodsList"
>
<vxe-table-column
field=
"OrderNo"
title=
"订单号"
width=
'300'
></vxe-table-column>
<vxe-table-column
field=
"OrderNo"
title=
"订单号"
width=
'300'
></vxe-table-column>
<vxe-table-column
field=
"GoodsName"
title=
"商品名称"
></vxe-table-column>
<vxe-table-column
field=
"GoodsName"
title=
"商品名称"
></vxe-table-column>
<vxe-table-column
field=
"Specification"
title=
"规格"
width=
'250'
></vxe-table-column>
<vxe-table-column
field=
"Specification"
title=
"规格"
width=
'250'
></vxe-table-column>
<vxe-table-column
field=
"Number"
title=
"数量"
width=
'100'
>
</vxe-table-column>
<vxe-table-column
field=
"Number"
title=
"数量"
width=
'100'
>
</vxe-table-column>
<vxe-table-column
field=
"NewGoodsName"
title=
"出库商品"
></vxe-table-column>
<vxe-table-column
field=
"NewGoodsName"
title=
"出库商品"
></vxe-table-column>
<vxe-table-column
field=
"NewSpecification"
title=
"出库规格"
width=
'250'
></vxe-table-column>
<vxe-table-column
field=
"NewSpecification"
title=
"出库规格"
width=
'250'
></vxe-table-column>
<vxe-table-column
field=
"NewNumber"
title=
"出库数量"
width=
'100'
>
</vxe-table-column>
<vxe-table-column
field=
"NewNumber"
title=
"出库数量"
width=
'100'
>
</vxe-table-column>
<vxe-table-column
field=
"Name"
title=
"出库状态"
width=
'180'
>
<vxe-table-column
field=
"Name"
title=
"出库状态"
width=
'180'
>
...
@@ -92,11 +89,7 @@
...
@@ -92,11 +89,7 @@
</div>
</div>
<el-dialog
<el-dialog
:title=
"isagree==2?'同意申请':'拒绝申请'"
:close-on-click-modal=
"false"
top=
"0"
:visible
.
sync=
"dialogState"
:title=
"isagree==2?'同意申请':'拒绝申请'"
:close-on-click-modal=
"false"
top=
"0"
:visible
.
sync=
"dialogState"
width=
"400px"
>
width=
"400px"
>
<el-form
class=
"MyEditForm"
label-width=
"0"
>
<el-form
class=
"MyEditForm"
label-width=
"0"
>
<el-form-item
prop=
"Name"
style=
"margin-left:60px;"
>
<el-form-item
prop=
"Name"
style=
"margin-left:60px;"
>
...
@@ -113,24 +106,23 @@
...
@@ -113,24 +106,23 @@
</template>
</template>
<
script
>
<
script
>
import
"@riophae/vue-treeselect/dist/vue-treeselect.css"
;
import
"@riophae/vue-treeselect/dist/vue-treeselect.css"
;
export
default
{
export
default
{
name
:
"outboundDetails"
,
name
:
"outboundDetails"
,
data
()
{
data
()
{
return
{
return
{
loading
:
false
,
loading
:
false
,
tableData
:
[],
tableData
:
[],
morequery
:
false
,
morequery
:
false
,
Updatemsg
:
{
Updatemsg
:
{
ID
:
0
,
ID
:
0
,
ExamineReason
:
''
,
ExamineReason
:
''
,
ApplyStatus
:
0
ApplyStatus
:
0
},
},
total
:
0
,
total
:
0
,
isagree
:
1
,
//同意为2 拒绝为3
isagree
:
1
,
//同意为2 拒绝为3
dialogState
:
false
,
dialogState
:
false
,
};
};
},
},
mounted
()
{
mounted
()
{
...
@@ -138,7 +130,7 @@ export default {
...
@@ -138,7 +130,7 @@ export default {
},
},
methods
:
{
methods
:
{
Backto
()
{
Backto
()
{
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"/outboundApplication"
path
:
"/outboundApplication"
});
});
...
@@ -147,12 +139,13 @@ export default {
...
@@ -147,12 +139,13 @@ export default {
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apiJavaPost
(
this
.
apiJavaPost
(
"/api/WarehouseOut/GetWarehouseOutApply"
,
"/api/WarehouseOut/GetWarehouseOutApply"
,
{
{
ID
:
this
.
$route
.
query
.
ID
},
ID
:
this
.
$route
.
query
.
ID
},
res
=>
{
res
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
data
!=
null
)
{
if
(
res
.
data
.
data
!=
null
)
{
this
.
tableData
=
res
.
data
.
data
;
this
.
tableData
=
res
.
data
.
data
;
}
}
...
@@ -163,25 +156,21 @@ export default {
...
@@ -163,25 +156,21 @@ export default {
},
},
null
null
);
);
},
},
changeNum
(
row
,
val
){
changeNum
(
row
,
val
)
{
if
(
val
==
''
||
val
==
0
)
{
//当输入 空和0 的时候做的处理
if
(
val
==
''
||
val
==
0
){
//当输入 空和0 的时候做的处理
this
.
tableData
.
WarehouseOutGoodsList
.
forEach
(
x
=>
{
this
.
tableData
.
WarehouseOutGoodsList
.
forEach
(
x
=>
{
if
(
x
.
ID
==
row
.
ID
)
{
if
(
x
.
ID
==
row
.
ID
)
{
x
.
Number
=
1
x
.
Number
=
1
}
}
});
});
}
}
},
},
save
(){
//修改 出库数量保存
save
()
{
//修改 出库数量保存
console
.
log
(
this
.
tableData
)
this
.
apiJavaPost
(
this
.
apiJavaPost
(
"/api/WarehouseOut/UpdateOutGoods"
,
"/api/WarehouseOut/UpdateOutGoods"
,
this
.
tableData
,
this
.
tableData
,
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getList
();
this
.
getList
();
}
else
{
}
else
{
...
@@ -191,15 +180,15 @@ export default {
...
@@ -191,15 +180,15 @@ export default {
null
null
);
);
},
},
See
(
type
)
{
See
(
type
)
{
this
.
Updatemsg
.
ID
=
this
.
$route
.
query
.
ID
;
this
.
Updatemsg
.
ID
=
this
.
$route
.
query
.
ID
;
this
.
Updatemsg
.
ApplyStatus
=
type
;
this
.
Updatemsg
.
ApplyStatus
=
type
;
this
.
Updatemsg
.
ExamineReason
=
''
;
this
.
Updatemsg
.
ExamineReason
=
''
;
this
.
isagree
=
type
;
this
.
isagree
=
type
;
this
.
dialogState
=
true
this
.
dialogState
=
true
},
},
submitForm
()
{
submitForm
()
{
if
(
this
.
isagree
==
3
&&
this
.
Updatemsg
.
ExamineReason
.
length
==
0
)
{
if
(
this
.
isagree
==
3
&&
this
.
Updatemsg
.
ExamineReason
.
length
==
0
)
{
this
.
Error
(
'请填写理由'
);
this
.
Error
(
'请填写理由'
);
return
return
}
}
...
@@ -207,9 +196,8 @@ export default {
...
@@ -207,9 +196,8 @@ export default {
"/api/WarehouseOut/UpdateWarehouseOutApply"
,
"/api/WarehouseOut/UpdateWarehouseOutApply"
,
this
.
Updatemsg
,
this
.
Updatemsg
,
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
dialogState
=
false
;
this
.
dialogState
=
false
;
this
.
Backto
()
this
.
Backto
()
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
...
@@ -217,34 +205,38 @@ export default {
...
@@ -217,34 +205,38 @@ export default {
},
},
null
null
);
);
}
}
}
}
};
};
</
script
>
</
script
>
<
style
>
<
style
>
.outboundDetails
.MyEditForm
.baseform
.el-form-item
:nth-child
(
4n
)
{
.outboundDetails
.MyEditForm
.baseform
.el-form-item
:nth-child
(
4n
)
{
margin-right
:
0
;
margin-right
:
0
;
}
}
.outboundDetails
.zczt1
{
.outboundDetails
.zczt1
{
background
:
#ffe4d5
;
background
:
#ffe4d5
;
color
:
#ffa87c
;
color
:
#ffa87c
;
}
}
.outboundDetails
.zczt2
{
.outboundDetails
.zczt2
{
background
:
#beeff0
;
background
:
#beeff0
;
color
:
#089bab
;
color
:
#089bab
;
}
}
.outboundDetails
.zczt3
{
.outboundDetails
.zczt3
{
background
:
#ffd6d5
;
background
:
#ffd6d5
;
color
:
#ff7874
;
color
:
#ff7874
;
}
}
.outboundDetails
.zczt4
{
.outboundDetails
.zczt4
{
background
:
#d7d6ff
;
background
:
#d7d6ff
;
color
:
#7b78ff
;
color
:
#7b78ff
;
}
}
.outboundDetails
.Commonzczt
{
.outboundDetails
.Commonzczt
{
display
:
inline-block
;
display
:
inline-block
;
width
:
24px
;
width
:
24px
;
height
:
24px
;
height
:
24px
;
...
@@ -253,27 +245,32 @@ export default {
...
@@ -253,27 +245,32 @@ export default {
border-radius
:
50%
;
border-radius
:
50%
;
font-size
:
12px
;
font-size
:
12px
;
font-family
:
"Microsoft YaHei"
;
font-family
:
"Microsoft YaHei"
;
}
}
.outboundDetails
{
.outboundDetails
{
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
}
}
.outboundDetails
.topkuang
{
.outboundDetails
.topkuang
{
padding
:
5px
10px
;
padding
:
5px
10px
;
border
:
1px
solid
#e2e2e2
;
border
:
1px
solid
#e2e2e2
;
background
:
#e2e2e2
;
background
:
#e2e2e2
;
border-radius
:
15px
;
border-radius
:
15px
;
margin-right
:
25px
;
margin-right
:
25px
;
}
}
.outboundDetails
.xiangq
{
.outboundDetails
.xiangq
{
padding
:
15px
0
;
padding
:
15px
0
;
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
/* align-items: center; */
/* align-items: center; */
justify-content
:
space-between
;
justify-content
:
space-between
;
}
}
.outboundDetails
.butoons
{
.outboundDetails
.butoons
{
/* float: right; */
/* float: right; */
margin-right
:
10px
;
margin-right
:
10px
;
}
}
</
style
>
</
style
>
src/components/assetsman/outboundOperate.vue
View file @
9a97c946
...
@@ -15,19 +15,19 @@
...
@@ -15,19 +15,19 @@
.outbound_Main
.outbound_Gun
{
.outbound_Main
.outbound_Gun
{
width
:
100%
;
width
:
100%
;
}
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"outbound_Main"
>
<div
class=
"outbound_Main"
>
<div
class=
"routerTitle"
style=
"padding:17px 30px;"
>
<div
class=
"routerTitle"
style=
"padding:17px 30px;"
>
<span
class=
"pageTitle"
style=
"margin-top:-5px;"
>
商品出库
</span>
<span
class=
"pageTitle"
style=
"margin-top:-5px;"
>
商品出库
</span>
<span
@
click=
"sureOutband()"
class=
"chaxunSpan"
v-if=
"ISoperation == false"
>
确认出库
</span>
<span
@
click=
"sureOutband()"
class=
"chaxunSpan"
v-if=
"ISoperation == false"
>
确认出库
</span>
<span
class=
"chaxunSpan"
style=
" background:#909399;"
v-if=
"ISoperation == true"
>
确认出库
</span>
<span
class=
"chaxunSpan"
style=
" background:#909399;"
v-if=
"ISoperation == true"
>
确认出库
</span>
</div>
</div>
<ul
class=
"queryul"
style=
"margin-left:20px;"
>
<ul
class=
"queryul"
style=
"margin-left:20px;"
>
扫码出库
扫码出库
<li
style=
"min-width: 364px;"
>
<li
style=
"min-width: 364px;"
>
<el-input
ref=
"barCodeInput"
v-model=
"barCode"
placeholder=
"商品出库条码"
<el-input
ref=
"barCodeInput"
v-model=
"barCode"
placeholder=
"商品出库条码"
@
keyup
.
enter
.
native=
"payCode"
></el-input>
@
keyup
.
enter
.
native=
"payCode"
></el-input>
</li>
</li>
</ul>
</ul>
<div
class=
"outBound_Cont"
>
<div
class=
"outBound_Cont"
>
...
@@ -56,8 +56,8 @@
...
@@ -56,8 +56,8 @@
<vxe-table-column
title=
"操作"
>
<vxe-table-column
title=
"操作"
>
<
template
v-slot=
"{ row, rowIndex }"
>
<
template
v-slot=
"{ row, rowIndex }"
>
<img
@
click=
"delBound(row,rowIndex)"
style=
"width:24px;height:24px"
<img
@
click=
"delBound(row,rowIndex)"
style=
"width:24px;height:24px"
src=
"../../assets/img/delete.png"
src=
"../../assets/img/delete.png"
alt=
""
>
alt=
""
>
</
template
>
</
template
>
</vxe-table-column>
</vxe-table-column>
</vxe-table>
</vxe-table>
...
@@ -120,9 +120,9 @@
...
@@ -120,9 +120,9 @@
WarehouseId
:
0
,
WarehouseId
:
0
,
WarehouseOutGoodsDetailList
:
[]
WarehouseOutGoodsDetailList
:
[]
},
},
orderNum
:
0
,
orderNum
:
0
,
ISoperation
:
false
,
ISoperation
:
false
,
WarehouseList
:[]
WarehouseList
:
[]
};
};
},
},
mounted
()
{
mounted
()
{
...
@@ -142,10 +142,10 @@
...
@@ -142,10 +142,10 @@
this
.
msg
.
pageIndex
=
val
;
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
this
.
getList
();
},
},
getWarehouseL
(){
getWarehouseL
()
{
this
.
ISoperation
=
false
this
.
ISoperation
=
false
this
.
WarehouseList
.
forEach
(
x
=>
{
this
.
WarehouseList
.
forEach
(
x
=>
{
if
(
x
.
WarehouseId
==
this
.
msg
.
WarehouseId
)
{
if
(
x
.
WarehouseId
==
this
.
msg
.
WarehouseId
)
{
this
.
ISoperation
=
true
this
.
ISoperation
=
true
}
}
})
})
...
@@ -158,7 +158,6 @@
...
@@ -158,7 +158,6 @@
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getWareHouseList
=
res
.
data
.
data
;
this
.
getWareHouseList
=
res
.
data
.
data
;
console
.
log
(
res
,
'res'
);
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
@@ -167,11 +166,11 @@
...
@@ -167,11 +166,11 @@
);
);
},
},
//获取盘点仓库的列表
//获取盘点仓库的列表
getSuppliesCheckList
(){
getSuppliesCheckList
()
{
this
.
apiJavaPost
(
"/api/WarehouseOut/GetSuppliesCheckList"
,
{},
this
.
apiJavaPost
(
"/api/WarehouseOut/GetSuppliesCheckList"
,
{},
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
WarehouseList
=
res
.
data
.
data
&&
res
.
data
.
data
.
length
>
0
?
res
.
data
.
data
:
[]
this
.
WarehouseList
=
res
.
data
.
data
&&
res
.
data
.
data
.
length
>
0
?
res
.
data
.
data
:
[]
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
@@ -211,31 +210,31 @@
...
@@ -211,31 +210,31 @@
this
.
loadingSearch
=
false
;
this
.
loadingSearch
=
false
;
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
var
myData
=
res
.
data
.
data
.
GoodsModel
;
var
myData
=
res
.
data
.
data
.
GoodsModel
;
if
(
myData
)
{
if
(
myData
)
{
var
scanMsg
=
{};
var
scanMsg
=
{};
var
data2
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
tableData
));
var
data2
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
tableData
));
// 2021-4-1加的
// 2021-4-1加的
let
goon
=
true
let
goon
=
true
if
(
myData
.
ValidityId
>
0
&&
this
.
scanData
.
length
>
0
)
{
if
(
myData
.
ValidityId
>
0
&&
this
.
scanData
.
length
>
0
)
{
this
.
scanData
.
map
(
x
=>
{
this
.
scanData
.
map
(
x
=>
{
if
(
x
.
ValidityId
==
myData
.
ValidityId
)
{
if
(
x
.
ValidityId
==
myData
.
ValidityId
)
{
this
.
Error
(
"该商品重复扫码"
);
this
.
Error
(
"该商品重复扫码"
);
goon
=
false
goon
=
false
return
return
}
}
})
})
}
}
if
(
goon
==
false
){
//如果有相同的id 就不执行下面的内容
if
(
goon
==
false
)
{
//如果有相同的id 就不执行下面的内容
return
return
}
}
this
.
orderNum
=
0
;
this
.
orderNum
=
0
;
let
isUpdate
=
false
let
isUpdate
=
false
for
(
let
i
=
0
;
i
<
data2
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
data2
.
length
;
i
++
)
{
let
x
=
data2
[
i
];
let
x
=
data2
[
i
];
if
((
myData
.
GoodsId
==
x
.
NewGoodsId
)
&&
(
myData
.
SpecificationKey
==
x
.
NewSpecificationSort
))
{
if
((
myData
.
GoodsId
==
x
.
NewGoodsId
)
&&
(
myData
.
SpecificationKey
==
x
.
NewSpecificationSort
))
{
this
.
orderNum
++
;
this
.
orderNum
++
;
if
(
x
.
nowBound
<
x
.
NewNumber
)
{
if
(
x
.
nowBound
<
x
.
NewNumber
)
{
isUpdate
=
true
;
isUpdate
=
true
;
x
.
nowBound
++
;
x
.
nowBound
++
;
this
.
tableData
=
data2
;
this
.
tableData
=
data2
;
this
.
scanData
.
unshift
(
myData
);
this
.
scanData
.
unshift
(
myData
);
...
@@ -254,11 +253,11 @@
...
@@ -254,11 +253,11 @@
}
}
}
}
}
}
if
(
this
.
orderNum
>
0
&&
!
isUpdate
)
{
if
(
this
.
orderNum
>
0
&&
!
isUpdate
)
{
this
.
Error
(
"超过了出库数量"
);
this
.
Error
(
"超过了出库数量"
);
}
}
this
.
getorderNum
();
this
.
getorderNum
();
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
data
.
Msg
);
this
.
Error
(
res
.
data
.
data
.
Msg
);
}
}
}
else
{
}
else
{
...
@@ -269,8 +268,8 @@
...
@@ -269,8 +268,8 @@
null
null
);
);
},
},
getorderNum
(){
getorderNum
()
{
if
(
this
.
orderNum
==
0
)
{
if
(
this
.
orderNum
==
0
)
{
this
.
Error
(
'该商品未在出库列表中'
);
this
.
Error
(
'该商品未在出库列表中'
);
}
}
},
},
...
...
src/components/global/wlDetails.vue
View file @
9a97c946
...
@@ -94,51 +94,51 @@
...
@@ -94,51 +94,51 @@
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
name
:
''
,
name
:
''
,
data
()
{
data
()
{
return
{
return
{
imgDig
:
false
,
imgDig
:
false
,
msg
:
{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
5
,
pageSize
:
5
,
PropertyId
:
""
PropertyId
:
""
},
},
OperationList
:
[],
OperationList
:
[],
total
:
0
,
total
:
0
,
datainfo
:
{
datainfo
:
{
ImageList
:
[],
ImageList
:
[],
},
},
PropertyId
:
''
,
PropertyId
:
''
,
detailLoad
:
false
,
detailLoad
:
false
,
imgSrc
:
''
,
imgSrc
:
''
,
}
}
},
},
created
()
{
created
()
{
},
},
mounted
()
{
mounted
()
{
},
},
methods
:
{
methods
:
{
openImg
(
item
)
{
openImg
(
item
)
{
this
.
imgDig
=
true
;
this
.
imgDig
=
true
;
this
.
imgSrc
=
item
;
this
.
imgSrc
=
item
;
},
},
InitData
(
id
)
{
InitData
(
id
)
{
this
.
PropertyId
=
id
;
this
.
PropertyId
=
id
;
this
.
msg
.
PropertyId
=
id
;
this
.
msg
.
PropertyId
=
id
;
this
.
getDataInfo
();
this
.
getDataInfo
();
},
},
getDataInfo
()
{
getDataInfo
()
{
this
.
apiJavaPost
(
this
.
apiJavaPost
(
"/api/Supplies/GetMaterialInfo"
,
"/api/Supplies/GetMaterialInfo"
,
{
{
MaterialId
:
this
.
PropertyId
},
MaterialId
:
this
.
PropertyId
},
res
=>
{
res
=>
{
this
.
OperationLoad
=
false
;
this
.
OperationLoad
=
false
;
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
datainfo
=
res
.
data
.
data
;
this
.
datainfo
=
res
.
data
.
data
;
console
.
log
(
"this.datainfo"
,
this
.
datainfo
)
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
@@ -147,11 +147,12 @@ export default {
...
@@ -147,11 +147,12 @@ export default {
);
);
},
},
},
},
}
}
</
script
>
</
script
>
<
style
>
<
style
>
.wlDetails
.imgList
img
{
.wlDetails
.imgList
img
{
display
:
inline-block
;
display
:
inline-block
;
width
:
120px
;
width
:
120px
;
height
:
120px
;
height
:
120px
;
...
@@ -159,35 +160,42 @@ export default {
...
@@ -159,35 +160,42 @@ export default {
margin-right
:
30px
;
margin-right
:
30px
;
overflow
:
hidden
;
overflow
:
hidden
;
position
:
relative
;
position
:
relative
;
}
}
.wlDetails
.CodeDiv
{
.wlDetails
.CodeDiv
{
float
:
right
;
float
:
right
;
}
}
.wlDetails
.baseDiv
.desItem
:nth-child
(
3n
)
{
margin-right
:
10px
!important
;
.wlDetails
.baseDiv
.desItem
:nth-child
(
3n
)
{
}
margin-right
:
10px
!important
;
.wlDetails
.desItem
p
:first-child
{
}
.wlDetails
.desItem
p
:first-child
{
margin-bottom
:
4px
;
margin-bottom
:
4px
;
}
}
.wlDetails
.desItem
{
.wlDetails
.desItem
{
display
:
inline-block
;
display
:
inline-block
;
background
:
#fff
;
background
:
#fff
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
border-radius
:
10px
;
border-radius
:
10px
;
width
:
200px
;
width
:
200px
;
margin
:
10px
10px
0px
0
;
margin
:
10px
10px
0px
0
;
padding
:
6px
10px
;
padding
:
6px
10px
;
}
}
.wlDetails
.baseTitle
{
padding
:
5px
0
;
.wlDetails
.baseTitle
{
padding
:
5px
0
;
border-bottom
:
1px
dashed
#ccc
;
border-bottom
:
1px
dashed
#ccc
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
font-family
:
"PingFangR"
;
font-family
:
"PingFangR"
;
}
}
.wlDetails
.right
{
.wlDetails
.right
{
width
:
100%
;
width
:
100%
;
padding
:
0
10px
0
15px
;
padding
:
0
10px
0
15px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
}
</
style
>
</
style
>
src/components/report/AssetsRecord.vue
View file @
9a97c946
This diff is collapsed.
Click to expand it.
src/components/report/codePrint.vue
View file @
9a97c946
...
@@ -7,7 +7,8 @@
...
@@ -7,7 +7,8 @@
<img
v-if=
"item.QRCode && item.QRCode!=''"
:src=
"`$
{baseUrl}${item.QRCode}`" alt="">
<img
v-if=
"item.QRCode && item.QRCode!=''"
:src=
"`$
{baseUrl}${item.QRCode}`" alt="">
<img
v-else
style=
"width:99px;heigth:99px"
src=
"../../assets/img/noimg.png"
alt=
""
>
<img
v-else
style=
"width:99px;heigth:99px"
src=
"../../assets/img/noimg.png"
alt=
""
>
</div>
</div>
<p
style=
"position:relative;top:-10px"
><span
@
click=
"getCheckDes(item)"
class=
"underline"
>
{{
item
.
PropertyNum
}}
</span></p>
<p
style=
"position:relative;top:-10px"
><span
@
click=
"getCheckDes(item)"
class=
"underline"
>
{{
item
.
PropertyNum
}}
</span></p>
</li>
</li>
</ul>
</ul>
...
@@ -22,15 +23,15 @@
...
@@ -22,15 +23,15 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
CheckDetails
from
"@/components/global/CheckDetails.vue"
;
import
CheckDetails
from
"@/components/global/CheckDetails.vue"
;
export
default
{
export
default
{
name
:
"assetsList"
,
name
:
"assetsList"
,
components
:
{
components
:
{
CheckDetails
CheckDetails
},
},
data
()
{
data
()
{
return
{
return
{
baseUrl
:
'http://property.oytour.com'
,
baseUrl
:
'http://property.oytour.com'
,
CheckDetailState
:
false
,
CheckDetailState
:
false
,
currentPage
:
1
,
currentPage
:
1
,
...
@@ -48,23 +49,23 @@ export default {
...
@@ -48,23 +49,23 @@ export default {
StartTime
:
""
,
StartTime
:
""
,
EndTime
:
""
EndTime
:
""
},
},
PropertyId
:
''
,
PropertyId
:
''
,
};
};
},
},
mounted
()
{
mounted
()
{
if
(
this
.
$route
.
query
.
msg
)
{
if
(
this
.
$route
.
query
.
msg
)
{
this
.
msg
=
JSON
.
parse
(
this
.
$route
.
query
.
msg
);
this
.
msg
=
JSON
.
parse
(
this
.
$route
.
query
.
msg
);
}
}
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
getCheckDes
(
item
)
{
getCheckDes
(
item
)
{
this
.
PropertyId
=
item
.
Id
;
this
.
PropertyId
=
item
.
Id
;
this
.
CheckDetailState
=
true
;
this
.
CheckDetailState
=
true
;
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
$refs
.
mychild
.
InitData
(
this
.
PropertyId
);
this
.
$refs
.
mychild
.
InitData
(
this
.
PropertyId
);
},
10
)
},
10
)
},
},
getList
()
{
getList
()
{
delete
this
.
msg
.
pageIndex
;
delete
this
.
msg
.
pageIndex
;
...
@@ -75,7 +76,6 @@ export default {
...
@@ -75,7 +76,6 @@ export default {
this
.
msg
,
this
.
msg
,
res
=>
{
res
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
console
.
log
(
"res"
,
res
);
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
tableData
=
res
.
data
.
data
;
this
.
tableData
=
res
.
data
.
data
;
}
else
{
}
else
{
...
@@ -88,38 +88,43 @@ export default {
...
@@ -88,38 +88,43 @@ export default {
}
}
};
};
</
script
>
</
script
>
<
style
>
<
style
>
.codePrint
{
.codePrint
{
margin
:
0
;
margin
:
0
;
padding
:
0
;
padding
:
0
;
width
:
100%
;
width
:
100%
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
height
:
100%
;
height
:
100%
;
margin-top
:
10px
;
margin-top
:
10px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
page-break-after
:
always
;
page-break-after
:
always
;
position
:
absolute
;
position
:
absolute
;
}
}
.codeUl
{
.codeUl
{
width
:
100%
;
width
:
100%
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
page-break-after
:
always
;
page-break-after
:
always
;
}
}
.codeUl
li
{
.codeUl
li
{
display
:
inline-block
;
display
:
inline-block
;
width
:
200px
;
width
:
200px
;
text-align
:
center
;
text-align
:
center
;
font-size
:
12px
;
font-size
:
12px
;
}
}
.codeContent
{
.codeContent
{
width
:
1000px
;
width
:
1000px
;
margin
:
0
auto
;
margin
:
0
auto
;
border
:
1px
solid
#333333
;
border
:
1px
solid
#333333
;
padding
:
0
!important
;
padding
:
0
!important
;
}
}
</
style
>
</
style
>
src/main.js
View file @
9a97c946
...
@@ -38,7 +38,6 @@ Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
...
@@ -38,7 +38,6 @@ Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
Vue
.
filter
(
"YMD"
,
function
(
date
)
{
Vue
.
filter
(
"YMD"
,
function
(
date
)
{
return
moment
(
date
).
format
(
"YYYY-MM-DD"
);
return
moment
(
date
).
format
(
"YYYY-MM-DD"
);
})
})
Vue
.
filter
(
"MD"
,
function
(
date
)
{
Vue
.
filter
(
"MD"
,
function
(
date
)
{
...
...
src/router/config.js
View file @
9a97c946
...
@@ -6,7 +6,6 @@ import index from '../components/global/index'
...
@@ -6,7 +6,6 @@ import index from '../components/global/index'
export
default
{
export
default
{
routes
:
[
routes
:
[
{
{
path
:
'/login'
,
path
:
'/login'
,
name
:
'Login'
,
name
:
'Login'
,
...
...
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