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
1313a511
Commit
1313a511
authored
Sep 12, 2024
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复几个编辑订单和详情的bug
parent
f0f9b510
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
24 deletions
+31
-24
detail.vue
src/views/ecw/order/detail.vue
+21
-23
edit.vue
src/views/ecw/order/edit.vue
+10
-1
No files found.
src/views/ecw/order/detail.vue
View file @
1313a511
...
@@ -12,36 +12,31 @@
...
@@ -12,36 +12,31 @@
<el-descriptions-item
:label=
"$t('中文名称')"
>
<el-descriptions-item
:label=
"$t('中文名称')"
>
<component
:is=
"hasCustomerDetailPermi ? 'router-link' : 'span'"
:to=
"`/customer/query/${order.consignorVO.customerId}`"
>
{{order.consignorVO.name}}
</component>
<component
:is=
"hasCustomerDetailPermi ? 'router-link' : 'span'"
:to=
"`/customer/query/${order.consignorVO.customerId}`"
>
{{order.consignorVO.name}}
</component>
</el-descriptions-item>
</el-descriptions-item>
<!-- v1.7新增 -->
<el-descriptions-item
:label=
"$t('英文名称')"
>
<component
:is=
"hasCustomerDetailPermi ? 'router-link' : 'span'"
:to=
"`/customer/query/${order.consignorVO.customerId}`"
>
{{order.consignorVO.nameEn}}
</component>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('电话')"
>
<el-descriptions-item
:label=
"$t('电话')"
>
+{{order.consignorVO.countryCode}} {{order.consignorVO.phone}}
+{{order.consignorVO.countryCode}} {{order.consignorVO.phone}}
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
</el-descriptions>
<el-descriptions
border
:class=
"showMore?'showInfo':'hiddenInfo'"
:column=
"3"
:labelStyle=
"{width:'110px'}"
:contentStyle=
"{width:'150px'}"
>
<el-descriptions
border
:class=
"showMore?'showInfo':'hiddenInfo'"
:column=
"3"
:labelStyle=
"{width:'110px'}"
:contentStyle=
"{width:'150px'}"
>
<el-descriptions-item
:label=
"$t('邮箱')"
>
{{order.consignorVO.email}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('英文名称')"
>
<el-descriptions-item
:label=
"$t('公司中文名称')"
>
<component
:is=
"hasCustomerDetailPermi ? 'router-link' : 'span'"
:to=
"`/customer/query/${order.consignorVO.customerId}`"
>
{{order.consignorVO.company}}
{{order.consignorVO.nameEn}}
</el-descriptions-item>
</component>
<!-- v1.7新增 -->
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('公司英文名称')"
>
<el-descriptions-item
:label=
"$t('公司中文名称')"
>
{{order.consignorVO.companyEn}}
{{order.consignorVO.company}}
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
<!-- v1.7新增 -->
<el-descriptions-item
:label=
"$t('公司英文名称')"
>
{{order.consignorVO.companyEn}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('邮箱')"
>
{{order.consignorVO.email}}
</el-descriptions-item>
</el-descriptions>
</el-col>
</el-col>
<el-col
:span=
"12"
v-if=
"order.consigneeVO"
style=
"position: relative;"
>
<el-col
:span=
"12"
style=
"position: relative;"
>
<span
style=
"color:#409EFF;position: absolute;right:40px;top:0;font-size:16px;cursor: pointer;"
@
click=
"consigneeChange"
>
{{consigneeText}}
</span>
<span
style=
"color:#409EFF;position: absolute;right:40px;top:0;font-size:16px;cursor: pointer;"
@
click=
"consigneeChange"
>
{{consigneeText}}
</span>
<el-descriptions
class=
"margin-top"
border
:title=
"$t('收货人')"
:column=
"3"
:labelStyle=
"{width:'110px'}"
:contentStyle=
"{width:'150px'}"
>
<el-descriptions
v-if=
"order.consigneeVO"
class=
"margin-top"
border
:title=
"$t('收货人')"
:column=
"3"
:labelStyle=
"{width:'110px'}"
:contentStyle=
"{width:'150px'}"
>
<el-descriptions-item
:label=
"$t('中文名称')"
>
<el-descriptions-item
:label=
"$t('中文名称')"
>
<component
:is=
"hasCustomerDetailPermi ? 'router-link' : 'span'"
:to=
"`/customer/query/${order.consigneeVO.customerId}`"
>
{{order.consigneeVO.name}}
</component>
<component
:is=
"hasCustomerDetailPermi ? 'router-link' : 'span'"
:to=
"`/customer/query/${order.consigneeVO.customerId}`"
>
{{order.consigneeVO.name}}
</component>
</el-descriptions-item>
<!-- v1.7新增 -->
<el-descriptions-item
:label=
"$t('英文名称')"
>
<component
:is=
"hasCustomerDetailPermi ? 'router-link' : 'span'"
:to=
"`/customer/query/${order.consigneeVO.customerId}`"
>
{{order.consigneeVO.nameEn}}
</component>
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('电话')"
>
<el-descriptions-item
:label=
"$t('电话')"
>
+{{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
+{{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
...
@@ -56,8 +51,10 @@
...
@@ -56,8 +51,10 @@
{{order.consigneeVO.address}}
{{order.consigneeVO.address}}
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
</el-descriptions>
<el-descriptions
border
:class=
"showMore?'showInfo':'hiddenInfo'"
:column=
"3"
:labelStyle=
"{width:'110px'}"
:contentStyle=
"{width:'150px'}"
>
<el-descriptions
v-if=
"order.consigneeVO && showMore"
border
:column=
"3"
:labelStyle=
"{width:'110px'}"
:contentStyle=
"{width:'150px'}"
>
<el-descriptions-item
:label=
"$t('邮箱')"
>
{{order.consigneeVO.email}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('英文名称')"
>
<component
:is=
"hasCustomerDetailPermi ? 'router-link' : 'span'"
:to=
"`/customer/query/${order.consigneeVO.customerId}`"
>
{{order.consigneeVO.nameEn}}
</component>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('公司中文名称')"
>
<el-descriptions-item
:label=
"$t('公司中文名称')"
>
{{order.consigneeVO.company}}
{{order.consigneeVO.company}}
</el-descriptions-item>
</el-descriptions-item>
...
@@ -65,6 +62,7 @@
...
@@ -65,6 +62,7 @@
<el-descriptions-item
:label=
"$t('公司英文名称')"
>
<el-descriptions-item
:label=
"$t('公司英文名称')"
>
{{order.consigneeVO.companyEn}}
{{order.consigneeVO.companyEn}}
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('邮箱')"
>
{{order.consigneeVO.email}}
</el-descriptions-item>
</el-descriptions>
</el-descriptions>
</el-col>
</el-col>
</el-row>
</el-row>
...
...
src/views/ecw/order/edit.vue
View file @
1313a511
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<!--初始化过程中不渲染页面,利用此特性在新建订单后重新初始化表单(字典选择组件默认值)-->
<!--初始化过程中不渲染页面,利用此特性在新建订单后重新初始化表单(字典选择组件默认值)-->
<el-form
v-if=
"!initing"
ref=
"form"
:model=
"form"
:rules=
"rules"
label-position=
"left"
inline
:disabled=
"updateChannel"
>
<el-form
v-if=
"!initing"
ref=
"form"
:model=
"form"
:rules=
"rules"
label-position=
"left"
inline
:disabled=
"updateChannel"
:validate-on-rule-change=
"false"
>
<el-card
v-if=
"form.applyStatus == 1"
class=
"mb-10"
>
<el-card
v-if=
"form.applyStatus == 1"
class=
"mb-10"
>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
以下信息修改审核中
'
)
}}
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
以下信息修改审核中
'
)
}}
</div>
<el-table
:data=
"form.applyInfoList"
>
<el-table
:data=
"form.applyInfoList"
>
...
@@ -99,6 +107,7 @@
...
@@ -99,6 +107,7 @@
</div>
</div>
</el-card>
</el-card>
<el-card
class=
"mt-10"
>
<el-card
class=
"mt-10"
>
<div
slot=
"header"
class=
"card-title"
>
{{$t('运输')}}
</div>
<div
class=
"form-section"
>
<div
class=
"form-section"
>
<el-form-item
:label=
"$t('运输方式')"
prop=
"transportId"
>
<el-form-item
:label=
"$t('运输方式')"
prop=
"transportId"
>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model=
"form.transportId"
formatter=
"number"
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model=
"form.transportId"
formatter=
"number"
...
...
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