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
40c6242f
Commit
40c6242f
authored
Nov 04, 2024
by
1483922988@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
6
parent
76798144
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
277 additions
and
238 deletions
+277
-238
order.js
src/api/ecw/order.js
+4
-6
startUnloading.vue
...ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
+2
-0
startUnloading.vue
...ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
+243
-226
customerFollow.vue
src/views/ecw/customer/components/customerFollow.vue
+2
-2
edit.vue
src/views/ecw/customer/edit.vue
+1
-1
edit.vue
src/views/ecw/offer/edit.vue
+24
-2
Warehouse.vue
src/views/ecw/order/warehousingTo/components/Warehouse.vue
+1
-1
No files found.
src/api/ecw/order.js
View file @
40c6242f
...
@@ -1074,9 +1074,8 @@ export function copyOrder(orderId) {
...
@@ -1074,9 +1074,8 @@ export function copyOrder(orderId) {
// 强制到仓
// 强制到仓
export
function
order_warehouse_check_force
(
data
)
{
export
function
order_warehouse_check_force
(
data
)
{
return
request
({
return
request
({
url
:
"
/order/order-warehouse-check/force
"
,
url
:
"
/order/order-warehouse-check/force/
"
+
data
.
orderId
,
method
:
"
post
"
,
method
:
"
post
"
data
})
})
}
}
...
@@ -1090,9 +1089,8 @@ export function order_warehouse_check_query(id) {
...
@@ -1090,9 +1089,8 @@ export function order_warehouse_check_query(id) {
// 撤销到仓
// 撤销到仓
export
function
order_warehouse_check_revoke
(
data
)
{
export
function
order_warehouse_check_revoke
(
data
)
{
return
request
({
return
request
({
url
:
"
/order/order-warehouse-check/revoke
"
,
url
:
"
/order/order-warehouse-check/revoke/
"
+
data
.
orderId
,
method
:
"
post
"
,
method
:
"
post
"
data
})
})
}
}
// 到仓修改
// 到仓修改
...
...
src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
View file @
40c6242f
...
@@ -301,11 +301,13 @@ export default {
...
@@ -301,11 +301,13 @@ export default {
order_warehouse_check_revoke
(
orderId
)
{
order_warehouse_check_revoke
(
orderId
)
{
this
.
$confirm
(
this
.
$t
(
"
确定要撤销到仓么?
"
)).
then
(
async
()
=>
{
this
.
$confirm
(
this
.
$t
(
"
确定要撤销到仓么?
"
)).
then
(
async
()
=>
{
let
r
=
await
order_warehouse_check_revoke
({
orderId
})
let
r
=
await
order_warehouse_check_revoke
({
orderId
})
this
.
getLoadGoodsList
()
})
})
},
},
order_warehouse_check_force
(
orderId
)
{
order_warehouse_check_force
(
orderId
)
{
this
.
$confirm
(
this
.
$t
(
"
确定要强制到仓么?
"
)).
then
(
async
()
=>
{
this
.
$confirm
(
this
.
$t
(
"
确定要强制到仓么?
"
)).
then
(
async
()
=>
{
let
r
=
await
order_warehouse_check_force
({
orderId
})
let
r
=
await
order_warehouse_check_force
({
orderId
})
this
.
getLoadGoodsList
()
})
})
},
},
getTotlContent
,
getTotlContent
,
...
...
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @
40c6242f
This diff is collapsed.
Click to expand it.
src/views/ecw/customer/components/customerFollow.vue
View file @
40c6242f
...
@@ -386,7 +386,7 @@ export default {
...
@@ -386,7 +386,7 @@ export default {
console
.
log
(
r
)
console
.
log
(
r
)
this
.
form
.
customerId
=
this
.
customerId
this
.
form
.
customerId
=
this
.
customerId
this
.
form
.
number
=
r
.
data
.
number
this
.
form
.
number
=
r
.
data
.
number
this
.
form
.
nu
bmerId
=
r
.
data
.
nubm
erId
this
.
form
.
nu
mberId
=
r
.
data
.
numb
erId
this
.
form
.
numberVersion
=
r
.
data
.
numberVersion
this
.
form
.
numberVersion
=
r
.
data
.
numberVersion
this
.
form
.
status
=
0
this
.
form
.
status
=
0
this
.
init
()
this
.
init
()
...
@@ -407,7 +407,7 @@ export default {
...
@@ -407,7 +407,7 @@ export default {
followTime
:
row
.
nextTime
,
followTime
:
row
.
nextTime
,
nextTime
:
""
,
nextTime
:
""
,
number
:
r
.
data
.
number
,
number
:
r
.
data
.
number
,
nu
bmerId
:
r
.
data
.
nubm
erId
,
nu
mberId
:
r
.
data
.
numb
erId
,
numberVersion
:
r
.
data
.
numberVersion
,
numberVersion
:
r
.
data
.
numberVersion
,
nextPlan
:
""
,
nextPlan
:
""
,
status
:
0
status
:
0
...
...
src/views/ecw/customer/edit.vue
View file @
40c6242f
src/views/ecw/offer/edit.vue
View file @
40c6242f
...
@@ -411,8 +411,9 @@
...
@@ -411,8 +411,9 @@
</div>
</div>
<div
class=
"form-section"
>
<div
class=
"form-section"
>
<el-form-item
:label=
"$t('竞争对手')"
prop=
"competitor"
>
<el-form-item
:label=
"$t('竞争对手')"
prop=
"competitor"
>
<el-select
clearable
v-model=
"form.competitor"
:placeholder=
"$t('请选择')"
class=
"w-200"
>
<el-select
clearable
v-model=
"form.competitor"
:placeholder=
"$t('请选择')"
class=
"w-200"
@
change=
"changeCompetitor"
>
<el-option
v-for=
"item in competitorList"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
/>
<el-option
v-for=
"item in competitorList"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
/>
<el-option
:label=
"$t('其他')"
:value=
"0"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('重要程度')"
prop=
"importance"
>
<el-form-item
:label=
"$t('重要程度')"
prop=
"importance"
>
...
@@ -563,7 +564,7 @@ import { getCustomerContactsSelect } from "@/api/ecw/customerContacts"
...
@@ -563,7 +564,7 @@ import { getCustomerContactsSelect } from "@/api/ecw/customerContacts"
import
Decimal
from
"
decimal.js
"
import
Decimal
from
"
decimal.js
"
import
getQuote
from
"
@/views/ecw/customer/index.vue
"
import
getQuote
from
"
@/views/ecw/customer/index.vue
"
import
{
getRegionList
}
from
"
@/api/ecw/order
"
import
{
getRegionList
}
from
"
@/api/ecw/order
"
import
{
competitorListAll
}
from
"
@/api/ecw/customer
"
import
{
competitorListAll
,
addCompetitor
}
from
"
@/api/ecw/customer
"
import
{
getCustomerContactsListByCustomer
}
from
"
@/api/ecw/customerContacts
"
import
{
getCustomerContactsListByCustomer
}
from
"
@/api/ecw/customerContacts
"
import
{
parse
}
from
"
querystring
"
import
{
parse
}
from
"
querystring
"
...
@@ -1435,6 +1436,27 @@ export default {
...
@@ -1435,6 +1436,27 @@ export default {
arr
.
push
(
tmp
)
arr
.
push
(
tmp
)
})
})
return
arr
return
arr
},
changeCompetitor
(
val
)
{
if
(
val
==
0
)
{
this
.
$prompt
(
"
请输入主要竞争对手
"
,
"
提示
"
,
{
confirmButtonText
:
"
确定
"
,
cancelButtonText
:
"
取消
"
}).
then
((
data
)
=>
{
console
.
log
(
data
)
addCompetitor
({
name
:
data
.
value
}).
then
((
r
)
=>
{
this
.
$message
.
success
(
"
添加成功!
"
)
competitorListAll
().
then
((
res
)
=>
{
this
.
competitorList
=
res
.
data
this
.
$nextTick
(()
=>
{
this
.
form
.
competitor
=
r
.
data
})
})
})
})
}
}
}
}
}
}
}
...
...
src/views/ecw/order/warehousingTo/components/Warehouse.vue
View file @
40c6242f
...
@@ -161,7 +161,7 @@
...
@@ -161,7 +161,7 @@
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('储位')"
prop=
"orderLocationBackVOList"
width=
"150px"
>
<el-table-column
:label=
"$t('储位')"
prop=
"orderLocationBackVOList"
width=
"150px"
>
<
template
v-slot=
"{ row, column, $index }"
>
<
template
v-slot=
"{ row, column, $index }"
>
<warehouse-area-select
v-if=
"visible"
v-model=
"form.table[$index].orderLocationBackVOList"
:order-id=
"orderId"
:order-item-id=
"warehousing.orderItemId"
:warehouse-in-id=
"form.table[$index].id"
:warehouse-id=
"warehouseId"
:is-editing=
"false"
></warehouse-area-select>
<warehouse-area-select
v-if=
"visible"
v-model=
"form.table[$index].orderLocationBackVOList"
:order-id=
"orderId"
:order-item-id=
"warehousing.orderItemId"
:warehouse-in-id=
"form.table[$index].id"
:warehouse-id=
"warehouseId"
:is-editing=
"false"
readonly
></warehouse-area-select>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('备注')"
>
<el-table-column
:label=
"$t('备注')"
>
...
...
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