From 517f67df765067bdc81b82214cd8081eac0731b9 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 5 Apr 2023 10:00:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=84=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/depository/table-in_mobile.html | 154 +++++++++-------- .../pages/depository/table-out_mobile.html | 161 +++++++++--------- .../pages/group/group-out_mobile.html | 135 ++++++++------- .../pages/material/material-out_mobile.html | 136 ++++++++------- .../pages/split/split-out_mobile.html | 123 ++++++------- .../depository_manage/mapper/GroupMapper.xml | 4 + 6 files changed, 376 insertions(+), 337 deletions(-) diff --git a/src/main/resources/templates/pages/depository/table-in_mobile.html b/src/main/resources/templates/pages/depository/table-in_mobile.html index 62a27259..5e9b263c 100644 --- a/src/main/resources/templates/pages/depository/table-in_mobile.html +++ b/src/main/resources/templates/pages/depository/table-in_mobile.html @@ -12,63 +12,73 @@
-
- 搜索信息 -
-
-
-
- -
- - - - +
+
+

搜索

+
+
+ +
+
+ +
+ + - + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
+
- +
-
+
@@ -83,7 +93,7 @@ function openDepositoryTree(obj) { } - function showDetail(){ + function showDetail() { } @@ -107,14 +117,14 @@ for (let i = 0; i < result.length; i++) { lis.push('

  • ' + result[i].applicantName+"的入库申请" + '

    '); + + result[i].id + ')">

    ' + result[i].applicantName + "的入库申请" + '

    '); lis.push('
    ' - +'

    ' + result[i].mname + '

    ' - +'

    ' + result[i].mversion + '

    ' - +'

    ' + result[i].mbrand + '

    ' - +'

    ' + result[i].quantity+" : "+result[i].airUnit + '

    ' - + '

    ' +result[i].depositoryName + '

    ' - + '

    ' +result[i].applicantTime + '

    ' + + '

    ' + result[i].mname + '

    ' + + '

    ' + result[i].mversion + '

    ' + + '

    ' + result[i].mbrand + '

    ' + + '

    ' + result[i].quantity + " : " + result[i].airUnit + '

    ' + + '

    ' + result[i].depositoryName + '

    ' + + '

    ' + result[i].applicantTime + '

    ' + '
    • '); } lis.push('
    '); @@ -186,7 +196,7 @@ }); - updateFlow = function(req) { + updateFlow = function (req) { $("#LAY_applicationIn").empty(); takingPre = 0; flow.load({ @@ -197,8 +207,8 @@ req.page = page; req.size = size; $.ajax({ - url:"/depositoryRecord/applicationInView", - type:"get", + url: "/depositoryRecord/applicationInView", + type: "get", data: req, dataType: "json", contentType: "application/json;charset=utf-8", @@ -208,14 +218,14 @@ lis.push("
    "); for (let i = 0; i < result.length; i++) { lis.push('

  • ' + result[i].applicantName+"的入库申请" + '

    '); + + result[i].id + ')">

    ' + result[i].applicantName + "的入库申请" + '

    '); lis.push('
    ' - +'

    ' + result[i].mname + '

    ' - +'

    ' + result[i].mversion + '

    ' - +'

    ' + result[i].mbrand + '

    ' - +'

    ' + result[i].quantity+" : "+result[i].airUnit + '

    ' - + '

    ' +result[i].depositoryName + '

    ' - + '

    ' +result[i].applicantTime + '

    ' + + '

    ' + result[i].mname + '

    ' + + '

    ' + result[i].mversion + '

    ' + + '

    ' + result[i].mbrand + '

    ' + + '

    ' + result[i].quantity + " : " + result[i].airUnit + '

    ' + + '

    ' + result[i].depositoryName + '

    ' + + '

    ' + result[i].applicantTime + '

    ' + '
    • '); } lis.push('
    '); diff --git a/src/main/resources/templates/pages/depository/table-out_mobile.html b/src/main/resources/templates/pages/depository/table-out_mobile.html index fe3494ea..19a8a160 100644 --- a/src/main/resources/templates/pages/depository/table-out_mobile.html +++ b/src/main/resources/templates/pages/depository/table-out_mobile.html @@ -12,68 +12,76 @@
    -
    - 搜索信息 -
    -
    -
    -
    - -
    - - - - -
    -
    -
    - -
    - - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    +
    +
    +

    搜索

    +
    +
    + +
    +
    + +
    + + - + +
    +
    +
    + +
    + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    -
    - -
    - +
    + +
    + +
    +
    +
    + +
    -
    -
    - -
    +
    - +
    -
    +
    @@ -94,11 +102,12 @@ function selectMaterialByName(obj) { } - layui.use(['form', 'flow', 'laydate'], function () { + layui.use(['form', 'flow', 'laydate', 'element'], function () { var $ = layui.jquery, form = layui.form, flow = layui.flow, - laydate = layui.laydate; + laydate = layui.laydate, + element = layui.element; let takingPre = 0; let size = 8; @@ -116,13 +125,13 @@ for (let i = 0; i < result.length; i++) { lis.push('

  • ' + result[i].applicantName+"的出库申请" + '

    '); + + result[i].id + ')">

    ' + result[i].applicantName + "的出库申请" + '

    '); lis.push('
    ' - +'

    ' + result[i].mname + '

    ' - +'

    ' + result[i].mversion + '

    ' - +'

    ' + result[i].mbrand + '

    ' - + '

    ' +result[i].depositoryName + '

    ' - + '

    ' +result[i].applicantTime + '

    ' + + '

    ' + result[i].mname + '

    ' + + '

    ' + result[i].mversion + '

    ' + + '

    ' + result[i].mbrand + '

    ' + + '

    ' + result[i].depositoryName + '

    ' + + '

    ' + result[i].applicantTime + '

    ' + '
    • '); } lis.push(''); @@ -225,7 +234,7 @@ }); - updateFlow = function(req) { + updateFlow = function (req) { $("#LAY_applicationOut").empty(); takingPre = 0; flow.load({ @@ -236,8 +245,8 @@ req.page = page; req.size = size; $.ajax({ - url:"/depositoryRecord/applicationOutView", - type:"get", + url: "/depositoryRecord/applicationOutView", + type: "get", data: req, dataType: "json", contentType: "application/json;charset=utf-8", @@ -247,13 +256,13 @@ for (let i = 0; i < result.length; i++) { lis.push('

  • ' + result[i].applicantName+"的出库申请" + '

    '); + + result[i].id + ')">

    ' + result[i].applicantName + "的出库申请" + '

    '); lis.push('
    ' - +'

    ' + result[i].mname + '

    ' - +'

    ' + result[i].mversion + '

    ' - +'

    ' + result[i].mbrand + '

    ' - + '

    ' +result[i].depositoryName + '

    ' - + '

    ' +result[i].applicantTime + '

    ' + + '

    ' + result[i].mname + '

    ' + + '

    ' + result[i].mversion + '

    ' + + '

    ' + result[i].mbrand + '

    ' + + '

    ' + result[i].depositoryName + '

    ' + + '

    ' + result[i].applicantTime + '

    ' + '
    • '); } lis.push(''); @@ -267,7 +276,7 @@ }); }; - showDetail = function(obj){ + showDetail = function (obj) { var index = layer.open({ title: '出库信息详情', type: 2, diff --git a/src/main/resources/templates/pages/group/group-out_mobile.html b/src/main/resources/templates/pages/group/group-out_mobile.html index 4230ccee..80784ca0 100644 --- a/src/main/resources/templates/pages/group/group-out_mobile.html +++ b/src/main/resources/templates/pages/group/group-out_mobile.html @@ -12,56 +12,62 @@
    -
    - 搜索信息 -
    -
    -
    - - -
    - -
    - +
    +
    +

    搜索

    +
    +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    -
    - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    +
    - +
    -
    +
    @@ -71,9 +77,10 @@