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

工艺问题修改

Browse Source
dev-scheduling
zhangdi 3 weeks ago
parent c2d17f7298
commit 40855c2bc8
4 changed files with 114 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. 135
      src/views/processManagement/components/processMainte/partDetails.vue
  2. 49
      src/views/processManagement/components/processMainte/processPlanning.vue
  3. 4
      src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
  4. 2
      src/views/processManagement/taskDispatch.vue

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

@ -10,7 +10,7 @@
v-model="version"
placeholder="请输入"
@change="versionChange()"
style="width:150px"
style="width: 150px"
>
<el-option
v-for="(item, index) in versionOptions"
@ -83,7 +83,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品应用领域:" prop="productApplicationArea" label-width="90px">
<el-form-item
label="产品应用领域:"
prop="productApplicationArea"
label-width="90px"
>
{{ formData.productApplicationArea }}
</el-form-item>
</el-col>
@ -326,8 +330,12 @@
{{ formData.formingThickness }}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品应用领域:" prop="productApplicationArea" label-width="90px">
<el-col :span="6">
<el-form-item
label="产品应用领域:"
prop="productApplicationArea"
label-width="90px"
>
{{ formData.productApplicationArea }}
</el-form-item>
</el-col>
@ -477,7 +485,7 @@
/>
</div>
<div class="process-right">
<el-form :model="form" label-width="auto" v-if="Object.keys(treeNodes).length !== 0">
<el-form :model="form" label-width="auto" v-if="treeLeave == 2">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="重要度:" prop="prority">
@ -498,21 +506,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="生产标识:" prop="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 label="流转编号:" prop="roamNo">
<el-input v-model="treeNodes.rawData.roamNo" disabled placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -523,7 +518,7 @@
</el-row>
</el-form>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="工序" name="1" v-if="treeLeave == 2"></el-tab-pane>
<el-tab-pane label="工艺维护" name="1" v-if="treeLeave == 2"></el-tab-pane>
<el-tab-pane label="项目" name="2" v-if="treeLeave == 3"></el-tab-pane>
<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>
@ -542,46 +537,14 @@
</el-table-column>
</el-table>
<el-table :data="form2.tableData2" style="width: 100%" v-if="activeName == '2'" border>
<el-table-column prop="trialNo" label="工序号"></el-table-column>
<el-table-column prop="projectName" label="检验项目">
<!-- <template #default="scope">
<el-select
v-model="scope.row.projectName"
placeholder="请选择"
clearable
filterable
disabled
>
<el-option
v-for="(item, index) in projectOptions"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</template> -->
</el-table-column>
<el-table-column prop="projectStandardName" label="检验标准">
<!-- <template #default="scope">
<el-select
v-model="scope.row.projectStandard"
placeholder="请选择"
clearable
filterable
disabled
>
<el-option
v-for="(item, index) in standardList"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</template> -->
</el-table-column>
<el-table-column prop="trialNo" label="项目编号"></el-table-column>
<el-table-column prop="projectName" label="检验项目"> </el-table-column>
<el-table-column prop="projectStandardName" 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'" border>
<el-table-column prop="trialNo" label="工序号"></el-table-column>
<el-table-column prop="trialNo" label="项目编号"></el-table-column>
<el-table-column prop="testType" label="镀前镀后">
<template #default="scope">
{{ scope.row.testType == 1 ? '镀前' : '镀后' }}
@ -592,7 +555,6 @@
<el-table-column prop="toolInfo" label="图纸尺寸"></el-table-column>
</el-table>
<el-table :data="form4.tableData4" style="width: 100%" v-if="activeName == '4'" border>
<el-table-column prop="trialNo" 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>
@ -867,6 +829,10 @@ export default {
this.treeNodes = nodes;
this.treeLeave = node.level;
if(this.treeNodes.rawData.prority){
this.treeNodes.rawData.prority = this.treeNodes.rawData.prority+'';
}
// 清空现有表格数据
this.form1.tableData1 = [];
this.form2.tableData2 = [];
@ -920,6 +886,40 @@ export default {
this.getCcraftInfo();
this.getPartInfo();
},
// ✅ 自动选中第一个子节点
autoSelectFirstNode() {
this.$nextTick(() => {
if (!this.data || this.data.length === 0) {
console.log('树数据为空，不自动选中');
return;
}
const rootNode = this.data[0];
console.log('根节点:', rootNode);
// 如果根节点有子节点，选中第一个子节点
if (rootNode.children && rootNode.children.length > 0) {
const firstChild = rootNode.children[0];
console.log('第一个子节点:', firstChild);
// 设置当前选中节点
if (this.$refs.tree) {
this.$refs.tree.setCurrentKey(firstChild.id);
}
// 模拟点击事件，加载对应数据
this.handleNodeClick(firstChild, {
level: firstChild.level,
parent: {
data: rootNode,
isRoot: false,
},
});
} else {
console.log('根节点无子节点，不自动选中');
}
});
},
// 获取工艺信息
getCcraftInfo() {
// 零件工艺管理-详情
@ -970,7 +970,7 @@ export default {
getPartManagementDetail(query).then(res => {
this.formData = res.data.data.dsPartEntity;
// res.data.data.dsPartVOList=null
this.dataTable = res.data.data.dsPartVOList==null?[]:res.data.data.dsPartVOList;
this.dataTable = res.data.data.dsPartVOList == null ? [] : res.data.data.dsPartVOList;
this.tabLoading = false;
if (this.dataTable.length > 0) {
this.dataTable.forEach(item => {
@ -1186,9 +1186,9 @@ export default {
margin-bottom: 12px;
}
:deep(.el-table .el-table__body-wrapper .el-table__cell) {
height: 50px !important;
height: 36px !important;
padding: 0 !important;
line-height: 50px !important;
line-height: 36px !important;
}
:deep(.header_height) {
height: 36px !important; /* 设置你想要的高度 */
@ -1198,4 +1198,17 @@ export default {
font-weight: 550 !important;
// color: #333;
}
:deep(.el-tree-node.is-current > .el-tree-node__content) {
background-color: rgba(40, 76, 135, 0.9) !important;
.el-tree-node__label {
color: #fff;
}
}
:deep(.el-tree-node__label) {
font-size: 14px;
}
:deep(.el-form-item) {
margin-bottom: 0px !important;
}
</style>

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

@ -27,7 +27,7 @@
node-key="id"
@node-click="handleNodeClick"
@node-contextmenu="handleNodeRightClick"
:default-expand-all="false"
default-expand-all
:expand-on-click-node="false"
/>
<div
@ -82,7 +82,11 @@
</el-row>
</el-form>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="工序" name="1" v-if="treeLeave == 1 || treeLeave == 2"></el-tab-pane>
<el-tab-pane
label="工艺维护"
name="1"
v-if="treeLeave == 1 || treeLeave == 2"
></el-tab-pane>
<el-tab-pane label="项目" name="2" v-if="treeLeave == 3"></el-tab-pane>
<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>
@ -232,7 +236,7 @@
:height="tableHeight"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="trialNo" label="工序号">
<el-table-column prop="trialNo" label="项目编号">
<template #default="scope">
<el-input
v-model="scope.row.trialNo"
@ -336,7 +340,7 @@
@selection-change="handleSelectionChange3"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="trialNo" label="工序号">
<el-table-column prop="trialNo" label="项目编号">
<template #default="scope">
<el-input
v-model="scope.row.trialNo"
@ -410,7 +414,7 @@
:height="tableHeight"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="trialNo" label="工序号">
<!-- <el-table-column prop="trialNo" label="工序号">
<template #default="scope">
<el-input
v-model="scope.row.trialNo"
@ -418,7 +422,7 @@
style="width: 100%"
></el-input>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="moldCode" label="对应工装">
<template #header>
<span><i style="color: red">*</i>对应工装</span>
@ -1182,14 +1186,28 @@ export default {
this.form2.tableData2.push({
_tempId: this.tempId, // 临时唯一标识
id: null,
trialNo: this.getProcessNo(this.form2.tableData2),
trialNo: this.treeNodes.processNo + '-' + this.getProcessNo(this.form2.tableData2),
});
}
if (this.activeName == '3') {
console.log('this.form3.tableData3', this.treeNodes);
let trialNo_ = '';
if (this.treeNodes.children.length <= 0) {
trialNo_ = this.treeNodes.processNo;
}else{
let projectInfo = this.treeNodes.children.filter(item => item.rawData.projectName.indexOf('尺寸检测')>-1);
console.log('projectInfo', projectInfo);
if(projectInfo.length>0){
trialNo_ = projectInfo[0].rawData.trialNo;
}else{
trialNo_ = this.treeNodes.processNo;
}
}
this.form3.tableData3.push({
_tempId: this.tempId, // 临时唯一标识
id: null,
trialNo: this.getProcessNo(this.form3.tableData3),
trialNo: trialNo_,
});
}
if (this.activeName == '4') {
@ -1794,17 +1812,26 @@ export default {
:deep(.el-tree) {
height: auto;
padding: 8px 0;
padding: 0px 0;
.el-tree-node__content {
height: 36px;
height: 26px;
&:hover {
background-color: #f5f7fa;
// background-color: #f5f7fa;
}
}
.el-tree-node__label {
font-size: 14px;
}
}
:deep(.el-tree-node.is-current > .el-tree-node__content) {
background-color: rgba(40, 76, 135, 0.9) !important;
.el-tree-node__label {
color: #fff;
}
}
:deep(.el-table__header th.el-table__cell) {
height: 40px !important;
min-height: 40px !important;

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

@ -12,7 +12,7 @@
</div>
<div class="process-right" v-loading="treeLoading">
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="工序" name="1" v-if="treeLeave == 2"></el-tab-pane>
<el-tab-pane label="工艺维护" name="1" v-if="treeLeave == 2"></el-tab-pane>
<el-tab-pane label="项目" name="2" v-if="treeLeave == 3"></el-tab-pane>
<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>
@ -27,8 +27,6 @@
</div>
<div class="table-btn-right" v-if="activeName == '1'">
<div class="table-btn-right-box">
<!-- <el-input v-model="reworkNoNum" type="number" placeholder="请输入" style="width: 220px; margin-right: 12px"></el-input>
<el-button type="primary" @change="reworkNoNumSave()">保存</el-button> -->
<el-input placeholder="请输入内容" v-model="reworkNoNum">
<template #append>
<el-button @click="reworkNoNumSave()">保存</el-button>

2
src/views/processManagement/taskDispatch.vue
Unescape View File

@ -22,7 +22,7 @@
<template #menu-right="{ size }"> </template>
<template #menu="scope">
<el-button v-if="scope.row.children" type="primary" link @click="setCrew(scope.row)"
<el-button type="primary" link @click="setCrew(scope.row)"
>分派</el-button
>
</template>

Write Preview
Loading…
Cancel
Save