feature/bug修复

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "2.6"
+  "version": "2.7"
 }

src/views/base/craftManagement/route/bindProcess.vue

@@ -354,7 +354,7 @@ const reset = () => {
 };
 const editProComponent = async () => {
   router.push({
-    path: `/base/craftManagement/processCom/${route.fullPath.split("/")[4]}/${route.fullPath.split("/")[5]}/${currentProcess.value.operationId}`,
+    path: `/base/craftManagement/processCom/${currentProcess.value.operationId}/${route.fullPath.split("/")[5]}/${route.fullPath.split("/")[4]}`,
   });
 };
 

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

@@ -207,8 +207,8 @@ const getSOAPpdf = (itemValue) => {
 };
 
 onMounted(() => {
-  routeId.value = route.fullPath.split("/")[4];
-  search.value.operationId = route.fullPath.split("/")[6];
+  routeId.value = route.fullPath.split("/")[6];
+  search.value.operationId = route.fullPath.split("/")[4];
   url.value = tableConfig[props.tableType].url;
   option.value = Object.assign(option.value, {
     addBtn: false,
@@ -219,7 +219,7 @@ onMounted(() => {
   });
   dataList();
   getRouteMaxVersion(
-    route.fullPath.split("/")[4] ? route.fullPath.split("/")[4] : routeId.value
+    route.fullPath.split("/")[6] ? route.fullPath.split("/")[6] : routeId.value
   ).then(({ data }) => {
     if (data) {
       bomVersion.value = data;
@@ -230,7 +230,7 @@ onMounted(() => {
 watch(
   () => props.tableType,
   () => {
-    routeId.value = route.fullPath.split("/")[4];
+    routeId.value = route.fullPath.split("/")[6];
     url.value = tableConfig[props.tableType].url;
     option.value = Object.assign(option.value, {
       addBtn: false,
@@ -241,8 +241,8 @@ watch(
     });
     dataList();
     getRouteMaxVersion(
-      route.fullPath.split("/")[4]
-        ? route.fullPath.split("/")[4]
+      route.fullPath.split("/")[6]
+        ? route.fullPath.split("/")[6]
         : routeId.value
     ).then(({ data }) => {
       if (data) {

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

@@ -121,7 +121,6 @@ onMounted(async () => {
   prodtCode.value = route.fullPath.split("/")[5];
   routerId.value = route.fullPath.split("/")[6];
   await loadTopList();
-
 });
 
 // 顶部====================
@@ -150,10 +149,20 @@ const save = async () => {
 const selectProComs = ref([]);
 const selectIndex = ref(-1);
 const currentCom = ref({});
-const handleCommand = (itme) => {
-  selectProComs.value.push(itme);
-  isChanged.value = true;
-  selectIndex.value = -1;
+const handleCommand = (item) => {
+  let status = true;
+  for (let i = 0; i < selectProComs.value.length; i++) {
+    if (selectProComs.value[i].compentName == item.compentName) {
+      status = false;
+    }
+  }
+  if (status == true) {
+    selectProComs.value.push(item);
+    isChanged.value = true;
+    selectIndex.value = -1;
+  } else {
+    ElMessage.error("请勿重复添加");
+  }
 };
 
 // 点击某一个改变下面的table

src/views/base/craftManagement/route/components/setExcel/index.vue

@@ -89,7 +89,7 @@ const deleteTep = async (id) => {
 const onSelected = async () => {
   const { data, code } = await add({
     baseFormIds: value1.value,
-    operationId: route.fullPath.split("/")[6],
+    operationId: route.fullPath.split("/")[4],
   });
   if (code == "200") {
     ElMessage.success("添加成功！");
@@ -116,7 +116,7 @@ const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
 //     value1.value.push(el.id);
 //   });
 // };
-search.value = { ...search.value, operationId: route.fullPath.split("/")[6] };
+search.value = { ...search.value, operationId: route.fullPath.split("/")[4] };
 const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
   Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件

src/views/base/craftManagement/routeCommon/index.vue

@@ -189,7 +189,7 @@ const router = useRouter();
 // 绑定工序
 const bindProcess = (row) => {
   router.push({
-    path: `/base/craftManagement/bindProcess/${row.id}/${row.prodtCode}`,
+    path: `/base/craftManagement/bindProcess/${row.id}/null`,
   });
 };
 

src/views/base/information/index.vue

@@ -307,6 +307,7 @@ option.value = Object.assign(option.value, {
       prop: "drawingVersion",
       type: "number",
       precision: 1,
+      min: 0,
       rules: [
         {
           required: true,

src/views/plan/workOrder/index.vue

@@ -709,6 +709,9 @@ option.value = Object.assign(option.value, {
         if (column.boxType) {
           dialog2.visible = true;
         }
+        if (column.boxType == "edit") {
+          form.value.productLineName = "";
+        }
       },
     },
     {