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
bcc0ae07
Commit
bcc0ae07
authored
Apr 01, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
order
parent
41e88add
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
141 additions
and
119 deletions
+141
-119
customTable.vue
components/customTable/customTable.vue
+15
-0
createOrder.vue
components/orderOperator/createOrder.vue
+126
-119
No files found.
components/customTable/customTable.vue
View file @
bcc0ae07
...
...
@@ -290,6 +290,21 @@ export default {
title
:
'紧急程度'
,
key
:
'urgencyLevel'
,
width
:
100
,
filters
:
this
.
getArry
(
this
.
$store
.
getters
.
dictionaryByKey
(
'plan.order.urgencyLevel'
)
),
filterMethod
(
value
,
row
)
{
return
row
.
urgencyLevel
.
indexOf
(
value
)
>
-
1
},
render
:
(
h
,
params
)
=>
{
return
h
(
'state'
,
{
props
:
{
code
:
'plan.order.urgencyLevel'
,
type
:
'text'
,
value
:
params
.
row
.
urgencyLevel
+
''
}
})
}
},
// {
// title: '任务类型',
...
...
components/orderOperator/createOrder.vue
View file @
bcc0ae07
...
...
@@ -116,7 +116,7 @@
</Col>
-->
<Col
span=
"8"
>
<FormItem
label=
"项目号"
style=
"width:100%"
>
<Input
v-model=
"orderSearchForm.projectNumber"
style=
"width:240px"
/>
<Input
v-model=
"orderSearchForm.projectNumber"
style=
"width:240px"
/>
</FormItem>
</Col>
</Row>
...
...
@@ -128,7 +128,11 @@
</Col>
<Col
span=
"8"
>
<FormItem
label=
"紧急程度"
style=
"width:100%"
>
<dictionary
style=
"width:240px"
code=
"plan.order.urgencyLevel"
v-model=
"orderSearchForm.urgencyLevel"
></dictionary>
<dictionary
style=
"width:240px"
code=
"plan.order.urgencyLevel"
v-model=
"orderSearchForm.urgencyLevel"
></dictionary>
</FormItem>
</Col>
<!--
<Col
span=
"8"
>
...
...
@@ -172,7 +176,7 @@
<Input
v-model=
"orderSearchForm.outerDrawnNumber"
placeholder
style=
"width:240px"
/>
</FormItem>
</Col>
-->
<!--
<Col
span=
"8"
>
<FormItem
label=
"模型版本"
style=
"width:100%"
>
<Input
v-model=
"orderSearchForm.modelVersion"
placeholder
style=
"width:240px"
/>
...
...
@@ -184,7 +188,7 @@
<Input
v-model=
"orderSearchForm.designer"
placeholder
style=
"width:240px"
/>
</FormItem>
</Col>
-->
<!--
<Col
span=
"8"
>
<FormItem
label=
"厂内机关负责人"
style=
"width:100%"
>
<Input
v-model=
"orderSearchForm.officeFunctionary"
placeholder
style=
"width:240px"
/>
...
...
@@ -213,240 +217,243 @@
</div>
</
template
>
<
script
>
var
myDate
=
new
Date
()
var
dayTomorrow
=
new
Date
()
dayTomorrow
.
setTime
(
dayTomorrow
.
getTime
()
+
24
*
60
*
60
*
1000
)
var
myDate
=
new
Date
()
;
var
dayTomorrow
=
new
Date
()
;
dayTomorrow
.
setTime
(
dayTomorrow
.
getTime
()
+
24
*
60
*
60
*
1000
)
;
var
nowDate
=
myDate
.
getFullYear
()
+
'-'
+
(
myDate
.
getMonth
()
+
1
)
+
'-'
+
myDate
.
getDate
()
myDate
.
getFullYear
()
+
"-"
+
(
myDate
.
getMonth
()
+
1
)
+
"-"
+
myDate
.
getDate
();
var
tomorrowDate
=
dayTomorrow
.
getFullYear
()
+
'-'
+
"-"
+
(
dayTomorrow
.
getMonth
()
+
1
)
+
'-'
+
dayTomorrow
.
getDate
()
"-"
+
dayTomorrow
.
getDate
()
;
export
default
{
name
:
'createOrder'
,
name
:
"createOrder"
,
data
()
{
return
{
divHeight
:
'260px'
,
divHeight
:
"260px"
,
list
:
[],
data1
:
[],
selectdata
:
[],
placeholdeinfo
:
'请选择'
,
placeholdeinfo
:
"请选择"
,
orderSearchForm
:
{
id
:
null
,
productId
:
null
,
//产品id
productName
:
''
,
//产品名称
productName
:
""
,
//产品名称
drawnNumber
:
null
,
//图号
taskType
:
null
,
//任务类型
stage
:
null
,
//阶段
materialId
:
null
,
//材料
quantity
:
1
,
//数量
guestName
:
''
,
//甲方客户
printSupply
:
''
,
//3D打印承制单位
functionaryOffice
:
''
,
//厂内责任机关
mainDepartmentId
:
''
,
//厂内责任主体部门ID
taskRequire
:
''
,
//任务接点要求
putintDocmentCode
:
''
,
//甲方投产输入文件编号
technologyDocmentCode
:
''
,
//甲方技术输入文件编号
outerDrawnNumber
:
''
,
//外部图号/模型号
modelVersion
:
''
,
//模型版本
taskCode
:
''
,
//甲方任务号
designer
:
''
,
//甲方设计人员
officeFunctionary
:
''
,
//厂内机关负责人
mainRoutingPeople
:
''
,
//厂内主工艺人员
guestName
:
""
,
//甲方客户
printSupply
:
""
,
//3D打印承制单位
functionaryOffice
:
""
,
//厂内责任机关
mainDepartmentId
:
""
,
//厂内责任主体部门ID
taskRequire
:
""
,
//任务接点要求
putintDocmentCode
:
""
,
//甲方投产输入文件编号
technologyDocmentCode
:
""
,
//甲方技术输入文件编号
outerDrawnNumber
:
""
,
//外部图号/模型号
modelVersion
:
""
,
//模型版本
taskCode
:
""
,
//甲方任务号
designer
:
""
,
//甲方设计人员
officeFunctionary
:
""
,
//厂内机关负责人
mainRoutingPeople
:
""
,
//厂内主工艺人员
routing_Method
:
null
,
//工艺方法
outer_Envelope_Size
:
''
,
//包装尺寸
outer_Envelope_Size
:
""
,
//包装尺寸
demandStartDate
:
this
.
getFormatDate
(
nowDate
),
//开始时间
demandFinishDate
:
this
.
getFormatDate
(
tomorrowDate
),
//完成时间
remark
:
''
,
//备注
projectNumber
:
''
,
//项目号
batchNumber
:
''
,
//批次号
urgencyLevel
:
null
,
//紧急程度
remark
:
""
,
//备注
projectNumber
:
""
,
//项目号
batchNumber
:
""
,
//批次号
urgencyLevel
:
null
//紧急程度
},
ruleValidate
:
{
productId
:
[
{
required
:
true
,
message
:
'请选择产品名称'
,
type
:
'number'
,
trigger
:
'change'
message
:
"请选择产品名称"
,
type
:
"number"
,
trigger
:
"change"
}
],
taskType
:
[
{
required
:
true
,
message
:
'请选择任务类型'
,
trigger
:
'change'
,
type
:
'number'
message
:
"请选择任务类型"
,
trigger
:
"change"
,
type
:
"number"
}
],
stage
:
[
{
required
:
true
,
message
:
'请选择阶段'
,
type
:
'number'
,
trigger
:
'change'
message
:
"请选择阶段"
,
type
:
"number"
,
trigger
:
"change"
}
],
materialId
:
[
{
required
:
true
,
message
:
'请选择材料'
,
type
:
'number'
,
trigger
:
'change'
message
:
"请选择材料"
,
type
:
"number"
,
trigger
:
"change"
}
],
quantity
:
[
{
required
:
true
,
message
:
'请输入数量'
,
type
:
'number'
,
trigger
:
'change'
message
:
"请输入数量"
,
type
:
"number"
,
trigger
:
"change"
}
],
routing_Method
:
[
{
required
:
true
,
message
:
'请选择工艺方法'
,
type
:
'number'
,
trigger
:
'change'
message
:
"请选择工艺方法"
,
type
:
"number"
,
trigger
:
"change"
}
]
}
}
}
;
},
methods
:
{
addOrderOk
()
{
return
this
.
orderSearchForm
return
this
.
orderSearchForm
;
},
handleSelect
(
data
)
{
if
(
data
.
length
>
0
)
{
this
.
selectdata
=
[]
this
.
selectdata
=
data
this
.
list
=
[]
this
.
list
.
push
({
label
:
data
[
0
].
title
,
value
:
data
[
0
].
id
})
if
(
data
[
0
].
isProduct
==
'1'
)
{
this
.
orderSearchForm
.
productName
=
data
[
0
].
title
this
.
orderSearchForm
.
productId
=
data
[
0
].
productId
this
.
orderSearchForm
.
drawnNumber
=
data
[
0
].
drawingNo
this
.
selectdata
=
[]
;
this
.
selectdata
=
data
;
this
.
list
=
[]
;
this
.
list
.
push
({
label
:
data
[
0
].
title
,
value
:
data
[
0
].
id
})
;
if
(
data
[
0
].
isProduct
==
"1"
)
{
this
.
orderSearchForm
.
productName
=
data
[
0
].
title
;
this
.
orderSearchForm
.
productId
=
data
[
0
].
productId
;
this
.
orderSearchForm
.
drawnNumber
=
data
[
0
].
drawingNo
;
}
else
{
this
.
$Message
.
error
(
'此节点不是产品,请选择产品节点!'
)
this
.
$Message
.
error
(
"此节点不是产品,请选择产品节点!"
);
}
}
},
resetFields
()
{
;(
this
.
placeholdeinfo
=
'请选择'
),
(
this
.
placeholdeinfo
=
"请选择"
),
(
this
.
orderSearchForm
=
{
productId
:
null
,
//产品id
productName
:
''
,
//产品名称
productName
:
""
,
//产品名称
drawnNumber
:
null
,
//图号
taskType
:
null
,
//任务类型
stage
:
null
,
//阶段
materialId
:
null
,
//材料
quantity
:
1
,
//数量
guestName
:
''
,
//甲方客户
printSupply
:
''
,
//3D打印承制单位
functionaryOffice
:
''
,
//厂内责任机关
mainDepartmentId
:
''
,
//厂内责任主体部门ID
taskRequire
:
''
,
//任务接点要求
putintDocmentCode
:
''
,
//甲方投产输入文件编号
technologyDocmentCode
:
''
,
//甲方技术输入文件编号
outerDrawnNumber
:
''
,
//外部图号/模型号
modelVersion
:
''
,
//模型版本
taskCode
:
''
,
//甲方任务号
designer
:
''
,
//甲方设计人员
officeFunctionary
:
''
,
//厂内机关负责人
mainRoutingPeople
:
''
,
//厂内主工艺人员
guestName
:
""
,
//甲方客户
printSupply
:
""
,
//3D打印承制单位
functionaryOffice
:
""
,
//厂内责任机关
mainDepartmentId
:
""
,
//厂内责任主体部门ID
taskRequire
:
""
,
//任务接点要求
putintDocmentCode
:
""
,
//甲方投产输入文件编号
technologyDocmentCode
:
""
,
//甲方技术输入文件编号
outerDrawnNumber
:
""
,
//外部图号/模型号
modelVersion
:
""
,
//模型版本
taskCode
:
""
,
//甲方任务号
designer
:
""
,
//甲方设计人员
officeFunctionary
:
""
,
//厂内机关负责人
mainRoutingPeople
:
""
,
//厂内主工艺人员
routing_Method
:
null
,
//工艺方法
outer_Envelope_Size
:
''
,
//包装尺寸
outer_Envelope_Size
:
""
,
//包装尺寸
demandStartDate
:
this
.
getFormatDate
(
nowDate
),
//开始时间
demandFinishDate
:
this
.
getFormatDate
(
tomorrowDate
),
//完成时间
remark
:
''
//备注
})
remark
:
""
//备注
})
;
},
inidate
(
data
)
{
this
.
orderSearchForm
=
data
this
.
orderSearchForm
.
productId
=
parseInt
(
data
.
productId
)
this
.
orderSearchForm
.
taskType
=
parseInt
(
data
.
taskType
)
this
.
orderSearchForm
.
stage
=
parseInt
(
data
.
stage
)
this
.
orderSearchForm
.
materialId
=
parseInt
(
data
.
materialId
)
this
.
orderSearchForm
.
routing_Method
=
parseInt
(
data
.
routing_Method
)
this
.
orderSearchForm
.
guestName
=
parseInt
(
data
.
guestName
)
this
.
orderSearchForm
.
printSupply
=
parseInt
(
data
.
printSupply
)
this
.
orderSearchForm
.
mainDepartmentId
=
parseInt
(
data
.
mainDepartmentId
)
this
.
orderSearchForm
=
data
;
this
.
orderSearchForm
.
productId
=
parseInt
(
data
.
productId
);
this
.
orderSearchForm
.
taskType
=
parseInt
(
data
.
taskType
);
this
.
orderSearchForm
.
stage
=
parseInt
(
data
.
stage
);
this
.
orderSearchForm
.
materialId
=
parseInt
(
data
.
materialId
);
this
.
orderSearchForm
.
routing_Method
=
parseInt
(
data
.
routing_Method
);
this
.
orderSearchForm
.
guestName
=
parseInt
(
data
.
guestName
);
this
.
orderSearchForm
.
printSupply
=
parseInt
(
data
.
printSupply
);
this
.
orderSearchForm
.
mainDepartmentId
=
parseInt
(
data
.
mainDepartmentId
);
this
.
orderSearchForm
.
urgencyLevel
=
parseInt
(
data
.
urgencyLevel
);
this
.
orderSearchForm
.
demandStartDate
=
this
.
getFormatDate
(
data
.
demandStartDate
)
)
;
this
.
orderSearchForm
.
demandFinishDate
=
this
.
getFormatDate
(
data
.
demandFinishDate
)
this
.
placeholdeinfo
=
data
.
productName
)
;
this
.
placeholdeinfo
=
data
.
productName
;
},
iniTree
(
data
)
{
this
.
data1
=
data
this
.
data1
=
data
;
},
renderContent
(
h
,
{
root
,
node
,
data
})
{
//渲染树的样式
return
h
(
'span'
,
"span"
,
{
style
:
{
color
:
data
.
isProduct
!=
'1'
?
'#249E91'
:
'#333'
,
//根据选中状态设置样式
cursor
:
'pointer'
color
:
data
.
isProduct
!=
"1"
?
"#249E91"
:
"#333"
,
//根据选中状态设置样式
cursor
:
"pointer"
},
on
:
{
click
:
()
=>
{
let
arrTree
=
[]
arrTree
.
push
(
data
)
this
.
handleSelect
(
arrTree
)
//手动选择树节点
let
arrTree
=
[]
;
arrTree
.
push
(
data
)
;
this
.
handleSelect
(
arrTree
)
;
//手动选择树节点
}
}
},
data
.
title
)
)
;
},
getStartDate
(
value
)
{
if
(
value
==
''
)
{
this
.
orderSearchForm
.
demandStartDate
=
this
.
getFormatDate
(
nowDate
)
if
(
value
==
""
)
{
this
.
orderSearchForm
.
demandStartDate
=
this
.
getFormatDate
(
nowDate
)
;
}
else
{
this
.
orderSearchForm
.
demandStartDate
=
this
.
getFormatDate
(
value
)
this
.
orderSearchForm
.
demandStartDate
=
this
.
getFormatDate
(
value
)
;
}
},
getFinishedDate
(
value
)
{
if
(
value
==
''
)
{
this
.
orderSearchForm
.
demandFinishDate
=
this
.
getFormatDate
(
tomorrowDate
)
if
(
value
==
""
)
{
this
.
orderSearchForm
.
demandFinishDate
=
this
.
getFormatDate
(
tomorrowDate
);
}
else
{
this
.
orderSearchForm
.
demandFinishDate
=
this
.
getFormatDate
(
value
)
this
.
orderSearchForm
.
demandFinishDate
=
this
.
getFormatDate
(
value
)
;
}
},
getFormatDate
(
dates
)
{
const
d
=
new
Date
(
dates
)
const
d
=
new
Date
(
dates
)
;
const
resDate
=
d
.
getFullYear
()
+
'-'
+
"-"
+
this
.
p
(
d
.
getMonth
()
+
1
)
+
'-'
+
this
.
p
(
d
.
getDate
())
return
resDate
"-"
+
this
.
p
(
d
.
getDate
())
;
return
resDate
;
},
p
(
s
)
{
return
s
<
10
?
'0'
+
s
:
s
return
s
<
10
?
"0"
+
s
:
s
;
}
},
created
()
{
var
theight
=
window
.
innerHeight
-
400
+
'px'
this
.
divHeight
=
theight
var
theight
=
window
.
innerHeight
-
400
+
"px"
;
this
.
divHeight
=
theight
;
},
mounted
()
{
window
.
onresize
=
()
=>
{
///浏览器窗口大小变化
return
(()
=>
{
window
.
screenHeight
=
window
.
innerHeight
this
.
divHeight
=
window
.
screenHeight
-
400
+
'px'
})()
}
window
.
screenHeight
=
window
.
innerHeight
;
this
.
divHeight
=
window
.
screenHeight
-
400
+
"px"
;
})()
;
}
;
}
}
}
;
</
script
>
\ No newline at end of file
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