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
0b716b8c
Commit
0b716b8c
authored
Sep 11, 2024
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部分订单列表和待备货列表的bug
parent
0a22d053
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
11 deletions
+34
-11
index.vue
src/views/ecw/order/index.vue
+21
-3
stockingList.vue
src/views/ecw/order/stockingList.vue
+13
-8
No files found.
src/views/ecw/order/index.vue
View file @
0b716b8c
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
v-model.trim=
"noParam.value"
v-model.trim=
"noParam.value"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
clearable
clearable
@
input=
"replaceSpace(noParam, 'value')"
@
keyup.enter.native=
"handleQuery"
@
keyup.enter.native=
"handleQuery"
>
>
<template
slot=
"prepend"
>
<template
slot=
"prepend"
>
...
@@ -33,6 +34,7 @@
...
@@ -33,6 +34,7 @@
:placeholder=
"$t('发货人')"
:placeholder=
"$t('发货人')"
clearable
clearable
@
keyup.enter.native=
"handleQuery"
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'consignorKey')"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
...
@@ -41,6 +43,7 @@
...
@@ -41,6 +43,7 @@
:placeholder=
"$t('收货人')"
:placeholder=
"$t('收货人')"
clearable
clearable
@
keyup.enter.native=
"handleQuery"
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'consigneeKey')"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
""
>
<el-form-item
label=
""
>
...
@@ -166,7 +169,7 @@
...
@@ -166,7 +169,7 @@
:placeholder=
"$t('请输入商品类型、品名或品牌')"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
clearable
@
keyup.enter.native=
"handleQuery"
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'
')"
@
input=
"replaceSpace(prodParam, 'value
')"
>
>
<
template
slot=
"prepend"
>
<
template
slot=
"prepend"
>
<dict-selector
<dict-selector
...
@@ -218,6 +221,18 @@
...
@@ -218,6 +221,18 @@
@
change=
"handleQuery"
@
change=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"statusList"
>
<el-select
v-model=
"queryParams.hasConsignee"
:placeholder=
"$t('请选择')"
clearable
@
change=
"handleQuery"
>
<el-option
:label=
"$t('有')"
:value=
"1"
></el-option>
<el-option
:label=
"$t('无')"
:value=
"0"
></el-option>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('报关方式')"
prop=
"customsTypes"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('报关方式')"
prop=
"customsTypes"
v-show=
"showSearch"
>
<dict-selector
<dict-selector
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
...
@@ -262,10 +277,9 @@
...
@@ -262,10 +277,9 @@
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('外部仓')"
prop=
"
number
"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('外部仓')"
prop=
"
isExternalWarehouse
"
v-show=
"showSearch"
>
<el-select
<el-select
v-model=
"queryParams.isExternalWarehouse"
v-model=
"queryParams.isExternalWarehouse"
multiple
:placeholder=
"$t('请选择')"
:placeholder=
"$t('请选择')"
clearable
clearable
@
change=
"handleQuery"
@
change=
"handleQuery"
...
@@ -2199,6 +2213,10 @@ export default {
...
@@ -2199,6 +2213,10 @@ export default {
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"
./pending?id=
"
+
order
.
orderId
,
path
:
"
./pending?id=
"
+
order
.
orderId
,
});
});
},
// 自动去除空格
replaceSpace
(
obj
,
field
){
obj
[
field
]
=
obj
[
field
].
replace
(
/
\s
+/g
,
''
);
}
}
},
},
};
};
...
...
src/views/ecw/order/stockingList.vue
View file @
0b716b8c
...
@@ -5,29 +5,30 @@
...
@@ -5,29 +5,30 @@
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
>
<el-form-item
:label=
"$t('编号')"
prop=
"orderNo"
>
<el-form-item
:label=
"$t('编号')"
prop=
"orderNo"
>
<el-input
<el-input
v-model=
"queryParams.numberKey"
v-model
.trim
=
"queryParams.numberKey"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
clearable
clearable
@
keyup.enter.native=
"handleQuery"
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'numberKey')"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-input
<el-input
v-model=
"queryParams.consignorKey"
v-model
.trim
=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
:placeholder=
"$t('发货人')"
clearable
clearable
@
keyup.enter.native=
"handleQuery"
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'
')"
@
input=
"replaceSpace(queryParams, 'consignorKey
')"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
<el-input
v-model=
"queryParams.consigneeKey"
v-model
.trim
=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
:placeholder=
"$t('收货人')"
clearable
clearable
@
keyup.enter.native=
"handleQuery"
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'
')"
@
input=
"replaceSpace(queryParams, 'consigneeKey
')"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
""
>
<el-form-item
label=
""
>
...
@@ -117,12 +118,13 @@
...
@@ -117,12 +118,13 @@
</selector>
</selector>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('商品')"
prop=
"
tidanNo
"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('商品')"
prop=
"
prodKey
"
v-show=
"showSearch"
>
<el-input
<el-input
v-model.trim=
"queryParams.prodKey"
v-model.trim=
"queryParams.prodKey"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
clearable
@
keyup.enter.native=
"handleQuery"
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'prodKey')"
/>
/>
</el-form-item>
</el-form-item>
...
@@ -181,7 +183,7 @@
...
@@ -181,7 +183,7 @@
<el-form-item
:label=
"$t('备案属性')"
prop=
"productRecord"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('备案属性')"
prop=
"productRecord"
v-show=
"showSearch"
>
<dict-selector
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
v-model=
"queryParams.productRecord"
v-model=
"queryParams.productRecord
s
"
multiple
multiple
clearable
clearable
@
change=
"handleQuery"
@
change=
"handleQuery"
...
@@ -196,7 +198,7 @@
...
@@ -196,7 +198,7 @@
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('外部仓')"
prop=
"
number
"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('外部仓')"
prop=
"
isExternalWarehouse
"
v-show=
"showSearch"
>
<el-select
<el-select
v-model=
"queryParams.isExternalWarehouse"
v-model=
"queryParams.isExternalWarehouse"
:placeholder=
"$t('请选择')"
:placeholder=
"$t('请选择')"
...
@@ -836,6 +838,9 @@ export default {
...
@@ -836,6 +838,9 @@ export default {
this
.
AddressTown
=
data
;
this
.
AddressTown
=
data
;
})
})
}
}
},
replaceSpace
(
obj
,
field
){
obj
[
field
]
=
obj
[
field
].
replace
(
/
\s
+/g
,
''
);
}
}
},
},
};
};
...
...
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