Browse Source

JLHWEB: 1、尝试修复卡顿问题

JohnnyChan 1 week ago
parent
commit
f55ee1ce59

+ 4 - 4
JLHWEB/src/components/LjVxeTable/components/TableColumn.vue

@@ -59,10 +59,10 @@ const RenderTableColumn: any = (item: ColumnProps) => {
 
   let _vxeCloumnSolt: any = {
     default: (scope: RenderScope<any>) => {
-      if (item?.editColRender && props.editable) {
-        if (item.editColRender) return item.editColRender({ ...scope, enum: enumData, field: item.field });
-        if (item.render) return item.render({ ...scope, enum: enumData, field: item.field });
-      }
+      // if (item?.editColRender && props.editable) {
+      //   if (item.editColRender) return item.editColRender({ ...scope, enum: enumData, field: item.field });
+      //   if (item.render) return item.render({ ...scope, enum: enumData, field: item.field });
+      // }
       if (item.render) return item.render({ ...scope, enum: enumData, field: item.field });
       if (slots[handleProp(item.field!)]) return slots[handleProp(item.field!)]!(scope);
       if (item.tag) return <el-tag type={getTagType(item, scope)}>{renderCellData(item, scope)}</el-tag>;

+ 1 - 1
JLHWEB/src/components/LjVxeTable/index.vue

@@ -2129,10 +2129,10 @@ const resetSetting = async (cb: any) => {
   let oriColumns = await getOriColumns(true, true, -1, enumMap.value);
   console.log("oriColumns :>> ", oriColumns);
   if (oriColumns.columns.length) {
-    cb && cb(oriColumns);
   } else {
     ElMessage.warning(t("sys.layout.empty") + props.dwname);
   }
+  cb && cb(oriColumns);
 
   // layoutStore.getDwLayout_online(-1, props.dwname!, 0).then((layout: any) => {
   //   console.log("layoutStore dwlayoutGet:>> ", layoutStore.dwlayoutGet);

+ 15 - 15
JLHWEB/src/views/erpapi/mattressInterface/detail.vue

@@ -483,21 +483,21 @@ const orderDefaultAction = [
                   type: "success"
                 });
                 // tabRemove(route.fullPath);
-                router.replace(
-                  `/erpapi/mattressInterface/detail?id=${LjDetailRef.value?._mainData.mattressid}&code=${LjDetailRef.value?._mainData.mattresscode}`
-                );
-
-                // const _cur = LjDetailRef.value?._mainData;
-                // router.push({
-                //   name: "mattressInterfaceDetail",
-                //   params: {
-                //     id: _cur.mattressid
-                //   },
-                //   query: {
-                //     code: _cur.mattresscode
-                //   },
-                //   replace: true
-                // });
+                // router.replace(
+                //   `/erpapi/mattressInterface/detail?id=${LjDetailRef.value?._mainData.mattressid}&code=${LjDetailRef.value?._mainData.mattresscode}`
+                // );
+
+                const _cur = LjDetailRef.value?._mainData;
+                router.push({
+                  name: "mattressInterfaceDetail",
+                  params: {
+                    id: _cur.mattressid
+                  },
+                  query: {
+                    code: _cur.mattresscode
+                  },
+                  replace: true
+                });
                 // LjDetailRef.value.refresh();
                 loadingStatus.save = false;
               })