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

工艺管理问题修改

Browse Source
dev-scheduling
zhangdi 2 months ago
parent 7c1a6c1c97
commit bb9a88835b
7 changed files with 28 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/styles/variables.scss
  2. 1
      src/views/processManagement/basicProcesses.vue
  3. 6
      src/views/processManagement/components/inPlantMaintenance.vue
  4. 9
      src/views/processManagement/components/processMainte/processPlanning.vue
  5. 34
      src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
  6. 1
      src/views/processManagement/inPlantProcess.vue
  7. 90
      src/views/processManagement/procepssPlanning.vue

2
src/styles/variables.scss
Unescape View File

@ -1,5 +1,5 @@
// $sidebar_width: 200px; // $sidebar_width: 200px;
$sidebar_width: 240px; $sidebar_width: 220px;
$sidebar_collapse: 65px; $sidebar_collapse: 65px;
$top_height: 60px; $top_height: 60px;
// $top_height: 50px; // $top_height: 50px;

1
src/views/processManagement/basicProcesses.vue
Unescape View File

@ -214,6 +214,7 @@ export default {
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
searchLabelWidth: 120, searchLabelWidth: 120,
width: 140,
type: 'select', type: 'select',
filterable:true, filterable:true,
clearable: true, clearable: true,

6
src/views/processManagement/components/inPlantMaintenance.vue
Unescape View File

@ -73,7 +73,7 @@ export default {
tip: false, tip: false,
simplePage: true, simplePage: true,
searchShow: true, searchShow: true,
searchMenuSpan: 6, searchMenuSpan: 12,
searchIcon: true, searchIcon: true,
searchIndex: 3, searchIndex: 3,
tree: false, tree: false,
@ -142,6 +142,7 @@ export default {
{ {
label: '产线', label: '产线',
prop: 'equipmentId', prop: 'equipmentId',
searchLabelWidth:50,
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
@ -166,7 +167,7 @@ export default {
{ {
label: '产线', label: '产线',
prop: 'equipmentName', prop: 'equipmentName',
search: true, search: false,
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
@ -177,6 +178,7 @@ export default {
addDisplay:false, addDisplay:false,
editDisplay:false, editDisplay:false,
}, },
{ {
label: '确认名称', label: '确认名称',

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

@ -718,7 +718,6 @@ export default {
let tsj = this.dictionaryData.find(item => item.dictValue == '涂箭头'); let tsj = this.dictionaryData.find(item => item.dictValue == '涂箭头');
sum_ += parseInt(this.partInfoData.tsjNum) * tsj.dictKey; sum_ += parseInt(this.partInfoData.tsjNum) * tsj.dictKey;
} }
// console.log(sum_, 'sum_');
this.form1.tableData1[index].proHours = parseFloat(sum_.toFixed(2)); this.form1.tableData1[index].proHours = parseFloat(sum_.toFixed(2));
} }
}, },
@ -879,9 +878,7 @@ export default {
if (parentNode && parentNode.data && !parentNode.isRoot) { if (parentNode && parentNode.data && !parentNode.isRoot) {
this.parentData = parentNode.data; // 父节点的原始数据 this.parentData = parentNode.data; // 父节点的原始数据
console.log('父节点数据:', this.parentData);
} else { } else {
console.log('当前节点无父节点（可能是根节点）');
} }
this.treeLeave = node.level; this.treeLeave = node.level;
@ -954,7 +951,6 @@ export default {
const node = this.contextTreeNode; const node = this.contextTreeNode;
const nodeId = node.data.id; const nodeId = node.data.id;
console.log('删除的节点ID:', node, nodeId);
try { try {
// 弹出确认框 // 弹出确认框
await this.$confirm('此操作将删除该工艺及所有子工序，是否继续？', '警告', { await this.$confirm('此操作将删除该工艺及所有子工序，是否继续？', '警告', {
@ -962,7 +958,6 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}); });
console.log('需要删除的子工序ID列表:', node);
// 调用删除API（替换为你的实际API） // 调用删除API（替换为你的实际API）
await craftBatchRemoval({ id: node.data.id }).then(res => { await craftBatchRemoval({ id: node.data.id }).then(res => {
this.$message.success('删除成功'); this.$message.success('删除成功');
@ -970,7 +965,6 @@ export default {
}); });
} catch (error) { } catch (error) {
if (error !== 'cancel') { if (error !== 'cancel') {
console.error('删除失败:', error);
this.$message.error('删除失败，请重试'); this.$message.error('删除失败，请重试');
} }
} finally { } finally {
@ -980,7 +974,6 @@ export default {
// 右侧tab切换 // 右侧tab切换
handleClick(value) { handleClick(value) {
console.log(999999, value);
this.form1.deleteIds = []; this.form1.deleteIds = [];
this.form2.deleteIds = []; this.form2.deleteIds = [];
this.form3.deleteIds = []; this.form3.deleteIds = [];
@ -1180,9 +1173,7 @@ export default {
if (isReturn == 1) { if (isReturn == 1) {
return this.$message.warning('涂色标的工时定额必须大于0,请修改！'); return this.$message.warning('涂色标的工时定额必须大于0,请修改！');
} }
console.log(898989, this.partInfoData);
// const res = await getPartDetail(this.partId); // const res = await getPartDetail(this.partId);
// console.log(res);
let dsCraftMold = this.partInfoData; let dsCraftMold = this.partInfoData;
if (dsCraftMold.markingsTest == '1') { if (dsCraftMold.markingsTest == '1') {

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

@ -666,7 +666,7 @@ export default {
this.getProject(); this.getProject();
this.getTeamSetList(); this.getTeamSetList();
this.getStandardList(); this.getStandardList();
this.getDictionary() this.getDictionary();
}, },
methods: { methods: {
// getPartList(){ // getPartList(){
@ -677,8 +677,8 @@ export default {
// 获取涂色标、涂色带、涂箭头的系数 // 获取涂色标、涂色带、涂箭头的系数
getDictionary() { getDictionary() {
getDictionary({ code: 'part_info' }).then(res => { getDictionary({ code: 'part_info' }).then(res => {
this.dictionaryData = res.data.data this.dictionaryData = res.data.data;
}) });
}, },
// 获取检验项目名字 // 获取检验项目名字
projectChange(row, index) { projectChange(row, index) {
@ -710,23 +710,21 @@ export default {
let selectName = this.processSetOption.find(item => item.id == row.processInfo.ppsId); let selectName = this.processSetOption.find(item => item.id == row.processInfo.ppsId);
this.form1.tableData1[index].processInfo.ppsName = selectName.name; this.form1.tableData1[index].processInfo.ppsName = selectName.name;
if (this.form1.tableData1[index].processName.indexOf('涂色标') > -1) { if (this.form1.tableData1[index].processName.indexOf('涂色标') > -1) {
console.log(this.partInfoData,this.dictionaryData,'this.partInfoData');
// tsbNum 涂色标个数 tsdNum 涂色带个数 涂箭头个数 // tsbNum 涂色标个数 tsdNum 涂色带个数 涂箭头个数
let sum_ = 0 let sum_ = 0;
if (this.partInfoData.tsbNum) { if (this.partInfoData.tsbNum) {
let tsb=this.dictionaryData.find(item => item.dictValue == '涂色标') let tsb = this.dictionaryData.find(item => item.dictValue == '涂色标');
sum_ += parseInt(this.partInfoData.tsbNum)*tsb.dictKey sum_ += parseInt(this.partInfoData.tsbNum) * tsb.dictKey;
} }
if (this.partInfoData.tsdNum) { if (this.partInfoData.tsdNum) {
let tsd=this.dictionaryData.find(item => item.dictValue == '涂色带') let tsd = this.dictionaryData.find(item => item.dictValue == '涂色带');
sum_ += parseInt(this.partInfoData.tsdNum)*tsd.dictKey sum_ += parseInt(this.partInfoData.tsdNum) * tsd.dictKey;
} }
if (this.partInfoData.tsjNum) { if (this.partInfoData.tsjNum) {
let tsj=this.dictionaryData.find(item => item.dictValue == '涂箭头') let tsj = this.dictionaryData.find(item => item.dictValue == '涂箭头');
sum_ += parseInt(this.partInfoData.tsjNum)*tsj.dictKey sum_ += parseInt(this.partInfoData.tsjNum) * tsj.dictKey;
} }
console.log(sum_,'sum_'); this.form1.tableData1[index].proHours = sum_;
this.form1.tableData1[index].proHours = sum_
} }
}, },
// 获取工艺能力名字 // 获取工艺能力名字
@ -825,8 +823,6 @@ export default {
}, },
// 组织树转换 // 组织树转换
transformCraftTree(responseData) { transformCraftTree(responseData) {
console.log('原始数据:', responseData); // 调试用
const { partInfo, craftList } = responseData; const { partInfo, craftList } = responseData;
const partCode = partInfo?.partCode || '未知零件'; const partCode = partInfo?.partCode || '未知零件';
@ -841,8 +837,9 @@ export default {
...craft, ...craft,
label: `${craftInfo?.reworkOrder || '返工单'}`, label: `${craftInfo?.reworkOrder || '返工单'}`,
children: processList.map(process => { children: processList.map(process => {
console.log(989898, process);
const ppsName = const ppsName =
process.ppsName || process.name || process.processName || '未知工序'; process.processInfo.ppsName || process.processInfo.name || process.processInfo.processName || '未知工序';
// 将 projectList 转为第四级子节点 // 将 projectList 转为第四级子节点
const projectChildren = (process.projectList || []).map(project => ({ const projectChildren = (process.projectList || []).map(project => ({
@ -886,7 +883,6 @@ 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('当前节点数据:', nodes.processList);
} }
// 根据节点层级加载对应数据 // 根据节点层级加载对应数据
if (this.treeLeave === 3) { if (this.treeLeave === 3) {
@ -903,7 +899,6 @@ export default {
}, },
// 右侧tab切换 // 右侧tab切换
handleClick(value) { handleClick(value) {
// console.log(999999, value);
this.form1.deleteIds = []; this.form1.deleteIds = [];
this.form2.deleteIds = []; this.form2.deleteIds = [];
this.form3.deleteIds = []; this.form3.deleteIds = [];
@ -1095,7 +1090,6 @@ export default {
if (this.treeLeave == 2) { if (this.treeLeave == 2) {
this.form1.tableData1.forEach(item => { this.form1.tableData1.forEach(item => {
console.log('item4444', item);
newArr.push({ newArr.push({
...item.processInfo, ...item.processInfo,
processProjectVOList: item.projectList || [], processProjectVOList: item.projectList || [],
@ -1111,8 +1105,6 @@ export default {
processMoldToolVOList: this.treeNodes.moldToolList || [], processMoldToolVOList: this.treeNodes.moldToolList || [],
}); });
} }
console.log('treeLeave', newArr);
// console.log('treeNodes', this.treeNodes);
let query_ = { let query_ = {
craft: { craft: {
partId: this.partId, partId: this.partId,

1
src/views/processManagement/inPlantProcess.vue
Unescape View File

@ -205,6 +205,7 @@ export default {
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
type: 'select', type: 'select',
searchLabelWidth:50,
dicData: [ dicData: [
{ {
value: 0, value: 0,

90
src/views/processManagement/procepssPlanning.vue
Unescape View File

@ -145,96 +145,6 @@ export default {
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',
column: [ column: [
// {
// label: '镀种',
// prop: 'partCode',
// search: true,
// sortable: true,
// overHidden: true,
// width: 210,
// hide: true,
// headerAlign: 'center',
// align: 'center',
// searchLabelWidth: 60,
// },
// {
// label: '物料编码',
// prop: 'partCode',
// search: true,
// sortable: true,
// overHidden: true,
// width: 210,
// hide: true,
// headerAlign: 'center',
// align: 'center',
// },
// {
// label: '子件类型',
// prop: 'partCode',
// search: true,
// sortable: true,
// overHidden: true,
// width: 210,
// hide: true,
// headerAlign: 'center',
// align: 'center',
// },
// {
// label: '材料',
// prop: 'partCode',
// search: true,
// sortable: true,
// overHidden: true,
// width: 210,
// hide: true,
// headerAlign: 'center',
// align: 'center',
// searchLabelWidth: 60,
// },
// {
// label: '粉重',
// prop: 'partCode',
// search: true,
// sortable: true,
// overHidden: true,
// width: 210,
// hide: true,
// headerAlign: 'center',
// align: 'center',
// searchLabelWidth: 60,
// },
// {
// label: '成型厚度',
// prop: 'partCode',
// search: true,
// sortable: true,
// overHidden: true,
// width: 210,
// hide: true,
// headerAlign: 'center',
// align: 'center',
// },
// {
// label: '检验项目',
// prop: 'partCode',
// search: true,
// sortable: true,
// overHidden: true,
// width: 210,
// hide: true,
// headerAlign: 'center',
// align: 'center',
// type: 'select',
// filterable:true,
// clearable: true,
// multiple: true,
// dicUrl:'/blade-desk/QA/InspectionItem/list?size=999999&current=1',
// props: {
// label: 'name',
// value: 'id',
// res:'res.records'
// },
// },
{ {
label: '零件号', label: '零件号',
prop: 'partCode', prop: 'partCode',

Write Preview
Loading…
Cancel
Save