JLHWEB: 1、修复床网弹窗无法显示滚动条问题；2、床垫报价修改时明细可编辑“工艺填写说明”；3、修复标签页顶替问题

JLHWEB/src/layouts/components/Tabs/index.vue

@@ -101,9 +101,10 @@ watch(
       let _path = tabsParams.path.replace(key, "/detail?");
       // 使用路由参数的地址，忽略查询参数后，查找相同地址
       let _path2 = tabsParams.path.replace("/edit/", "/detail/");
+      let hasPath2 = route.fullPath.indexOf("/edit/") > -1;
       let tabsMenuList = tabStore.tabsMenuList;
       for (let i = 0; i < tabsMenuList.length; i++) {
-        if (tabsMenuList[i].path == _path || tabsMenuList[i].path.split("?")[0] == _path2.split("?")[0]) {
+        if (tabsMenuList[i].path == _path || (hasPath2 && tabsMenuList[i].path.split("?")[0] == _path2.split("?")[0])) {
           name = tabsMenuList[i].name;
           tabsMenuList[i] = tabsParams;
           isReplace = true;
@@ -118,9 +119,10 @@ watch(
       let _path = tabsParams.path.replace(key, "/edit?");
       // 使用路由参数的地址，忽略查询参数后，查找相同地址
       let _path2 = tabsParams.path.replace("/detail/", "/edit/");
+      let hasPath2 = route.fullPath.indexOf("/detail/") > -1;
       let tabsMenuList = tabStore.tabsMenuList;
       for (let i = 0; i < tabsMenuList.length; i++) {
-        if (tabsMenuList[i].path == _path || tabsMenuList[i].path.split("?")[0] == _path2.split("?")[0]) {
+        if (tabsMenuList[i].path == _path || (hasPath2 && tabsMenuList[i].path.split("?")[0] == _path2.split("?")[0])) {
           tabsMenuList[i] = tabsParams;
           isReplace = true;
           break;

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

@@ -1490,7 +1490,6 @@ export const useHooks = (t?: any) => {
     height: "auto",
     align: "left",
     // height: "",
-    minHeight: "300px",
     editConfig: {
       trigger: "click",
       mode: "cell",

JLHWEB/src/views/quote/bednetQuote/detail.vue

@@ -207,7 +207,7 @@ const tableProps_mx = ref({
   height: "auto",
   align: "left",
   // height: "",
-  minHeight: "300px",
+  // minHeight: "300px",
   editConfig: { trigger: "click", mode: "row", enabled: false, autoFocus: true },
   editRules: {
     bednet_height: [
@@ -275,7 +275,7 @@ const tableProps_spring = ref({
   height: "auto",
   align: "left",
   // height: "",
-  minHeight: "300px",
+  // minHeight: "300px",
   editConfig: { trigger: "click", mode: "row", enabled: false, autoFocus: true },
   editRules: {
     springname: [

JLHWEB/src/views/quote/bednetQuote/hooks/index.tsx

@@ -1613,16 +1613,13 @@ export const useHooks = (t?: any, props?: any) => {
     console.log("duo_qv_str val :>> ", val);
     const { _mainData } = state.LjDetailRef;
 
-    let item = enumArr.find((item: any) => item.value == val);
+    let item = enumArr.find((item: any) => item.value + "" == val);
     let attrKey = "area_";
     if (_mainData.sponge_mtrlid > 0) {
       attrKey = "sponge_";
     }
     let arr = getDuoquVal(item, attrKey);
 
-    console.log("state.vxeTableMxRef :>> ", state.vxeTableMxRef);
-    // console.log("state.vxeTableMxRef.element.get :>> ", state.vxeTableMxRef.element.getTableData());
-    // let { fullData } = state.vxeTableMxRef.element.getTableData();
     let num = arr.length;
     state.bednetMxData[0].if_part = Boolean(num > 1);
     console.log("fullData bednetMxData :>> ", state.bednetMxData);
@@ -2023,8 +2020,6 @@ export const useHooks = (t?: any, props?: any) => {
         const { column, row, status } = scope;
         let _label = column.title;
 
-        console.log("fabrics1_mtrlid 变了没:>> ", row.fabrics1_mtrlid);
-
         return (
           <>
             <MtrldefSelect

JLHWEB/src/views/quote/mattressQuote/hooks/index.tsx

@@ -3800,7 +3800,13 @@ export const useHooks = (t?: any) => {
     },
     {
       title: "工艺填写说明",
-      field: "gydscrp"
+      field: "gydscrp",
+      editRender: {
+        name: "input",
+        props: {
+          type: "textarea"
+        }
+      }
     }
   ];
 
@@ -4240,7 +4246,6 @@ export const useHooks = (t?: any) => {
       field: "chastr",
       editRender: {},
       editColRender: (scope: any) => {
-        console.log("formulakind chastr scope :>> ", scope, state.diancengAreaEnum);
         return (
           <el-select v-model={scope.row.chastr}>
             {{
@@ -4277,7 +4282,6 @@ export const useHooks = (t?: any) => {
       // },
       editRender: {},
       editColRender: (scope: any) => {
-        console.log("formulakind editColRender scope :>> ", scope);
         let lastVal = scope.row.formulakind;
         return (
           <el-select v-model={scope.row.formulakind} onChange={val => cushionsFormulaKindChange(val, lastVal, scope)}>