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
e66f1eac
Commit
e66f1eac
authored
Oct 28, 2023
by
Marcus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增用途字段
https://zentao.test.jdshangmen.com/task-view-3029.html
parent
16534a56
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
15 deletions
+33
-15
Warehouse.vue
src/views/ecw/order/warehousing/components/Warehouse.vue
+33
-8
WarehouseRecordDetailItem.vue
...rder/warehousing/components/WarehouseRecordDetailItem.vue
+0
-7
No files found.
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @
e66f1eac
...
...
@@ -70,10 +70,19 @@
</el-checkbox-group>
</el-form-item>
</el-col>
</el-row
>
<el-col
:span=
"8"
>
<el-form-item
:label=
"$t('入仓时间')"
v-if=
"!edit"
>
<el-date-picker
v-model=
"form.inTime"
type=
"datetime"
:placeholder=
"$t('请选择入仓时间')"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-col>
<el-col
:span=
"16"
>
<el-form-item
:label=
"$t('用途')"
>
<el-checkbox-group
v-model=
"form.usageIds"
>
<el-checkbox
v-for=
"item in getDictDatas(DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE)"
:key=
"item.value"
:label=
"item.value"
>
{{ $l(item, 'label') }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-card
class=
"box-card"
>
...
...
@@ -289,10 +298,20 @@
</el-checkbox-group>
</el-form-item>
</el-col>
</el-row
>
<el-col
:span=
"8"
>
<el-form-item
:label=
"$t('入仓时间')"
>
<el-date-picker
v-model=
"form1.inTime"
type=
"datetime"
:placeholder=
"$t('请选择入仓时间')"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-col>
<el-col
:span=
"16"
>
<el-form-item
:label=
"$t('用途')"
>
<el-checkbox-group
v-model=
"form1.usageIds"
>
<el-checkbox
v-for=
"item in getDictDatas(DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE)"
:key=
"item.value"
:label=
"item.value"
>
{{ $l(item, 'label') }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-card
class=
"box-card"
>
...
...
@@ -671,7 +690,8 @@ export default {
type
:
undefined
,
feeType
:
undefined
,
recordMode
:
undefined
,
pictureUrls
:
[]
pictureUrls
:
[],
usageIds
:
[]
},
form1
:
{
table
:
[],
...
...
@@ -690,7 +710,8 @@ export default {
type
:
1
,
feeType
:
undefined
,
recordMode
:
undefined
,
pictureUrls
:
[]
pictureUrls
:
[],
usageIds
:
[]
},
brandList
:
[],
brandList1
:
[],
...
...
@@ -769,6 +790,7 @@ export default {
this
.
form
.
type
=
this
.
warehousing
.
type
this
.
form
.
feeType
=
this
.
warehousing
.
feeType
this
.
form
.
pictureUrls
=
this
.
warehousing
.
pictureUrls
this
.
form
.
usageIds
=
this
.
warehousing
.
usageIds
?.
split
(
'
,
'
)
||
[]
this
.
warehousing
.
orderWarehouseInBackItemDoList
.
forEach
(
e
=>
{
let
bg
=
{}
...
...
@@ -853,6 +875,7 @@ export default {
orderItemId
:
undefined
,
orderNo
:
this
.
warehousing
.
orderNo
,
warehouseInProdAttrIds
:
this
.
form1
.
warehouseInProdAttrIds
.
join
(
'
,
'
),
usageIds
:
this
.
form1
.
usageIds
.
join
(
'
,
'
),
orderWarehouseInItemDoList
:
this
.
form1
.
table
.
map
(
e
=>
{
return
{
...
e
,
...
...
@@ -900,6 +923,7 @@ export default {
weight
:
(
+
this
.
warehousing
.
weight
)?.
toFixed
(
2
)
||
''
,
prodId
:
this
.
form
.
prodId
,
warehouseInProdAttrIds
:
this
.
form
.
warehouseInProdAttrIds
.
join
(
'
,
'
),
usageIds
:
this
.
form
.
usageIds
.
join
(
'
,
'
),
"
orderWarehouseInUpdateItemDoList
"
:
this
.
form
.
table
.
map
(
e
=>
{
return
{
...
e
,
...
...
@@ -930,6 +954,7 @@ export default {
orderNo
:
this
.
warehousing
.
orderNo
,
isAppend
:
this
.
isAdd
?
true
:
undefined
,
warehouseInProdAttrIds
:
this
.
form
.
warehouseInProdAttrIds
.
join
(
'
,
'
),
usageIds
:
this
.
form
.
usageIds
.
join
(
'
,
'
),
orderWarehouseInItemDoList
:
this
.
form
.
table
.
map
(
e
=>
{
return
{
...
e
,
...
...
src/views/ecw/order/warehousing/components/WarehouseRecordDetailItem.vue
View file @
e66f1eac
...
...
@@ -43,13 +43,6 @@
<el-checkbox-group
v-model=
"usageIds"
>
<el-checkbox
v-for=
"item in getDictDatas(DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE)"
:key=
"item.value"
:label=
"item.value"
:disabled=
"readonly"
>
{{
$l
(
item
,
'
label
'
)
}}
</el-checkbox>
</el-checkbox-group>
<!--
<dict-selector
v-model=
"usageIds"
:type=
"DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE"
multiple
form-type=
"checkbox"
:disabled=
"readonly"
></dict-selector>
-->
</el-form-item>
</el-col>
</el-row>
...
...
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