Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
H
hs-app-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
李星剑
hs-app-project
Commits
697358c5
Commit
697358c5
authored
Dec 30, 2021
by
李星剑
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
38e24819
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
469 additions
and
92 deletions
+469
-92
modeling.js
src/config/request/apiList/modeling.js
+18
-6
modelingTaskCategory.js
src/config/request/apiList/modelingTaskCategory.js
+11
-0
apis.js
src/config/request/apis.js
+7
-5
utils.js
src/mixins/utils.js
+14
-0
modelingOrder.vue
src/pages/fabricModeling/modelingOrder.vue
+3
-3
tenantSelection.vue
src/pages/home/tenantSelection.vue
+1
-1
addItem.vue
src/pages/modeling/addItem.vue
+24
-11
item.vue
src/pages/modeling/item.vue
+361
-66
read.md
src/pages/modeling/read.md
+12
-0
reviewHistory.vue
src/pages/modeling/reviewHistory.vue
+18
-0
No files found.
src/config/request/apiList/modeling.js
View file @
697358c5
// let base = "/gdep-plm/modelingTaskCategory"
let
base
=
"/gdep-plm/modelingtask"
;
export
default
{
modeling
:{
category
:
{
url
:
`/gdep-plm/modelingTaskCategory/page`
,
method
:
"POST"
,
},
// 新建 修改
submit
:{
url
:
`
${
base
}
/submit`
,
method
:
"POST"
,
},
// 详情
detail
:{
url
:
`
${
base
}
/detail`
,
method
:
"GET"
,
},
// 催单
reminders
:{
url
:
`
${
base
}
/reminders`
,
method
:
"post"
,
},
// 寄样
sendSamples
:{
url
:
`
${
base
}
/sendSamples`
,
method
:
"post"
,
},
// 列表
selectModelingTaskPage
:
{
url
:
`
${
base
}
/selectModelingTaskPage`
,
method
:
"get"
,
},
// 确认建模任务
confirm
:{
url
:
`
${
base
}
/confirm`
,
method
:
"post"
,
}
}
}
src/config/request/apiList/modelingTaskCategory.js
0 → 100644
View file @
697358c5
let
base
=
"/gdep-plm/modelingTaskCategory"
export
default
{
modelingTaskCategory
:{
list
:{
url
:
`
${
base
}
/list`
,
method
:
"GET"
,
},
}
}
src/config/request/apis.js
View file @
697358c5
...
...
@@ -4,17 +4,19 @@
import
user
from
'./apiList/user.js'
import
auth
from
'./apiList/auth.js'
import
color
from
'./apiList/colors.js'
import
orderTicket
from
'./apiList/orderTicket.js'
// import orderTicket from './apiList/orderTicket.js'
// 建模任务表接口
import
modeling
from
'./apiList/modeling.js'
// 建模品类表接口
import
modelingTaskCategory
from
'./apiList/modelingTaskCategory.js'
import
plm
from
'./apiList/plm.js'
// import goods from './apiList/goods.js'
// import base from './apiList/base.js'
export
default
{
...
user
,
...
auth
,
...
color
,
...
orderTicket
,
//
...orderTicket,
...
modeling
,
...
plm
...
plm
,
...
modelingTaskCategory
};
src/mixins/utils.js
0 → 100644
View file @
697358c5
export
default
{
methods
:{
previewImage
(
url
){
uni
.
previewImage
({
urls
:
typeof
url
===
'string'
?
[
url
]:
url
})
},
callPhone
(
phoneNumber
){
uni
.
makePhoneCall
({
phoneNumber
})
}
}
}
src/pages/fabricModeling/modelingOrder.vue
View file @
697358c5
...
...
@@ -357,11 +357,11 @@ export default {
if
(
val
==
'即刻发布'
)
{
this
.
$Router
.
push
(
`/pages/modeling/addItem?id=
${
item
.
id
}
`
);
}
else
if
(
val
==
'选款'
)
{
// this.$Router.push(`/pages/designCommissioned/addItem?id=${item.id}&status=2
`);
this
.
$Router
.
push
(
`/pages/modeling/item?id=
${
item
.
id
}
`
);
}
else
if
(
val
==
'马上寄送'
)
{
this
.
$Router
.
push
(
`/pages/
designCommissioned/addI
tem?id=
${
item
.
id
}
`
);
this
.
$Router
.
push
(
`/pages/
modeling/i
tem?id=
${
item
.
id
}
`
);
}
else
{
this
.
$Router
.
push
(
'/pages/
designCommissioned/listSelectToAdd
'
);
this
.
$Router
.
push
(
'/pages/
modeling/addItem
'
);
}
}
}
...
...
src/pages/home/tenantSelection.vue
View file @
697358c5
...
...
@@ -48,7 +48,7 @@ export default {
// 向宿主App发送事件
uni
.
sendNativeEvent
(
'getTenantList'
,
{},
ret
=>
{
this
.
list
=
JSON
.
parse
(
ret
).
filter
((
item
)
=>
{
return
item
.
tenantPlat
===
'sa
s
s'
return
item
.
tenantPlat
===
'sa
a
s'
});
})
// #endif
...
...
src/pages/modeling/addItem.vue
View file @
697358c5
...
...
@@ -64,7 +64,7 @@
</u-form-item>
<!--指定面料颜色数量-->
<u-form-item
label=
"指定面料颜色数量"
prop=
"component"
required
>
<u-number-box
v-model=
"detail.clothRowColourQuantity"
@
blur
=
"addModelingTaskColourDTOList"
></u-number-box>
<u-number-box
v-model=
"detail.clothRowColourQuantity"
@
change
=
"addModelingTaskColourDTOList"
></u-number-box>
</u-form-item>
<view
class=
"brandList-tips u-p-t-24 u-p-r-30 u-p-b-24 u-p-l-30"
>
<view
class=
"u-border-bottom u-flex u-p-b-8 "
>
...
...
@@ -305,23 +305,19 @@ export default {
this
.
detail
.
price
=
extra
;
},
init
(){
this
.
$http
(
"modeling.category"
,{
"current"
:
1
,
"size"
:
10
})
this
.
$http
(
"modelingTaskCategory.list"
)
.
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
===
200
){
this
.
modelingTaskCategory
=
data
.
records
.
map
((
item
)
=>
{
this
.
modelingTaskCategory
=
data
.
map
((
item
)
=>
{
return
{
label
:
item
.
name
,
value
:
item
.
id
,
extra
:
item
.
price
,
}
});
// console.log(data)
}
})
},
...
...
@@ -344,9 +340,24 @@ export default {
let
{
modelingTaskPictureDTOList
,
...
onther
}
=
this
.
detail
;
this
.
$http
(
"modeling.submit"
,
Object
.
assign
({},
onther
,
{
operationType
:
type
,
modelingTaskPictureDTOList
:
modelingTaskPictureDTOList
.
concat
(
this
.
delModelingTaskPictureDTOList
)})
{
designAgencyColourQuantity
:
this
.
designAgencyColourQuantity
,
operationType
:
type
,
modelingTaskPictureDTOList
:
modelingTaskPictureDTOList
.
concat
(
this
.
delModelingTaskPictureDTOList
)})
).
then
(
res
=>
{
let
{
code
,
msg
}
=
res
;
if
(
code
===
200
){
this
.
$refs
.
uToast
.
show
({
title
:
msg
,
back
:
true
});
}
else
{
this
.
$refs
.
uToast
.
show
({
title
:
msg
});
}
})
},
...
...
@@ -358,6 +369,7 @@ export default {
for
(
let
i
=
0
;
i
<
item
.
value
;
i
++
)
{
res
.
push
(
this
.
getDefaultColor
())
}
this
.
modelingTaskColourDTOList
=
res
;
},
validateColors
(){
...
...
@@ -401,8 +413,9 @@ export default {
modelingTaskColourDTOList
:
data
[
'modelingTaskColourList'
],
modelingTaskPictureDTOList
:
data
[
'modelingTaskPictureList'
]
});
console
.
log
(
data
[
'modelingTaskPictureList'
])
this
.
modelingTaskColourList
=
data
[
'modelingTaskColourList'
]
this
.
$nextTick
(()
=>
{
this
.
modelingTaskColourDTOList
=
data
[
'modelingTaskColourList'
];
})
}
})
},
...
...
src/pages/modeling/item.vue
View file @
697358c5
...
...
@@ -9,55 +9,128 @@
<view
class=
"body u-p-30"
:style=
"
{ bottom: footerHeight + 'px', top: headerHeight+ 'px'}">
<view
class=
"u-flex u-p-b-20"
>
<view
class=
"item-status"
>
待寄样
{{
status
}}
</view>
<text
class=
"item-status u-flex-1 text-right"
>
完工日期:
2020-11-11
完工日期:
{{
detail
.
expirationDate
}}
</text>
</view>
<!--
寄样信息
-->
<!--
面料模型
-->
<view
class=
"bg-fff u-p-r-30 u-p-b-30 u-p-l-30 u-m-b-20"
>
<view
class=
"u-border-bottom u-l-height-44"
>
寄样信息
</view>
<view
class=
"u-border-bottom u-p-b-32"
>
<view
class=
"u-l-height-44 u-flex"
>
<view
class=
"u-flex-1"
>
面料模型
</view>
<view
class=
"lightgrey"
@
click=
""
>
编辑便签
<u-icon
name=
"arrow-right"
></u-icon>
</view>
</view>
<view
v-if=
"detail.modelingTaskLabelList.length > 0"
>
<view
class=
"tag"
v-for=
"(modelingTaskLabel) in detail.modelingTaskLabelList"
>
{{
modelingTaskLabel
.
labelName
}}
</view>
</view>
</view>
<view
class=
"u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40"
>
指定面料颜色模型(
{{
detail
.
clothRowColourQuantity
}}
种)
</view>
<view
class=
"overflow"
>
<view
v-for=
"(item, index) in modelingTaskMaterialColourList_type1"
@
click=
"previewImage(`$
{imgUrl}${item.pictureCode}`)"
:key="index" class="float-left">
<view
class=
"pre-item pre-item--80 u-relative"
>
<image
class=
"pre-item-image"
:src=
"`$
{imgUrl}${item.pictureCode}`" mode="aspectFill" >
</image>
<text
class=
"u-absolute pre-item-text text-center"
>
{{
item
.
colorCode
}}
</text>
</view>
</view>
</view>
</view>
<view
class=
"u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40"
>
指定面料颜色模型(
{{
designAgencyColourQuantity
}}
种)
</view>
<view
class=
"overflow"
>
<view
v-for=
"(item, index) in modelingTaskMaterialColourList_type2"
@
click=
"previewImage(`$
{imgUrl}${item.pictureCode}`)"
:key="index" class="float-left">
<view
class=
"pre-item pre-item--80 u-relative"
>
<image
class=
"pre-item-image"
:src=
"`$
{imgUrl}${item.pictureCode}`" mode="aspectFill" >
</image>
<text
class=
"u-absolute pre-item-text text-center"
>
{{
item
.
colorCode
}}
</text>
</view>
</view>
</view>
</view>
<view
class=
"u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
标签
<text
class=
"color_cda475 u-font-xs"
>
(若建模合格,则必须选择标签)
</text></view>
<view
class=
"u-line-1 u-flex-1 content"
>
{{
labelNames
}}
</view>
</view>
<view
class=
"u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
建模评审
<text
class=
"color_cda475 u-font-xs"
>
(若驳回,则必须填写意见)
</text></view>
<view
class=
"u-line-1 u-flex-1 content"
>
<u-input
v-model=
"modelingTaskReviewer.reviewerComment"
placeholder=
"请输入评审意见"
></u-input>
</view>
</view>
</view>
<!--委托建模服务商-->
<view
class=
"bg-fff u-p-r-30 u-p-b-30 u-p-l-30 u-m-b-20"
v-if=
"detail.status >= 4"
>
<view
class=
"u-border-bottom u-l-height-44"
>
委托建模服务商
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
服务商
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
{{
detail
.
enterpriseName
}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
联系人
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
{{
detail
.
contactName
}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
联系电话
</view>
<view
class=
"u-line-1 u-flex-1 content"
@
click=
"callPhone(detail.contactPhone)"
>
{{
detail
.
contactPhone
}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
寄样地址
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
光泽度要高,90%以上
{{
detail
.
address
}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
手机号
</view>
<view
class=
"u-m-r-40 label"
>
接单时间
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
213.12元
{{
detail
.
orderTime
}}
</view>
</view>
<template
v-if=
"detail.status > 4"
>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
寄样地址
</view>
<view
class=
"u-m-r-40 label"
>
服务商
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
213.12元
{{
detail
.
modelingTaskSampleInformation
.
courier
}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
快递单号
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
{{
detail
.
modelingTaskSampleInformation
.
trackingNumber
}}
</view>
<!--接单信息-->
<view
class=
"bg-fff u-p-r-30 u-p-b-30 u-p-l-30 u-m-b-20"
>
<view
class=
"u-border-bottom u-l-height-44"
>
模型图像
</view>
<u-image
url=
"https://huansi-gdep-dev.oss-cn-hangzhou.aliyuncs.com/2dc07ee4-3b1c-45be-ae79-2bbdb61571af"
width=
"150"
height=
"150"
></u-image>
<u-image
url=
"https://huansi-gdep-dev.oss-cn-hangzhou.aliyuncs.com/2dc07ee4-3b1c-45be-ae79-2bbdb61571af"
width=
"150"
height=
"150"
></u-image>
</view>
<!--接单信息-->
<view
class=
"bg-fff u-p-r-30 u-p-b-30 u-p-l-30 u-m-b-20"
>
<view
class=
"u-border-bottom u-l-height-44"
>
接单信息
</view>
</
template
>
<
template
v-if=
"detail.status === 4"
>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
设计机构
</view>
<view
class=
"u-m-r-40 label"
>
服务商
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
光泽度要高,90%以上
<u-input
v-model=
"formData.courierText"
readonly
placeholder=
"请选择快递"
type=
"select"
:select-open=
"show"
@
click=
"show = true;"
/>
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
接单日期
</view>
<view
class=
"u-m-r-40 label"
>
快递单号
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
213.12元
<u-input
v-model=
"formData.trackingNumber"
placeholder=
"请选择快递"
/>
</view>
</view>
</
template
>
</view>
<!--面料信息-->
<view
class=
"bg-fff u-p-r-30 u-p-b-30 u-p-l-30 u-m-b-20"
>
...
...
@@ -65,124 +138,305 @@
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
面料名称
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
加厚荷兰绒绒布布料
{{detail.materialName}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
建模品类
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
牛仔面料
{{detail.modelingCategoryText}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
面料门幅
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
牛仔面料
{{ detail.clothWidth }}{{detail.clothWidthUnit}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
面料成分
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
牛仔面料
{{detail.component}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-flex u-m-t-18 u-m-b-8
u-col-top
"
>
<view
class=
"u-m-r-40 label"
>
面料图片
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
牛仔面料
</view>
</view>
</view>
<!--面料建模质量标准-->
<view
class=
"bg-fff u-p-r-30 u-p-b-30 u-p-l-30 u-m-b-20"
>
<view
class=
"u-border-bottom u-l-height-44"
>
面料建模质量标准
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
标准1
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
光泽度要高,90%以上
<view
v-for=
"(item, index) in detail.modelingTaskPictureDTOList"
@
click=
"previewImage(`${imgUrl}${item.pictureCode}`)"
:key=
"index"
class=
"float-left"
>
<view
class=
"pre-item pre-item--60 u-relative"
>
<image
class=
"pre-item-image"
:src=
"`${imgUrl}${item.pictureCode}`"
mode=
"aspectFill"
></image>
<text
class=
"u-absolute pre-item-text text-center"
>
{{ item.pictureType === 1 ? '正面': '反面'}}
</text>
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
项目价格
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
213.12元
</view>
</view>
</view>
<!--委托建模信息-->
<view
class=
"bg-fff u-p-r-30 u-p-b-30 u-p-l-30 "
>
<view
class=
"bg-fff u-p-r-30 u-p-b-30 u-p-l-30
u-m-b-20
"
>
<view
class=
"u-border-bottom u-l-height-44"
>
委托建模信息
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
创建时间
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
2021-12-12 21:21
{{detail.createTime}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
发布时间
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
2021-12-12 21:21
{{detail.releaseDate}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
完工期限
</view>
<view
class=
"u-m-r-40 label"
>
截止时间
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
2021-12-12
{{detail.expirationDate}}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label"
>
项目价格
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
213.12元
{{detail.price}}元
</view>
</view>
</view>
<!--指定面料颜色-->
<view
class=
"bg-fff u-p-r-30 u-p-b-30 u-p-l-30 u-m-b-20"
>
<view
class=
"u-border-bottom u-l-height-44"
>
指定面料颜色
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label width_300"
>
指定面料颜色数量
</view>
<view
class=
"u-line-1 u-flex-1 content"
>
{{ detail.clothRowColourQuantity }}种
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8 align-start"
>
<view
class=
"u-m-r-40 label width_300"
>
指定面料颜色名称
</view>
<view
class=
"u-flex-1 content wordKeepAll"
>
{{ colourNameList }}
</view>
</view>
<view
class=
"u-flex u-m-t-18 u-m-b-8"
>
<view
class=
"u-m-r-40 label width_300"
>
设计机构提供颜色数量
</view>
<view
class=
"u-line-1 u-flex-1 content "
>
{{ designAgencyColourQuantity }}种
</view>
</view>
<!-- <view class="u-flex u-m-t-18 u-m-b-8">-->
<!-- <view class="u-m-r-40 label width_300">设计机构提供颜色名称</view>-->
<!-- <view class="u-flex-1 content wordKeepAll"></view>-->
<!-- </view>-->
</view>
</view>
<!--底部按钮-->
<view
class=
"footer"
id=
"footer"
>
<view
v-if=
"detail.status < 8"
>
<view
class=
"footer"
id=
"footer"
>
<view
class=
"footer-btn"
>
<!---->
<view
class=
"custom-style-round-circle custom-style-btn custom-style
"
>
<view
class=
"custom-style-round-circle custom-style-btn custom-style"
v-if=
"detail.status === 4
"
>
<view
class=
"custom-style-right submit"
>
<view
class=
"title"
>
选款
</view>
<view
class=
"title"
v-if=
"detail.status === 4"
@
click=
"sendSamples"
>
寄样
</view>
</view>
</view>
<view
class=
"custom-style-round-circle custom-style-btn custom-style"
v-if=
"detail.status === 7"
>
<view
class=
"custom-style-left save"
@
click=
"taskConfirm(3)"
>
驳回
</view>
<view
class=
"custom-style-right submit"
@
click=
"taskConfirm(2)"
>
<view
class=
"title"
>
建模合格
</view>
</view>
</view>
</view>
</view>
</view>
<!--提示-->
<u-toast
ref=
"uToast"
/>
<!--建模品类选择-->
<u-select
mode=
"single-column"
:list=
"courierList"
v-model=
"show"
@
confirm=
"confirm"
>
</u-select>
</view>
</template>
<
script
>
import
dom
from
"../../mixins/dom"
import
utils
from
"../../mixins/utils"
import
HsTipTitle
from
"../../components/hs-tip-title/hs-tip-title"
;
import
HsMaterialThumbnail
from
"../../components/hs-material-thumbnail/hs-material-thumbnail"
;
export
default
{
name
:
"index"
,
components
:
{
HsMaterialThumbnail
,
HsTipTitle
},
mixins
:[
dom
],
mixins
:[
dom
,
utils
],
data
(){
return
{}
return
{
detail
:{
clothRowColourQuantity
:
0
,
// 布行指定面料颜色数量
clothWidth
:
0
,
// 门幅
clothWidthUnit
:
'cm'
,
// 门幅单位
component
:
''
,
// 成分
// designAgencyColourQuantity: '', // 设计机构提供的颜色数量
expirationDate
:
''
,
// 截止日期
materialName
:
''
,
// 面料名称
modelingCategoryId
:
''
,
// 建模品类id
modelingCategoryText
:
''
,
// 建模品类文本
modelingTaskColourDTOList
:
[],
// 布行指定面料颜色名称集合
modelingTaskPictureDTOList
:
[
{
pictureType
:
1
},
{
pictureType
:
2
},
],
// 建模单 图片信息
price
:
0
,
modelingTaskSampleInformation
:
{},
modelingTaskMaterialColourList
:
[],
modelingTaskLabelList
:
[]
,
// 建模任务的标签
},
onLoad
({
id
}){
imgUrl
:
this
.
$IMG_URL
,
// 上传地址
formData
:
{
trackingNumber
:
''
,
courier
:
''
,
},
show
:
false
,
courierList
:
[
{
label
:
'顺丰'
,
value
:
0
},
{
label
:
'EMS'
,
value
:
1
},
{
label
:
'邮政包裹'
,
value
:
2
},
{
label
:
'百世汇通'
,
value
:
3
},
{
label
:
'申通'
,
value
:
4
},
{
label
:
'中通'
,
value
:
5
},
{
label
:
'圆通'
,
value
:
6
},
{
label
:
'国通'
,
value
:
7
},
{
label
:
'韵达'
,
value
:
8
},
{
label
:
'天天'
,
value
:
9
},
{
label
:
'优速'
,
value
:
10
},
{
label
:
'京东'
,
value
:
11
},
{
label
:
'宅急送'
,
value
:
12
},
],
modelingTaskReviewer
:{
isDeleted
:
false
,
reviewerComment
:
''
,
}
}
},
computed
:{
labelNames
(){
return
this
.
detail
.
modelingTaskLabelList
.
filter
(
item
=>
item
.
isDeleted
===
false
)
.
map
((
item
)
=>
item
.
labelName
).
join
(
"|"
)
},
colourNameList
(){
return
this
.
detail
.
modelingTaskColourDTOList
.
map
((
item
)
=>
item
.
colourName
).
join
(
"|"
)
},
designAgencyColourQuantity
(){
return
10
-
this
.
detail
.
clothRowColourQuantity
},
// 1-布行指定颜色
modelingTaskMaterialColourList_type1
(){
return
this
.
detail
.
modelingTaskMaterialColourList
.
filter
(
item
=>
item
.
type
===
1
)
},
// 2-设计机构提供颜色
modelingTaskMaterialColourList_type2
(){
return
this
.
detail
.
modelingTaskMaterialColourList
.
filter
(
item
=>
item
.
type
===
2
)
},
status
(){
if
([
1
,
2
].
indexOf
(
this
.
detail
.
oddStatus
)
>
-
1
){
return
[
""
,
"两天无人接单"
,
"未及时完成"
][
this
.
detail
.
oddStatus
]
}
let
status
=
[
""
,
"待发布"
,
"任务待审批"
,
"待接单"
,
"待寄样"
,
"建模中"
,
"建模待审批"
,
"待确认"
,
"已完成"
]
return
status
[
this
.
detail
.
status
];
}
},
onLoad
({
id
}){
if
(
id
){
this
.
getDetail
(
id
)
}
},
mounted
()
{
},
methods
:{
confirm
(
data
){
let
{
value
,
label
}
=
data
[
0
];
this
.
formData
.
courierText
=
label
this
.
formData
.
courier
=
value
},
// 寄样
sendSamples
(){
this
.
$http
(
"modeling.sendSamples"
,{
...
this
.
formData
,
modelingTaskId
:
this
.
detail
.
id
}).
then
(
res
=>
{
})
},
confirmHttp
(
data
){
this
.
$http
(
"modeling.confirm"
,{
...
this
.
detail
,
...
data
,
modelingTaskReviewer
:
this
.
modelingTaskReviewer
})
},
validate
(){
},
taskConfirm
(
operationType
){
this
.
confirmHttp
({
operationType
})
// if(operationType === 2){
//
// }else{
// this.v
// }
},
getDetail
(
id
){
this
.
$http
(
"modeling.detail"
,{
modelingTaskId
:
id
})
.
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
===
200
){
this
.
detail
=
Object
.
assign
({},
data
,{
modelingCategoryText
:
data
[
'modelingCategory'
][
'name'
],
modelingTaskColourDTOList
:
data
[
'modelingTaskColourList'
],
modelingTaskPictureDTOList
:
data
[
'modelingTaskPictureList'
]
});
// 委托建模服务商
let
info
=
data
.
modelingTaskSampleInformation
;
this
.
formData
=
{
trackingNumber
:
info
.
trackingNumber
,
courier
:
info
.
courier
,
id
:
info
.
id
,
courierText
:
this
.
courierList
.
find
((
item
)
=>
item
.
value
==
info
.
courier
).
label
}
}
})
},
}
}
</
script
>
<
style
scoped
lang=
"scss"
>
.lightgrey
{
color
:
lightgrey
;
font-size
:
28rpx
;
line-height
:
40rpx
;
}
.color_e1c19d
{
color
:
#e1c19d
;
}
.color_cda475
{
color
:
#cda475
;}
.wordKeepAll
{
word-break
:
keep-all
;
}
.width_300
{
width
:
300rpx
;
}
.tag
{
display
:
inline-block
;
font-size
:
20rpx
;
background
:
#e5e5e5
;
color
:
#747474
;
padding
:
4rpx
;
margin-right
:
20rpx
;
}
@mixin
vue-flex
(
$direction
:
row
)
{
/* #ifndef APP-NVUE */
display
:
flex
;
...
...
@@ -214,6 +468,38 @@ export default {
.bg-fff
{
background
:
#fff
;
}
.pre-item
{
border-radius
:
10rpx
;
//overflow: hidden;
position
:
relative
;
margin-right
:
30rpx
;
&
-text
{
bottom
:
0
;
left
:
0
;
font-size
:
24rpx
;
color
:
#333
;
width
:
100%
;
background
:
rgba
(
255
,
255
,
255
,.
7
);
}
&
-image
{
width
:
100%
;
height
:
120rpx
;
}
&
--60
{
width
:
120rpx
;
height
:
120rpx
;
display
:
inline-block
;
}
&
--80
{
width
:
160rpx
;
height
:
160rpx
;
display
:
inline-block
;
}
}
.float-left
{
display
:
inline-block
}
.body
{
background
:
#fafafa
;
position
:
absolute
;
...
...
@@ -247,6 +533,7 @@ export default {
}
}
}
.brandList-tip
{
height
:
88rpx
;
background
:
#fcfaf7
;
...
...
@@ -255,6 +542,7 @@ export default {
line-height
:
88rpx
;
padding-left
:
30rpx
;
}
.custom-style
{
color
:
#fff
;
height
:
88rpx
;
line-height
:
88rpx
;
@include
vue-flex
;
...
...
@@ -287,6 +575,7 @@ export default {
}
}
}
.footer
{
position
:
fixed
;
width
:
100%
;
...
...
@@ -301,4 +590,10 @@ export default {
padding
:
20rpx
60rpx
;
}
}
.overflow
{
overflow-x
:
scroll
;
overflow-y
:
hidden
;
white-space
:
nowrap
;
}
</
style
>
src/pages/modeling/read.md
0 → 100644
View file @
697358c5
1-待发布 发布
2-任务待审批
3-待接单
4-待寄样 寄样 选快递 填单号
5-建模中
6-建模待审批
7-待确认 评审
8-已完成
撤回 3
催单
src/pages/modeling/
editItem
.vue
→
src/pages/modeling/
reviewHistory
.vue
View file @
697358c5
<
template
>
<view>
</view>
</
template
>
<
script
>
export
default
{
name
:
"editItem"
name
:
"reviewHistory"
,
data
(){
}
}
</
script
>
<
style
scoped
>
<
style
scoped
lang=
"scss"
>
</
style
>
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