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
875e8494
Commit
875e8494
authored
Sep 20, 2022
by
dcy
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
698de892
0481d232
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
13 deletions
+37
-13
index.vue
src/components/CustomerFollowList/index.vue
+2
-1
indexFutureBox.vue
src/views/ecw/box/indexFutureBox.vue
+7
-4
index.vue
src/views/ecw/customerComplaint/index.vue
+4
-0
index.vue
src/views/ecw/order/warehousing/index.vue
+2
-2
index.vue
src/views/ecw/productBrank/BrandForm/index.vue
+16
-3
index.vue
src/views/ecw/productBrank/index.vue
+6
-3
No files found.
src/components/CustomerFollowList/index.vue
View file @
875e8494
...
...
@@ -106,7 +106,8 @@ export default {
this
.
resetCustomerFollowForm
()
if
(
!!
this
.
customerId
)
getCustomerContactsListByCustomer
({
customerId
:
this
.
customerId
}).
then
(
r
=>
{
this
.
customerContactsList
=
r
.
data
this
.
customerFollow
.
form
.
customerId
=
this
.
customerId
this
.
$set
(
this
.
customerFollow
.
form
,
'
customerId
'
,
this
.
customerId
)
// this.customerFollow.form.customerId = this.customerId
})
listServiceUser
().
then
(
r
=>
{
this
.
serviceUserList
=
r
.
data
...
...
src/views/ecw/box/indexFutureBox.vue
View file @
875e8494
...
...
@@ -19,7 +19,7 @@
<el-option
v-for=
"item in importWarehouseList"
:label=
"item.titleZh"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
重置
</el-button>
...
...
@@ -82,7 +82,7 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog
:title=
"title"
:visible.sync=
"open"
width=
"500px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"
8
0px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"
12
0px"
>
<el-form-item
label=
"始发地"
prop=
"startWarehouseId"
>
<el-select
v-model=
"form.startWarehouseId"
placeholder=
"请选择始发地"
>
<el-option
v-for=
"item in exportWarehouseList"
:label=
"item.titleZh"
:value=
"item.id"
:key=
"item.id"
></el-option>
...
...
@@ -143,7 +143,7 @@ import { getChannelList } from '@/api/ecw/channel';
import
{
getWarehouseList
}
from
"
@/api/ecw/warehouse
"
export
default
{
name
:
"
FutureBox
"
,
name
:
"
index
FutureBox
"
,
components
:
{
},
data
()
{
...
...
@@ -187,7 +187,8 @@ export default {
// 表单校验
rules
:
{
},
warehouseList
:
[]
warehouseList
:
[],
channelList
:
[],
};
},
computed
:
{
...
...
@@ -224,6 +225,8 @@ export default {
}
},
created
()
{
// 查询渠道
getChannelList
().
then
((
res
)
=>
(
this
.
channelList
=
res
.
data
));
this
.
transportTypes
=
this
.
getDictDatas
(
this
.
DICT_TYPE
.
ECW_TRANSPORT_TYPE
).
filter
((
item
)
=>
item
.
value
==
"
1
"
||
item
.
value
==
"
2
"
);
...
...
src/views/ecw/customerComplaint/index.vue
View file @
875e8494
...
...
@@ -571,4 +571,8 @@ export default {
.formShow
div
{
flex
:
1
;
}
.dialog-footer
{
display
:
flex
;
flex-direction
:
row
!important
;
}
</
style
>
src/views/ecw/order/warehousing/index.vue
View file @
875e8494
...
...
@@ -106,8 +106,8 @@
<span
slot=
"append"
>
m³
</span>
</el-input>
</el-form-item>
<el-form-item
label=
"总
方数
量"
style=
"width: 300px"
>
<el-input
v-model=
"form.sumWeight"
placeholder=
"请输入总
数
量"
>
<el-form-item
label=
"总
重
量"
style=
"width: 300px"
>
<el-input
v-model=
"form.sumWeight"
placeholder=
"请输入总
重
量"
>
<span
slot=
"append"
>
kg
</span>
</el-input>
</el-form-item>
...
...
src/views/ecw/productBrank/BrandForm/index.vue
View file @
875e8494
...
...
@@ -8,7 +8,7 @@
<el-input
v-model=
"form.brandName"
placeholder=
"商标"
></el-input>
</el-form-item>
<el-form-item
:label=
"`商标$
{index + 1}分类`">
<el-select
v-model=
"form.productTypeId"
:placeholder=
"`请选择商标$
{index + 1}分类`" @change="form.productIds = [], updateValue()">
<el-select
v-model=
"form.productTypeId"
:placeholder=
"`请选择商标$
{index + 1}分类`" @change="form.productIds = [
0
], updateValue()">
<el-option
v-for=
"item in productTypeList"
:key=
"item.id"
...
...
@@ -19,7 +19,7 @@
</el-select>
</el-form-item>
<el-form-item
:label=
"`商标$
{index + 1}商品`">
<el-select
v-model=
"form.productIds"
:placeholder=
"`请选择商标$
{index + 1}商品`" multiple filterable @change="updateValue">
<el-select
v-model=
"form.productIds"
:placeholder=
"`请选择商标$
{index + 1}商品`" multiple filterable
clearable
@change="updateValue">
<el-option
v-for=
"item in getProductListByTypeId(form.productTypeId)"
:key=
"item.id"
...
...
@@ -73,9 +73,22 @@ export default {
},
methods
:
{
getProductListByTypeId
(
typeId
)
{
return
typeId
===
0
?
[]
:
this
.
productList
.
filter
((
p
)
=>
p
.
typeId
===
typeId
)
return
[
{
id
:
0
,
titleZh
:
'
全部
'
},
...(
typeId
===
0
?
[]
:
this
.
productList
.
filter
((
p
)
=>
p
.
typeId
===
typeId
))
]
},
// 删除商品0
delete0
(){
if
(
this
.
form
.
productIds
.
length
>
1
){
const
index
=
this
.
form
.
productIds
.
indexOf
(
0
)
if
(
index
!==
-
1
)
{
this
.
form
.
productIds
.
splice
(
index
,
1
)
}
}
},
updateValue
()
{
this
.
delete0
()
const
trademarkCategoryRelList
=
[]
this
.
form
.
productIds
.
forEach
(
productId
=>
{
trademarkCategoryRelList
.
push
({
...
...
src/views/ecw/productBrank/index.vue
View file @
875e8494
...
...
@@ -124,7 +124,7 @@
trademarkCategoryRelList: []
})"
>
添加商标
</el-button>
<div
slot=
"footer"
class=
"dialog-foo
ter"
>
<div
slot=
"footer"
style=
"text-align: cen
ter"
>
<el-button
type=
"primary"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
</div>
...
...
@@ -143,7 +143,6 @@ import {getProductList} from "@/api/ecw/product"
import
BrandForm
from
"
@/views/ecw/productBrank/BrandForm
"
import
Empower
from
"
@/views/ecw/productBrank/Empower
"
export
default
{
name
:
"
ProductBrank
"
,
components
:
{
...
...
@@ -182,6 +181,10 @@ export default {
form
:
{},
// 表单校验
rules
:
{
titleZh
:
[{
required
:
true
,
message
:
'
请输入品牌中文标题
'
,
trigger
:
"
blur
"
}],
titleEn
:
[{
required
:
true
,
message
:
'
请输入品牌英文标题
'
,
trigger
:
"
blur
"
}],
// aorder: [{ required: true, message: '请输入排序', trigger: "blur" }],
filing
:
[{
required
:
true
,
message
:
'
请选择是否备案
'
,
trigger
:
"
change
"
}],
},
recordStatus
:
getDictDatas
(
DICT_TYPE
.
BRAND_REG_TYPE
),
...
...
@@ -196,7 +199,7 @@ export default {
created
()
{
this
.
getList
();
getProductTypeList
().
then
(
r
=>
{
this
.
productTypeList
=
r
.
data
this
.
productTypeList
=
[{
id
:
0
,
titleZh
:
'
全部
'
},
...
r
.
data
]
})
getProductList
().
then
(
r
=>
{
this
.
productList
=
r
.
data
...
...
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