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

工艺逻辑提交

Browse Source
dev-scheduling
zhangdi 3 months ago
parent ffb343273f
commit 1628cfd74e
5 changed files with 104 additions and 38 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/views/processManagement/components/addTestDialog.vue
  2. 85
      src/views/processManagement/components/processMainte/processPlanning.vue
  3. 21
      src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
  4. 4
      src/views/processManagement/sinTer/index.vue
  5. 28
      src/views/qualityManagement/similarParts/index.vue

2
src/views/processManagement/components/addTestDialog.vue
Unescape View File

@ -21,7 +21,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工艺版本号:" prop="version"> <el-form-item label="工艺版本号:" prop="version">
<el-select v-model="ruleForm.version" placeholder="请输入" clearable filterable> <el-select v-model="ruleForm.version" placeholder="请输入" clearable filterable>
<el-option v-for="(item,index) in versionOptions" :key="index" :label="item.partVersions" :value="item.partVersions" /> <el-option v-for="(item,index) in versionOptions" :key="index" :label="item.partVersion" :value="item.partVersion" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

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

@ -276,7 +276,11 @@
clearable clearable
filterable filterable
> >
<el-option v-for="(item, index) in projectOptions" :label="item.name" :value="item.id"></el-option> <el-option
v-for="(item, index) in projectOptions"
:label="item.name"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</template> </template>
@ -296,7 +300,11 @@
clearable clearable
filterable filterable
> >
<el-option v-for="(item, index) in standardList" :label="item.name" :value="item.id"></el-option> <el-option
v-for="(item, index) in standardList"
:label="item.name"
:value="item.id"
></el-option>
</el-select> </el-select>
<!-- <el-input <!-- <el-input
v-model="scope.row.projectStandard" v-model="scope.row.projectStandard"
@ -501,7 +509,7 @@ import {
getCraftAbilityList, getCraftAbilityList,
getPartDetail, getPartDetail,
getProject, getProject,
getStandardList getStandardList,
} from '@/api/processManagement/taskProcessing'; } from '@/api/processManagement/taskProcessing';
import { getPqList } from '@/api/qualityManagement/remindRedeem/remindRedeem'; import { getPqList } from '@/api/qualityManagement/remindRedeem/remindRedeem';
export default { export default {
@ -604,9 +612,8 @@ export default {
treeNodes: {}, //选中组织树节点信息 treeNodes: {}, //选中组织树节点信息
partInfoData: {}, //零件信息 partInfoData: {}, //零件信息
tempId: 0, tempId: 0,
projectOptions: [],//检验项目列表 projectOptions: [], //检验项目列表
standardList: [],//检验标准列表 standardList: [], //检验标准列表
}; };
}, },
mounted() { mounted() {
@ -616,17 +623,17 @@ export default {
this.getProcessSetList(); this.getProcessSetList();
this.getCraftAbilityList(); this.getCraftAbilityList();
this.getPqList(); this.getPqList();
this.getProject() this.getProject();
this.getStandardList() this.getStandardList();
}, },
methods: { methods: {
getStandardList(){ getStandardList() {
getStandardList().then(res => { getStandardList().then(res => {
this.standardList = res.data.data; this.standardList = res.data.data;
}); });
}, },
getProject(){ getProject() {
getProject({size: 999999, current: 1}).then(res => { getProject({ size: 999999, current: 1 }).then(res => {
this.projectOptions = res.data.data.records; this.projectOptions = res.data.data.records;
}); });
}, },
@ -647,10 +654,9 @@ export default {
}); });
}, },
// 工艺模板列表 // 工艺模板列表
async getModelList () { async getModelList() {
await getModelList().then(res => { await getModelList().then(res => {
this.modelOption = res.data.data; this.modelOption = res.data.data;
}); });
}, },
// 工序列表查询 // 工序列表查询
@ -695,15 +701,15 @@ export default {
}); });
}, },
// 获取零件信息详情数据 // 获取零件信息详情数据
async getDetails() { async getDetails() {
await getProcessAuthorized({ await getProcessAuthorized({
partId: this.partId, partId: this.partId,
taskId: this.updateRow.id, taskId: this.updateRow.id,
rank: this.rank, rank: this.rank,
}).then(res => { }).then(res => {
this.data = this.transformCraftTree(res.data.data); this.data = this.transformCraftTree(res.data.data);
this.partInfoData = res.data.data.partInfo; this.partInfoData = res.data.data.partInfo;
if (this.partInfoData.partName == '石墨模') { if (this.partInfoData.partName == '石墨模') {
let graphite = this.modelOption.find(item => item.name == '石墨模'); let graphite = this.modelOption.find(item => item.name == '石墨模');
this.modelLevel = graphite.id; this.modelLevel = graphite.id;
this.modelLevelChange(); this.modelLevelChange();
@ -774,6 +780,11 @@ export default {
this.form2.tableData2 = []; this.form2.tableData2 = [];
this.form3.tableData3 = []; this.form3.tableData3 = [];
this.form4.tableData4 = []; this.form4.tableData4 = [];
this.form1.deleteIds = [];
this.form2.deleteIds = [];
this.form3.deleteIds = [];
this.form4.deleteIds = [];
// 根据节点层级切换标签页 // 根据节点层级切换标签页
if (this.treeLeave === 2) { if (this.treeLeave === 2) {
this.activeName = '1'; this.activeName = '1';
@ -798,11 +809,19 @@ export default {
// 右侧tab切换 // 右侧tab切换
handleClick(value) { handleClick(value) {
console.log(999999, value); console.log(999999, value);
this.form1.deleteIds = [];
this.form2.deleteIds = [];
this.form3.deleteIds = [];
this.form4.deleteIds = [];
}, },
// 切换等级 // 切换等级
leavelChange() { leavelChange() {
// this.$message.success('保存成功'); // this.$message.success('保存成功');
this.getDetails(); this.getDetails();
this.form1.deleteIds = [];
this.form2.deleteIds = [];
this.form3.deleteIds = [];
this.form4.deleteIds = [];
}, },
// 获取工序号 // 获取工序号
getProcessNo(table) { getProcessNo(table) {
@ -854,21 +873,18 @@ export default {
}, },
handleSelectionChange1(val) { handleSelectionChange1(val) {
this.form1.selectIds = val.map(row => row.id || row._tempId); this.form1.selectIds = val.map(row => row.id || row._tempId);
this.form1.deleteIds = val
.filter(row => row.id != null && row.id !== '') // 排除新增行（id 为 null 或空）
.map(row => row.id);
}, },
handleSelectionChange2(val) { handleSelectionChange2(val) {
this.form2.selectIds = val.map(row => row.id || row._tempId); this.form2.selectIds = val.map(row => row.id || row._tempId);
this.form2.deleteIds = val.filter(row => row.id != null).map(row => row.id); // this.form2.deleteIds = val.filter(row => row.id != null).map(row => row.id);
}, },
handleSelectionChange3(val) { handleSelectionChange3(val) {
this.form3.selectIds = val.map(row => row.id || row._tempId); this.form3.selectIds = val.map(row => row.id || row._tempId);
this.form3.deleteIds = val.filter(row => row.id != null).map(row => row.id); // this.form3.deleteIds = val.filter(row => row.id != null).map(row => row.id);
}, },
handleSelectionChange4(val) { handleSelectionChange4(val) {
this.form4.selectIds = val.map(row => row.id || row._tempId); this.form4.selectIds = val.map(row => row.id || row._tempId);
this.form4.deleteIds = val.filter(row => row.id != null).map(row => row.id); // this.form4.deleteIds = val.filter(row => row.id != null).map(row => row.id);
}, },
// 删除选择行 // 删除选择行
delTable() { delTable() {
@ -880,16 +896,26 @@ export default {
this.$message.warning(message); this.$message.warning(message);
return; return;
} }
this.form1.deleteIds = this.form1.tableData1
.filter(row => this.form1.selectIds.includes(row.id || row._tempId))
.filter(row => row.id != null && row.id !== '') // 只保留有真实 id 的行
.map(row => row.id);
this.form1.tableData1 = this.form1.tableData1.filter(row => { this.form1.tableData1 = this.form1.tableData1.filter(row => {
const key = row.id || row._tempId; const key = row.id || row._tempId;
return !this.form1.selectIds.includes(key); return !this.form1.selectIds.includes(key);
}); });
this.form1.selectIds = []; // 清空选中 this.form1.selectIds = []; // 清空选中
} else if (active === '2') { } else if (active === '2') {
if (this.form2.selectIds.length === 0) { if (this.form2.selectIds.length === 0) {
this.$message.warning(message); this.$message.warning(message);
return; return;
} }
this.form2.deleteIds = this.form2.tableData2
.filter(row => this.form2.selectIds.includes(row.id || row._tempId))
.filter(row => row.id != null && row.id !== '')
.map(row => row.id);
this.form2.tableData2 = this.form2.tableData2.filter(row => { this.form2.tableData2 = this.form2.tableData2.filter(row => {
const key = row.id || row._tempId; const key = row.id || row._tempId;
return !this.form2.selectIds.includes(key); return !this.form2.selectIds.includes(key);
@ -900,6 +926,10 @@ export default {
this.$message.warning(message); this.$message.warning(message);
return; return;
} }
this.form3.deleteIds = this.form3.tableData3
.filter(row => this.form3.selectIds.includes(row.id || row._tempId))
.filter(row => row.id != null && row.id !== '')
.map(row => row.id);
this.form3.tableData3 = this.form3.tableData3.filter(row => { this.form3.tableData3 = this.form3.tableData3.filter(row => {
const key = row.id || row._tempId; const key = row.id || row._tempId;
return !this.form3.selectIds.includes(key); return !this.form3.selectIds.includes(key);
@ -910,6 +940,11 @@ export default {
this.$message.warning(message); this.$message.warning(message);
return; return;
} }
this.form4.deleteIds = this.form4.tableData4
.filter(row => this.form4.selectIds.includes(row.id || row._tempId))
.filter(row => row.id != null && row.id !== '')
.map(row => row.id);
this.form4.tableData4 = this.form4.tableData4.filter(row => { this.form4.tableData4 = this.form4.tableData4.filter(row => {
const key = row.id || row._tempId; const key = row.id || row._tempId;
return !this.form4.selectIds.includes(key); return !this.form4.selectIds.includes(key);
@ -1140,6 +1175,7 @@ export default {
authorizedAccomplish2(query_).then(res => { authorizedAccomplish2(query_).then(res => {
this.$message.success('保存成功'); this.$message.success('保存成功');
this.getDetails();
}); });
} }
}); });
@ -1155,6 +1191,7 @@ export default {
saveProcessProjectSave(query_).then(res => { saveProcessProjectSave(query_).then(res => {
this.$message.success('保存成功'); this.$message.success('保存成功');
this.getDetails();
}); });
} }
}); });
@ -1169,6 +1206,7 @@ export default {
}; };
saveProcessMeasuringTool(query_).then(res => { saveProcessMeasuringTool(query_).then(res => {
this.$message.success('保存成功'); this.$message.success('保存成功');
this.getDetails();
}); });
} }
}); });
@ -1183,6 +1221,7 @@ export default {
}; };
saveProcessMoldTool(query_).then(res => { saveProcessMoldTool(query_).then(res => {
this.$message.success('保存成功'); this.$message.success('保存成功');
this.getDetails();
}); });
} }
}); });

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

