Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pda-ui
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
pda
pda-ui
Commits
6cfa0a8e
Commit
6cfa0a8e
authored
Jan 22, 2024
by
全洪江
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
改了功能
parent
05e879a4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
85 additions
and
102 deletions
+85
-102
requestApply.vue
src/views/mes/pro/productiorequest/requestApply.vue
+3
-3
requestInfo.vue
src/views/mes/pro/productiorequest/requestInfo.vue
+82
-99
No files found.
src/views/mes/pro/productiorequest/requestApply.vue
View file @
6cfa0a8e
...
@@ -168,15 +168,15 @@
...
@@ -168,15 +168,15 @@
align=
"center"
align=
"center"
prop=
"isNeedPrototype"
prop=
"isNeedPrototype"
/>
/>
<el-table-column
label=
"唯一码产品"
align=
"center"
prop=
"isUniqueCode"
/>
<el-table-column
label=
"唯一码产品"
align=
"center"
prop=
"isUniqueCode"
/>
<el-table-column
label=
"不考虑型体配色"
align=
"center"
prop=
"isConsiderColor"
/>
<el-table-column
label=
"不考虑型体配色"
align=
"center"
prop=
"isConsiderColor"
/>
<el-table-column
label=
"是否禁用"
align=
"center"
prop=
"isDisabled"
/>
<el-table-column
label=
"是否禁用"
align=
"center"
prop=
"isDisabled"
/>
<
template
slot-scope=
"scope"
>
<!--
<template slot-scope="scope">
<dict-tag
<dict-tag
:options="dict.type.sys_yes_no"
:options="dict.type.sys_yes_no"
:value="scope.row.isNeedShoeImg"
:value="scope.row.isNeedShoeImg"
/>
/>
</
template
>
</template>
-->
<!-- <dict-tag
<!-- <dict-tag
:options="dict.type.sys_yes_no"
:options="dict.type.sys_yes_no"
:value="scope.row.isNeedPrototype"
:value="scope.row.isNeedPrototype"
...
...
src/views/mes/pro/productiorequest/requestInfo.vue
View file @
6cfa0a8e
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
<el-col
:md=
"8"
:xs=
"12"
style=
"height: 50.5px"
>
<el-col
:md=
"8"
:xs=
"12"
style=
"height: 50.5px"
>
<el-form-item
label=
"产品"
prop=
"itemId"
>
<el-form-item
label=
"产品"
prop=
"itemId"
>
<el-input
<el-input
v-model=
"form.item
Id
"
v-model=
"form.item
Name
"
readonly
readonly
placeholder=
"请选择产品"
placeholder=
"请选择产品"
>
>
...
@@ -49,23 +49,6 @@
...
@@ -49,23 +49,6 @@
<ItemSelect
ref=
"ItemSelectRef"
@
onSelected=
"onItemSelect"
/>
<ItemSelect
ref=
"ItemSelectRef"
@
onSelected=
"onItemSelect"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
style=
"height: 50.5px"
>
<el-form-item
label=
"制造工厂"
prop=
"factoryId"
>
<el-input
v-model=
"form.factoryId"
readonly
placeholder=
"请选择"
>
<el-button
slot=
"append"
icon=
"el-icon-search"
@
click=
"$refs['factoryRef'].showFlag = true"
></el-button>
</el-input>
<factory
ref=
"factoryRef"
@
onSelected=
" onfactory"
/>
</el-form-item>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
style=
"height: 50.5px"
>
<el-col
:md=
"8"
:xs=
"12"
style=
"height: 50.5px"
>
<el-form-item
label=
"工艺路线"
prop=
"routeId"
>
<el-form-item
label=
"工艺路线"
prop=
"routeId"
>
<el-input
<el-input
...
@@ -86,98 +69,89 @@
...
@@ -86,98 +69,89 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col
:md=
"8"
:xs=
"12"
>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"
仓库"
prop=
"warehouse
"
>
<el-form-item
label=
"
简称"
prop=
"abbreviation
"
>
<el-input
<el-input
v-model=
"form.abbreviation"
v-model=
"form.abbreviation"
placeholder=
"请输入
仓库
"
placeholder=
"请输入
简称
"
></el-input>
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"
尺码"
prop=
"sizeGroup
"
>
<el-form-item
label=
"
样品英文名"
prop=
"enName
"
>
<el-input
<el-input
v-model=
"form.enName"
v-model=
"form.enName"
placeholder=
"请输入
尺码
"
placeholder=
"请输入
样品英文名称
"
></el-input>
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"是否要鞋图"
prop=
"isNeedShoeImg"
>
<el-form-item
label=
"样品数量"
prop=
"num"
>
<el-input
<el-input
v-model=
"form.num"
placeholder=
"请输入样品数量"
>
v-model=
"form.isNeedShoeImg"
<
template
slot=
"suffix"
>
{{
form
.
unit
}}
</
template
>
placeholder=
"请输是否"
</el-input>
>
</el-form-item>
<el-option
aria-label=
"是"
value=
"Y"
></el-option>
<el-option
aria-label=
"否"
value=
"N"
></el-option>
</el-input>
</el-form-item>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"是否附样品"
prop=
"isNeedPrototype"
>
<el-input
v-model=
"form.isNeedPrototype"
placeholder=
"请输是否"
>
<el-option
aria-label=
"是"
value=
"Y"
></el-option>
<el-option
aria-label=
"否"
value=
"N"
></el-option>
</el-input>
</el-form-item>
</el-col>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"唯一码产品"
prop=
"isUniqueCode"
>
<el-form-item
label=
"打样形式"
prop=
"type"
>
<el-input
<el-input
v-model=
"form.isUniqueCode"
v-model=
"form.type"
placeholder=
"请输是否"
placeholder=
"请选择打样形式"
>
></el-input>
<el-option
aria-label=
"是"
value=
"Y"
></el-option>
</el-form-item>
<el-option
aria-label=
"否"
value=
"N"
></el-option>
</el-input>
</el-form-item>
</el-col>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"不考虑型体配色"
prop=
"isConsiderColor: "
>
<el-form-item
label=
"分配方式"
prop=
"modality"
>
<el-input
<el-input
v-model=
"form.isConsiderColor"
v-model=
"form.modality"
placeholder=
"请输是否"
placeholder=
"请选择分配方式"
>
></el-input>
<el-option
aria-label=
"是"
value=
"Y"
></el-option>
</el-form-item>
<el-option
aria-label=
"否"
value=
"N"
></el-option>
</el-input>
</el-form-item>
</el-col>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"是否禁用"
prop=
"isDisabled: "
>
<el-form-item
label=
"表面处理"
prop=
"surfaceTreatment"
>
<el-input
<el-input
v-model=
"form.isConsiderColor"
v-model=
"form.surfaceTreatment"
placeholder=
"请输是否"
placeholder=
"请输入表面处理"
>
></el-input>
<el-option
aria-label=
"是"
value=
"Y"
></el-option>
</el-form-item>
<el-option
aria-label=
"否"
value=
"N"
></el-option>
</el-input>
</el-form-item>
</el-col>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"
鞋图"
prop=
"shoeImg
"
>
<el-form-item
label=
"
NG原因"
prop=
"ngReason
"
>
<el-input
<el-input
v-model=
"form.
type
"
v-model=
"form.
ngReason
"
placeholder=
"请
选鞋图
"
placeholder=
"请
输入NG原因
"
></el-input>
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"样品"
prop=
"prototype"
>
<el-form-item
label=
"计划完成日期"
prop=
"plannedFinishDate"
>
<el-date-picker
value-format=
"yyyy-MM-dd"
v-model=
"form.plannedFinishDate"
placeholder=
"请输入计划完成日期"
></el-date-picker>
</el-form-item>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"版面需求时间"
prop=
"plannedLayoutDate"
>
<el-date-picker
value-format=
"yyyy-MM-dd"
v-model=
"form.plannedLayoutDate"
placeholder=
"请输入版面需求时间"
></el-date-picker>
</el-form-item>
</el-col>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"测试标准"
prop=
"testStandard"
>
<el-input
<el-input
v-model=
"form.
modality
"
v-model=
"form.
testStandard
"
placeholder=
"
请选择样品
"
placeholder=
"
测试标准
"
></el-input>
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row>
<el-row>
<el-col
:md=
"8"
:xs=
"12"
>
<el-col
:md=
"8"
:xs=
"12"
>
<el-form-item
label=
"备注"
prop=
"remark"
>
<el-form-item
label=
"备注"
prop=
"remark"
>
...
@@ -203,6 +177,7 @@
...
@@ -203,6 +177,7 @@
</PageWrapper>
</PageWrapper>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
genCode
}
from
"@/api/system/autocode/rule"
;
import
{
genCode
}
from
"@/api/system/autocode/rule"
;
import
ProogingBom
from
"./components/ProogingBom.vue"
;
import
ProogingBom
from
"./components/ProogingBom.vue"
;
...
@@ -232,16 +207,21 @@ export default {
...
@@ -232,16 +207,21 @@ export default {
// 表单参数
// 表单参数
form
:
{
form
:
{
prototypeRequestCode
:
""
,
prototypeRequestCode
:
""
,
routeId
:
""
,
itemId
:
""
,
itemId
:
""
,
factoryId
:
""
,
itemName
:
""
,
isNeedShoeImg
:
""
,
unit
:
""
,
isNeedPrototype
:
""
,
routeId
:
""
,
isUniqueCode
:
""
,
routeName
:
""
,
isConsiderColor
:
""
,
abbreviation
:
""
,
isDisabled
:
""
,
enName
:
""
,
shoeImg
:
""
,
num
:
""
,
prototype
:
""
,
type
:
""
,
modality
:
""
,
surfaceTreatment
:
""
,
ngReason
:
""
,
plannedFinishDate
:
""
,
plannedLayoutDate
:
""
,
testStandard
:
""
,
remark
:
""
,
remark
:
""
,
},
},
rules
:
{},
rules
:
{},
...
@@ -279,7 +259,7 @@ export default {
...
@@ -279,7 +259,7 @@ export default {
this
.
bomList
=
data
.
bomList
;
this
.
bomList
=
data
.
bomList
;
// 设置组件数据
// 设置组件数据
this
.
$refs
[
"ProogingBomRef"
].
tableData
=
data
.
bomList
;
this
.
$refs
[
"ProogingBomRef"
].
tableData
=
data
.
bomList
;
this
.
$refs
[
"ProogingProcess"
].
tableData
=
data
.
processList
;
this
.
$refs
[
"ProogingProcess
Ref
"
].
tableData
=
data
.
processList
;
})
})
.
finally
(()
=>
{
.
finally
(()
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
...
@@ -357,16 +337,19 @@ export default {
...
@@ -357,16 +337,19 @@ export default {
resetForm
()
{
resetForm
()
{
this
.
form
=
{
this
.
form
=
{
prototypeRequestCode
:
""
,
prototypeRequestCode
:
""
,
routeId
:
""
,
itemId
:
""
,
itemId
:
""
,
factoryId
:
""
,
itemName
:
""
,
isNeedShoeImg
:
""
,
routeId
:
""
,
isNeedPrototype
:
""
,
abbreviation
:
""
,
isUniqueCode
:
""
,
enName
:
""
,
isConsiderColor
:
""
,
num
:
""
,
isDisabled
:
""
,
type
:
""
,
shoeImg
:
""
,
modality
:
""
,
prototype
:
""
,
surfaceTreatment
:
""
,
ngReason
:
""
,
plannedFinishDate
:
""
,
plannedLayoutDate
:
""
,
testStandard
:
""
,
remark
:
""
,
remark
:
""
,
};
};
this
.
$refs
[
"ProogingBomRef"
].
resetState
();
this
.
$refs
[
"ProogingBomRef"
].
resetState
();
...
...
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