From ed906c11d8fc284be9bb982251c0729e03bf7aa2 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Mon, 3 Apr 2023 08:10:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E3=80=81?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E3=80=81=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/pages/material/material-out.html   | 3 +--
 target/classes/templates/pages/depository/table-stock.html | 4 +++-
 target/classes/templates/pages/material/material-out.html  | 7 ++++---
 .../templates/pages/materialtype/materialType_view.html    | 4 +++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/pages/material/material-out.html b/src/main/resources/templates/pages/material/material-out.html
index 80ebda2d..449f303b 100644
--- a/src/main/resources/templates/pages/material/material-out.html
+++ b/src/main/resources/templates/pages/material/material-out.html
@@ -235,6 +235,7 @@
             page: true,
             skin: 'line',
             done: function (res, curr, count) {
+                bindTableToolbarFunction();
                 let display = $("#display").val();
                 if ("inline-block" === display) {
                     if (flagForRelod) {
@@ -245,8 +246,6 @@
                     }
 
                 }
-                bindTableToolbarFunction();
-
 
             }
 
diff --git a/target/classes/templates/pages/depository/table-stock.html b/target/classes/templates/pages/depository/table-stock.html
index 70ab7478..3b3cdeb3 100644
--- a/target/classes/templates/pages/depository/table-stock.html
+++ b/target/classes/templates/pages/depository/table-stock.html
@@ -16,6 +16,7 @@
         <fieldset class="table-search-fieldset">
             <legend>搜索信息</legend>
             <div style="margin: 10px 10px 10px 10px">
+                <input style="display: none" th:value="${number}" id="number">
                 <form class="layui-form layui-form-pane" action="">
                     <div class="layui-form-item">
                         <div class="layui-inline">
@@ -505,7 +506,8 @@
                         }
 
                         if ("WebSocket" in window) {
-                            socket = new WebSocket('ws://127.0.0.1:11111/webSocket/300450');
+                            let number = $("#number").val();
+                            socket = new WebSocket('ws://127.0.0.1:11111/webSocket/'+number);
                             switch (socket.readyState) {
                                 case WebSocket.CONNECTING:
                                     // 连接中
diff --git a/target/classes/templates/pages/material/material-out.html b/target/classes/templates/pages/material/material-out.html
index 9c24aa84..449f303b 100644
--- a/target/classes/templates/pages/material/material-out.html
+++ b/target/classes/templates/pages/material/material-out.html
@@ -17,6 +17,7 @@
     <div class="layuimini-main">
         <input style="display:none;" id="nowDay" th:value="${nowDay}">
         <input style="display:none;" id="display" th:value="${display}">
+        <input style="display: none" th:value="${number}" id="number">
 
         <fieldset class="table-search-fieldset">
             <legend>搜索信息</legend>
@@ -234,6 +235,7 @@
             page: true,
             skin: 'line',
             done: function (res, curr, count) {
+                bindTableToolbarFunction();
                 let display = $("#display").val();
                 if ("inline-block" === display) {
                     if (flagForRelod) {
@@ -241,12 +243,10 @@
                         let col = {field: 'price', width: 150, title: '物料单价'};
                         cols.splice(6, 0, col);
                         table.reload('currentTableId', {cols: [cols]});
-                        bindTableToolbarFunction();
                     }
 
                 }
 
-
             }
 
         });
@@ -284,7 +284,8 @@
                         }
 
                         if ("WebSocket" in window) {
-                            socket = new WebSocket('ws://127.0.0.1:11111/webSocket/300450');
+                            let number = $("#number").val();
+                            socket = new WebSocket('ws://127.0.0.1:11111/webSocket/'+number);
                             switch (socket.readyState) {
                                 case WebSocket.CONNECTING:
                                     // 连接中
diff --git a/target/classes/templates/pages/materialtype/materialType_view.html b/target/classes/templates/pages/materialtype/materialType_view.html
index 03405edb..dd6f34dd 100644
--- a/target/classes/templates/pages/materialtype/materialType_view.html
+++ b/target/classes/templates/pages/materialtype/materialType_view.html
@@ -18,6 +18,7 @@
             <div style="margin: 10px 10px 10px 10px">
                 <form class="layui-form layui-form-pane" action="">
                     <input id="parentId" style="display: none" th:value="${parentId}">
+                    <input style="display: none" th:value="${number}" id="number">
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">类型名称</label>
@@ -284,7 +285,8 @@
                         }
 
                         if ("WebSocket" in window) {
-                            socket = new WebSocket('ws://127.0.0.1:11111/webSocket/300450');
+                            let number = $("#number").val();
+                            socket = new WebSocket('ws://127.0.0.1:11111/webSocket/'+number);
                             switch (socket.readyState) {
                                 case WebSocket.CONNECTING:
                                     // 连接中