From 9bb5c03402122b86733e7662e27ab5a5519d176e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 一月 2024 10:05:53 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/views/order/order.html | 12 +++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java | 4 ++
zy-asrs-wms/src/main/webapp/static/js/order/order.js | 49 ++++++++++++++----------
3 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
index 70f9092..893c0f0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
@@ -95,6 +95,10 @@
if (!Cools.isEmpty(param.get("doc_type"))) {
wrapper.eq(Order::getDocType, param.get("doc_type"));
}
+ if (!Cools.isEmpty(param.get("docName"))) {
+ DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocName, param.get("docName")));
+ wrapper.eq(Order::getDocType, docType.getDocId());
+ }
if (!Cools.isEmpty(param.get("settle"))) {
wrapper.eq(Order::getSettle, param.get("settle"));
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/order/order.js b/zy-asrs-wms/src/main/webapp/static/js/order/order.js
index ae2c137..3be8908 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/order/order.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/order/order.js
@@ -12,26 +12,34 @@
var layDate = layui.laydate;
var laytpl = layui.laytpl;
- // 娓叉煋鎼滅储妯℃澘
- $.ajax({
- url: baseUrl+"/docType/page/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- limit: 9999
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- let template = Handlebars.compile($('#docTypeTpl').html());
- $('#docType-query').html(template(res.data));
- layui.form.render('select');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- })
+ // // 娓叉煋鎼滅储妯℃澘
+ // $.ajax({
+ // url: baseUrl+"/docType/page/auth",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: {
+ // limit: 9999
+ // },
+ // method: 'POST',
+ // success: function (res) {
+ // if (res.code === 200){
+ // let template = Handlebars.compile($('#docTypeTpl').html());
+ // $('#docType-query').html(template(res.data));
+ // layui.form.render('select');
+ // } else if (res.code === 403){
+ // top.location.href = baseUrl+"/";
+ // } else {
+ // layer.msg(res.msg, {icon: 2})
+ // }
+ // }
+ // })
+
+ let docName = getQueryVariable('docName')
+ let where = {};
+ if (docName != false) {
+ where.docName = decodeURI(docName);
+ }
+
+ console.log(where)
// 娓叉煋琛ㄦ牸
var insTb = table.render({
@@ -40,6 +48,7 @@
headers: {token: localStorage.getItem('token')},
page: true,
cellMinWidth: 100,
+ where: where,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
cols: [[
diff --git a/zy-asrs-wms/src/main/webapp/views/order/order.html b/zy-asrs-wms/src/main/webapp/views/order/order.html
index ac90e29..d0760f5 100644
--- a/zy-asrs-wms/src/main/webapp/views/order/order.html
+++ b/zy-asrs-wms/src/main/webapp/views/order/order.html
@@ -59,12 +59,12 @@
<input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <select name="doc_type" id="docType-query">
- </select>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="doc_type" id="docType-query">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<select name="settle">
--
Gitblit v1.9.1