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
e6b3abc8
Commit
e6b3abc8
authored
Nov 20, 2024
by
Smile
Committed by
wux
Jan 02, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:空运渠道设置免收泡重需求
parent
6185d54e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
en_US.json
src/i18n/languages/en_US.json
+3
-1
zh_CN.json
src/i18n/languages/zh_CN.json
+3
-1
edit.vue
src/views/ecw/channel/edit.vue
+5
-0
weightDeal.vue
src/views/ecw/order/weightDeal.vue
+3
-3
No files found.
src/i18n/languages/en_US.json
View file @
e6b3abc8
...
...
@@ -4718,5 +4718,7 @@
"被合并客户-非主客户"
:
"Consolidated customer - Non-principal customer"
,
"注意事项"
:
"Matters need attention"
,
"选择客户"
:
"Select a customer"
,
"运输"
:
"Transportation"
"运输"
:
"Transportation"
,
"免泡重量"
:
"免泡重量"
,
"请输入免泡重量"
:
"请输入免泡重量"
}
src/i18n/languages/zh_CN.json
View file @
e6b3abc8
...
...
@@ -324,5 +324,7 @@
"特殊设置"
:
"特殊设置"
,
"已卸柜/已到仓时间"
:
"已卸柜/已到仓时间"
,
"动态"
:
"动态"
,
"增值服务"
:
"增值服务"
"增值服务"
:
"增值服务"
,
"免泡重量"
:
"免泡重量"
,
"请输入免泡重量"
:
"请输入免泡重量"
}
src/views/ecw/channel/edit.vue
View file @
e6b3abc8
...
...
@@ -100,6 +100,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('免泡重量')"
prop=
"sort"
>
<el-input
v-model.number=
"form.bubbleExemptWeight"
:placeholder=
"$t('请输入免泡重量')"
/>
</el-form-item>
</el-col>
</el-row>
<el-row
:gutter=
"20"
>
<el-col
:span=
"12"
>
...
...
src/views/ecw/order/weightDeal.vue
View file @
e6b3abc8
...
...
@@ -158,7 +158,7 @@
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
v-if=
"list.orderExceptionStatus!=2"
>
<div
v-if=
"type=='order_heavy_cargo_exception'"
>
<el-button
type=
"primary"
@
click=
"submit('general_cargo')"
>
{{$t('设为普货')}}
</el-button>
<el-button
type=
"primary"
v-hasPermi=
"['ecw:weight_deal:general_cargo']"
@
click=
"submit('general_cargo')"
>
{{$t('设为普货')}}
</el-button>
<el-button
plain
type=
"primary"
@
click=
"submit('process')"
>
{{$t('设为已处理')}}
</el-button>
</div>
<div
v-else
>
...
...
@@ -167,8 +167,8 @@
-->
<!--<el-button type="primary" @click="submit('general_cargo')">{{$t('设为免泡')}}</el-button>-->
<el-button
plain
type=
"primary"
@
click=
"submit('process')"
>
{{$t('设为全泡')}}
</el-button>
<el-button
plain
type=
"primary"
@
click=
"submit('half_throw')"
>
{{$t('设为半抛')}}
</el-button>
<el-button
plain
type=
"primary"
v-hasPermi=
"['ecw:weight_deal:process']"
@
click=
"submit('process')"
>
{{$t('设为全泡')}}
</el-button>
<el-button
plain
type=
"primary"
v-hasPermi=
"['ecw:weight_deal:half_throw']"
@
click=
"submit('half_throw')"
>
{{$t('设为半抛')}}
</el-button>
</div>
</div>
...
...
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