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
9a7df83f
Commit
9a7df83f
authored
Apr 14, 2023
by
邓春圆
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/predev' into predev
parents
0e608046
38bbadb5
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
46 additions
and
37 deletions
+46
-37
en_US.json
src/i18n/languages/en_US.json
+11
-1
index.js
src/router/index.js
+4
-4
subMaterial.vue
src/views/ecw/box/shippingSea/nodePage/subMaterial.vue
+2
-1
edit.vue
src/views/ecw/channel/edit.vue
+8
-8
index.vue
src/views/ecw/channel/index.vue
+1
-1
allAchievement.vue
src/views/ecw/deptTarget/allAchievement.vue
+8
-12
voucher.vue
src/views/ecw/financial/voucher.vue
+12
-10
No files found.
src/i18n/languages/en_US.json
View file @
9a7df83f
...
...
@@ -3791,6 +3791,13 @@
"内部号不能为空"
:
"Internal number cannot be empty"
,
"版本链接不能为空"
:
"Version link cannot be empty"
,
"强制更新不能为空"
:
"Forced update cannot be empty"
,
"请输入名称-中文"
:
"Please enter a name - Chinese"
,
"请输入名称-英文"
:
"Please enter a name - English"
,
"请输入内部名称-中文"
:
"Please enter internal name - Chinese"
,
"请输入内部名称-英文"
:
"Please enter the internal name - English"
,
"备注-中文"
:
"Remarks - Chinese"
,
"备注-英文"
:
"Remarks - English"
,
"请输入备注-英文"
:
"Please enter remarks - English"
,
"货物毛重(KGS)"
:
"Gross weight of goods (KGS)"
,
"请输入货物毛重"
:
"Please enter the gross weight of the goods"
,
"提单确认件.xlsx"
:
"Bill of Lading Confirmation.xlsx"
,
...
...
@@ -3823,5 +3830,8 @@
"角"
:
"horn"
,
"厘"
:
"Centimeters"
,
"取消付款单反审核"
:
"Cancel Payment Order De-approval"
,
"提交核销"
:
"Submit for verification"
"提交核销"
:
"Submit for verification"
,
"是否确认删除渠道管理编号为{channelId}的数据项?"
:
"Are you sure to delete the data item with channel management number {channelId}?"
,
"流程详情"
:
"Flow details"
,
"收款单核销审核"
:
"The payment voucher verification review"
}
src/router/index.js
View file @
9a7df83f
...
...
@@ -157,8 +157,8 @@ export const constantRoutes = [
},
{
path
:
'
process-instance/detail
'
,
component
:
(
resolve
)
=>
require
([
'
@/views/bpm/processInstance/detail
'
],
resolve
),
name
:
'
流程详情
'
,
meta
:
{
title
:
'
流程详情
'
,
activeMenu
:
'
/bpm/task/my
'
}
name
:
'
Flow details
'
,
meta
:
{
title
:
'
流程详情
'
,
titleEn
:
'
Flow details
'
,
activeMenu
:
'
/bpm/task/my
'
}
}
]
},
...
...
@@ -171,13 +171,13 @@ export const constantRoutes = [
path
:
'
empAchievement
'
,
component
:
(
resolve
)
=>
require
([
'
@/views/ecw/deptTarget/empAchievement
'
],
resolve
),
name
:
'
员工业绩
'
,
meta
:
{
title
:
'
员工业绩
'
,
activeMenu
:
'
/deptTarget/index
'
}
meta
:
{
title
:
'
员工业绩
'
,
titleEn
:
'
Emp Achievement
'
,
activeMenu
:
'
/deptTarget/index
'
}
},
{
path
:
'
myDeptAchievement
'
,
component
:
(
resolve
)
=>
require
([
'
@/views/ecw/deptTarget/myDeptAchievement
'
],
resolve
),
name
:
'
我的部门业绩
'
,
meta
:
{
title
:
'
我的部门业绩
'
,
activeMenu
:
'
/deptTarget/myDeptAchievement
'
}
meta
:
{
title
:
'
我的部门业绩
'
,
titleEn
:
'
My dept Achievement
'
,
activeMenu
:
'
/deptTarget/myDeptAchievement
'
}
}
]
},
...
...
src/views/ecw/box/shippingSea/nodePage/subMaterial.vue
View file @
9a7df83f
...
...
@@ -2,7 +2,7 @@
<div>
<el-form
ref=
"subMaterialForm"
:model=
"subMaterialObj"
label-width=
"140px"
>
<el-form-item
:label=
"$t('代理商AGENT')"
>
<supplierSelect
v-model=
"subMaterialObj.agentId"
:placeholder=
"$t('请选择供应商')"
:allSupplier=
"this.$attrs.allSupplier"
disabled
/>
<supplierSelect
v-model=
"subMaterialObj.agentId"
:
areaType=
"1"
:
placeholder=
"$t('请选择供应商')"
:allSupplier=
"this.$attrs.allSupplier"
disabled
/>
</el-form-item>
<el-form-item
:label=
"$t('提单号M/BL NO.')"
class=
"two-element"
>
<el-input
v-model=
"subMaterialObj.blMblNo"
:placeholder=
"$t('请输入提单号')"
></el-input>
...
...
@@ -144,6 +144,7 @@ export default {
this
.
$set
(
this
.
subMaterialObj
,
'
destPortId
'
,
this
.
shipmentObj
.
bookSeaInfo
?.
destPortId
||
undefined
)
this
.
$set
(
this
.
subMaterialObj
,
'
kgs
'
,
this
.
shipmentObj
.
customsInfo
?.
dcGoodsWgt
||
undefined
)
this
.
$set
(
this
.
subMaterialObj
,
'
containerSealNo
'
,(
this
.
shipmentObj
.
trailerInfo
?.
tlContainerNo
||
''
)
+
'
/
'
+
(
this
.
shipmentObj
.
trailerInfo
?.
tlStripSeal
||
'
/
'
))
this
.
subMaterialObj
.
containerSealNo
=
this
.
subMaterialObj
.
containerSealNo
.
replace
(
'
//
'
,
''
)
}
this
.
getSup
(
this
.
subMaterialObj
.
agentId
)
...
...
src/views/ecw/channel/edit.vue
View file @
9a7df83f
...
...
@@ -10,19 +10,19 @@
<el-row>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('中文名称')"
prop=
"nameZh"
>
<el-input
v-model=
"form.nameZh"
placeholder=
"请输入名称-中文
"
/>
<el-input
v-model=
"form.nameZh"
:placeholder=
"$t('请输入名称-中文')
"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('名称英文')"
prop=
"nameEn"
>
<el-input
v-model=
"form.nameEn"
placeholder=
"请输入名称-英文
"
/>
<el-input
v-model=
"form.nameEn"
:placeholder=
"$t('请输入名称-英文')
"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('内部名称中文')"
prop=
"internalNameZh"
>
<el-input
v-model=
"form.internalNameZh"
placeholder=
"请输入内部名称-中文
"
:placeholder=
"$t('请输入内部名称-中文')
"
/>
</el-form-item>
</el-col>
...
...
@@ -30,7 +30,7 @@
<el-form-item
:label=
"$t('内部名称英文')"
prop=
"internalNameEn"
>
<el-input
v-model=
"form.internalNameEn"
placeholder=
"请输入内部名称-英文
"
:placeholder=
"$t('请输入内部名称-英文')
"
/>
</el-form-item>
</el-col>
...
...
@@ -95,16 +95,16 @@
</el-col>
-->
</el-row>
<el-form-item
label=
"备注-中文
"
prop=
"remarksZh"
>
<el-form-item
:label=
"$t('备注-中文')
"
prop=
"remarksZh"
>
<el-input
v-model=
"form.remarksZh"
placeholder=
"请输入备注-中文
"
:placeholder=
"$t('请输入备注-中文')
"
/>
</el-form-item>
<el-form-item
label=
"备注-英文
"
prop=
"remarksEn"
>
<el-form-item
:label=
"$t('备注-英文')
"
prop=
"remarksEn"
>
<el-input
v-model=
"form.remarksEn"
placeholder=
"请输入备注-英文
"
:placeholder=
"$t('请输入备注-英文')
"
/>
</el-form-item>
<!--
<el-form-item
label=
"状态(0:禁用 1:启用)"
prop=
"status"
>
...
...
src/views/ecw/channel/index.vue
View file @
9a7df83f
...
...
@@ -201,7 +201,7 @@ export default {
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
channelId
=
row
.
channelId
;
this
.
$modal
.
confirm
(
'
是否确认删除渠道管理编号为"
'
+
channelId
+
'
"的数据项?
'
).
then
(
function
()
{
this
.
$modal
.
confirm
(
this
.
$t
(
'
是否确认删除渠道管理编号为{channelId}的数据项?
'
),{
channelId
}
).
then
(
function
()
{
return
deleteChannel
(
channelId
);
}).
then
(()
=>
{
this
.
getList
();
...
...
src/views/ecw/deptTarget/allAchievement.vue
View file @
9a7df83f
...
...
@@ -444,10 +444,8 @@
// this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
// this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
// 执行导出
this
.
$modal
.
confirm
(
this
.
$t
(
'
是否确认导出所有部门业绩数据项?
'
)).
then
(()
=>
{
this
.
exportLoading
=
true
;
return
exportDetailExcel
(
params
);
}).
then
(
response
=>
{
exportDetailExcel
(
params
).
then
(
response
=>
{
this
.
$download
.
excel
(
response
,
`
${
this
.
$t
(
'
业绩明细
'
)}
.xls`
);
this
.
exportLoading
=
false
;
...
...
@@ -466,10 +464,8 @@
// this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
// this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
// 执行导出
this
.
$modal
.
confirm
(
this
.
$t
(
'
是否确认导出所有部门业绩统计?
'
)).
then
(()
=>
{
this
.
exportLoading
=
true
;
return
exportStatisticsExcel
(
params
);
}).
then
(
response
=>
{
exportStatisticsExcel
(
params
).
then
(
response
=>
{
this
.
$download
.
excel
(
response
,
`
${
this
.
$t
(
'
业绩统计
'
)}
.xls`
);
this
.
exportLoading
=
false
;
...
...
src/views/ecw/financial/voucher.vue
View file @
9a7df83f
...
...
@@ -32,12 +32,14 @@
<dict-selector
:type=
"DICT_TYPE.ECW_RECEIPT_STATE"
v-model=
"queryParams.state"
clearable
/>
</el-form-item>
<el-form-item
:label=
"$t('业务员')"
>
<el-select
v-model=
"queryParams.salesmanId"
:placeholder=
"$t('请选择业务员')"
clearable
>
<el-option
v-for=
"item in creatorData"
...
...
@@ -471,29 +473,29 @@ export default {
}
const
receiptIdData
=
this
.
list
[
this
.
writeOffIndex
]
if
(
this
.
writeOffType
==
1
){
this
.
$modal
.
confirm
(
this
.
$t
(
'
您确认要反审核吗
'
)
+
'
?
'
)
.
then
(()
=>
{
// this.$alert()
//
.confirm(this.$t('您确认要反审核吗')+'?')
//
.then(()=>
{
financeApproveNo
({
receiptId
:
receiptIdData
.
id
,
receiptNo
:
receiptIdData
.
receiptNo
,
remark
:
this
.
reason
}
).
then
(
res
=>
{
this
.
getList
();
this
.
$message
.
success
(
this
.
$t
(
"
提交成功
"
));
this
.
dialogVisible
=
false
// this.$store.dispatch('tagsView/delCurrentView')
}
);
}
)
.
catch
(()
=>
{
this
.
dialogVisible
=
false
}
);
//
}
)
//
.catch(() =>
{
this
.
dialogVisible
=
false
}
);
}
else
{
this
.
$modal
.
confirm
(
this
.
$t
(
'
您确认要反核销吗
'
)
+
'
?
'
)
.
then
(()
=>
{
//
this.$modal
//
.confirm(this.$t('您确认要反核销吗')+'?')
//
.then(()=>
{
financeReceiptWriteOffNo
({
receiptId
:
receiptIdData
.
id
,
receiptNo
:
receiptIdData
.
receiptNo
,
remark
:
this
.
reason
}
).
then
(
res
=>
{
this
.
getList
();
this
.
$message
.
success
(
this
.
$t
(
"
提交成功
"
));
this
.
dialogVisible
=
false
// this.$store.dispatch('tagsView/delCurrentView')
}
);
}
)
.
catch
(()
=>
{
this
.
dialogVisible
=
false
}
);
//
}
)
//
.catch(() =>
{
this
.
dialogVisible
=
false
}
);
}
}
,
...
...
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