{{ formData.tjtNum }}
@@ -403,6 +406,7 @@ import {
getPartDetail,
getProcessAuthorized,
getVersion,
+ getPlatingList,
} from '@/api/processManagement/taskProcessing';
export default {
@@ -520,6 +524,13 @@ export default {
sortable: true,
overHidden: true,
},
+ {
+ label: '面积',
+ prop: 'area',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ },
{
label: '数量',
prop: 'quota',
@@ -529,7 +540,7 @@ export default {
},
{
label: '总面积',
- prop: 'quota',
+ prop: 'totalArea',
search: false,
sortable: true,
overHidden: true,
@@ -588,8 +599,9 @@ export default {
children: 'children',
label: 'label',
},
- version:'',//版本号
- versionOptions:[],//
+ version: '', //版本号
+ versionOptions: [], //
+ plateList: [], //镀种信息
};
},
mounted() {
@@ -597,15 +609,20 @@ export default {
this.getCcraftInfo();
this.getPartInfo();
+ this.getPlatingList();
},
methods: {
-
- // 获取零件号的版本号列表
+ getPlatingList() {
+ getPlatingList().then(res => {
+ this.plateList = res.data.data;
+ });
+ },
+ // 获取零件号的版本号列表
partChange(partId) {
getVersion({ partId: partId }).then(res => {
this.versionOptions = res.data.data;
});
- },// 组织树点击
+ }, // 组织树点击
handleNodeClick(nodes, node, self) {
if (nodes.disabled) {
return false;
@@ -706,6 +723,11 @@ export default {
getPartDetail(this.rowData.id).then(res => {
this.formData = res.data.data.dsPartEntity;
this.dataTable = res.data.data.dsPartEntities;
+ if (this.dataTable.length > 0) {
+ this.dataTable.forEach(item => {
+ item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串）
+ });
+ }
});
}
},
@@ -796,7 +818,7 @@ export default {
.box-card {
display: flex;
flex-direction: row;
- height: calc(100vh - 200px);
+ // height: calc(100vh - 200px);
.process-left {
// padding: 20px;
diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue
index 24006a9..433e37c 100644
--- a/src/views/processManagement/components/processMainte/processPlanning.vue
+++ b/src/views/processManagement/components/processMainte/processPlanning.vue
@@ -276,7 +276,7 @@
clearable
filterable
>
-
+
@@ -492,6 +492,7 @@ import {
getProcessSetList,
getCraftAbilityList,
getPartDetail,
+ getProject
} from '@/api/processManagement/taskProcessing';
import { getPqList } from '@/api/qualityManagement/remindRedeem/remindRedeem';
export default {
@@ -594,6 +595,8 @@ export default {
treeNodes: {}, //选中组织树节点信息
partInfoData: {}, //零件信息
tempId: 0,
+ projectOptions: [],//检验项目列表
+
};
},
mounted() {
@@ -603,8 +606,14 @@ export default {
this.getProcessSetList();
this.getCraftAbilityList();
this.getPqList();
+ this.getProject()
},
methods: {
+ getProject(){
+ getProject({size: 999999, current: 1}).then(res => {
+ this.projectOptions = res.data.data.records;
+ });
+ },
// 获取工序名字
processChange(row, index) {
let selectName = this.processSetOption.find(item => item.id == row.processCode);
@@ -1104,7 +1113,7 @@ export default {
let qualityInfo = this.rankList.find(
item => item.code == this.treeNodes.rawData.qualityGradeCode
);
- this.treeNodes.rawData.qualityGradeName = qualityInfo.name;
+ // this.treeNodes.rawData.qualityGradeName = qualityInfo.name;
}
let query_ = {
dsPart: this.partInfoData, //零件信息
diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
index 169d964..1151ffd 100644
--- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
+++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
@@ -53,7 +53,7 @@
导入模板
-
+
@@ -129,6 +129,7 @@
placeholder="请选择"
clearable
filterable
+ @change="processChange(scope.row, scope.$index)"
>
-
-
-
+
-
-
+
@@ -452,6 +448,8 @@ import {
getProcessList,
getProcessSetList,
getCraftAbilityList,
+ getProject,
+ getTeamSetList
} from '@/api/processManagement/taskProcessing';
export default {
@@ -564,6 +562,9 @@ export default {
craftAbilityOption: [],
treeNodes: {},
reworkNoNum: null, //返工序号
+ projectOptions:[],//检验项目维护
+ teamOptions:[],//班组
+
};
},
mounted() {
@@ -571,8 +572,30 @@ export default {
this.getModelList();
this.getProcessSetList();
this.getCraftAbilityList();
+ this.getProject()
+ this.getTeamSetList()
},
methods: {
+ getTeamSetList(){
+ getTeamSetList().then(res => {
+ this.teamOptions = res.data.data;
+ });
+ },
+ getProject(){
+ getProject({size: 999999, current: 1}).then(res => {
+ this.projectOptions = res.data.data.records;
+ });
+ },
+ // 获取工序名字
+ processChange(row, index) {
+ let selectName = this.processSetOption.find(item => item.id == row.processCode);
+ this.form1.tableData1[index].processName = selectName.name;
+ },
+ // 获取工艺能力名字
+ craftChange(row, index) {
+ let selectName = this.craftAbilityOption.find(item => item.id == row.craftCode);
+ this.form1.tableData1[index].craftName = selectName.name;
+ },
reworkNoNumSave() {
console.log(99999, this.reworkNoNum);
},
@@ -596,7 +619,31 @@ export default {
},
// 导入模板
modelLevelChange() {
- getModelDetailList({ modelId: this.modelLevel }).then(res => {});
+ getModelDetailList({ modelId: this.modelLevel }).then(res => {
+ const templateData = res.data.data;
+ const existing = [...this.form1.tableData1];
+ // 将模板中的工序数据映射为表格所需格式
+ const mappedData = templateData.map((item, index) => {
+ // 如果模板中的字段和表格字段一致，可直接使用；否则需转换
+ return {
+ id: null, // 新增时通常设为 null
+ processNo: this.getProcessNo(this.form1.tableData1), // 自动生成工序号
+ processCode: item.processCode || item.id, // 假设模板中有 processCode 或 id
+ processName: item.processName,
+ craftCode: item.craftCode,
+ craftName: item.craftName,
+ proDes: item.proDes || item.description,
+ proHours: item.proHours || '',
+ setoutHours: item.setoutHours || '',
+ isMain: item.isMain || '0',
+ // 其他字段按需补充...
+ };
+ });
+ // 赋值（方式1）或追加（方式2）
+ this.form1.tableData1 = [...existing, ...mappedData]; // 追加模式
+
+ this.$message.success('模板导入成功');
+ });
},
// 导入零件信息
getProcessList() {