瀏覽代碼

fix:升版

lupeng 4 月之前
父節點
當前提交
7d0629eb2f
共有 3 個文件被更改,包括 43 次插入8 次删除
  1. 6 0
      src/api/craft/route/index.ts
  2. 1 1
      src/hooks/userCrud.ts
  3. 36 7
      src/views/base/craftManagement/route/index.vue

+ 6 - 0
src/api/craft/route/index.ts

@@ -69,3 +69,9 @@ export function updateMain(data: object) {
     data: data,
   });
 }
+export function getMaxRouteVersion(prodtCode: string) {
+  return request({
+    url: `/api/v1/op/route/getMaxRouteVersion/${prodtCode}`,
+    method: "get",
+  });
+}

+ 1 - 1
src/hooks/userCrud.ts

@@ -78,7 +78,7 @@ export const useCrud = (config?: UseCrudConfig) => {
         config?.done && config?.done();
         ElMessage.success(res?.msg ?? "");
         if (commonConfig.value?.afterAdd) {
-          commonConfig.value?.afterAdd();
+          commonConfig.value?.afterAdd(res?.data);
         }
       } else {
         config?.loading && config?.loading();

+ 36 - 7
src/views/base/craftManagement/route/index.vue

@@ -87,7 +87,7 @@
           icon="el-icon-copy-document"
           :disabled="false"
           @click="copyRow(row)"
-          >复制</el-button
+          >升版</el-button
         >
         <el-button link icon="el-icon-copy-document" @click="bindProcessPop(row)"
           >绑定</el-button
@@ -212,7 +212,14 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import { useDictionaryStore } from "@/store";
-import {copyList, copyProductRoute, copyRoute, editRouteWith, updateMain} from "@/api/craft/route/index";
+import {
+  copyList,
+  copyProductRoute,
+  copyRoute,
+  editRouteWith,
+  getMaxRouteVersion,
+  updateMain
+} from "@/api/craft/route/index";
 import { getUserList } from "@/api/system/user/index";
 import RouteChangeLog from "@/views/base/craftManagement/route/components/routeChangeLog.vue";
 import {ElMessageBox} from "element-plus";
@@ -255,10 +262,16 @@ const dialog2 = ref({
   title: "绑定",
   visible: false,
 });
+const routeData =ref({});
 // 传入一个url,后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/op/route",
+    afterAdd:(routeData)=>{
+      router.push({
+        path: `/base/craftManagement/bindProcess/${routeData.id}/${routeData.prodtCode}`,
+      });
+    }
   });
 const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
   Methords; //增删改查
@@ -389,15 +402,31 @@ const startChooseRoute = () => {
 };
 // 已经绑定了工序的可以复制,跟后端HT商量只传id即可。
 const copyRow = (row) => {
-  option.value.column[4].display = false;
-  option.value.column[5].display = false;
+  option.value.column.forEach((item)=>{
+    if(item.prop==="commonRouteCode"||item.prop==="commonRouteName"){
+      item.display=false;
+    }
+      }
+
+  );
   if (row.usable == 0) {
     ElMessage.error("该路线未被绑定!");
     return;
   }
-  form.value = Object.assign(form.value, row);
-  form.value.processRouteVersion = "";
-  crudRef.value.rowAdd();
+  getMaxRouteVersion(row.prodtCode).then((data)=>{
+        if(data.code==='200'){
+          form.value = Object.assign(form.value, row);
+          form.value.processRouteVersion ='';
+          if(data.data){
+            form.value.processRouteVersion =(parseFloat(data.data)+1).toFixed(1);
+          }
+          form.value.prodtName1 = row.prodtName;
+          crudRef.value.rowAdd();
+        }
+  }
+
+  )
+
 };
 
 const renameRoute = () => {