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
1d29e338
Commit
1d29e338
authored
Sep 22, 2022
by
我在何方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
7c9c66a8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
19 deletions
+22
-19
creatPayment.vue
src/views/ecw/financial/creatPayment.vue
+1
-1
paymentVoucher.vue
src/views/ecw/financial/paymentVoucher.vue
+1
-1
receivable.vue
src/views/ecw/financial/receivable.vue
+1
-1
voucher.vue
src/views/ecw/financial/voucher.vue
+1
-1
index.vue
src/views/ecw/order/exception/index.vue
+18
-15
No files found.
src/views/ecw/financial/creatPayment.vue
View file @
1d29e338
...
@@ -736,7 +736,7 @@ export default {
...
@@ -736,7 +736,7 @@ export default {
};
};
</
script
>
</
script
>
<
style
>
<
style
scoped
>
.card
{
.card
{
margin-top
:
20px
;
margin-top
:
20px
;
}
}
...
...
src/views/ecw/financial/paymentVoucher.vue
View file @
1d29e338
...
@@ -330,7 +330,7 @@ export default {
...
@@ -330,7 +330,7 @@ export default {
}
;
}
;
<
/script
>
<
/script
>
<
style
>
<
style
scoped
>
.
card
{
.
card
{
margin
-
top
:
20
px
;
margin
-
top
:
20
px
;
}
}
...
...
src/views/ecw/financial/receivable.vue
View file @
1d29e338
...
@@ -319,7 +319,7 @@ export default {
...
@@ -319,7 +319,7 @@ export default {
};
};
</
script
>
</
script
>
<
style
>
<
style
scoped
>
.card
{
.card
{
margin-top
:
20px
;
margin-top
:
20px
;
}
}
...
...
src/views/ecw/financial/voucher.vue
View file @
1d29e338
...
@@ -384,7 +384,7 @@ export default {
...
@@ -384,7 +384,7 @@ export default {
}
;
}
;
<
/script
>
<
/script
>
<
style
>
<
style
scoped
>
.
card
{
.
card
{
margin
-
top
:
20
px
;
margin
-
top
:
20
px
;
}
}
...
...
src/views/ecw/order/exception/index.vue
View file @
1d29e338
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"100px"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"100px"
>
<el-row>
<el-row>
<el-form-item
>
<el-form-item
>
<el-select
v-model=
"queryParams.dateType"
style=
"width: 172px;"
>
<el-select
v-model=
"queryParams.dateType"
style=
"width: 172px;"
clearable
>
<el-option
:label=
"$t('入仓时间')"
value=
"1"
/>
<el-option
:label=
"$t('入仓时间')"
value=
"1"
/>
<el-option
:label=
"$t('处理时间')"
value=
"2"
/>
<el-option
:label=
"$t('处理时间')"
value=
"2"
/>
</el-select>
</el-select>
...
@@ -13,28 +13,28 @@
...
@@ -13,28 +13,28 @@
<el-date-picker
clearable
v-model=
"queryParams.endCreateTime"
value-format=
"yyyy-MM-dd HH:mm:ss"
format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetime"
:placeholder=
"$t('请选择结束日期')"
/>
<el-date-picker
clearable
v-model=
"queryParams.endCreateTime"
value-format=
"yyyy-MM-dd HH:mm:ss"
format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetime"
:placeholder=
"$t('请选择结束日期')"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('始发地:')"
>
<el-form-item
:label=
"$t('始发地:')"
>
<el-select
v-model=
"queryParams.originId"
:placeholder=
"$t('请选择始发地')"
>
<el-select
v-model=
"queryParams.originId"
:placeholder=
"$t('请选择始发地')"
clearable
>
<el-option
v-for=
"item in expoerCityList"
:label=
"$l(item, 'title')"
:value=
"item.id"
:key=
"item.id"
></el-option>
<el-option
v-for=
"item in expoerCityList"
:label=
"$l(item, 'title')"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('目的地:')"
>
<el-form-item
:label=
"$t('目的地:')"
>
<el-select
v-model=
"queryParams.destinationId"
:placeholder=
"$t('请选择目的地')"
>
<el-select
v-model=
"queryParams.destinationId"
:placeholder=
"$t('请选择目的地')"
clearable
>
<el-option
v-for=
"item in importCityList"
:label=
"$l(item, 'title')"
:value=
"item.id"
:key=
"item.id"
></el-option>
<el-option
v-for=
"item in importCityList"
:label=
"$l(item, 'title')"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('运输方式:')"
>
<el-form-item
:label=
"$t('运输方式:')"
>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model=
"queryParams.transportId"
formatter=
"number"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
:clearable=
"true"
v-model=
"queryParams.transportId"
/>
</el-form-item>
</el-form-item>
</el-row>
</el-row>
<el-row>
<el-row>
<el-form-item
:label=
"$t('控货:')"
>
<el-form-item
:label=
"$t('控货:')"
>
<dict-selector
:type=
"DICT_TYPE.ECW_YESNO"
v-model=
"queryParams.isCargoControl"
@
keyup.enter.native=
"handleQuery"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_YESNO"
:clearable=
"true"
v-model=
"queryParams.isCargoControl"
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('异常状态:')"
>
<el-form-item
:label=
"$t('异常状态:')"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_EXCEPTION_STATUS"
v-model=
"queryParams.orderExceptionStatus"
@
keyup.enter.native=
"handleQuery"
/>
<dict-selector
:type=
"DICT_TYPE.ORDER_EXCEPTION_STATUS"
:clearable=
"true"
v-model=
"queryParams.orderExceptionStatus"
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('异常类型:')"
>
<el-form-item
:label=
"$t('异常类型:')"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_ERROR_TYPE"
v-model=
"queryParams.orderExceptionType"
@
keyup.enter.native=
"handleQuery"
/>
<dict-selector
:type=
"DICT_TYPE.ORDER_ERROR_TYPE"
:clearable=
"true"
v-model=
"queryParams.orderExceptionType"
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('订单号:')"
>
<el-form-item
:label=
"$t('订单号:')"
>
<el-input
v-model=
"queryParams.orderNo"
:placeholder=
"$t('请输入订单号')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.orderNo"
:placeholder=
"$t('请输入订单号')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
...
@@ -42,21 +42,21 @@
...
@@ -42,21 +42,21 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-form-item
:label=
"$t('发货人:')"
>
<el-form-item
:label=
"$t('发货人:')"
>
<customer-selector
v-model=
"queryParams.consignor"
@
change=
"consignor = $event"
/>
<customer-selector
v-model=
"queryParams.consignor"
:clearable=
"true"
@
change=
"consignor = $event"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('唛头:')"
>
<el-form-item
:label=
"$t('唛头:')"
>
<el-input
v-model=
"queryParams.marks"
:placeholder=
"$t('请输入唛头')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.marks"
:placeholder=
"$t('请输入唛头')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('品名:')"
>
<el-form-item
:label=
"$t('品名:')"
>
<product-selector
v-model=
"queryParams.goodsName"
@
keyup.enter.native=
"handleQuery"
/>
<product-selector
v-model=
"queryParams.goodsName"
:clearable=
"true"
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('备案:')"
>
<el-form-item
:label=
"$t('备案:')"
>
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
v-model=
"queryParams.productRecord"
@
keyup.enter.native=
"handleQuery"
/>
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
:clearable=
"true"
v-model=
"queryParams.productRecord"
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
</el-row>
</el-row>
<el-row>
<el-row>
<el-form-item
:label=
"$t('跟进业务:')"
>
<el-form-item
:label=
"$t('跟进业务:')"
>
<el-select
v-model=
"queryParams.salesmanId"
:placeholder=
"$t('请选择跟进业务')"
>
<el-select
v-model=
"queryParams.salesmanId"
:placeholder=
"$t('请选择跟进业务')"
clearable
>
<el-option
v-for=
"item in creatorData"
:key=
"item.id"
:label=
"item.nickname"
:value=
"item.id"
/>
<el-option
v-for=
"item in creatorData"
:key=
"item.id"
:label=
"item.nickname"
:value=
"item.id"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
@@ -144,7 +144,8 @@
...
@@ -144,7 +144,8 @@
import
{
getOrderExceptionPage
}
from
"
@/api/ecw/orderException
"
import
{
getOrderExceptionPage
}
from
"
@/api/ecw/orderException
"
import
{
getTradeCityList
}
from
'
@/api/ecw/region
'
import
{
getTradeCityList
}
from
'
@/api/ecw/region
'
import
{
DICT_TYPE
}
from
'
@/utils/dict
'
import
{
DICT_TYPE
}
from
'
@/utils/dict
'
import
{
userList
}
from
"
@/api/system/user
"
// import { userList } from "@/api/system/user"
import
{
listServiceUser
}
from
"
@/api/system/user
"
import
CustomerSelector
from
'
@/components/CustomerSelector
'
import
CustomerSelector
from
'
@/components/CustomerSelector
'
import
ProductSelector
from
'
@/components/ProductSelector
'
import
ProductSelector
from
'
@/components/ProductSelector
'
...
@@ -176,7 +177,10 @@ export default {
...
@@ -176,7 +177,10 @@ export default {
created
()
{
created
()
{
this
.
getList
();
this
.
getList
();
getTradeCityList
().
then
(
res
=>
this
.
tradeCityList
=
res
.
data
)
getTradeCityList
().
then
(
res
=>
this
.
tradeCityList
=
res
.
data
)
userList
(
'
salesman
'
).
then
(
res
=>
this
.
creatorData
=
res
.
data
)
listServiceUser
().
then
(
r
=>
{
this
.
creatorData
=
r
.
data
})
// userList('salesman').then(res =>this.creatorData = res.data)
},
},
computed
:{
computed
:{
expoerCityList
(){
expoerCityList
(){
...
@@ -198,6 +202,7 @@ export default {
...
@@ -198,6 +202,7 @@ export default {
this
.
list
=
response
.
data
.
list
;
this
.
list
=
response
.
data
.
list
;
this
.
total
=
response
.
data
.
total
;
this
.
total
=
response
.
data
.
total
;
this
.
loading
=
false
;
this
.
loading
=
false
;
this
.
reset
()
});
});
},
},
/** 表单重置 */
/** 表单重置 */
...
@@ -206,14 +211,12 @@ export default {
...
@@ -206,14 +211,12 @@ export default {
page
:
1
,
page
:
1
,
rows
:
10
,
rows
:
10
,
};
};
this
.
resetForm
(
"
queryForm
"
);
},
},
importCityName
(
id
){
importCityName
(
id
){
return
this
.
tradeCityList
.
filter
(
item
=>
item
.
id
==
id
)
return
this
.
tradeCityList
.
filter
(
item
=>
item
.
id
==
id
)
},
},
/** 搜索按钮操作 */
/** 搜索按钮操作 */
handleQuery
()
{
handleQuery
()
{
this
.
queryParams
.
page
=
1
;
this
.
getList
();
this
.
getList
();
},
},
handEdit
(
id
){
handEdit
(
id
){
...
...
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