@@ -361,8 +361,43 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -407,6 +442,7 @@ import {
getProcessAuthorized,
getVersion,
getPlatingList,
+ getProject,
} from '@/api/processManagement/taskProcessing';
export default {
@@ -602,6 +638,8 @@ export default {
version: '', //版本号
versionOptions: [], //
plateList: [], //镀种信息
+ projectOptions: [],
+ standardList:[],//检验标准
};
},
mounted() {
@@ -610,8 +648,19 @@ export default {
this.getCcraftInfo();
this.getPartInfo();
this.getPlatingList();
+ this.getStandardList()
},
methods: {
+ getStandardList() {
+ getStandardList().then(res => {
+ this.standardList = res.data.data;
+ });
+ },
+ getProject() {
+ getProject({ size: 999999, current: 1 }).then(res => {
+ this.projectOptions = res.data.data.records;
+ });
+ },
getPlatingList() {
getPlatingList().then(res => {
this.plateList = res.data.data;
@@ -723,7 +772,7 @@ export default {
getPartDetail(this.rowData.id).then(res => {
this.formData = res.data.data.dsPartEntity;
this.dataTable = res.data.data.dsPartEntities;
- this.partChange( this.formData.id)
+ this.partChange(this.formData.id);
if (this.dataTable.length > 0) {
this.dataTable.forEach(item => {
item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数(字符串)
@@ -816,10 +865,13 @@ export default {
top: -5px;
/* 或者使用 flex: 0 0 200px; 根据需要调整宽度 */
}
+.box-card-two{
+ height: calc(100vh - 200px);
+}
.box-card {
display: flex;
flex-direction: row;
- // 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 49b1449..acc9c4c 100644
--- a/src/views/processManagement/components/processMainte/processPlanning.vue
+++ b/src/views/processManagement/components/processMainte/processPlanning.vue
@@ -88,7 +88,7 @@
插入一行
删除选择行
- 保存
+ 保存
{
@@ -1158,6 +1160,7 @@ export default {
// });
// }
// }
+ this.craftLoading = true
// 处理传参
if (this.treeNodes.rawData.qualityGradeCode) {
@@ -1175,6 +1178,7 @@ export default {
authorizedAccomplish2(query_).then(res => {
this.$message.success('保存成功');
+ this.craftLoading = false
this.getDetails();
});
}
@@ -1183,6 +1187,7 @@ export default {
if (this.activeName == '2') {
this.$refs.tableForm2.validate((isValid, invalidFields) => {
if (isValid) {
+ this.craftLoading = true
let query_ = {
processEntity: this.treeNodes.rawData.processInfo, //工序
processProjectEntityList: this.form2.tableData2, //项目
@@ -1191,6 +1196,7 @@ export default {
saveProcessProjectSave(query_).then(res => {
this.$message.success('保存成功');
+ this.craftLoading = false
this.getDetails();
});
}
@@ -1199,6 +1205,7 @@ export default {
if (this.activeName == '3') {
this.$refs.tableForm3.validate((isValid, invalidFields) => {
if (isValid) {
+ this.craftLoading = true
let query_ = {
processEntity: this.treeNodes.rawData.processInfo, //工序
processMeasuringToolEntities: this.form3.tableData3, //尺寸量具
@@ -1206,6 +1213,7 @@ export default {
};
saveProcessMeasuringTool(query_).then(res => {
this.$message.success('保存成功');
+ this.craftLoading = false
this.getDetails();
});
}
diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
index 88db722..bc280ae 100644
--- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
+++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
@@ -455,7 +455,7 @@ import {
getTeamSetList,
getStandardList
} from '@/api/processManagement/taskProcessing';
-import {getPartList} from '@/api/orderManagement/getPartList';
+// import {getPartList} from '@/api/orderManagement/getPartList';
export default {
name: 'CraftIndex',