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

工艺管理详情页面调整

Browse Source
dev-scheduling
zhangdi 4 days ago
parent f404b450b5
commit 480217af12
2 changed files with 91 additions and 76 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. 14
      src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
  2. 153
      src/views/processManagement/components/processMainte/partDetails.vue

14
src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
Unescape View File

@ -504,6 +504,20 @@ export default {
},
],
},
{
label: '修改人',
prop: 'updateUser',
search: false,
sortable: true,
overHidden: true,
},
{
label: '修改时间',
prop: 'updateTime',
search: false,
sortable: true,
overHidden: true,
},
],
},
partType: '',

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

@ -1,14 +1,14 @@
<template>
<el-dialog title="详情" v-model="setCrewShow" :before-close="cancel" fullscreen>
<div class="tabs-container">
<el-tabs v-if="setCrewShow" v-model="activeName">
<el-tabs v-if="setCrewShow" v-model="activeNameTab">
<el-tab-pane label="零件信息" name="1"> </el-tab-pane>
<el-tab-pane label="工艺编制" name="2"> </el-tab-pane>
</el-tabs>
<div class="content-right">
<p v-if="showProcessVersion">工艺版本：202510191001</p>
</div>
<div v-show="activeName === '1'">
<div v-show="activeNameTab === '1'">
<el-card class="box-card-info">
<div slot="header" class="clearfix">
<span style="font-size: 20px">基本信息</span>
@ -249,14 +249,14 @@
<avue-crud
:option="option"
:table-loading="loading"
:data="data"
:data="dataTable"
v-model="form"
ref="crud"
>
</avue-crud>
</el-card>
</div>
<div v-show="activeName === '2'" class="box-card">
<div v-show="activeNameTab === '2'" class="box-card">
<div class="process-left">
<div class="process-select">
<!-- 工艺级别：-->
@ -307,85 +307,39 @@
<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-column type="selection" width="55"></el-table-column>
<el-table-column prop="processNo" label="工序号"></el-table-column>
<el-table-column prop="processName" label="工序">
<template #header>
<span><i style="color: red">*</i>工序</span>
</template>
</el-table-column>
<el-table-column prop="craftName" label="工艺能力">
<template #header>
<span><i style="color: red">*</i>工艺能力</span>
</template>
</el-table-column>
<el-table-column prop="proDes" label="工序描述">
<template #header>
<span><i style="color: red">*</i>工序描述</span>
</template>
</el-table-column>
<el-table-column prop="proHours" label="定额工时(分钟)">
<template #header>
<span><i style="color: red">*</i>定额工时(分钟)</span>
</template>
</el-table-column>
<el-table-column prop="processName" label="工序"> </el-table-column>
<el-table-column prop="craftName" label="工艺能力"> </el-table-column>
<el-table-column prop="proDes" label="工序描述"> </el-table-column>
<el-table-column prop="proHours" label="定额工时(分钟)"> </el-table-column>
<el-table-column prop="setoutHours" label="准备工时(分钟)"> </el-table-column>
<el-table-column prop="isMain" label="是否主工序">
<template #default="scope">
<el-select v-model="scope.row.isMain" placeholder="请选择" disabled>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="2"></el-option>
</el-select>
{{ scope.row.isMain == '1' ? '是' : '否' }}
</template>
</el-table-column>
</el-table>
<el-table :data="form2.tableData2" style="width: 100%" v-if="activeName == '2'">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="trialNo" label="工序号"></el-table-column>
<el-table-column prop="projectName" label="检验项目">
<template #header>
<span><i style="color: red">*</i>检验项目</span>
</template>
</el-table-column>
<el-table-column prop="projectStandard" label="检验标准">
<template #header>
<span><i style="color: red">*</i>检验标准</span>
</template>
</el-table-column>
<el-table-column prop="proHours" label="定额工时(分钟)">
<template #header>
<span><i style="color: red">*</i>定额工时(分钟)</span>
</template>
</el-table-column>
<el-table-column prop="processNo" label="工序号"></el-table-column>
<el-table-column prop="projectName" label="检验项目"> </el-table-column>
<el-table-column prop="projectStandard" label="检验标准"> </el-table-column>
<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-column type="selection" width="55"></el-table-column>
<el-table-column prop="trialNo" label="工序号"></el-table-column>
<el-table-column prop="processNo" label="工序号"></el-table-column>
<el-table-column prop="testType" label="镀前镀后">
<template #header>
<span><i style="color: red">*</i>镀前镀后</span>
</template>
<template #default="scope">
{{ scope.row.testType == 1 ? '镀前' : '镀后' }}
</template>
</el-table-column>
<el-table-column prop="tool" label="量具">
<template #header>
<span><i style="color: red">*</i>量具</span>
</template>
</el-table-column>
<el-table-column prop="tool" label="量具"> </el-table-column>
<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-column type="selection" width="55"></el-table-column>
<el-table-column prop="trialNo" label="工序号"></el-table-column>
<el-table-column prop="moldCode" label="对应工装">
<template #header>
<span><i style="color: red">*</i>对应工装</span>
</template>
</el-table-column>
<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>
<el-table-column prop="isPrint" label="是否印字"></el-table-column>
<el-table-column prop="printNo" label="印字版编号"></el-table-column>
@ -404,7 +358,6 @@
</el-dialog>
</template>
<script>
import dsPartBasicInfo from './dsPartBasicInfo.vue';
import processPlanning from './processPlanning.vue';
import {
@ -445,9 +398,10 @@ export default {
},
data() {
return {
showProcessVersion:false,
showProcessVersion: false,
setCrewShow: false,
activeName: '1',
activeNameTab: '1',
craftData: {},
formData: {},
form: {},
@ -469,6 +423,7 @@ export default {
activeName: '1',
treeLeave: 2, //组织树选中层级
data: [],
dataTable: [],
option: {
tip: false,
simplePage: false,
@ -503,14 +458,14 @@ export default {
column: [
{
label: '零件号',
prop: 'subCode',
prop: 'partCode',
search: false,
sortable: true,
overHidden: true,
},
{
label: '零件名称',
prop: 'subName',
prop: 'partName',
search: false,
sortable: true,
overHidden: true,
@ -538,7 +493,7 @@ export default {
},
{
label: '零件类型',
prop: 'productType',
prop: 'sinTerType',
search: false,
sortable: true,
overHidden: true,
@ -567,6 +522,20 @@ export default {
},
],
},
{
label: '修改人',
prop: 'updateUser',
search: false,
sortable: true,
overHidden: true,
},
{
label: '修改时间',
prop: 'updateTime',
search: false,
sortable: true,
overHidden: true,
},
],
},
loading: false,
@ -579,13 +548,23 @@ export default {
mounted() {
this.setCrewShow = this.isOpen;
this.getPartInfo();
this.getCcraftInfo();
this.getPartInfo();
},
methods: {
// 组织树点击
handleNodeClick(nodes, node, self) {
// if (nodes.disabled) {
// // 阻止默认的点击行为
// return false;
// }
// this.treeLeave = node.level;
// if (this.treeLeave == 3) {
// this.activeName = '2';
// }
// if (this.treeLeave == 2) {
// this.activeName = '1';
// }
if (nodes.disabled) {
return false;
}
@ -609,19 +588,37 @@ export default {
const { processInfo, projectList, measuringToolList, moldToolList } = nodes.rawData;
// 加载项目表格数据
this.form2.tableData2 = projectList
this.form2.tableData2 = projectList.map(item => ({
trialNo: item.projectCode,
projectName: item.projectName,
projectStandard: item.projectStandard,
proHours: item.proHours,
prepareHours: item.prepareHours,
}));
// 加载量具表格数据
this.form3.tableData3 = measuringToolList
this.form3.tableData3 = measuringToolList.map(item => ({
trialNo: item.projectCode || '',
testType: item.testType,
tool: item.tool,
toolSize: item.toolSize,
toolInfo: item.toolInfo,
}));
// 加载工装表格数据
this.form4.tableData4 = moldToolList
this.form4.tableData4 = moldToolList.map(item => ({
trialNo: processInfo.processNo,
moldCode: item.moldCode,
moldName: item.moldName,
isPrint: item.isPrint,
printNo: item.printNo,
testFixtureNo: item.testFixtureNo,
}));
}
},
setDataLocal() {
this.$setItem('零件信息信息验证', this.validateObj);
},
leavelChange(value) {
console.log('工艺级别', value);
},
@ -638,7 +635,7 @@ export default {
this.data = this.transformCraftTree(res.data.data);
});
} else if (this.detailsType === 'taskProcessing') {
let query = {
let query = {
partId: 4,
partVersion: '1.3',
rank: '2',
@ -664,6 +661,7 @@ export default {
} else if (this.detailsType === 'taskProcessing') {
getPartDetail(this.rowData.id).then(res => {
this.formData = res.data.data.dsPartEntity;
this.dataTable = res.data.data.dsPartEntities;
});
}
},
@ -681,7 +679,7 @@ export default {
children: craftList.map(craft => {
const { craftInfo, processList } = craft;
// 拼接二级节点标签：roamNo-craftNo
const craftLabel = `${craftInfo.roamNo}-${craftInfo.craftNo}`;
const craftLabel = `${craftInfo.roamNo}-${craftInfo.craftNo}`;
return {
...craftInfo,
@ -790,4 +788,7 @@ export default {
}
}
}
:deep(.el-card__body) {
width: 100%;
}
</style>

Write Preview
Loading…
Cancel
Save