Explorar o código

修改了禅道上面的bug

ooo hai 1 ano
pai
achega
4e31f75f72

+ 7 - 0
src/api/craft/process/index.ts

@@ -41,3 +41,10 @@ export function getBomVersion(data: object) {
     data: data,
   });
 }
+
+export function getRouteMaxVersion(routeId: string) {
+  return request({
+    url: `/api/v1/op/route/getRouteMaxVersion/${routeId}`,
+    method: "get",
+  });
+}

+ 1 - 1
src/components/CommonTable/index.vue

@@ -156,7 +156,7 @@ watch(
         col.minWidth = calculateColumnWidth(col);
       }
     }
-    dataList();
+    //dataList();
   }
 );
 

+ 3 - 3
src/views/base/craftManagement/route/bindProcess.vue

@@ -238,9 +238,9 @@ const editProComponent = async () => {
   let res = await updateProcess(currentProcess.value);
   ElMessage.success("保存成功");
   router.push({
-		path: `/base/craftManagement/processCom/${currentProcess.value.id}`,
-		query: {prodtCode:route.query.prodtCode}
-	});
+    path: `/base/craftManagement/processCom/${currentProcess.value.id}`,
+    query: { prodtCode: route.query.prodtCode, routeId: route.query.routeId },
+  });
 };
 
 // 全局=======

+ 40 - 17
src/views/base/craftManagement/route/components/bottomTable.vue

@@ -42,7 +42,11 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import { getTableConfig } from "./configs";
-import { saveCompoents, getBomVersion } from "@/api/craft/process/index";
+import {
+  saveCompoents,
+  getBomVersion,
+  getRouteMaxVersion,
+} from "@/api/craft/process/index";
 import SingleUpload from "@/components/Upload/SingleUpload.vue";
 
 const props = defineProps({
@@ -70,15 +74,13 @@ const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
 const { selectionChange, multipleUpdate } = Methords; //选中和批量删除事件
 
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
-
+const bomVersion = ref(null);
 const startCreat = () => {
   if (props.tableType === "wuliaocaiji") {
-    let bomVersion = null;
     if (data.value && data.value.length > 0) {
-      bomVersion = data.value[0].recordVersion;
+      bomVersion.value = data.value[0].recordVersion;
     }
-    console.log("startCreat", data.value, "bomVersion", bomVersion);
-    commonTableType.value = "MARTERIAL_BOM";
+
     if (!route.query.prodtCode) {
       ElMessage.error("物料编号读取错误");
       return;
@@ -99,24 +101,35 @@ const startCreat = () => {
       //查询参数
       let configParam = {};
       configParam.materialCode = route.query.prodtCode;
-      if (bomVersion) {
-        configParam.bomVersion = bomVersion;
+      if (bomVersion.value) {
+        configParam.bomVersion = bomVersion.value;
       }
       //根据物料编码和版本号获取对应的物料BOM
-      commonTableRef.value?.startSelect(configParam);
-      commonTableRef.value?.refreshDictData("bomVersion", resListMap, "value");
-      commonTableRef.value?.mergeOption({
-        searchShow: bomVersion ? false : true,
+      commonTableType.value = "MARTERIAL_BOM";
+      nextTick(() => {
+        commonTableRef.value?.startSelect(configParam);
+        commonTableRef.value?.refreshDictData(
+          "bomVersion",
+          resListMap,
+          "value"
+        );
+        commonTableRef.value?.mergeOption({
+          searchShow: bomVersion.value ? false : true,
+        });
       });
     });
   } else if (props.tableType === "dianjian") {
     commonTableType.value = "OP_CHECK";
-    commonTableRef.value?.startSelect();
+    nextTick(() => {
+      commonTableRef.value?.startSelect();
+    });
   } else if (props.tableType === "ESOP") {
     commonTableType.value = "ESOP";
-    commonTableRef.value?.startSelect({
-      materialCode: route.query.prodtCode,
-      enable: 1,
+    nextTick(() => {
+      commonTableRef.value?.startSelect({
+        materialCode: route.query.prodtCode,
+        enable: 1,
+      });
     });
   } else {
     crudRef.value && crudRef.value.rowAdd();
@@ -147,7 +160,7 @@ const onSelectedFinish = (itemValue) => {
     form.value.recordVersion = itemValue.bomVersion;
     form.value.num = itemValue.bomMaterialNumber;
     form.value.traceType = "S";
-    form.value.unit = itemValue.unitDictValue;
+    form.value.unit = itemValue.unit;
   } else if (props.tableType === "dianjian") {
     form.value.checkName = itemValue.checkName;
     form.value.checkCode = itemValue.checkCode;
@@ -183,6 +196,11 @@ onMounted(() => {
     column: tableConfig[props.tableType].column,
   });
   dataList();
+  getRouteMaxVersion(route.query.routeId).then(({ data }) => {
+    if (data) {
+      bomVersion.value = data;
+    }
+  });
 });
 
 watch(
@@ -198,6 +216,11 @@ watch(
       column: tableConfig[props.tableType].column,
     });
     dataList();
+    getRouteMaxVersion(route.query.routeId).then(({ data }) => {
+      if (data) {
+        bomVersion.value = data;
+      }
+    });
   }
 );
 </script>

+ 1 - 1
src/views/base/craftManagement/route/index.vue

@@ -188,7 +188,7 @@ const router = useRouter();
 const bindProcess = (row) => {
   router.push({
     path: `/base/craftManagement/bindProcess/${row.id}`,
-    query: { prodtCode: row.prodtCode },
+    query: { prodtCode: row.prodtCode,routeId: row.id},
   });
 };