更新物料添加时 增加版本号的处理

src/api/craft/process/index.ts

@@ -33,3 +33,11 @@ export function sortGXJLList(data: object) {
     data: data,
   });
 }
+
+export function getBomVersion(data: object) {
+  return request({
+    url: `/api/v1/base/bomVersion/list`,
+    method: "post",
+    data: data,
+  });
+}

src/components/CommonTable/configs/tableConfig.ts

@@ -416,6 +416,12 @@ export const tableConfig = {
 		url: "/api/v1/base/materialBom/list",
 		column: [
 			{
+				label: "物料版本",
+				prop: "bomVersion",
+				search: true,
+				type: "select",
+			},
+			{
 				label: "物料编码",
 				prop: "materialCode",
 				hide: true

src/components/CommonTable/index.vue

@@ -34,6 +34,7 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
+import { getBomVersion } from "@/api/craft/process/index";
 import { tableConfig } from "./configs/tableConfig";
 
 const props = defineProps({
@@ -48,11 +49,36 @@ const props = defineProps({
 });
 
 const isShowTable = ref(false);
-
-const startSelect = (param) => {
+const startSelect = async (param, comObj) => {
   if (param) {
     commonConfig.value.params = param;
   }
+  if (comObj && comObj.tableName == "wuliaocaiji") {
+    //说明时物料采集的添加框 进行物料采集的下拉框数据获取
+    let bomParam = {
+      materialCode: param.materialCode,
+    };
+    await getBomVersion(bomParam).then((res) => {
+      let resListMap = [];
+      res?.data.forEach((versions) => {
+        resListMap.push({
+          label: versions.bomVersion,
+          value: versions.bomVersion,
+        });
+      });
+      option?.value?.column?.forEach((col) => {
+        if (col.label == "物料版本") {
+          col.dicData = resListMap;
+          if (resListMap.length > 0) {
+            commonConfig.value.params.bomVersion = resListMap[0].value;
+            col.value = resListMap[0].value;
+            console.log("col", col);
+          }
+          return;
+        }
+      });
+    });
+  }
   dataList();
   isShowTable.value = true;
 };

src/views/base/craftManagement/route/components/bottomTable.vue

@@ -74,7 +74,13 @@ const startCreat = () => {
   if (props.tableType === "wuliaocaiji") {
     //根据物料编码获取对应的物料BOM
     commonTableRef.value &&
-      commonTableRef.value.startSelect({ materialCode: route.query.prodtCode });
+      commonTableRef.value.startSelect(
+        {
+          materialCode: route.query.prodtCode,
+          bomVersion: 1.0,
+        },
+        { tableName: "wuliaocaiji" }
+      );
   } else {
     crudRef.value && crudRef.value.rowAdd();
   }
@@ -101,7 +107,7 @@ const onSelectedFinish = (itemValue) => {
     form.value.itemName = itemValue.bomMaterialName;
     form.value.itemCode = itemValue.bomMaterialCode;
     form.value.itemModel = itemValue.bomMaterialAttribute;
-    form.value.recordVersion = itemValue.bomMaterialNumber;
+    form.value.recordVersion = itemValue.bomVersion;
     form.value.num = itemValue.bomMaterialNumber;
     form.value.traceType = "S";
     form.value.unit = itemValue.unitDictValue;

src/views/base/craftManagement/route/components/processComponent.vue

@@ -146,11 +146,16 @@ const clickToolCom = (com, index) => {
     ElMessage.warning("请先保存组件！！！");
     return;
   }
-  tipTitle = '编辑'+com.compentName
+  tipTitle.value = "编辑" + com.compentName;
   selectIndex.value = index;
   currentCom.value = com;
-  if (com.compentType === "mingpai" || com.compentType === "duomeiticaiji"
-   || com.compentType === "tiaoshipipei" || com.compentType === "jingu") {
+  if (
+    com.compentType === "jiluxiang" ||
+    com.compentType === "mingpai" ||
+    com.compentType === "duomeiticaiji" ||
+    com.compentType === "tiaoshipipei" ||
+    com.compentType === "jingu"
+  ) {
     isNoneedEdit.value = true;
   } else {
     tableType.value = com.compentType;
@@ -175,7 +180,7 @@ const getNameClass = (index) => {
 };
 
 // 底部table ===============
-let tipTitle = ref("编辑物料采集");
+let tipTitle = ref({});
 const bottomTableRef = ref({});
 const tableType = ref("MARTERIAL_BOM");