suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工艺管理逻辑调整

Browse Source
dev-scheduling
jinna 3 months ago
parent 0d4bc2ef2e
commit bd1acee9cb
2 changed files with 100 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 134
      src/views/processManagement/components/processMainte/partDetails.vue
  2. 4
      src/views/processManagement/components/processMainte/processPlanning.vue

134
src/views/processManagement/components/processMainte/partDetails.vue
Unescape View File

@ -6,8 +6,8 @@
<el-tab-pane label="工艺编制" name="2"> </el-tab-pane>
</el-tabs>
<div class="content-right">
<p v-if="this.detailsType == 'taskProcessing'">工艺版本：{{ partVersion }}</p>
<div class='version_select' v-else>
<p v-if="this.detailsType == 'taskProcessing'">工艺版本：{{ version }}</p>
<div class="version_select" v-else>
工艺版本：<el-select v-model="version" placeholder="请输入" clearable filterable>
<el-option
v-for="(item, index) in versionOptions"
@ -97,9 +97,9 @@
:span="6"
v-if="partType == '热表' || (partType == '烧结' && formData.isGlassCake)"
>
<el-form-item label="物料编码:" prop="wuliaobianma">
<el-form-item label="物料编码:" prop="plateGoodsCode">
<el-select
v-model="value"
v-model="formData.plateGoodsCode"
placeholder="请选择"
style="width: 250px"
disabled
@ -238,23 +238,45 @@
<el-row :gutter="24">
<el-col
:span="24"
v-if="partType == '热表' || (partType == '烧结' && !formData.isGlassCake)"
v-if="partType == '热表' || (partType == '烧结' && formData.isGlassCake)"
>
<el-form-item label="工艺校验:" prop="sinTer">
<el-checkbox v-model="formData.goldMark" v-if="partType == '热表'" disabled
>镀金标识</el-checkbox
>
<el-checkbox v-model="formData.markingsTest" disabled>涂色标</el-checkbox>
<el-checkbox
v-model="formData.markingsTest"
@change="setDataLocal"
:true-label="'1'"
:false-label="'0'"
disabled
>涂色标</el-checkbox
>
<el-checkbox
v-model="formData.fluorescenceCheck"
@change="setDataLocal"
v-if="partType == '热表'"
:true-label="'1'"
:false-label="'0'"
disabled
>荧光检</el-checkbox
>
<el-checkbox v-model="formData.hotDispose" v-if="partType == '热表'" disabled
<el-checkbox
v-model="formData.hotDispose"
@change="setDataLocal"
v-if="partType == '热表'"
:true-label="'1'"
:false-label="'0'"
disabled
>热处理检验</el-checkbox
>
<el-checkbox v-model="formData.inkjetPrinting" v-if="partType == '热表'"
<el-checkbox
v-model="formData.inkjetPrinting"
@change="setDataLocal"
v-if="partType == '热表'"
:true-label="'1'"
:false-label="'0'"
disabled
>喷码</el-checkbox
>
</el-form-item>
@ -311,33 +333,47 @@
/>
</div>
<div class="process-right">
<el-form :model="form" label-width="auto">
<el-form :model="form" label-width="auto" v-if="Object.keys(treeNodes).length !== 0">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="重要度:" prop="prority">
{{
this.craftData.craftList.length > 0
? this.craftData.craftList[0].craftInfo.prority
: ''
}}
<el-select
v-model="treeNodes.rawData.prority"
:placeholder="'请选择'"
clearable
filterable
disabled
>
<el-option
v-for="item in priorityList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="生产标识:" prop="qualityGradeName">
{{
this.craftData.craftList.length > 0
? this.craftData.craftList[0].craftInfo.qualityGradeName
: ''
}}
<el-select
v-model="treeNodes.rawData.qualityGradeCode"
:placeholder="'请选择'"
clearable
filterable
disabled
>
<el-option
v-for="item in rankList"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注:" prop="beizhu">
{{
this.craftData.craftList.length > 0
? this.craftData.craftList[0].craftInfo.remarks
: ''
}}
<el-input v-model="treeNodes.rawData.remarks" placeholder="请输入" disabled />
</el-form-item>
</el-col>
</el-row>
@ -348,7 +384,7 @@
<el-tab-pane label="尺寸、量具" name="3" v-if="treeLeave == 3"></el-tab-pane>
<el-tab-pane label="工装、模具表" name="4" v-if="treeLeave == 3"></el-tab-pane>
</el-tabs>
<el-table :data="form1.tableData1" style="width: 100%" v-if="activeName == '1'">
<el-table :data="form1.tableData1" style="width: 100%" v-if="activeName == '1'" border>
<el-table-column prop="processNo" label="工序号"></el-table-column>
<el-table-column prop="processName" label="工序"> </el-table-column>
<el-table-column prop="craftName" label="工艺能力"> </el-table-column>
@ -361,7 +397,7 @@
</template>
</el-table-column>
</el-table>
<el-table :data="form2.tableData2" style="width: 100%" v-if="activeName == '2'">
<el-table :data="form2.tableData2" style="width: 100%" v-if="activeName == '2'" border>
<el-table-column prop="processNo" label="工序号"></el-table-column>
<el-table-column prop="projectName" label="检验项目">
<template #default="scope">
@ -400,7 +436,7 @@
<el-table-column prop="proHours" label="定额工时(分钟)"> </el-table-column>
<el-table-column prop="prepareHours" label="准备工时(分钟)"></el-table-column>
</el-table>
<el-table :data="form3.tableData3" style="width: 100%" v-if="activeName == '3'">
<el-table :data="form3.tableData3" style="width: 100%" v-if="activeName == '3'" border>
<el-table-column prop="processNo" label="工序号"></el-table-column>
<el-table-column prop="testType" label="镀前镀后">
<template #default="scope">
@ -411,7 +447,7 @@
<el-table-column prop="toolSize" label="量具尺寸"></el-table-column>
<el-table-column prop="toolInfo" label="图纸尺寸"></el-table-column>
</el-table>
<el-table :data="form4.tableData4" style="width: 100%" v-if="activeName == '4'">
<el-table :data="form4.tableData4" style="width: 100%" v-if="activeName == '4'" border>
<el-table-column prop="processNo" label="工序号"></el-table-column>
<el-table-column prop="moldCode" label="对应工装"> </el-table-column>
<el-table-column prop="moldName" label="工装名称"></el-table-column>
@ -451,19 +487,14 @@ export default {
processPlanning,
},
props: {
partType: {
type: String,
default: '',
},
// partType: {
// type: String,
// default: '',
// },
isOpen: {
type: Boolean,
default: false,
},
dialogType: {
type: String,
default: '',
},
rowData: {
type: Object,
default: () => ({}),
@ -484,6 +515,7 @@ export default {
activeName: '1',
activeNameTab: '1',
craftData: {},
treeNodes: {},
formData: {},
form: {},
processLevel: '1',
@ -648,6 +680,12 @@ export default {
this.getPartInfo();
this.getPlatingList();
this.getStandardList();
if (this.detailsType == 'processPlanning') {
console.log(9999,this.rowData)
// this.partChange()
}
//
},
methods: {
getStandardList() {
@ -729,6 +767,7 @@ export default {
leavelChange(value) {
console.log('工艺级别', value);
this.getCcraftInfo();
this.getPartInfo();
},
// 获取工艺信息
getCcraftInfo() {
@ -767,12 +806,29 @@ export default {
getPartManagementDetail(query).then(res => {
this.formData = res.data.data.dsPartEntity;
this.dataTable = res.data.data.dsPartEntities;
this.version = res.data.data.partVersion;
if (this.dataTable.length > 0) {
this.dataTable.forEach(item => {
item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串）
});
}
if (this.formData.isSintering != '1') {
this.partType = '热表';
} else {
this.partType = '烧结';
}
});
} else if (this.detailsType === 'taskProcessing') {
getPartDetail(this.rowData.id).then(res => {
this.formData = res.data.data.dsPartEntity;
this.dataTable = res.data.data.dsPartEntities;
this.partChange(this.formData.id);
this.version = res.data.data.partVersion;
if (this.formData.isSintering != '1') {
this.partType = '热表';
} else {
this.partType = '烧结';
}
if (this.dataTable.length > 0) {
this.dataTable.forEach(item => {
item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串）
@ -870,7 +926,7 @@ export default {
display: flex;
line-height: 35px;
.el-select {
flex:1
flex: 1;
}
}
}

4
src/views/processManagement/components/processMainte/processPlanning.vue
Unescape View File

@ -631,12 +631,12 @@ export default {
},
methods: {
// 获取检验项目名字
projectChange() {
projectChange(row,index) {
let selectName = this.projectOptions.find(item => item.id == row.projecCode);
this.form2.tableData2[index].projectName = selectName.name;
},
// 获取检验标准名字
standardChange() {
standardChange(row,index) {
let selectName = this.standardList.find(item => item.id == row.projectStandard);
this.form2.tableData2[index].projectStandardName = selectName.name;
},

Write Preview
Loading…
Cancel
Save