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
bf7028b8
Commit
bf7028b8
authored
Oct 30, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复几个bug
parent
c3bac476
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
9 deletions
+11
-9
index.vue
src/components/ProductsSelector/index.vue
+3
-3
index.vue
src/components/QuickCreateCustomer/index.vue
+6
-4
detail.vue
src/views/ecw/order/detail.vue
+1
-1
edit.vue
src/views/ecw/order/edit.vue
+1
-1
No files found.
src/components/ProductsSelector/index.vue
View file @
bf7028b8
...
@@ -13,13 +13,13 @@
...
@@ -13,13 +13,13 @@
<el-button
type=
"primary"
@
click=
"reLoad"
>
{{
$t
(
'
搜索
'
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"reLoad"
>
{{
$t
(
'
搜索
'
)
}}
</el-button>
<div
v-if=
"showAll"
>
<div
v-if=
"showAll"
>
<el-checkbox
:label=
"$t('全选(最多500)')"
@
change=
"toggleAll"
></el-checkbox>
<el-checkbox
:label=
"$t('全选(最多500)')"
@
change=
"toggleAll"
:disabled=
"isAllProduct"
></el-checkbox>
<el-checkbox
:label=
"$t('全选库内商品(共
{cnt}个)', {cnt: total})" v-model="isAllProduct">
</el-checkbox>
<el-checkbox
:label=
"$t('全选库内商品(共
{cnt}个)', {cnt: total})" v-model="isAllProduct">
</el-checkbox>
</div>
</div>
</div>
</div>
<div
class=
"list"
>
<div
class=
"list"
>
<div
class=
"item"
v-for=
"item in list"
:key=
"item.id"
>
<div
class=
"item"
v-for=
"item in list"
:key=
"item.id"
>
<el-checkbox
@
change=
"toggleCheck(item, $event)"
:value=
"ids.indexOf(item.id) > -1"
/>
{{
item
.
titleZh
}}
<el-checkbox
@
change=
"toggleCheck(item, $event)"
:value=
"ids.indexOf(item.id) > -1"
:disabled=
"isAllProduct"
/>
{{
item
.
titleZh
}}
<div>
{{
item
.
titleEn
}}
</div>
<div>
{{
item
.
titleEn
}}
</div>
</div>
</div>
</div>
</div>
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<
/div
>
<
/div
>
<
div
class
=
"
list
"
>
<
div
class
=
"
list
"
>
<
div
class
=
"
item
"
v
-
for
=
"
(choosed) in choosedList
"
:
key
=
"
choosed.id
"
:
data
-
data
=
"
JSON.stringify(choosed)
"
>
<
div
class
=
"
item
"
v
-
for
=
"
(choosed) in choosedList
"
:
key
=
"
choosed.id
"
:
data
-
data
=
"
JSON.stringify(choosed)
"
>
<
el
-
link
class
=
"
el-icon-delete
"
@
click
=
"
remove(choosed)
"
/>
{{
choosed
.
titleZh
}}
<
el
-
link
class
=
"
el-icon-delete
"
@
click
=
"
remove(choosed)
"
:
disabled
=
"
isAllProduct
"
/>
{{
choosed
.
titleZh
}}
<
div
>
{{
choosed
.
titleEn
}}
<
/div
>
<
div
>
{{
choosed
.
titleEn
}}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
...
src/components/QuickCreateCustomer/index.vue
View file @
bf7028b8
...
@@ -12,10 +12,11 @@
...
@@ -12,10 +12,11 @@
<el-input
v-model=
"form.customerContacts[0].name"
placeholder=
"请输入联系人"
/>
<el-input
v-model=
"form.customerContacts[0].name"
placeholder=
"请输入联系人"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"手机号"
prop=
"customerContacts.0.phoneNew"
>
<el-form-item
label=
"手机号"
prop=
"customerContacts.0.phoneNew"
>
<el-select
v-model=
"form.customerContacts[0].areaCode"
placeholder=
"请选择区号"
filterable
class=
"w-200"
>
<
!--
<
el-select
v-model=
"form.customerContacts[0].areaCode"
placeholder=
"请选择区号"
filterable
class=
"w-200"
>
<el-option
v-for=
"(item, index) in countryList"
<el-option
v-for=
"(item, index) in countryList"
:key=
"index"
:label=
"item.nameShort + item.nameZh + '(' + item.tel + ')'"
:value=
"item.tel"
/>
:key=
"index"
:label=
"item.nameShort + item.nameZh + '(' + item.tel + ')'"
:value=
"item.tel"
/>
</el-select>
</el-select>
-->
<area-code-selector
v-model=
"form.customerContacts[0].areaCode"
/>
<el-input
v-model=
"form.customerContacts[0].phoneNew"
maxlength=
"11"
placeholder=
"请输入联系方式"
class=
"w-150 ml-10"
/>
<el-input
v-model=
"form.customerContacts[0].phoneNew"
maxlength=
"11"
placeholder=
"请输入联系方式"
class=
"w-150 ml-10"
/>
</el-form-item>
</el-form-item>
...
@@ -56,9 +57,10 @@ import {createCustomer} from '@/api/ecw/customer'
...
@@ -56,9 +57,10 @@ import {createCustomer} from '@/api/ecw/customer'
import
{
listServiceUser
}
from
"
@/api/system/user
"
import
{
listServiceUser
}
from
"
@/api/system/user
"
import
{
getCountryListAll
}
from
'
@/api/ecw/country
'
import
{
getCountryListAll
}
from
'
@/api/ecw/country
'
import
{
getCustomerContactsSelect
}
from
'
@/api/ecw/customerContacts
'
import
{
getCustomerContactsSelect
}
from
'
@/api/ecw/customerContacts
'
import
AreaCodeSelector
from
'
@/components/AreaCodeSelector
'
export
default
{
export
default
{
name
:
"
quickCreateCustomer
"
,
name
:
"
quickCreateCustomer
"
,
components
:
{
AreaCodeSelector
},
props
:{
props
:{
type
:
String
,
type
:
String
,
},
},
...
@@ -69,7 +71,7 @@ export default {
...
@@ -69,7 +71,7 @@ export default {
// 表单参数
// 表单参数
form
:
{
form
:
{
customerContacts
:[{}]
customerContacts
:[{
isDefault
:
1
}]
},
},
// 表单校验
// 表单校验
rules
:
{
rules
:
{
...
...
src/views/ecw/order/detail.vue
View file @
bf7028b8
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
<el-card
class=
"card"
>
<el-card
class=
"card"
>
<el-descriptions
class=
"mr-10"
border
:title=
"$t('基础信息')"
:column=
"2"
>
<el-descriptions
class=
"mr-10"
border
:title=
"$t('基础信息')"
:column=
"2"
>
<el-descriptions-item
:label=
"$t('唛头')"
>
{{order.marks}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('唛头')"
>
{{order.marks}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('送货时间')"
>
{{order.deliveryDate}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('送货时间')"
v-if=
"!order.isExternalWarehouse"
>
{{order.deliveryDate}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('是否控货')"
>
<el-descriptions-item
:label=
"$t('是否控货')"
>
<dict-tag
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
:value=
"order.isCargoControl"
/>
<dict-tag
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
:value=
"order.isCargoControl"
/>
</el-descriptions-item>
</el-descriptions-item>
...
...
src/views/ecw/order/edit.vue
View file @
bf7028b8
...
@@ -869,7 +869,7 @@ export default {
...
@@ -869,7 +869,7 @@ export default {
console
.
log
(
'
选择联系人
'
,
contact
)
console
.
log
(
'
选择联系人
'
,
contact
)
if
(
!
this
.
contactChooseType
&&
!
this
.
quickCreateType
)
return
if
(
!
this
.
contactChooseType
&&
!
this
.
quickCreateType
)
return
if
(
!
this
.
contactChooseType
&&
this
.
quickCreateType
){
if
(
!
this
.
contactChooseType
&&
this
.
quickCreateType
){
this
.
contactChooseType
=
this
.
quickCreateType
==
1
?
'
consignor
'
:
'
consignee
'
this
.
contactChooseType
=
this
.
quickCreateType
==
0
?
'
consignor
'
:
'
consignee
'
}
}
this
.
$set
(
this
.
form
,
this
.
contactChooseType
+
'
Company
'
,
contact
.
company
)
this
.
$set
(
this
.
form
,
this
.
contactChooseType
+
'
Company
'
,
contact
.
company
)
this
.
$set
(
this
.
form
,
this
.
contactChooseType
+
'
ContactsId
'
,
contact
.
customerContactsId
)
this
.
$set
(
this
.
form
,
this
.
contactChooseType
+
'
ContactsId
'
,
contact
.
customerContactsId
)
...
...
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