工艺问题修改

dev-scheduling
zhangdi 3 weeks ago
parent de01773d8a
commit 0974cda134
  1. 18
      src/views/processManagement/components/processMainte/partDetails.vue
  2. 6
      src/views/processManagement/components/processMainte/processPlanning.vue
  3. 10
      src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
  4. 10
      src/views/processManagement/procepssPlanning.vue
  5. 3
      src/views/qualityManagement/similarParts/index.vue

@ -482,6 +482,7 @@
@node-click="handleNodeClick" @node-click="handleNodeClick"
:default-expand-all="true" :default-expand-all="true"
:expand-on-click-node="false" :expand-on-click-node="false"
ref="tree"
/> />
</div> </div>
<div class="process-right"> <div class="process-right">
@ -491,7 +492,7 @@
<el-form-item label="重要度:" prop="prority"> <el-form-item label="重要度:" prop="prority">
<el-select <el-select
v-model="treeNodes.rawData.prority" v-model="treeNodes.rawData.prority"
:placeholder="'请选择'" :placeholder="''"
clearable clearable
filterable filterable
disabled disabled
@ -512,7 +513,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="备注:" prop="beizhu"> <el-form-item label="备注:" prop="beizhu">
<el-input v-model="treeNodes.rawData.remarks" placeholder="请输入" disabled /> <el-input v-model="treeNodes.rawData.remarks" placeholder="" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -823,15 +824,14 @@ export default {
}, },
// //
handleNodeClick(nodes, node, self) { handleNodeClick(nodes, node, self) {
console.log(9999999,nodes,node)
if (nodes.disabled) { if (nodes.disabled) {
return false; return false;
} }
this.treeNodes = nodes; this.treeNodes = nodes;
this.treeLeave = node.level; this.treeLeave = node.level;
if(this.treeNodes.rawData.prority){
this.treeNodes.rawData.prority = this.treeNodes.rawData.prority+'';
}
// //
this.form1.tableData1 = []; this.form1.tableData1 = [];
@ -842,6 +842,8 @@ export default {
if (this.treeLeave === 2) { if (this.treeLeave === 2) {
this.activeName = '1'; this.activeName = '1';
this.form1.tableData1 = nodes.processList; this.form1.tableData1 = nodes.processList;
console.log('默认点击选中第一个数据')
this.treeNodes.rawData.prority = this.treeNodes.rawData.prority+'';
} }
// //
if (this.treeLeave === 3) { if (this.treeLeave === 3) {
@ -932,6 +934,7 @@ export default {
getProcessManagementAuthorized(query).then(res => { getProcessManagementAuthorized(query).then(res => {
this.data = this.transformCraftTree(res.data.data); this.data = this.transformCraftTree(res.data.data);
this.tabLoading = false; this.tabLoading = false;
this.autoSelectFirstNode();
}); });
} else if (this.detailsType === 'taskProcessing') { } else if (this.detailsType === 'taskProcessing') {
let query_ = {}; let query_ = {};
@ -955,6 +958,7 @@ export default {
this.craftData = res.data.data; this.craftData = res.data.data;
this.data = this.transformCraftTree(res.data.data); this.data = this.transformCraftTree(res.data.data);
this.tabLoading = false; this.tabLoading = false;
this.autoSelectFirstNode();
}); });
} }
}, },
@ -1061,7 +1065,7 @@ export default {
return { return {
...processInfo, ...processInfo,
id: generateId('process', processInfo.id, processInfo.processNo), id: generateId('process', processInfo.id, processInfo.processNo),
label: processInfo.processName || '未知工序', label: processInfo.processNo+'-'+processInfo.processName,
level: 3, level: 3,
rawData: { rawData: {
processInfo, processInfo,
@ -1072,7 +1076,7 @@ export default {
// //
children: (projectList || []).map(project => ({ children: (projectList || []).map(project => ({
id: generateId('project', project.id, project.projectCode), id: generateId('project', project.id, project.projectCode),
label: project.projectName || '未知项目', label: project.trialNo+'-'+project.projectName,
level: 4, level: 4,
disabled: true, disabled: true,
rawData: project, rawData: project,

@ -980,7 +980,7 @@ export default {
return { return {
...processInfo, ...processInfo,
id: generateId('process', processInfo.id, processInfo.processNo), id: generateId('process', processInfo.id, processInfo.processNo),
label: processInfo.processName || '未知工序', label: processInfo.processNo+'-'+processInfo.processName,
level: 3, level: 3,
rawData: { rawData: {
processInfo, processInfo,
@ -991,7 +991,7 @@ export default {
// //
children: (projectList || []).map(project => ({ children: (projectList || []).map(project => ({
id: generateId('project', project.id, project.projectCode), id: generateId('project', project.id, project.projectCode),
label: project.projectName || '未知项目', label: project.trialNo+'-'+project.projectName || '未知项目',
level: 4, level: 4,
disabled: true, disabled: true,
rawData: project, rawData: project,
@ -1190,13 +1190,11 @@ export default {
}); });
} }
if (this.activeName == '3') { if (this.activeName == '3') {
console.log('this.form3.tableData3', this.treeNodes);
let trialNo_ = ''; let trialNo_ = '';
if (this.treeNodes.children.length <= 0) { if (this.treeNodes.children.length <= 0) {
trialNo_ = this.treeNodes.processNo; trialNo_ = this.treeNodes.processNo;
}else{ }else{
let projectInfo = this.treeNodes.children.filter(item => item.rawData.projectName.indexOf('尺寸检测')>-1); let projectInfo = this.treeNodes.children.filter(item => item.rawData.projectName.indexOf('尺寸检测')>-1);
console.log('projectInfo', projectInfo);
if(projectInfo.length>0){ if(projectInfo.length>0){
trialNo_ = projectInfo[0].rawData.trialNo; trialNo_ = projectInfo[0].rawData.trialNo;
}else{ }else{

@ -1268,4 +1268,14 @@ export default {
height: 36px !important; /* 设置你想要的高度 */ height: 36px !important; /* 设置你想要的高度 */
line-height: 36px !important; line-height: 36px !important;
} }
: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;
}
</style> </style>

@ -189,6 +189,16 @@ export default {
}, },
], ],
}, },
{
label: '镀种',
prop: 'plate',
sortable: true,
search: false,
overHidden: true,
headerAlign: 'center',
align: 'center',
width: 250,
},
{ {
label: '工艺路线', label: '工艺路线',

@ -220,6 +220,7 @@ export default {
closeDialog() { closeDialog() {
this.isRushOpen = false; this.isRushOpen = false;
this.isBatchOpen = false; this.isBatchOpen = false;
this.onLoad(this.page,this.query);
}, },
inBatchesFn(row) { inBatchesFn(row) {
this.rowItem = row; this.rowItem = row;
@ -264,7 +265,7 @@ export default {
rowSave(row, done, loading) { rowSave(row, done, loading) {
add(row).then( add(row).then(
() => { () => {
this.onLoad(this.page); this.onLoad(this.page,this.query);
this.$message({ this.$message({
type: 'success', type: 'success',
message: '操作成功!', message: '操作成功!',

Loading…
Cancel
Save