Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
soss
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hooloo
web
soss
Commits
103de35c
Commit
103de35c
authored
May 19, 2022
by
lixiaomin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改页面
parent
0a9a8feb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
4 deletions
+22
-4
src/components/SelectMaterial/index.vue
+12
-2
src/views/goods/category/index.vue
+5
-1
src/views/goods/goods/index.vue
+5
-1
No files found.
src/components/SelectMaterial/index.vue
View file @
103de35c
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<el-table-column
label=
"原料数量"
align=
"center"
prop=
"quantity"
>
<el-table-column
label=
"原料数量"
align=
"center"
prop=
"quantity"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<div
style=
"display: flex;align-items: center;"
>
<div
style=
"display: flex;align-items: center;"
>
<el-input
v-model=
"scope.row.quantity"
placeholder=
"请输入原料数量"
/>
<el-input
v-model
.
number
=
"scope.row.quantity"
placeholder=
"请输入原料数量"
/>
<div
style=
"margin-left: 5px"
>
<div
style=
"margin-left: 5px"
>
<span>
{{
scope
.
row
.
unit
}}
</span>
<span>
{{
scope
.
row
.
unit
}}
</span>
</div>
</div>
...
@@ -101,12 +101,22 @@ export default {
...
@@ -101,12 +101,22 @@ export default {
let
subTag
=
true
;
let
subTag
=
true
;
this
.
ids
.
map
((
item
)
=>
{
this
.
ids
.
map
((
item
)
=>
{
if
(
!
item
.
quantity
){
if
(
!
item
.
quantity
){
subTag
=
false
;
let
name
=
item
.
name
;
let
name
=
item
.
name
;
this
.
$modal
.
msgSuccess
(
''
+
name
+
"原料名称的原料数量为空"
);
this
.
$modal
.
msgSuccess
(
''
+
name
+
"原料名称的原料数量为空"
);
return
;
return
;
}
else
{
// const regular = /^[+]{0,1}(\d+)$/ //正数 (不包括小数)
const
regular
=
/^
[
+
]{0,1}(\d
+
)
$|^
[
+
]{0,1}(\d
+
\.\d
+
)
$/
//正数(包括小数)
if
(
!
regular
.
test
(
item
.
quantity
))
{
this
.
$modal
.
msgSuccess
(
''
+
item
.
name
+
"原料名称的原料数量不是大于0的数字!"
)
subTag
=
false
;
return
;
}
}
}
});
});
console
.
log
(
"subTag"
,
subTag
);
if
(
subTag
){
if
(
subTag
){
this
.
$emit
(
this
.
$emit
(
"callback"
,
"callback"
,
...
...
src/views/goods/category/index.vue
View file @
103de35c
...
@@ -28,7 +28,11 @@
...
@@ -28,7 +28,11 @@
</el-row>
</el-row>
<el-table
v-loading=
"loading"
:data=
"classList"
>
<el-table
v-loading=
"loading"
:data=
"classList"
>
<el-table-column
label=
"分类名称"
align=
"center"
prop=
"name"
/>
<el-table-column
label=
"分类名称"
align=
"center"
prop=
"name"
>
<template
slot-scope=
"scope"
>
<a
@
click=
"handleUpdate(scope.row)"
style=
"color: blue"
>
{{
scope
.
row
.
name
}}
</a>
</
template
>
</el-table-column>
<el-table-column
label=
"编码"
align=
"center"
prop=
"code"
/>
<el-table-column
label=
"编码"
align=
"center"
prop=
"code"
/>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remarks"
/>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remarks"
/>
<el-table-column
label=
"商品数量"
align=
"center"
prop=
"goodsCount"
/>
<el-table-column
label=
"商品数量"
align=
"center"
prop=
"goodsCount"
/>
...
...
src/views/goods/goods/index.vue
View file @
103de35c
...
@@ -32,7 +32,11 @@
...
@@ -32,7 +32,11 @@
</el-row>
</el-row>
<PutShopOffShop
ref=
"putShopOffShop"
@
callback=
"getList"
/>
<PutShopOffShop
ref=
"putShopOffShop"
@
callback=
"getList"
/>
<el-table
v-loading=
"loading"
:data=
"spuList"
>
<el-table
v-loading=
"loading"
:data=
"spuList"
>
<el-table-column
label=
"商品名称"
align=
"center"
prop=
"name"
width=
"150"
/>
<el-table-column
label=
"商品名称"
align=
"center"
prop=
"name"
width=
"150"
>
<template
slot-scope=
"scope"
>
<a
@
click=
"handleUpdate(scope.row)"
style=
"color: blue"
>
{{
scope
.
row
.
name
}}
</a>
</
template
>
</el-table-column>
<el-table-column
label=
"编码"
align=
"center"
prop=
"code"
width=
"150"
/>
<el-table-column
label=
"编码"
align=
"center"
prop=
"code"
width=
"150"
/>
<el-table-column
label=
"缩略图"
align=
"center"
prop=
""
width=
"150"
>
<el-table-column
label=
"缩略图"
align=
"center"
prop=
""
width=
"150"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
...
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