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
278f6a40
Commit
278f6a40
authored
Mar 03, 2025
by
zs嵩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
批量加价
parent
af3b23f3
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1083 additions
and
429 deletions
+1083
-429
boxSea.js
src/api/ecw/boxSea.js
+179
-165
custom.scss
src/styles/custom.scss
+12
-0
batchMarkup.vue
src/views/ecw/box/batchMarkup.vue
+524
-243
batchMarkupComList.vue
src/views/ecw/box/batchMarkupComList.vue
+348
-0
index.vue
...financial/selfNoReportNew/selfNoReportDetailNew/index.vue
+6
-6
cargoControl.vue
src/views/ecw/order/cargoControl.vue
+14
-15
No files found.
src/api/ecw/boxSea.js
View file @
278f6a40
This diff is collapsed.
Click to expand it.
src/styles/custom.scss
View file @
278f6a40
...
...
@@ -14,6 +14,9 @@
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
.fills
{
flex
:
1
;
}
}
.custom-form-1
{
...
...
@@ -25,3 +28,12 @@
width
:
100%
;
}
}
.el-table--mini
{
.el-link
{
font-size
:
12px
;
}
.el-table__header-wrapper
th
{
font-size
:
12px
!
important
;
}
}
src/views/ecw/box/batchMarkup.vue
View file @
278f6a40
This diff is collapsed.
Click to expand it.
src/views/ecw/box/batchMarkupComList.vue
0 → 100644
View file @
278f6a40
This diff is collapsed.
Click to expand it.
src/views/ecw/financial/selfNoReportNew/selfNoReportDetailNew/index.vue
View file @
278f6a40
...
...
@@ -129,7 +129,7 @@
<
template
slot-scope=
"{ row }"
>
<div
v-for=
"item in row.netReceiptsTotalFeeGroupDtoList || []"
:key=
"item.currencyId"
>
{{
item
.
amount
}}{{
item
.
currencyName
}}
</div>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('已收总金额')"
width=
"150"
align=
"center"
prop=
"writeOffTotalFeeGroupDtoList"
>
<
template
slot-scope=
"{ row }"
>
<div
v-for=
"item in row.writeOffTotalFeeGroupDtoList || []"
:key=
"item.currencyId"
>
{{
item
.
amount
}}{{
item
.
currencyName
}}
</div>
...
...
@@ -278,14 +278,14 @@
</el-table-column>
<el-table-column
:label=
"$t('客户经理')"
prop=
"salesmanName"
width=
"150"
align=
"center"
></el-table-column>
<el-table-column
:label=
"$t('发货人')"
width=
"300"
align=
"center"
>
<
template
slot-scope=
"{ row }"
><router-link
:to=
"'/customer/query/' + row.consignorCustomerId"
>
{{
row
.
consignorCustomerNumber
}}
-
{{
isChinese
?
row
.
consignorName
:
row
.
consignorNameEn
}}
-
{{
row
.
consignorPhone
}}
</router-link></
template
>
<
template
slot-scope=
"{ row }"
>
<router-link
:to=
"'/customer/query/' + row.consignorCustomerId"
>
{{
row
.
consignorCustomerNumber
}}
-
{{
isChinese
?
row
.
consignorName
:
row
.
consignorNameEn
}}
-
{{
row
.
consignorPhone
}}
</router-link>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('收货人')"
width=
"300"
align=
"center"
>
<
template
slot-scope=
"{ row }"
>
<router-link
:to=
"'/customer/query/' + row.consigneeCustomerId"
>
{{
row
.
consigneeCustomerNumber
}}
-
{{
isChinese
?
row
.
consigneeName
:
row
.
consigneeNameEn
}}
-
{{
row
.
consigneePhone
}}
</router-link>
</
template
>
<router-link
:to=
"'/customer/query/' + row.consigneeCustomerId"
>
{{
row
.
consigneeCustomerNumber
}}
-
{{
isChinese
?
row
.
consigneeName
:
row
.
consigneeNameEn
}}
-
{{
row
.
consigneePhone
}}
</router-link>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('订单入仓时间')"
width=
"150"
align=
"center"
>
<
template
slot-scope=
"{ row }"
>
...
...
src/views/ecw/order/cargoControl.vue
View file @
278f6a40
...
...
@@ -5,18 +5,18 @@
<el-form-item
:label=
"$t('编号')"
prop=
"orderNo"
>
<el-input
class=
"w-200"
v-model.trim=
"noParam.value"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(noParam, 'value')"
>
<template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_QUERY_NO_FIELD"
defaultable
v-model=
"noParam.key"
/>
<dict-selector
:type=
"DICT_TYPE.ORDER_QUERY_NO_FIELD"
defaultable
v-model=
"noParam.key"
/>
</
template
>
</el-input>
</el-form-item>
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-input
v-model.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
<el-input
v-model.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
v-model.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
<el-input
v-model.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('控货状态')"
prop=
"isCargoControl"
>
<dict-selector
v-model=
"queryParams.cargoControlStatusList"
multiple
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
<dict-selector
v-model=
"queryParams.cargoControlStatusList"
multiple
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<div>
<el-form-item
:label=
"$t('始发仓')"
prop=
"startWarehouseIds"
>
...
...
@@ -41,10 +41,10 @@
</el-form-item>
</div>
<el-form-item
:label=
"$t('客户经理')"
>
<user-selector
manage
v-model=
"queryParams.salesmanIds"
multiple
clearable
@
change=
"handleQuery"
:prepend=
"{ id: 0, nickname: $t('未分配客户经理') }"
class=
"w-200"
/>
<user-selector
manage
v-model=
"queryParams.salesmanIds"
multiple
clearable
@
change=
"handleQuery"
:prepend=
"{ id: 0, nickname: $t('未分配客户经理') }"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('运输方式')"
prop=
"transportId"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model.number=
"queryParams.transportId"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model.number=
"queryParams.transportId"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('出货渠道')"
prop=
"channelIds"
>
<selector
clearable
:options=
"channelList"
:label-field=
"$l('name')"
value-field=
"channelId"
v-model=
"queryParams.channelIds"
multiple
class=
"w-200"
></selector>
...
...
@@ -55,28 +55,27 @@
<el-form-item
:label=
"$t('商品') + ':'"
v-show=
"showSearch"
>
<el-input
v-model.trim=
"prodParam.value"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
>
<
template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_QUERY_PROD_FIELD"
defaultable
v-model=
"prodParam.key"
/>
<dict-selector
:type=
"DICT_TYPE.ORDER_QUERY_PROD_FIELD"
defaultable
v-model=
"prodParam.key"
/>
</
template
>
</el-input>
</el-form-item>
<el-form-item
:label=
"$t('订单状态')"
prop=
"statusList"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_STATUS"
multiple
v-model=
"queryParams.statusList"
@
keyup.enter.native=
"handleQuery"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
<dict-selector
:type=
"DICT_TYPE.ORDER_STATUS"
multiple
v-model=
"queryParams.statusList"
@
keyup.enter.native=
"handleQuery"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<!--<el-form-item :label="$t('提单号')" prop="tidanNo">
<el-input v-model.trim="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>-->
<el-form-item
:label=
"$t('报关方式')"
prop=
"customsTypes"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
multiple
v-model=
"queryParams.customsTypes"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
multiple
v-model=
"queryParams.customsTypes"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<!--<el-form-item :label="$t('唛头')" prop="marks">
<el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>-->
<el-form-item
:label=
"$t('备案属性')"
prop=
"productRecords"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
multiple
v-model=
"queryParams.productRecords"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
multiple
v-model=
"queryParams.productRecords"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('外部仓')"
prop=
"isExternalWarehouse"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.isExternalWarehouse"
:placeholder=
"$t('请选择')"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
...
...
@@ -98,19 +97,19 @@
</el-form-item>-->
<el-form-item
:label=
"$t('提货状态')"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.PICK_STATE"
multiple
v-model=
"queryParams.pickStateList"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
<dict-selector
:type=
"DICT_TYPE.PICK_STATE"
multiple
v-model=
"queryParams.pickStateList"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('放货率')"
v-show=
"showSearch"
>
<el-input
type=
"number"
v-model.trim=
"releaseRatio.value"
:placeholder=
"$t('请输入数字')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
>
<
template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.RELEASE_RATIO_FIELD"
defaultable
v-model=
"releaseRatio.key"
/>
<dict-selector
:type=
"DICT_TYPE.RELEASE_RATIO_FIELD"
defaultable
v-model=
"releaseRatio.key"
/>
</
template
>
</el-input>
</el-form-item>
<el-form-item
:label=
"$t('提货率')"
v-show=
"showSearch"
>
<el-input
type=
"number"
v-model.trim=
"pickRatio.value"
:placeholder=
"$t('请输入数字')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
>
<
template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.PICK_RATIO_FIELD"
defaultable
v-model=
"pickRatio.key"
/>
<dict-selector
:type=
"DICT_TYPE.PICK_RATIO_FIELD"
defaultable
v-model=
"pickRatio.key"
/>
</
template
>
</el-input>
</el-form-item>
...
...
@@ -128,7 +127,7 @@
</el-select>
</el-form-item>
<div
class=
"flex pb-20"
>
<dict-selector
:type=
"DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME"
v-model=
"dateFilterType"
defaultable
class=
"w-200 mr-5"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME"
v-model=
"dateFilterType"
defaultable
class=
"w-200 mr-5"
/>
<el-date-picker
v-model=
"dateFilter"
type=
"datetimerange"
range-separator=
"-"
:start-placeholder=
"$t('开始日期')"
:end-placeholder=
"$t('结束日期')"
value-format=
"yyyy-MM-dd HH:mm:ss"
@
change=
"handleQuery"
>
</el-date-picker>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
:loading=
"loading"
class=
"ml-10"
>
{{ $t("搜索") }}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{ $t("重置") }}
</el-button>
...
...
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