diff --git a/src/views/mes/baseProcessInfo/index.vue b/src/views/mes/baseProcessInfo/index.vue
index 44110b0..98cc3b4 100644
--- a/src/views/mes/baseProcessInfo/index.vue
+++ b/src/views/mes/baseProcessInfo/index.vue
@@ -58,7 +58,7 @@
-
+ 1111
diff --git a/src/views/mes/materialBom/addBom.vue b/src/views/mes/materialBom/addBom.vue
index c0b31c2..07c85f1 100644
--- a/src/views/mes/materialBom/addBom.vue
+++ b/src/views/mes/materialBom/addBom.vue
@@ -52,8 +52,8 @@
>
-
-
+
+
@@ -157,7 +157,7 @@ const data = reactive>({
materialBomVersion: undefined,
ancestors: undefined,
standardAmount: undefined,
- topFlag: undefined,
+ topFlag: '1',
checkType: undefined,
projectId: undefined,
assembleTime: undefined,
diff --git a/src/views/mes/materialBom/index.vue b/src/views/mes/materialBom/index.vue
index 2b738ed..6f4ba7b 100644
--- a/src/views/mes/materialBom/index.vue
+++ b/src/views/mes/materialBom/index.vue
@@ -17,9 +17,9 @@
-
-
-
+
+
+
搜索
重置
@@ -53,7 +53,7 @@
-
+
diff --git a/src/views/mes/planInfo/index.vue b/src/views/mes/planInfo/index.vue
index 8991f1b..648d704 100644
--- a/src/views/mes/planInfo/index.vue
+++ b/src/views/mes/planInfo/index.vue
@@ -80,10 +80,10 @@
-
+
-
+
@@ -97,7 +97,7 @@
-
+
@@ -180,10 +180,14 @@
-
+
+
+
+
+
-
-
+
+
@@ -313,6 +317,15 @@
+
+
+
+
+
+
@@ -322,6 +335,7 @@ import { PlanInfoVO, PlanInfoQuery, PlanInfoForm } from '@/api/mes/planInfo/type
import { getBaseShiftInfoList } from '@/api/mes/baseShiftInfo';
import { getBaseClassTeamInfoList } from '@/api/mes/baseClassTeamInfo';
import BomSelect from '@/views/mes/materialBom/addBom.vue';
+import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
import { getStationInfoList } from '@/api/mes/baseStationInfo';
@@ -351,6 +365,8 @@ const processList = ref([]);
let stationList = ref([]);
const materialBomOpen = ref(false);
const bomSelectRef = ref();
+const materialOpen = ref(false);
+const materialSelectRef = ref();
/*获取班次下拉框*/
const getShiftSelect = async () => {
@@ -388,9 +404,9 @@ const columns = ref([
{ key: 7, label: `物料名称`, visible: true },
{ key: 8, label: `物料BOM`, visible: true },
{ key: 9, label: `工序名称`, visible: true },
- { key: 10, label: `顺序`, visible: true },
- { key: 11, label: `上一工序ID`, visible: true },
- { key: 12, label: `最后工序标识`, visible: true },
+ { key: 10, label: `顺序`, visible: false },
+ { key: 11, label: `上一工序ID`, visible: false },
+ { key: 12, label: `最后工序标识`, visible: false },
{ key: 13, label: `下达类型`, visible: true },
{ key: 14, label: `下达ID`, visible: true },
{ key: 15, label: `单位生产时间(秒)`, visible: false },
@@ -449,6 +465,7 @@ const initFormData: PlanInfoForm = {
classTeamId: undefined,
modelCode: undefined,
remark: undefined,
+ materialBoMName: undefined,
}
const data = reactive>({
form: {...initFormData},
@@ -607,10 +624,23 @@ const handleMaterialBomAdd = () => {
const submitMaterialBomForm = () => {
let selectedRow = bomSelectRef.value.tableRef.store.states.currentRow.value;
form.value.materialBomId = selectedRow.materialBomId
- form.value.materialName = selectedRow.materialName
+ form.value.materialBoMName = selectedRow.materialName
materialBomOpen.value = false;
}
+/** 新增按钮操作 */
+const handleMaterialAdd = () => {
+ materialOpen.value = true;
+}
+
+/** 提交物料BOM信息按钮 */
+const submitMaterialForm = () => {
+ let selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value;
+ form.value.materialId = selectedRow.materialId
+ form.value.materialName = selectedRow.materialName
+ materialOpen.value = false;
+}
+
onMounted(() => {
getShiftSelect();
getClassTeamSelect();