Merge branch 'master' of http://git.longjoe.com/shuiping150/JLH

JLHWEB/src/api/modules/common.ts

@@ -102,7 +102,7 @@ export const GetERPMtrlTypeList = () => {
  * @returns
  */
 export const CreatMtrlPf = (params?: Mattress.ReqRefreshMattressInterface) => {
-  return http.post(PORT1 + `/CreatMtrldef`, params);
+  return http.post<Mattress.ResSaveMattressBcp>(PORT1 + `/CreatMtrldef`, params);
 };
 /**
  * @description 生成L1清单

JLHWEB/src/views/erpapi/mattressInterface/detail.vue

@@ -356,6 +356,12 @@ const orderDefaultAction = [
       limited: () => {
         return !!orderStatus.value || LjDetailRef.value?._mainData.xd_flag == 1;
       },
+      disabledTextCallBack: (data: any) => {
+        if (data.yw_flag == 1) {
+          return "已业务补充审核，无法修改";
+        }
+        return "";
+      },
       clickFunc: item => {
         routeToEdit(1);
       }
@@ -396,6 +402,12 @@ const orderDefaultAction = [
       limited: () => {
         return !!orderStatus.value;
       },
+      disabledTextCallBack: (data: any) => {
+        if (data.js1_flag == 1) {
+          return "已产品补充审核，无法修改";
+        }
+        return "";
+      },
       clickFunc: item => {
         routeToEdit(2);
       }
@@ -436,6 +448,12 @@ const orderDefaultAction = [
       limited: () => {
         return !!orderStatus.value;
       },
+      disabledTextCallBack: (data: any) => {
+        if (data.js2_flag == 1) {
+          return "已清单补充审核，无法修改";
+        }
+        return "";
+      },
       clickFunc: item => {
         routeToEdit(3);
       }

JLHWEB/src/views/erpapi/mattressInterface/hooks/index.tsx

@@ -133,7 +133,12 @@ export const useHooks = (t?: any) => {
       type: "warning"
     })
       .then(() => {
-        CreatMtrlPf({ mattressid }).then(() => {
+        CreatMtrlPf({ mattressid }).then(res => {
+          console.log("toCreateMtrl, res :>> ", res);
+
+          state.LjDetailRef._mainData.erp_mtrlid = res.mattress.erp_mtrlid;
+          state.LjDetailRef._mainData.creatmtrl_flag = res.mattress.creatmtrl_flag;
+          state.LjDetailRef._mainData.erp_mtrlcode = res.mattress.erp_mtrlcode;
           ElNotification({
             title: "物料",
             message: "生成/更新成功！",