Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-app-operator-master
Commits
9f8dd866
Commit
9f8dd866
authored
Nov 05, 2022
by
我在何方
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator
into dev
parents
23c91796
2831f0bd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
edit.vue
src/views/ecw/customer/edit.vue
+11
-0
edit.vue
src/views/ecw/order/edit.vue
+1
-0
edit.vue
src/views/ecw/productAttr/edit.vue
+1
-1
No files found.
src/views/ecw/customer/edit.vue
View file @
9f8dd866
...
@@ -657,6 +657,17 @@ export default {
...
@@ -657,6 +657,17 @@ export default {
const
form
=
{...
this
.
form
,
type
:
this
.
form
.
type
?.
join
(
'
,
'
),
taxRate
:
Number
(
this
.
form
.
taxRate
)}
const
form
=
{...
this
.
form
,
type
:
this
.
form
.
type
?.
join
(
'
,
'
),
taxRate
:
Number
(
this
.
form
.
taxRate
)}
// 检查路线是否启用了但是没选择目的仓
let
errors
=
0
form
.
customerLines
.
forEach
(
line
=>
{
if
(
!
line
.
objectiveIds
||
line
.
objectiveIds
==
''
){
errors
++
}
})
if
(
errors
){
return
this
.
$message
.
error
(
'
有两条路线未选择目的地
'
)
}
// 修改的提交
// 修改的提交
if
(
this
.
form
.
id
!=
null
)
{
if
(
this
.
form
.
id
!=
null
)
{
this
.
form
.
customerContacts
.
forEach
(
e
=>
{
this
.
form
.
customerContacts
.
forEach
(
e
=>
{
...
...
src/views/ecw/order/edit.vue
View file @
9f8dd866
...
@@ -529,6 +529,7 @@ export default {
...
@@ -529,6 +529,7 @@ export default {
},
},
data
()
{
data
()
{
let
validatorPositiveNumber
=
(
rule
,
value
,
callback
)
=>
{
let
validatorPositiveNumber
=
(
rule
,
value
,
callback
)
=>
{
if
(
!
value
||
value
==
''
)
return
callback
();
if
(
!
value
)
return
callback
(
new
Error
(
'
请输入数字
'
))
if
(
!
value
)
return
callback
(
new
Error
(
'
请输入数字
'
))
if
(
!
Number
(
value
))
return
callback
(
new
Error
(
'
请输入有效数字
'
))
if
(
!
Number
(
value
))
return
callback
(
new
Error
(
'
请输入有效数字
'
))
let
reg
=
/
((
^
[
1-9
]\d
*
)
|^0
)(\.\d
*
){0,1}
$/
;
let
reg
=
/
((
^
[
1-9
]\d
*
)
|^0
)(\.\d
*
){0,1}
$/
;
...
...
src/views/ecw/productAttr/edit.vue
View file @
9f8dd866
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<dict-selector
:type=
"DICT_TYPE.ECW_PACKAGING_TYPE"
v-model=
"form.packaging"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_PACKAGING_TYPE"
v-model=
"form.packaging"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('是否预约入仓')"
prop=
"needBook"
>
<el-form-item
:label=
"$t('是否预约入仓')"
prop=
"needBook"
>
<dict-selector
form
atter=
"bool"
form-type=
"radio"
:type=
"DICT_TYPE.ECW_YESNO"
v-model=
"form.needBook"
:formater=
"Boolean
"
/>
<dict-selector
form
-type=
"radio"
:type=
"DICT_TYPE.ECW_YESNO"
v-model=
"form.needBook"
formatter=
"number
"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('每日入仓上限')"
prop=
"dayLimit"
v-if=
"form.needBook"
>
<el-form-item
:label=
"$t('每日入仓上限')"
prop=
"dayLimit"
v-if=
"form.needBook"
>
<el-input
placeholder=
""
v-model=
"form.dayLimit"
class=
"w-200"
>
<el-input
placeholder=
""
v-model=
"form.dayLimit"
class=
"w-200"
>
...
...
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