@ -275,11 +275,14 @@
:prop="`tableData2[${scope.$index}].projectStandard`" :prop="`tableData2[${scope.$index}].projectStandard`"
:rules="formRules2.projectStandard" :rules="formRules2.projectStandard"
> >
<el-input <el-select
v-model="scope.row.projectStandard" v-model="scope.row.projectStandard"
placeholder="请输入" placeholder="请选择"
style="width: 100%" clearable
></el-input> filterable
>
<el-option v-for="(item, index) in standardList" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@ -449,7 +452,8 @@ import {
getProcessSetList, getProcessSetList,
getCraftAbilityList, getCraftAbilityList,
getProject, getProject,
getTeamSetList getTeamSetList,
getStandardList
} from '@/api/processManagement/taskProcessing'; } from '@/api/processManagement/taskProcessing';
export default { export default {
@ -564,6 +568,7 @@ export default {
reworkNoNum: null, //返工序号 reworkNoNum: null, //返工序号
projectOptions:[],//检验项目维护 projectOptions:[],//检验项目维护
teamOptions:[],//班组 teamOptions:[],//班组
standardList:[],//标准
}; };
}, },
@ -574,8 +579,14 @@ export default {
this.getCraftAbilityList(); this.getCraftAbilityList();
this.getProject() this.getProject()
this.getTeamSetList() this.getTeamSetList()
this.getStandardList()
}, },
methods: { methods: {
getStandardList(){
getStandardList().then(res => {
this.standardList = res.data.data;
});
},
getTeamSetList(){ getTeamSetList(){
getTeamSetList().then(res => { getTeamSetList().then(res => {
this.teamOptions = res.data.data; this.teamOptions = res.data.data;

4
src/views/processManagement/sinTer/index.vue
Unescape View File

@ -141,7 +141,7 @@ export default {
}, },
{ {
label: '子件号', label: '子件号',
prop: 'bpartName', prop: 'zpartCode',
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 24,
@ -157,7 +157,7 @@ export default {
span: 24, span: 24,
search: false, search: false,
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'center',
}, },
], ],
}, },

28
src/views/qualityManagement/similarParts/index.vue
Unescape View File

@ -136,6 +136,7 @@ export default {
sortable: true, sortable: true,
span: 24, span: 24,
type: 'select', type: 'select',
filterable: true,
dicUrl: '/blade-desk/dsPart/getPartList', dicUrl: '/blade-desk/dsPart/getPartList',
props: { props: {
label: 'partCode', label: 'partCode',
@ -148,6 +149,9 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
], ],
change: val => {
this.onChangeData(val.item, 'partOne');
},
}, },
{ {
label: '相似零件', label: '相似零件',
@ -155,12 +159,13 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
span: 24, span: 24,
// type: 'select', filterable: true,
// dicUrl: '/blade-desk/dsPart/getPartList', type: 'select',
// props: { dicUrl: '/blade-desk/dsPart/getPartList',
// label: 'partCode', props: {
// value: 'id', label: 'partCode',
// }, value: 'id',
},
rules: [ rules: [
{ {
required: true, required: true,
@ -168,6 +173,9 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
], ],
change: val => {
this.onChangeData(val.item, 'partTwo');
},
}, },
], ],
}, },
@ -178,6 +186,14 @@ export default {
}; };
}, },
methods: { methods: {
onChangeData(val, type) {
if (val&&type == 'partOne') {
this.form.partOneCode = val.partName;
}
if (val&&type == 'partTwo') {
this.form.partTwoCode = val.partName;
}
},
// 点击导入按钮 // 点击导入按钮
handleImport() { handleImport() {
this.isShowImport = true; this.isShowImport = true;

Write Preview
Loading…
Cancel
Save