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
ab289607
Commit
ab289607
authored
Jun 12, 2024
by
lanbaoming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-06-11提交
parent
a79d96a7
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
522 additions
and
114 deletions
+522
-114
batchMarkup.vue
src/views/ecw/box/batchMarkup.vue
+2
-1
indexSea.vue
src/views/ecw/box/indexSea.vue
+412
-98
query.vue
src/views/ecw/box/query.vue
+5
-4
receiptDetail.vue
src/views/ecw/financial/receiptDetail.vue
+38
-3
PrintLadingBill.vue
src/views/ecw/order/components/PrintLadingBill.vue
+2
-2
detail.vue
src/views/ecw/order/detail.vue
+1
-0
index.vue
src/views/ecw/warehouse/index.vue
+0
-1
index.vue
src/views/report/BankReceiptDetails/index.vue
+62
-5
No files found.
src/views/ecw/box/batchMarkup.vue
View file @
ab289607
...
...
@@ -143,7 +143,8 @@ import {getChannelList} from "@/api/ecw/channel";
import
{
getCabinetPage
}
from
"
@/api/ecw/cabinet
"
;
import
{
getWarehouseList
}
from
"
@/api/ecw/warehouse
"
;
import
{
getSupplierPage
}
from
"
@/api/ecw/supplier
"
;
import
{
approvalCancel
,
boxGoodsDetail
,
createApproval
,
getSectionList
,
loadSecGoodsList
}
from
"
@/api/ecw/boxSea
"
;
import
{
approvalCancel
,
boxGoodsDetail
,
createApproval
,
getSectionList
,
loadSecGoodsList
}
from
"
@/api/ecw/boxSea
"
;
import
{
getAbnormalList
,
getbox
,
getLogList
}
from
"
@/api/ecw/box
"
;
import
{
getTotlContent
}
from
"
@/views/ecw/box/shippingSea/utils
"
;
import
WorkFlow
from
"
@/components/WorkFlow
"
;
...
...
src/views/ecw/box/indexSea.vue
View file @
ab289607
This diff is collapsed.
Click to expand it.
src/views/ecw/box/query.vue
View file @
ab289607
...
...
@@ -392,7 +392,8 @@
<el-table-column
:label=
"$t('操作')"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"primary"
:disabled=
"scope.row.paymentId!='-1'"
type=
"primary"
:disabled=
"scope.row.paymentId != '-1'"
size=
"small"
@
click=
"editCostClick(scope.row)"
style=
"marginright: 10px"
...
...
@@ -404,7 +405,8 @@
@
confirm=
"deleteCostClick(scope.row)"
>
<el-button
type=
"danger"
:disabled=
"scope.row.paymentId!='-1'"
type=
"danger"
:disabled=
"scope.row.paymentId != '-1'"
size=
"small"
slot=
"reference"
v-hasPermi=
"['ecw:box-cost:delete']"
...
...
@@ -539,7 +541,6 @@
/>
</
template
>
</el-dialog>
<!-- 对话框 lanbm 2024-05-23 add异常登记对话框 -->
<el-dialog
custom-class=
"shipping-dialog"
...
...
src/views/ecw/financial/receiptDetail.vue
View file @
ab289607
...
...
@@ -722,14 +722,49 @@
<
/div
>
<
/div
>
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('水单号')
"
prop
=
"
billNo
"
>
<!--
lanbm
2024
-
06
-
12
add
<
el
-
form
-
item
:
label
=
"
$t('创建人')
"
prop
=
"
billNo
"
>
<
el
-
input
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.billNo
"
style
=
"
width: 220px
"
><
/el-input
>
<
span
v
-
else
>
{{
addForm
.
billNo
}}
<
/span
>
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('创建时间')
"
prop
=
"
createTime
"
>
<
el
-
input
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.createTime
"
style
=
"
width: 220px
"
><
/el-input
>
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('最后更新人')
"
prop
=
"
billNo
"
>
<
el
-
input
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.billNo
"
style
=
"
width: 220px
"
><
/el-input
>
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('最后更新时间')
"
prop
=
"
updateTime
"
>
<
el
-
input
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.updateTime
"
style
=
"
width: 220px
"
><
/el-input
>
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('提交审批人')
"
prop
=
"
billNo
"
>
<
el
-
input
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.billNo
"
style
=
"
width: 220px
"
><
/el-input
>
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('审批通过时间')
"
prop
=
"
billNo
"
>
<
el
-
input
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.billNo
"
style
=
"
width: 220px
"
><
/el-input
>
<
/el-form-item>--
>
<
/el-form
>
<
div
slot
=
"
footer
"
v
-
if
=
"
!isView
"
>
<
el
-
button
type
=
"
primary
"
@
click
=
"
saveFrom
"
>
{{
...
...
src/views/ecw/order/components/PrintLadingBill.vue
View file @
ab289607
...
...
@@ -7,8 +7,8 @@
<!--
<div
v-if=
"detail"
class=
"billcontent"
v-html=
"detail.billContent"
></div>
-->
<p
class=
"subs"
style=
"text-align:center"
>
<!--lanbm 2024-06-04 添加审批状态控制逻辑-->
<el-button
type=
"primary"
@
click=
"download"
:disabled=
"detail.
bpmS
tatus!='2'"
>
{{
$t
(
'
下载
'
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"print"
:disabled=
"detail.
bpmS
tatus!='2'"
>
{{
$t
(
'
打印
'
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"download"
:disabled=
"detail.
s
tatus!='2'"
>
{{
$t
(
'
下载
'
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"print"
:disabled=
"detail.
s
tatus!='2'"
>
{{
$t
(
'
打印
'
)
}}
</el-button>
</p>
</el-dialog>
</
template
>
...
...
src/views/ecw/order/detail.vue
View file @
ab289607
...
...
@@ -451,6 +451,7 @@
</el-table-column>
</el-table>
</el-tab-pane>
<!--lanbm 2024-06-11 处理订单到仓时间取值问题-->
<el-tab-pane
:label=
"$t('订单动态')"
name=
"second"
>
<el-timeline
v-if=
"order.orderTimeVOList && order.orderTimeVOList.length"
:reverse=
"true"
>
<el-timeline-item
v-for=
"(activity, index) in order.orderTimeVOList"
:key=
"index"
:timestamp=
"parseTime(activity.businessTime)"
>
...
...
src/views/ecw/warehouse/index.vue
View file @
ab289607
...
...
@@ -1098,7 +1098,6 @@ export default {
],
},
nodeId
:
this
.
$route
.
query
.
nodeId
,
// 枚举
CommonStatusEnum
:
CommonStatusEnum
,
// 数据字典
...
...
src/views/report/BankReceiptDetails/index.vue
View file @
ab289607
...
...
@@ -108,6 +108,23 @@
placeholder=
"请输截止月"
/>
</el-form-item>
<el-form-item
:label=
"$t('收款账户')"
prop=
"accountNo"
>
<el-select
filterable
clear
v-model=
"queryParams.accountNo"
:placeholder=
"$t('请选择收款账户')"
style=
"width: 220px"
v-el-select-loadmore=
"loadmore"
>
<el-option
v-for=
"item in bankData"
:key=
"item.id"
:label=
"item.baAccountName"
:value=
"item.baAccountName"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
搜索
</el-button
...
...
@@ -209,6 +226,11 @@
align=
"center"
prop=
"createTime"
/>
<el-table-column
:label=
"$t('提价审批人')"
align=
"center"
prop=
"createBpm"
/>
<el-table-column
:label=
"$t('提交审批时间')"
align=
"center"
...
...
@@ -229,7 +251,6 @@
>
{{
$t
(
"
删除
"
)
}}
</el-button
>
<el-button
v-if=
"scope.row.status == 0"
type=
"text"
@
click=
"detailClick(scope.row)"
v-hasPermi=
"['ecw:payment:detail:detail']"
...
...
@@ -351,9 +372,7 @@
</el-form-item>
<el-form-item
:label=
"$t('剩余应收金额')"
>
<span>
{{ form.syValue }}
</span
>
<span>
{{ form.syValue }}
</span>
</el-form-item>
<el-form-item
:label=
"$t('收款账户')"
prop=
"accountNo"
>
<el-select
...
...
@@ -469,9 +488,46 @@
style=
"width: 220px"
></el-input>
</el-form-item>
<!--lanbm 2024-06-12 add-->
<el-form-item
:label=
"$t('创建人')"
v-show=
"isEdit"
prop=
"creator"
>
<el-input
v-model=
"form.creator"
style=
"width: 220px"
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('创建时间')"
v-show=
"isEdit"
prop=
"createTime"
>
<el-input
v-model=
"form.createTime"
style=
"width: 220px"
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('最后更新人')"
v-show=
"isEdit"
prop=
"updater"
>
<el-input
v-model=
"form.updater"
style=
"width: 220px"
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('最后更新时间')"
v-show=
"isEdit"
prop=
"updateTime"
>
<el-input
v-model=
"form.updateTime"
style=
"width: 220px"
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('提交审批人')"
v-show=
"isEdit"
prop=
"createBpm"
>
<el-input
v-model=
"form.createBpm"
style=
"width: 220px"
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('审批通过时间')"
v-show=
"isEdit"
prop=
"updateTimeBpm"
>
<el-input
v-model=
"form.updateTimeBpm"
style=
"width: 220px"
></el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
>
<el-button
type=
"primary"
@
click=
"saveFrom"
>
{{
<el-button
type=
"primary"
v-show=
"!isEdit"
@
click=
"saveFrom"
>
{{
saveBtnText
}}
</el-button>
<el-button
@
click=
"hiddenDialog"
>
{{ $t("取消") }}
</el-button>
...
...
@@ -561,6 +617,7 @@ export default {
sDate4
:
undefined
,
eDate4
:
undefined
,
//实收日期
creator
:
undefined
,
//创建人
accountNo
:
undefined
,
//收款账号 lanbm 2024-06-12 add
},
params
:
{
page
:
1
,
...
...
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