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
6e57e4fb
Commit
6e57e4fb
authored
Dec 06, 2021
by
李星剑
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upload 款式委托
parent
d6d0d85e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
16 deletions
+31
-16
hs-material-thumbnail.vue
...omponents/hs-material-thumbnail/hs-material-thumbnail.vue
+3
-3
request.js
src/config/request/request.js
+2
-1
addItem.vue
src/pages/designCommissioned/addItem.vue
+2
-2
item.vue
src/pages/designCommissioned/item.vue
+23
-9
splitItem.vue
src/pages/designCommissioned/splitItem.vue
+1
-1
No files found.
src/components/hs-material-thumbnail/hs-material-thumbnail.vue
View file @
6e57e4fb
...
@@ -7,11 +7,11 @@
...
@@ -7,11 +7,11 @@
<span><u-icon
size=
"24"
color=
"#fff"
name=
"arrow-right"
></u-icon></span>
<span><u-icon
size=
"24"
color=
"#fff"
name=
"arrow-right"
></u-icon></span>
</view>
</view>
<view
class=
"u-font-24 u-m-t-20 color_6F6F72"
>
<view
class=
"u-font-24 u-m-t-20 color_6F6F72"
>
<span
class=
"u-m-r-10"
>
{{
item
.
m
dmM
aterialCategory
}}
</span>
<span
class=
"u-m-r-10"
>
{{
item
.
materialCategory
}}
</span>
|
|
<span
class=
"u-m-l-10 u-m-r-10"
>
{{
item
.
m
dmMaterialCloth
Width
}}
cm
</span>
<span
class=
"u-m-l-10 u-m-r-10"
>
{{
item
.
m
aterialDoor
Width
}}
cm
</span>
|
|
<span
class=
"u-m-l-10"
>
{{
item
.
m
dmMaterialCompon
ent
}}
</span>
<span
class=
"u-m-l-10"
>
{{
item
.
m
aterialElem
ent
}}
</span>
</view>
</view>
</view>
</view>
</view>
</view>
...
...
src/config/request/request.js
View file @
6e57e4fb
...
@@ -105,7 +105,8 @@ export default class Request {
...
@@ -105,7 +105,8 @@ export default class Request {
let
query
=
Request
.
addQueryString
(
options
.
params
);
let
query
=
Request
.
addQueryString
(
options
.
params
);
mergeUrl
+=
mergeUrl
.
indexOf
(
'?'
)
===
-
1
?
`?
${
query
}
`
:
`&
${
query
}
`
mergeUrl
+=
mergeUrl
.
indexOf
(
'?'
)
===
-
1
?
`?
${
query
}
`
:
`&
${
query
}
`
}
}
if
(
typeof
options
.
data
!==
'object'
){
if
(
typeof
options
.
data
!==
'object'
&&
options
.
method
===
'get'
){
mergeUrl
=
mergeUrl
+
'/'
+
options
.
data
;
mergeUrl
=
mergeUrl
+
'/'
+
options
.
data
;
options
.
data
=
{};
options
.
data
=
{};
}
}
...
...
src/pages/designCommissioned/addItem.vue
View file @
6e57e4fb
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
<view
class=
"u-font-28 u-m-t-18 u-m-b-8"
></view>
<view
class=
"u-font-28 u-m-t-18 u-m-b-8"
></view>
<view
class=
"u-flex"
>
<view
class=
"u-flex"
>
<view
class=
"u-line-1 u-flex-1 u-font-32"
>
<view
class=
"u-line-1 u-flex-1 u-font-32"
>
<input
v-model=
"detail.expirationDate"
@
click=
"timePickerShow = true"
readonly
/>
<input
v-model=
"detail.expirationDate"
@
click=
"timePickerShow = true"
readonly
disabled
/>
</view>
</view>
<u-icon
name=
"arrow-right"
></u-icon>
<u-icon
name=
"arrow-right"
></u-icon>
</view>
</view>
...
@@ -602,7 +602,7 @@ export default {
...
@@ -602,7 +602,7 @@ export default {
}
=
res
;
}
=
res
;
if
(
code
===
200
){
if
(
code
===
200
){
this
.
toast
(
msg
,()
=>
{
this
.
toast
(
msg
,()
=>
{
this
.
b
ack
();
this
.
toB
ack
();
})
})
}
else
{
}
else
{
this
.
toast
(
msg
)
this
.
toast
(
msg
)
...
...
src/pages/designCommissioned/item.vue
View file @
6e57e4fb
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<view
class=
"u-p-r-30 u-p-b-30 u-p-l-30 bg-fff u-m-b-20"
>
<view
class=
"u-p-r-30 u-p-b-30 u-p-l-30 bg-fff u-m-b-20"
>
<view
class=
"u-l-height-44"
>
所选面料
</view>
<view
class=
"u-l-height-44"
>
所选面料
</view>
<view
>
<view
>
<hs-material-thumbnail
:item=
"
detail
"
></hs-material-thumbnail>
<hs-material-thumbnail
:item=
"
item
"
></hs-material-thumbnail>
</view>
</view>
</view>
</view>
<!--面料颜色要求-->
<!--面料颜色要求-->
...
@@ -103,15 +103,16 @@
...
@@ -103,15 +103,16 @@
拆单
拆单
</view>
</view>
</view>
</view>
</view
>
<!--待发布 立即按钮 状态 4 --
>
<!--待发布 立即按钮 状态 4 -->
<view
class=
"custom-style-round-circle custom-style-btn custom-style"
<view
class=
"custom-style-round-circle custom-style-btn custom-style"
v-if=
"this.detail.status === 4"
>
v-if=
"this.detail.status === 4"
>
<view
class=
"custom-style-left save"
@
click=
"toEditItem"
>
编辑
</view
>
<view
class=
"custom-style-left save"
@
click=
"toEditItem"
>
编辑
</view
>
<view
class=
"custom-style-right submit"
@
click=
"submitData"
>
<view
class=
"custom-style-right submit"
@
click=
"submitData"
>
立即发布
立即发布
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<!--提示-->
<!--提示-->
<u-toast
ref=
"uToast"
/>
<u-toast
ref=
"uToast"
/>
...
@@ -177,6 +178,15 @@ export default {
...
@@ -177,6 +178,15 @@ export default {
}
}
},
},
computed
:{
computed
:{
item
(){
// console.log(this.detail)
return
{
materialName
:
this
.
detail
.
mdmMaterialName
,
materialCategory
:
this
.
detail
.
mdmMaterialCategory
,
materialDoorWidth
:
this
.
detail
.
mdmMaterialClothWidth
,
materialElement
:
this
.
detail
.
mdmMaterialComponent
,
}
},
footerShow
(){
footerShow
(){
let
status
=
this
.
detail
.
status
;
let
status
=
this
.
detail
.
status
;
return
status
!==
8
||
status
!==
10
return
status
!==
8
||
status
!==
10
...
@@ -373,7 +383,11 @@ export default {
...
@@ -373,7 +383,11 @@ export default {
referToBrand
:
data
.
referToBrand
,
referToBrand
:
data
.
referToBrand
,
otherDescribe
:
data
.
otherDescribe
,
otherDescribe
:
data
.
otherDescribe
,
colourQuantity
:
data
.
colourQuantity
,
colourQuantity
:
data
.
colourQuantity
,
status
:
data
.
status
status
:
data
.
status
,
mdmMaterialName
:
data
.
mdmMaterialName
,
mdmMaterialCategory
:
data
.
mdmMaterialCategory
,
mdmMaterialClothWidth
:
data
.
mdmMaterialClothWidth
,
mdmMaterialComponent
:
data
.
mdmMaterialComponent
,
}
}
}
else
{
}
else
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
...
...
src/pages/designCommissioned/splitItem.vue
View file @
6e57e4fb
...
@@ -189,7 +189,7 @@ export default {
...
@@ -189,7 +189,7 @@ export default {
}
=
res
;
}
=
res
;
if
(
code
===
200
){
if
(
code
===
200
){
this
.
toast
(
msg
,()
=>
{
this
.
toast
(
msg
,()
=>
{
this
.
b
ack
();
this
.
toB
ack
();
})
})
}
else
{
}
else
{
this
.
toast
(
msg
)
this
.
toast
(
msg
)
...
...
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