From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/webapp/views/pakStore/matQuery.html |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 299d087..433d45c 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -30,7 +30,12 @@
         <div id="search-box" class="layui-form layui-card-header">
             <div class="layui-inline">
                 <div class="layui-input-inline">
-                    <input class="layui-input" type="text" name="mat_no" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+                    <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+                </div>
+            </div>
+            <div class="layui-inline">
+                <div class="layui-input-inline">
+                    <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鍙�" autocomplete="off">
                 </div>
             </div>
             <!-- 鏃ユ湡鑼冨洿 -->
@@ -52,7 +57,7 @@
     </fieldset>
 
     <div class="layui-form">
-        <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
+        <table class="layui-hide" id="mat" lay-filter="mat"></table>
     </div>
 </div>
 
@@ -94,9 +99,9 @@
 
         // 鐗╂枡鏌ヨ鏁版嵁琛�
         matQueryTable = table.render({
-            elem: '#matCode',
+            elem: '#mat',
             headers: {token: localStorage.getItem('token')},
-            url: baseUrl + '/matCode/list/auth',
+            url: baseUrl + '/mat/list/auth',
             page: true,
             limit: 7,
             limits: [7, 10, 30,50,100],
@@ -127,7 +132,7 @@
         });
 
         // 鐩戝惉澶村伐鍏锋爮浜嬩欢
-        table.on('toolbar(matCode)', function (obj) {
+        table.on('toolbar(mat)', function (obj) {
             let checkStatus = table.checkStatus(obj.config.id);
             let data = checkStatus.data;
             switch(obj.event) {

--
Gitblit v1.9.1