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
47027a14
Commit
47027a14
authored
Jun 18, 2023
by
zhoutong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator
into dev
parents
ac29c6cc
2fe1d6d0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
7 deletions
+11
-7
dict.js
src/utils/dict.js
+1
-0
packaging-type.vue
src/views/ecw/channel/componrnts/packaging-type.vue
+2
-2
myAchievement.vue
src/views/ecw/deptTarget/myAchievement.vue
+1
-1
myDeptAchievement.vue
src/views/ecw/deptTarget/myDeptAchievement.vue
+1
-1
myDeptTarget.vue
src/views/ecw/deptTarget/myDeptTarget.vue
+5
-2
index.vue
src/views/ecw/order/warehousing/index.vue
+1
-1
No files found.
src/utils/dict.js
View file @
47027a14
...
...
@@ -200,6 +200,7 @@ export const DICT_TYPE = {
ORDER_SPECIAL_NEEDS
:
'
order_special_needs
'
,
// 订单特殊需求
ORDER_ABNORMAL_STATE
:
'
order_abnormal_state
'
,
TARGET_TYPE
:
'
target_type
'
,
//部门业绩目标类型
CEBE_UNIT
:
'
cube_unit
'
,
//目标单位
RECEIPT_ITEM_STATE
:
'
receipt_item_state
'
,
//收款单明细状态
// ========== 出货模块 ==========
BOX_SHIPPING_TRAILER_STATUS
:
'
shipping_trailer_status
'
,
// 拖车状态
...
...
src/views/ecw/channel/componrnts/packaging-type.vue
View file @
47027a14
...
...
@@ -96,11 +96,11 @@ export default {
"
channelId
"
:
''
,
"
clearancePrice
"
:
''
,
"
clearancePriceUnit
"
:
''
,
"
clearanceVolumeUnit
"
:
''
,
"
clearanceVolumeUnit
"
:
6
,
"
endNum
"
:
''
,
"
packagingId
"
:
''
,
"
startNum
"
:
''
,
"
weightUnit
"
:
''
"
weightUnit
"
:
6
}
this
.
value1
[
this
.
keyArr
].
push
(
p
)
this
.
$forceUpdate
();
...
...
src/views/ecw/deptTarget/myAchievement.vue
View file @
47027a14
...
...
@@ -99,7 +99,7 @@
<el-table-column
:label=
"$t('重量')"
align=
"center"
prop=
"completeWeight"
/>
<el-table-column
:label=
"$t('方数')"
align=
"center"
prop=
"completeVolume"
/>
<el-table-column
:label=
"$t('下单时间')"
align=
"center"
prop=
"createTime"
/>
<el-table-column
:label=
"$t('
装柜
时间')"
align=
"center"
prop=
"ldBoxTime"
/>
<el-table-column
:label=
"$t('
业绩创建
时间')"
align=
"center"
prop=
"ldBoxTime"
/>
<el-table-column
:label=
"$t('客户经理')"
align=
"center"
prop=
"userId"
:formatter=
"customerServiceFn"
>
</el-table-column>
</el-table>
...
...
src/views/ecw/deptTarget/myDeptAchievement.vue
View file @
47027a14
...
...
@@ -98,7 +98,7 @@
<el-table-column
:label=
"$t('重量')"
align=
"center"
prop=
"completeWeight"
/>
<el-table-column
:label=
"$t('方数')"
align=
"center"
prop=
"completeVolume"
/>
<el-table-column
:label=
"$t('下单时间')"
align=
"center"
prop=
"createTime"
/>
<el-table-column
:label=
"$t('
装柜
时间')"
align=
"center"
prop=
"ldBoxTime"
/>
<el-table-column
:label=
"$t('
业绩创建
时间')"
align=
"center"
prop=
"ldBoxTime"
/>
<el-table-column
:label=
"$t('客户经理')"
align=
"center"
prop=
"userId"
:formatter=
"customerServiceFn"
>
</el-table-column>
</el-table>
...
...
src/views/ecw/deptTarget/myDeptTarget.vue
View file @
47027a14
...
...
@@ -124,8 +124,11 @@
:key=
"item.channelId"
></el-option>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('立方数')"
prop=
"cubeNum"
>
<el-input
v-model=
"form.cubeNum"
:placeholder=
"$t('请输入立方数')"
/>
<el-form-item
:label=
"$t('目标值')"
prop=
"cubeNum"
>
<el-input
v-model=
"form.cubeNum"
:placeholder=
"$t('请输入目标值')"
/>
</el-form-item>
<el-form-item
:label=
"$t('目标单位')"
prop=
"cubeUnit"
>
<dict-selector
:type=
"DICT_TYPE.CEBE_UNIT"
v-model=
"form.cubeUnit"
:placeholder=
"$t('请选择目标单位')"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
...
src/views/ecw/order/warehousing/index.vue
View file @
47027a14
...
...
@@ -164,7 +164,7 @@
<span
style=
"font-size: 18px"
>
{{$t('入仓影像')}}
</span>
</div>
<div>
<image-and-video-upload
readonly
:fileSize=
"50"
:isShowTip=
"true"
:value=
"[...form.urls, ...this.orderItemList.map(e => e.pictureUrls).flat()]"
></image-and-video-upload>
<image-and-video-upload
readonly
:fileSize=
"50"
:isShowTip=
"true"
:value=
"[...form.urls, ...this.orderItemList.map(e => e.pictureUrls
|| []
).flat()]"
></image-and-video-upload>
</div>
</el-card>
<div
style=
"text-align: center;margin-top: 15px"
v-if=
"!(order.status !== 3 && isEdit)"
>
...
...
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