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
1fa21c47
Commit
1fa21c47
authored
Apr 21, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
111
parent
d05ea51b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
52 additions
and
5 deletions
+52
-5
rukudan.vue
src/components/Materialman/rukudan.vue
+15
-4
ListAssets.vue
src/components/approval/ListAssets.vue
+7
-0
assetsList.vue
src/components/assetsman/assetsList.vue
+19
-0
CheckDetails.vue
src/components/global/CheckDetails.vue
+7
-1
Login.vue
src/components/global/Login.vue
+1
-0
codePrint.vue
src/components/report/codePrint.vue
+3
-0
No files found.
src/components/Materialman/rukudan.vue
View file @
1fa21c47
...
@@ -187,7 +187,7 @@
...
@@ -187,7 +187,7 @@
<th>
物料名称
</th>
<th>
物料名称
</th>
<th>
分类名称
</th>
<th>
分类名称
</th>
<th>
品牌
</th>
<th>
品牌
</th>
<th
>
单价
</th>
<th
width=
"100px"
><span
class=
"cred"
>
*单价
</span>
</th>
<th
width=
"100px"
><span
class=
"cred"
>
*入库数量
</span></th>
<th
width=
"100px"
><span
class=
"cred"
>
*入库数量
</span></th>
<th
width=
"100px"
><span
class=
"cred"
>
*入库金额
</span></th>
<th
width=
"100px"
><span
class=
"cred"
>
*入库金额
</span></th>
<th
width=
"200px"
>
备注
</th>
<th
width=
"200px"
>
备注
</th>
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
<td>
{{item.SuppliesName}}
</td>
<td>
{{item.SuppliesName}}
</td>
<td>
{{item.CategoryName}}
</td>
<td>
{{item.CategoryName}}
</td>
<td>
{{item.BrandName}}
</td>
<td>
{{item.BrandName}}
</td>
<td>
{{item.UnitPrice}}
</td>
<td>
<el-input
@
input=
"UnitPriceChange(item,index)"
v-model=
"item.UnitPrice"
></el-input>
</td>
<td><el-input
@
input=
"NumberChange(item,index)"
v-model=
"item.Number"
></el-input></td>
<td><el-input
@
input=
"NumberChange(item,index)"
v-model=
"item.Number"
></el-input></td>
<td><el-input
@
input=
"MoneyChange(item,index)"
v-model=
"item.Money"
></el-input></td>
<td><el-input
@
input=
"MoneyChange(item,index)"
v-model=
"item.Money"
></el-input></td>
<td><el-input
v-model=
"item.Remark"
></el-input></td>
<td><el-input
v-model=
"item.Remark"
></el-input></td>
...
@@ -405,10 +405,21 @@ export default {
...
@@ -405,10 +405,21 @@ export default {
null
null
);
);
},
},
UnitPriceChange
(
item
,
index
){
if
(
item
.
Number
!=
'0'
&&
item
.
Number
!=
''
&&
item
.
UnitPrice
!=
'0'
&&
item
.
UnitPrice
!=
''
){
this
.
wlItemList
[
index
].
Money
=
(
Number
(
item
.
Number
)
*
Number
(
item
.
UnitPrice
)).
toFixed
(
2
);
}
this
.
addMsg
.
Money
=
0
;
this
.
wlItemList
.
forEach
(
x
=>
{
this
.
addMsg
.
Money
+=
Number
(
x
.
Money
)
})
this
.
$forceUpdate
()
},
NumberChange
(
item
,
index
){
NumberChange
(
item
,
index
){
item
.
Number
=
item
.
Number
.
replace
(
this
.
$commonUtils
.
Regex
.
isInteger
,
""
);
item
.
Number
=
item
.
Number
.
replace
(
this
.
$commonUtils
.
Regex
.
isInteger
,
""
);
if
(
item
.
Number
!=
'0'
&&
item
.
Number
!=
''
&&
item
.
Money
!=
'0'
&&
item
.
Money
!=
''
){
if
(
item
.
Number
!=
'0'
&&
item
.
Number
!=
''
&&
item
.
UnitPrice
!=
'0'
&&
item
.
UnitPrice
!=
''
){
this
.
wlItemList
[
index
].
UnitPrice
=
(
Number
(
item
.
Money
)
/
Number
(
item
.
Number
)).
toFixed
(
2
);
this
.
wlItemList
[
index
].
Money
=
(
Number
(
item
.
Number
)
*
Number
(
item
.
UnitPrice
)).
toFixed
(
2
);
}
}
this
.
addMsg
.
Money
=
0
;
this
.
addMsg
.
Money
=
0
;
...
...
src/components/approval/ListAssets.vue
View file @
1fa21c47
...
@@ -256,6 +256,13 @@ export default {
...
@@ -256,6 +256,13 @@ export default {
},
},
methods
:
{
methods
:
{
goCode
(){
goCode
(){
if
(
this
.
dateList
&&
this
.
dateList
.
length
>
0
)
{
this
.
msg
.
StartTime
=
this
.
dateList
[
0
];
this
.
msg
.
EndTime
=
this
.
dateList
[
1
];
}
else
{
this
.
msg
.
StartTime
=
""
;
this
.
msg
.
EndTime
=
""
;
}
let
msg
=
JSON
.
stringify
(
this
.
msg
)
let
msg
=
JSON
.
stringify
(
this
.
msg
)
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"/codePrint"
,
path
:
"/codePrint"
,
...
...
src/components/assetsman/assetsList.vue
View file @
1fa21c47
...
@@ -171,6 +171,9 @@
...
@@ -171,6 +171,9 @@
<el-tooltip
class=
"item"
effect=
"dark"
content=
"变更领用人"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"变更领用人"
placement=
"top"
>
<img
v-if=
"row.PropertyStatus == 2"
@
click=
"ChnagePeople(row)"
style=
"width:24px;height:24px"
src=
"../../assets/img/shbh.png"
alt=
""
/>
<img
v-if=
"row.PropertyStatus == 2"
@
click=
"ChnagePeople(row)"
style=
"width:24px;height:24px"
src=
"../../assets/img/shbh.png"
alt=
""
/>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看二维码"
placement=
"top"
>
<img
v-if=
"row.QRCode && row.QRCode!=''"
@
click=
"seeCode(row)"
style=
"width:24px;height:24px"
src=
"../../assets/img/pdsh.png"
alt=
""
/>
</el-tooltip>
</
template
>
</
template
>
</vxe-table-column>
</vxe-table-column>
</vxe-table>
</vxe-table>
...
@@ -551,6 +554,14 @@
...
@@ -551,6 +554,14 @@
</div>
</div>
</el-form>
</el-form>
</el-dialog>
</el-dialog>
<!-- 查看二维码 -->
<el-dialog
top=
"0"
title=
"资产二维码"
:visible
.
sync=
"codeState"
width=
"300px"
>
<div
style=
"text-align:center;padding:30px 0 40px 0"
>
<img
:src=
"imgUrl"
alt=
""
>
<p
class=
"f14"
>
{{codeNum}}
</p>
<p
class=
"f12"
style=
"color:#FF7874;margin-top:10px"
>
使用麦子助手扫一扫可快速盘点
</p>
</div>
</el-dialog>
</div>
</div>
</template>
</template>
...
@@ -566,6 +577,9 @@ export default {
...
@@ -566,6 +577,9 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
codeNum
:
''
,
imgUrl
:
''
,
codeState
:
false
,
changeState
:
false
,
changeState
:
false
,
changeMsg
:{
changeMsg
:{
EmployeeId
:
''
,
EmployeeId
:
''
,
...
@@ -714,6 +728,11 @@ export default {
...
@@ -714,6 +728,11 @@ export default {
this
.
getPropertyStatus
();
this
.
getPropertyStatus
();
},
},
methods
:
{
methods
:
{
seeCode
(
row
){
this
.
codeState
=
true
;
this
.
codeNum
=
row
.
PropertyNum
;
this
.
imgUrl
=
'http://property.oytour.com'
+
row
.
QRCode
;
},
ImportSee
(
path
){
ImportSee
(
path
){
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"/"
+
path
,
path
:
"/"
+
path
,
...
...
src/components/global/CheckDetails.vue
View file @
1fa21c47
...
@@ -24,7 +24,10 @@
...
@@ -24,7 +24,10 @@
<span
v-else
>
无
</span>
<span
v-else
>
无
</span>
</p>
</p>
</div>
</div>
<div
class=
"baseTitle"
>
基本信息
</div>
<div
class=
"CodeDiv"
>
<img
:src=
"'http://property.oytour.com'+datainfo.QRCode"
alt=
""
>
</div>
<div
class=
"baseTitle"
style=
"margin-top:20px;"
>
基本信息
</div>
<div
class=
"baseDiv"
>
<div
class=
"baseDiv"
>
<div
class=
"desItem"
>
<div
class=
"desItem"
>
<p>
资产名称
</p>
<p>
资产名称
</p>
...
@@ -236,6 +239,9 @@ export default {
...
@@ -236,6 +239,9 @@ export default {
</
script
>
</
script
>
<
style
>
<
style
>
.CheckDetails
.CodeDiv
{
float
:
right
;
}
.CheckDetails
.baseDiv
.desItem
:nth-child
(
3n
)
{
.CheckDetails
.baseDiv
.desItem
:nth-child
(
3n
)
{
margin-right
:
0
;
margin-right
:
0
;
}
}
...
...
src/components/global/Login.vue
View file @
1fa21c47
...
@@ -74,6 +74,7 @@ export default {
...
@@ -74,6 +74,7 @@ export default {
this
.
userInfo
.
EmPassword
=
"123456"
;
this
.
userInfo
.
EmPassword
=
"123456"
;
}
}
this
.
userInfo
.
Domain
=
window
.
location
.
hostname
this
.
userInfo
.
Domain
=
window
.
location
.
hostname
// this.userInfo.Domain = "zcyx.oytour.com";
},
},
Login
(){
Login
(){
if
(
this
.
userInfo
.
EmAccount
==
""
)
{
if
(
this
.
userInfo
.
EmAccount
==
""
)
{
...
...
src/components/report/codePrint.vue
View file @
1fa21c47
...
@@ -11,6 +11,9 @@
...
@@ -11,6 +11,9 @@
</li>
</li>
</ul>
</ul>
<div
v-show=
"tableData.length==0"
style=
"text-align:center;padding:100px 0"
class=
"f18"
>
暂无数据
</div>
</div>
</div>
<el-dialog
top=
"0"
title=
"资产详情"
:visible
.
sync=
"CheckDetailState"
width=
"1150px"
>
<el-dialog
top=
"0"
title=
"资产详情"
:visible
.
sync=
"CheckDetailState"
width=
"1150px"
>
<CheckDetails
ref=
"mychild"
></CheckDetails>
<CheckDetails
ref=
"mychild"
></CheckDetails>
...
...
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