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
96fb5eef
Commit
96fb5eef
authored
Nov 13, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
“发货人”、“收货人”、“商品”搜索内容只需去除前后空格,中间有空格无需处理
parent
019d4da1
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
21 deletions
+23
-21
cargoControl.vue
src/views/ecw/order/cargoControl.vue
+3
-3
index.vue
src/views/ecw/order/exception/index.vue
+1
-3
index.vue
src/views/ecw/order/index.vue
+3
-3
penddingList.vue
src/views/ecw/order/penddingList.vue
+8
-4
stockingList.vue
src/views/ecw/order/stockingList.vue
+0
-3
warningCargoControl.vue
src/views/ecw/order/warningCargoControl.vue
+8
-5
No files found.
src/views/ecw/order/cargoControl.vue
View file @
96fb5eef
...
...
@@ -10,10 +10,10 @@
</el-input>
</el-form-item>
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-input
v-model.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'consignorKey')"
/>
<el-input
v-model.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
v-model.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'consigneeKey')"
/>
<el-input
v-model.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
:label=
"$t('控货状态')"
prop=
"isCargoControl"
>
<dict-selector
v-model=
"queryParams.cargoControlStatusList"
multiple
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
clearable
@
change=
"handleQuery"
/>
...
...
@@ -53,7 +53,7 @@
<el-input v-model="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
</el-form-item>-->
<el-form-item
:label=
"$t('商品') + ':'"
v-show=
"showSearch"
>
<el-input
v-model.trim=
"prodParam.value"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(prodParam, 'value')"
>
<el-input
v-model.trim=
"prodParam.value"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
>
<
template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_QUERY_PROD_FIELD"
defaultable
v-model=
"prodParam.key"
class=
"w-50"
/>
</
template
>
...
...
src/views/ecw/order/exception/index.vue
View file @
96fb5eef
...
...
@@ -31,7 +31,6 @@
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'consignorText')"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeText"
>
...
...
@@ -40,7 +39,6 @@
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'consigneeText')"
/>
</el-form-item>
<el-form-item
:label=
"$t('运输方式') + ':'"
v-show=
"showSearch"
>
...
...
@@ -211,7 +209,7 @@
v-model=
"queryParams.goodsNameKey"
/>
<product-selector
v-model=
"queryParams.goodsName"
v-model
.trim
=
"queryParams.goodsName"
style=
"flex: 1"
:clearable=
"true"
@
keyup.enter.native=
"handleQuery"
...
...
src/views/ecw/order/index.vue
View file @
96fb5eef
...
...
@@ -13,10 +13,10 @@
</el-form-item> -->
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-input
v-model.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'consignorKey')"
/>
<el-input
v-model.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
v-model.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'consigneeKey')"
/>
<el-input
v-model.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
:label=
"$t('控货')"
prop=
"isCargoControl"
v-show=
"showSearch"
>
...
...
@@ -63,7 +63,7 @@
</el-form-item> -->
<el-form-item
:label=
"$t('商品')"
prop=
"tidanNo"
v-show=
"showSearch"
>
<el-input
v-model.trim=
"prodParam.value"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(prodParam, 'value')"
>
<el-input
v-model.trim=
"prodParam.value"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
>
<
template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_QUERY_PROD_FIELD"
defaultable
v-model=
"prodParam.key"
class=
"w-50"
/>
</
template
>
...
...
src/views/ecw/order/penddingList.vue
View file @
96fb5eef
...
...
@@ -4,14 +4,14 @@
<!-- 搜索工作栏 -->
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"100px"
>
<el-form-item
:label=
"$t('编号')"
prop=
"orderNo"
>
<el-input
v-model=
"queryParams.numberKey"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/\s+/g, '
')"
/>
<el-input
v-model=
"queryParams.numberKey"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'numberKey
')"
/>
</el-form-item>
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-input
v-model
=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')
"
/>
<el-input
v-model
.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery
"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
v-model
=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')
"
/>
<el-input
v-model
.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery
"
/>
</el-form-item>
<el-form-item
:label=
"$t('客户经理')"
>
<user-selector
manage
v-model=
"queryParams.salesmanIds"
multiple
clearable
@
change=
"handleQuery"
...
...
@@ -685,6 +685,10 @@ export default {
this
.
AddressTown
=
data
;
})
}
},
// 自动去除空格
replaceSpace
(
obj
,
field
)
{
obj
[
field
]
=
obj
[
field
].
replace
(
/
\s
+/g
,
""
)
}
}
};
...
...
src/views/ecw/order/stockingList.vue
View file @
96fb5eef
...
...
@@ -19,7 +19,6 @@
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'consignorKey')"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
...
...
@@ -28,7 +27,6 @@
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'consigneeKey')"
/>
</el-form-item>
<el-form-item
:label=
"$t('客户经理')"
>
...
...
@@ -115,7 +113,6 @@
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'prodKey')"
/>
</el-form-item>
...
...
src/views/ecw/order/warningCargoControl.vue
View file @
96fb5eef
...
...
@@ -3,14 +3,14 @@
<!-- 搜索工作栏 -->
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"100px"
>
<el-form-item
:label=
"$t('订单编号')"
prop=
"orderNo"
>
<el-input
v-model
=
"queryParams.orderNo"
:placeholder=
"$t('订单编号')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/\s+/g, '
')"
/>
<el-input
v-model
.trim=
"queryParams.orderNo"
:placeholder=
"$t('订单编号')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'orderNo
')"
/>
</el-form-item>
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-input
v-model
=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
<el-input
v-model
.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
v-model
=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')
"
/>
<el-input
v-model
.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery
"
/>
</el-form-item>
<el-form-item
:label=
"$t('控货状态')"
prop=
"isCargoControl"
>
<dict-selector
v-model=
"queryParams.cargoControlStatusList"
multiple
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
clearable
@
change=
"handleQuery"
/>
...
...
@@ -46,7 +46,7 @@
</el-form-item>
<el-form-item
:label=
"$t('商品')"
prop=
"prodId"
v-show=
"showSearch"
>
<product-selector
v-model
=
"queryParams.prodId"
@
keyup.enter.native=
"handleQuery"
clearable
@
change=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')
"
/>
<product-selector
v-model
.trim=
"queryParams.prodId"
@
keyup.enter.native=
"handleQuery"
clearable
@
change=
"handleQuery
"
/>
</el-form-item>
<el-form-item
:label=
"$t('订单状态')"
prop=
"statusList"
v-show=
"showSearch"
>
...
...
@@ -351,7 +351,10 @@ export default {
this
.
loading
=
false
})
},
// 自动去除空格
replaceSpace
(
obj
,
field
)
{
obj
[
field
]
=
obj
[
field
].
replace
(
/
\s
+/g
,
""
)
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
page
=
1
...
...
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