diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 8cf40e9b..6249e16d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -527,6 +527,12 @@ public class PageController { mv.addObject("display", "none"); } mv.addObject("number", userToken.getNumber()); + String userAgent = request.getHeader("user-agent"); + // 判断当前使用的设备为移动端还是pc端 + boolean b = DeviceUtil.checkAgentIsMobile(userAgent); + if(b){ + mv.setViewName("pages/material/material-out_mobile"); + } return mv; } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index ba67305b..c4b47add 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -257,6 +257,9 @@ public class MaterialServiceImpl implements MaterialService { if (material.getPrice() != null) { material.setPrice(material.getPrice() / 100); } + if(material.getBrand() == null){ + material.setBrand(""); + } } return materialByCondition; } diff --git a/src/main/resources/templates/pages/depository/table-stock_mobile.html b/src/main/resources/templates/pages/depository/table-stock_mobile.html index 606068d5..f5fba435 100644 --- a/src/main/resources/templates/pages/depository/table-stock_mobile.html +++ b/src/main/resources/templates/pages/depository/table-stock_mobile.html @@ -115,7 +115,6 @@ let takingPre = 0; let size = 8; - let page = 1; $('#openSonByDepository').on('click', function () { diff --git a/src/main/resources/templates/pages/material/material-out_back.html b/src/main/resources/templates/pages/material/material-out_back.html deleted file mode 100644 index a225dd72..00000000 --- a/src/main/resources/templates/pages/material/material-out_back.html +++ /dev/null @@ -1,509 +0,0 @@ - - - - - layui - - - - - - - -
-
-
- 搜索信息 -
-
-
- -
- -
- - - -
-
-
- -
- - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
-
-
- -
- -
- - -
-
- - - - - - -
- - - - - -
-
- - - - - \ No newline at end of file diff --git a/src/main/resources/templates/pages/material/material-out_mobile.html b/src/main/resources/templates/pages/material/material-out_mobile.html new file mode 100644 index 00000000..8d0340d4 --- /dev/null +++ b/src/main/resources/templates/pages/material/material-out_mobile.html @@ -0,0 +1,227 @@ + + + + + layui + + + + + + + + + + +
+
+ + + + +
+ 搜索信息 +
+
+
+ + +
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+ + + + +
+
+ + + + + + + + + \ No newline at end of file diff --git a/target/classes/templates/pages/material/material-out_back.html b/target/classes/templates/pages/material/material-out_back.html deleted file mode 100644 index a225dd72..00000000 --- a/target/classes/templates/pages/material/material-out_back.html +++ /dev/null @@ -1,509 +0,0 @@ - - - - - layui - - - - - - - -
-
-
- 搜索信息 -
-
-
- -
- -
- - - -
-
-
- -
- - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
-
-
- -
- -
- - -
-
- - - - - - -
- - - - - -
-
- - - - - \ No newline at end of file