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
c2042786
Commit
c2042786
authored
Aug 05, 2024
by
chenzj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产版本工序合工作单元新增的字段
parent
4915aad5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
229 additions
and
1 deletion
+229
-1
index.vue
src/views/mes/md/workunit/index.vue
+82
-1
ProogingBom.vue
...ews/mes/pro/productionSolution/components/ProogingBom.vue
+8
-0
ProogingProcess.vue
...mes/pro/productionSolution/components/ProogingProcess.vue
+139
-0
No files found.
src/views/mes/md/workunit/index.vue
View file @
c2042786
...
...
@@ -192,6 +192,66 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-checkbox
v-model=
"form.sacmForEdgeOpening"
true-label=
"Y"
false-label=
"N"
>
开边
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForPasteComposite"
true-label=
"Y"
false-label=
"N"
>
粘贴符合
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForThermalComposite"
true-label=
"Y"
false-label=
"N"
>
热复合
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForLabeling"
true-label=
"Y"
false-label=
"N"
>
粘标
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForBuckleUp"
true-label=
"Y"
false-label=
"N"
>
装扣
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForCreasing"
true-label=
"Y"
false-label=
"N"
>
压痕
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForOrgan"
true-label=
"Y"
false-label=
"N"
>
风琴
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForThermalCutting"
true-label=
"Y"
false-label=
"N"
>
热切
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForThermalSelfFusion"
true-label=
"Y"
false-label=
"N"
>
热自合
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForMolarTooth"
true-label=
"Y"
false-label=
"N"
>
压齿
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForSlitting"
true-label=
"Y"
false-label=
"N"
>
分切
</el-checkbox>
</el-form-item>
<el-row>
<el-col
:span=
"20"
>
<el-form-item
label=
"备注"
label-width=
"120px"
prop=
"remark"
>
...
...
@@ -267,6 +327,17 @@ export default {
treatingWidthMax
:
''
,
dieSunkOffsetOilTankNum
:
''
,
printingMethod
:
''
,
sacmForEdgeOpening
:
''
,
sacmForPasteComposite
:
''
,
sacmForThermalComposite
:
''
,
sacmForLabeling
:
''
,
sacmForBuckleUp
:
''
,
sacmForCreasing
:
''
,
sacmForOrgan
:
''
,
sacmForThermalCutting
:
''
,
sacmForThermalSelfFusion
:
''
,
sacmForMolarTooth
:
''
,
sacmForSlitting
:
''
,
},
// 表单校验
rules
:
{
...
...
@@ -317,7 +388,17 @@ export default {
treatingWidthMax
:
''
,
dieSunkOffsetOilTankNum
:
''
,
printingMethod
:
''
,
sacmForEdgeOpening
:
''
,
sacmForPasteComposite
:
''
,
sacmForThermalComposite
:
''
,
sacmForLabeling
:
''
,
sacmForBuckleUp
:
''
,
sacmForCreasing
:
''
,
sacmForOrgan
:
''
,
sacmForThermalCutting
:
''
,
sacmForThermalSelfFusion
:
''
,
sacmForMolarTooth
:
''
,
sacmForSlitting
:
''
,
}
this
.
autoGenFlag
=
false
;
this
.
resetForm
(
"form"
);
...
...
src/views/mes/pro/productionSolution/components/ProogingBom.vue
View file @
c2042786
...
...
@@ -215,6 +215,10 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:lg=
"6"
:md=
"8"
:sm=
"12"
:xs=
"12"
>
<el-form-item
label=
"报废百分比"
prop=
"scrapPercentage"
>
<el-input
...
...
@@ -271,6 +275,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:lg=
"6"
:md=
"8"
:sm=
"12"
:xs=
"12"
>
<el-form-item
label=
"替代组"
prop=
"alternativeGroup"
>
<el-input
...
...
@@ -311,6 +317,8 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:lg=
"6"
:md=
"8"
:sm=
"12"
:xs=
"12"
>
<el-form-item
label=
"是否固定数量"
prop=
"isFixed"
>
<el-select
...
...
src/views/mes/pro/productionSolution/components/ProogingProcess.vue
View file @
c2042786
...
...
@@ -132,6 +132,12 @@
/>
</
template
>
</el-table-column>
<el-table-column
label=
"加工处理最小厚度"
align=
"center"
prop=
"treatingThicknessMin"
/>
<el-table-column
label=
"加工处理最大厚度"
align=
"center"
prop=
"treatingThicknessMax"
/>
<el-table-column
label=
"加工处理最小宽度"
align=
"center"
prop=
"treatingWidthMin"
/>
<el-table-column
label=
"加工处理最大宽度"
align=
"center"
prop=
"treatingWidthMax"
/>
<el-table-column
label=
"凹印_胶版油槽数"
align=
"center"
prop=
"dieSunkOffsetOilTankNum"
/>
<el-table-column
label=
"印刷方式"
align=
"center"
prop=
"printingMethod"
/>
<el-table-column
label=
"工序备注"
prop=
"processRemark"
align=
"center"
/>
<el-table-column
v-if=
"mode != 'info'"
...
...
@@ -291,6 +297,43 @@
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"固化时间"
label-width=
"120px"
prop=
"solidifyTime"
>
<el-input
v-model=
"form.solidifyTime"
placeholder=
"请输入固化时间"
>
<i
slot=
"suffix"
style=
"font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e"
>
MIN
</i>
</el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"最小厚度"
label-width=
"120px"
prop=
"treatingThicknessMin"
>
<el-input
v-model=
"form.treatingThicknessMin"
placeholder=
"请输入最小厚度"
>
<i
slot=
"suffix"
style=
"font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e"
>
cm
</i>
</el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"最大厚度"
label-width=
"120px"
prop=
"treatingThicknessMax"
>
<el-input
v-model=
"form.treatingThicknessMax"
placeholder=
"请输入最大厚度"
>
<i
slot=
"suffix"
style=
"font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e"
>
cm
</i>
</el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"最小宽度"
label-width=
"120px"
prop=
"treatingWidthMin"
>
<el-input
v-model=
"form.treatingWidthMin"
placeholder=
"请输入最小宽度"
>
<i
slot=
"suffix"
style=
"font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e"
>
cm
</i>
</el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"最大宽度"
label-width=
"120px"
prop=
"treatingWidthMax"
>
<el-input
v-model=
"form.treatingWidthMax"
placeholder=
"请输入最大宽度"
>
<i
slot=
"suffix"
style=
"font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e"
>
cm
</i>
</el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"单位转换比例"
prop=
"unitConvert"
>
<el-input
...
...
@@ -309,6 +352,11 @@
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"印刷方式"
label-width=
"120px"
prop=
"printingMethod"
>
<el-input
v-model=
"form.printingMethod"
placeholder=
"请输入印刷方式"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"加工方式"
prop=
"processingMethod"
>
<el-select
...
...
@@ -397,6 +445,63 @@
</el-select>
</el-form-item>
</el-col>
<el-form-item>
<el-checkbox
v-model=
"form.sacmForEdgeOpening"
true-label=
"Y"
false-label=
"N"
>
开边
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForPasteComposite"
true-label=
"Y"
false-label=
"N"
>
粘贴符合
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForThermalComposite"
true-label=
"Y"
false-label=
"N"
>
热复合
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForLabeling"
true-label=
"Y"
false-label=
"N"
>
粘标
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForBuckleUp"
true-label=
"Y"
false-label=
"N"
>
装扣
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForCreasing"
true-label=
"Y"
false-label=
"N"
>
压痕
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForOrgan"
true-label=
"Y"
false-label=
"N"
>
风琴
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForThermalCutting"
true-label=
"Y"
false-label=
"N"
>
热切
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForThermalSelfFusion"
true-label=
"Y"
false-label=
"N"
>
热自合
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForMolarTooth"
true-label=
"Y"
false-label=
"N"
>
压齿
</el-checkbox>
<el-checkbox
v-model=
"form.sacmForSlitting"
true-label=
"Y"
false-label=
"N"
>
分切
</el-checkbox>
</el-form-item>
<el-col
:span=
"12"
>
<el-form-item
label=
"备注"
prop=
"remark"
>
<el-input
...
...
@@ -477,6 +582,23 @@ export default {
remark
:
""
,
deputyUnitOfMeasure
:
""
,
unitConvert
:
""
,
sacmForEdgeOpening
:
''
,
sacmForPasteComposite
:
''
,
sacmForThermalComposite
:
''
,
sacmForLabeling
:
''
,
sacmForBuckleUp
:
''
,
sacmForCreasing
:
''
,
sacmForOrgan
:
''
,
sacmForThermalCutting
:
''
,
sacmForThermalSelfFusion
:
''
,
sacmForMolarTooth
:
''
,
sacmForSlitting
:
''
,
treatingThicknessMin
:
''
,
treatingThicknessMax
:
''
,
treatingWidthMin
:
''
,
treating_WidthMax
:
''
,
dieSunkOffsetOilTankNum
:
''
,
printingMethod
:
''
,
},
currentRow
:
{},
currentRowIndex
:
undefined
,
...
...
@@ -586,6 +708,23 @@ export default {
remark
:
""
,
deputyUnitOfMeasure
:
""
,
unitConvert
:
""
,
sacmForEdgeOpening
:
''
,
sacmForPasteComposite
:
''
,
sacmForThermalComposite
:
''
,
sacmForLabeling
:
''
,
sacmForBuckleUp
:
''
,
sacmForCreasing
:
''
,
sacmForOrgan
:
''
,
sacmForThermalCutting
:
''
,
sacmForThermalSelfFusion
:
''
,
sacmForMolarTooth
:
''
,
sacmForSlitting
:
''
,
treatingThicknessMin
:
''
,
treatingThicknessMax
:
''
,
treatingWidthMin
:
''
,
treating_WidthMax
:
''
,
dieSunkOffsetOilTankNum
:
''
,
printingMethod
:
''
,
};
},
/**重置组件状态 */
...
...
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