修改查询结果页面

.env.dev

@@ -8,7 +8,7 @@ VUE_APP_TITLE = WMS开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.94:48080'
 VUE_APP_BASE_API = 'http://61.155.26.34:36936'
 # VUE_APP_BASE_API = 'http://127.0.0.1:48080'
-# VUE_APP_BASE_API = 'http://113.105.183.190:42699'
+# VUE_APP_BASE_API = 'http://2227el9013.iok.la'
 # VUE_APP_BASE_API = 'http://192.168.1.85:48080'
 # VUE_APP_ETM_URL = 'https://222jp79013zl.vicp.fun'
 # VUE_APP_ETM_URL = 'http://localhost:81/index'

src/api/wms/output/inrequest.js

@@ -2,98 +2,98 @@ import request from "@/utils/request";
 
 // 创建入库申请主
 export function createInRequest(data) {
-    return request({
-        url: "/rtkwms/inout-request/createOutRequestOrder",
-        method: "post",
-        data: data,
-    });
+  return request({
+    url: "/rtkwms/inout-request/createOutRequestOrder",
+    method: "post",
+    data: data,
+  });
 }
 // 创建入库申请主
 export function createRequest(data) {
-    return request({
-        url: "/rtkwms/in-request/createOutRequestOrder",
-        method: "post",
-        data: data,
-    });
+  return request({
+    url: "/rtkwms/in-request/createOutRequestOrder",
+    method: "post",
+    data: data,
+  });
 }
 // 创建入库申请主
 export function getSourceOrder(data) {
-    return request({
-        url: "/rtkwms/inout-request/getSourceOrder",
-        method: "post",
-        data: data,
-    });
+  return request({
+    url: "/rtkwms/inout-request/getSourceOrder",
+    method: "post",
+    data: data,
+  });
 }
 
 // 更新入库申请主
 export function updateInRequest(data) {
-    return request({
-        url: "/rtkwms/inout-request/updateOutRequestOrder",
-        method: "put",
-        data: data,
-    });
+  return request({
+    url: "/rtkwms/inout-request/updateOutRequestOrder",
+    method: "put",
+    data: data,
+  });
 }
 // 更新入库申请主
 export function updateRequest(data) {
-    return request({
-        url: "/rtkwms/in-request/updateOutRequestOrder",
-        method: "put",
-        data: data,
-    });
+  return request({
+    url: "/rtkwms/in-request/updateOutRequestOrder",
+    method: "put",
+    data: data,
+  });
 }
 
 // 删除入库申请主
 export function deleteInRequest(id) {
-    return request({
-        url: "/rtkwms/inout-request/delete?id=" + id,
-        method: "delete",
-    });
+  return request({
+    url: "/rtkwms/inout-request/delete?id=" + id,
+    method: "delete",
+  });
 }
 
 // 获得入库申请主
 export function getInRequest(id) {
-    return request({
-        url: "/rtkwms/inout-request/get?id=" + id,
-        method: "get",
-    });
+  return request({
+    url: "/rtkwms/in-request/get?id=" + id,
+    method: "get",
+  });
 }
 // 获得入库申请主
 export function getStockPage(params) {
-    return request({
-        url: "/rtkerp/stock/page",
-        method: "get",
-        params,
-    });
+  return request({
+    url: "/rtkerp/stock/page",
+    method: "get",
+    params,
+  });
 }
 export function getMaterialPage(params) {
-    return request({
-        url: "/rtkerp/material/page",
-        method: "get",
-        params,
-    });
+  return request({
+    url: "/rtkerp/material/page",
+    method: "get",
+    params,
+  });
 }
 // 获得入库申请主分页
 export function getInRequestPage(params) {
-    return request({
-        url: "/rtkwms/inout-request/page",
-        method: "get",
-        params,
-    });
+  return request({
+    url: "/rtkwms/inout-request/page",
+    method: "get",
+    params,
+  });
 }
 // 导出入库申请主 Excel
 export function exportInRequestExcel(params) {
-    return request({
-        url: "/rtkwms/inout-request/export-excel",
-        method: "get",
-        params,
-        responseType: "blob",
-    });
+  return request({
+    url: "/rtkwms/inout-request/export-excel",
+    method: "get",
+    params,
+    responseType: "blob",
+  });
 }
 
 export function getDictByOrderType(params) {
-    return request({
-        url: "/rtkwms/inout-request/getDictByOrderType",
-        method: "get",
-        params,
-    });
-}
+  return request({
+    url: "/rtkwms/inout-request/getDictByOrderType",
+    method: "get",
+    params,
+  });
+}

src/views/mes/queryManage/queryNew.vue

@@ -63,10 +63,7 @@
       stripe
       border
       size="small"
-      max-height="calc(100vh - 230px)"
       show-overflow-tooltip
-      show-summary
-      :summary-method="getSummaries"
       @selection-change="handleSelectionChange"
       @header-dragend="handleResize"
     >
@@ -360,10 +357,12 @@ export default {
           this.queryData
         );
       } else if (operateType === 3) {
-        if (this.multipleSelection.length === 0)
+        if (this.multipleSelection.length === 0) {
           return this.$message.warning("请先选择行数据!");
-        if (this.multipleSelection.length > 1)
+        }
+        if (this.multipleSelection.length > 1) {
           return this.$message.warning("只能选择单条数据修改!");
+        }
         this.$refs.parameterDetailRef.open(
           "update",
           btn,
@@ -388,8 +387,9 @@ export default {
     },
 
     handlePrintByJimu(params) {
-      if (this.multipleSelection.length === 0)
+      if (this.multipleSelection.length === 0) {
         return this.$message.warning("请先选择数据!");
+      }
       const baseUrl = process.env.VITE_BASE_URL;
       const token = getAccessToken();
       const tenantId = getTenantId();
@@ -410,8 +410,9 @@ export default {
     },
 
     async handlePrintByOtherSoft(params) {
-      if (this.multipleSelection.length === 0)
+      if (this.multipleSelection.length === 0) {
         return this.$message.warning("请先选择数据!");
+      }
       const { interfaceUrl, paramList, restMethod, templet } = params;
       if (!templet) return this.$message.warning("未配置打印模板!");
       const fieldValues = this.paramsToConver(paramList);
@@ -428,8 +429,9 @@ export default {
     },
 
     async handleDynamic(params) {
-      if (this.multipleSelection.length === 0)
+      if (this.multipleSelection.length === 0) {
         return this.$message.warning("请先选择数据!");
+      }
       const {
         interfaceUrl,
         restMethod = "get",
@@ -547,7 +549,7 @@ export default {
           typeof valA === "string" ? parseFloat(valA.replace(/,/g, "")) : valA;
         valB =
           typeof valB === "string" ? parseFloat(valB.replace(/,/g, "")) : valB;
-        if (isNaN(valA))
+        if (isNaN(valA)) {
           return direction === "asc"
             ? valA > valB
               ? 1
@@ -555,7 +557,8 @@ export default {
             : valA < valB
             ? 1
             : -1;
-        if (isNaN(valB))
+        }
+        if (isNaN(valB)) {
           return direction === "asc"
             ? valA > valB
               ? 1
@@ -563,6 +566,7 @@ export default {
             : valA < valB
             ? 1
             : -1;
+        }
         return direction === "asc" ? valA - valB : valB - valA;
       });
     },
@@ -789,6 +793,8 @@ export default {
 /* ---------- ContentWrap 原样式 ---------- */
 .el-content-wrap {
   /* 自定义 */
+  height: 100vh;
+  overflow-y: auto;
 }
 .text-16px {
   font-size: 16px;