更改物料采集来源及领用申请

src/components/CommonTable/configs/tableConfig.ts

@@ -21,7 +21,7 @@ export const tableConfig = {
         dicData: dicts.material_properties,
         props: { label: "dictLabel", value: "dictValue" },
       },
-      {
+      /*{
         label: "是否工装",
         prop: "frock",
         filterable: true,
@@ -29,15 +29,15 @@ export const tableConfig = {
         dicData: [
           {
             label: "否",
-            value: 0,
+            value: "0",
           },
           {
             label: "是",
-            value: 1,
+            value: "1",
           },
         ],
-        value: 0,
-      },
+        value: "0",
+      },*/
       {
         label: "质检方案",
         prop: "inspectDictValue",

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

@@ -105,7 +105,24 @@ const startCreat = () => {
     let bomParam = {
       materialCode: route.fullPath.split("/")[5],
     };
-    getBomVersion(bomParam).then((res) => {
+
+
+    //根据物料编码和版本号获取对应的物料BOM
+    commonTableType.value = "MARTERIAL";
+    nextTick(() => {
+      commonTableRef.value?.startSelect({});
+      commonTableRef.value?.refreshDictData(
+          "bomVersion",
+          resListMap,
+          "value"
+      );
+      commonTableRef.value?.mergeOption({
+        searchShow: bomVersion.value ? false : true,
+      });
+    });
+
+
+    /*getBomVersion(bomParam).then((res) => {
       let resListMap = [];
       //说明时物料采集的添加框 进行物料采集的下拉框数据获取
       res?.data.forEach((versions) => {
@@ -121,7 +138,7 @@ const startCreat = () => {
         configParam.bomVersion = bomVersion.value;
       }
       //根据物料编码和版本号获取对应的物料BOM
-      commonTableType.value = "MARTERIAL_BOM";
+      commonTableType.value = "MARTERIAL";
       nextTick(() => {
         commonTableRef.value?.startSelect(configParam);
         commonTableRef.value?.refreshDictData(
@@ -133,7 +150,7 @@ const startCreat = () => {
           searchShow: bomVersion.value ? false : true,
         });
       });
-    });
+    });*/
   } else if (props.tableType === "dianjian") {
     commonTableType.value = "OP_CHECK";
     nextTick(() => {
@@ -166,17 +183,22 @@ const onSortChange = () => {
 const routeId = ref("");
 // ============公共弹窗table选择相关，物料采集等使用===============
 const commonTableRef = ref({});
-const commonTableType = ref("MARTERIAL_BOM");
+const commonTableType = ref("MARTERIAL");
 const onSelectedFinish = (itemValue) => {
   crudRef.value && crudRef.value.rowAdd();
   if (props.tableType === "wuliaocaiji") {
-    form.value.itemName = itemValue.bomMaterialName;
+   /* form.value.itemName = itemValue.bomMaterialName;
     form.value.itemCode = itemValue.bomMaterialCode;
     form.value.itemModel = itemValue.bomMaterialAttribute;
     form.value.recordVersion = itemValue.bomVersion;
-    form.value.num = itemValue.bomMaterialNumber;
+    form.value.num = itemValue.bomMaterialNumber;*/
+    form.value.itemName = itemValue.materialName;
+    form.value.itemCode = itemValue.materialCode;
+    form.value.itemModel = itemValue.spec;
+    //form.value.recordVersion = itemValue.bomVersion;
+    form.value.num = 1
     form.value.traceType = "S";
-    form.value.unit = itemValue.unit;
+    form.value.unit = itemValue.unitDictValue;
   } else if (props.tableType === "dianjian") {
     form.value.checkName = itemValue.checkName;
     form.value.checkCode = itemValue.checkCode;

src/views/base/craftManagement/route/components/configs.ts

@@ -47,12 +47,12 @@ export const getTableConfig = (id: string) => {
           addDisabled: true,
           editDisabled: true,
         },
-        {
+        /*{
           label: "物料版本号",
           prop: "recordVersion",
           addDisabled: true,
           editDisabled: true,
-        },
+        },*/
         {
           label: "物料编码",
           prop: "itemCode",

src/views/base/materials/components/choice-item-page.vue

@@ -183,7 +183,7 @@ option.value = Object.assign(option.value, {
 onMounted(() => {
   search.value.prodtCode = props.materialCode
   if(props.enabled != '-1'){
-    alert(props.enabled)
+    //alert(props.enabled)
     search.value.enabled = "0"
   }
   dataList();