Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Releases
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
周远喜
mes-ui
Commits
92f58224
Commit
92f58224
authored
Jul 20, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报价单流程判断优化
parent
01c2b987
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
12 deletions
+26
-12
metalQuotation.vue
pages/order/quotation/components/metalQuotation.vue
+0
-3
photosensitive.vue
pages/order/quotation/components/photosensitive.vue
+0
-2
index.vue
pages/order/quotation/index.vue
+26
-7
No files found.
pages/order/quotation/components/metalQuotation.vue
View file @
92f58224
...
...
@@ -9,7 +9,6 @@
fullscreen
footer-hide
>
{{
status
}}
<Form
:model=
"formItem"
:label-width=
"80"
>
<Row
type=
"flex"
justify=
"space-between"
>
<Col
span=
"8"
>
...
...
@@ -350,10 +349,8 @@ export default {
// console.log(this.newList)
if
(
this
.
status
==
0
)
{
this
.
formItem
.
status
=
1
;
alert
(
this
.
formItem
.
status
);
}
else
{
this
.
formItem
.
status
=
3
;
alert
(
this
.
formItem
.
status
);
}
let
item
=
[];
let
quotationMain
=
{};
...
...
pages/order/quotation/components/photosensitive.vue
View file @
92f58224
...
...
@@ -229,10 +229,8 @@ export default {
//订单报价
if
(
this
.
status
==
0
)
{
this
.
formItem
.
status
=
1
;
alert
(
this
.
formItem
.
status
);
}
else
{
this
.
formItem
.
status
=
3
;
alert
(
this
.
formItem
.
status
);
}
let
item
=
[];
let
quotationMain
=
{};
...
...
pages/order/quotation/index.vue
View file @
92f58224
...
...
@@ -3,7 +3,7 @@
<!-- 左侧树 -->
<!--
<Sider
hide-trigger
:style=
"
{background: '#fff'}" width="260">
<Tree-Type
@
func=
"getMsgFormSon"
:style=
"
{ height: treeHeight + 'px' }">
</Tree-Type>
</Sider>
-->
</Sider>
-->
<Sider
hide-trigger
v-if=
"showMenu"
class=
"menu_side"
width=
"300"
>
<ProductTree
@
on-hide=
"onHide"
@
on-select=
"productSearch"
/>
</Sider>
...
...
@@ -134,8 +134,16 @@
<Metal-Details
ref=
"metalDetail"
:resultDetils=
"resultDetils"
></Metal-Details>
<Photosensitive-Details
ref=
"photosensitiveDetail"
:resultDetils=
"resultDetils"
></Photosensitive-Details>
<!-- 报价记录里送审 -->
<MetalQuotation-Generation
ref=
"metalQuotationExamine"
:childData=
"zPhotosensitive"
@
update=
"update"
></MetalQuotation-Generation>
<Photosensitive-Generation
ref=
"photosensitiveExamine"
:childData=
"zPhotosensitive"
@
update=
"update"
></Photosensitive-Generation>
<MetalQuotation-Generation
ref=
"metalQuotationExamine"
:childData=
"zPhotosensitive"
@
update=
"update"
></MetalQuotation-Generation>
<Photosensitive-Generation
ref=
"photosensitiveExamine"
:childData=
"zPhotosensitive"
@
update=
"update"
></Photosensitive-Generation>
</Layout>
</
template
>
...
...
@@ -148,7 +156,7 @@ import MetalQuotation from "./components/metalQuotation.vue"; //订单报价弹
import
Photosensitive
from
"./components/photosensitive.vue"
;
//订单报价弹框光敏
import
MetalDetails
from
"./components/metalDetails.vue"
;
//报价历史记录铺粉详情弹框
import
PhotosensitiveDetails
from
"./components/photosensitiveDetails.vue"
;
//报价历史记录光敏详情弹框
import
ProductTree
from
"@/components/page/productTree.vue"
;
//左侧树列表
import
ProductTree
from
"@/components/page/productTree.vue"
;
//左侧树列表
import
MetalQuotationGeneration
from
"./components/metalQuotationGeneration.vue"
;
//生成报价单弹框
import
PhotosensitiveGeneration
from
"./components/photosensitiveGeneration.vue"
;
//生成报价单弹框
export
default
{
...
...
@@ -160,7 +168,8 @@ export default {
MetalQuotation
,
Photosensitive
,
MetalDetails
,
PhotosensitiveDetails
,
ProductTree
,
PhotosensitiveDetails
,
ProductTree
,
MetalQuotationGeneration
,
PhotosensitiveGeneration
},
...
...
@@ -169,6 +178,7 @@ export default {
zPhotosensitive
:
{
result
:
[]
},
status
:
""
,
userId
:
0
,
showMenu
:
true
,
model1
:
""
,
...
...
@@ -375,6 +385,15 @@ export default {
this
.
tableHeight
=
window
.
innerHeight
-
250
;
this
.
newColumn
=
this
.
column
;
this
.
tableTata
(
this
.
selectName
);
var
data
=
{
id
:
"cf192e27-1e81-4000-98ee-392eeb539616"
};
this
.
$api
.
get
(
`
${
workflowUrl
}
/schema/getbyid`
,
data
).
then
(
res
=>
{
//流程判断
if
(
res
.
success
)
{
this
.
status
=
res
.
result
.
status
;
}
});
},
async
fetch
({
store
,
params
})
{
await
store
.
dispatch
(
"loadDictionary"
);
// 加载数据字典
...
...
@@ -398,7 +417,7 @@ export default {
},
productSearch
(
id
,
item
,
ids
)
{
// console.log(item)
this
.
getMsgFormSon
(
ids
)
this
.
getMsgFormSon
(
ids
)
;
// let where = { productId: { op: "In", value: ids } };
// this.$refs.grid.reload(where);
},
...
...
@@ -597,7 +616,7 @@ export default {
(
params
.
row
.
status
===
3
||
params
.
row
.
status
===
4
)
&&
!
params
.
row
.
upCode
?
"重新报价"
:
params
.
row
.
status
===
1
:
params
.
row
.
status
===
1
&&
this
.
status
==
0
?
"送审"
:
""
)
...
...
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