From 169a93b351413221045f0de0092562070247c399 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Thu, 16 Mar 2023 15:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=B8=80=E4=BA=9B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=81=AE=E7=BD=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/QyWxOperationService.java    | 12 ++++---
 .../templates/pages/depository/table-out.html | 34 ++++++++++++++++---
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
index ca774faf..9499e2f2 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
@@ -1744,13 +1744,15 @@ public class QyWxOperationService {
                 }
                 qywxUserIdList.add(user);
             }
+            if (qywxUserIdList.size() > 0) {
+                // 用于设置仓库管理员流程
+                Approval_template_approver approval_template_approver_depository_manager = new Approval_template_approver();
+                approval_template_approver_depository_manager.setAttr(1);
+                approval_template_approver_depository_manager.setUserid(qywxUserIdList);
 
-            // 用于设置仓库管理员流程
-            Approval_template_approver approval_template_approver_depository_manager = new Approval_template_approver();
-            approval_template_approver_depository_manager.setAttr(1);
-            approval_template_approver_depository_manager.setUserid(qywxUserIdList);
+                approval_template_approver_list.add(approval_template_approver_depository_manager);
+            }
 
-            approval_template_approver_list.add(approval_template_approver_depository_manager);
         }
 
 
diff --git a/src/main/resources/templates/pages/depository/table-out.html b/src/main/resources/templates/pages/depository/table-out.html
index 7f019c34..ceef3366 100644
--- a/src/main/resources/templates/pages/depository/table-out.html
+++ b/src/main/resources/templates/pages/depository/table-out.html
@@ -84,6 +84,11 @@
             </div>
         </script>
 
+
+        <script id="applicationOutCode" type="text/html">
+            <a  id="{{d.id}}" onclick="showDetail(this)">{{d.code}}</a>
+        </script>
+
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
 
         <script type="text/html" id="currentTableBar">
@@ -98,6 +103,11 @@
 <script>
     var data;
 
+    function showDetail() {
+
+    }
+
+
     // 用于加载仓库菜单
     function selectMaterialByName(obj) {
     }
@@ -192,7 +202,8 @@
             cols: [
                 [
                     {type: "checkbox", width: 50},
-                    {field: 'code', width: 150, title: '申请编码', sort: true},
+                    // {field: 'code', width: 150, title: '申请编码', sort: true},
+                    {title: '申请编码', width: 150, templet: '#applicationOutCode'},
                     {field: 'mname', width: 150, title: '物料名称'},
                     {field: 'mcode', width: 150, title: '存货编码'},
                     {field: 'quantity', width: 150, title: '数量', sort: true},
@@ -201,7 +212,7 @@
                     {field: 'state', width: 150, title: '流程状态'},
                     {
                         field: 'pass', title: '是否完成出库', minWidth: 120, templet: function (d) {
-                            if (d.pass == 1) {
+                            if (d.pass === 1) {
                                 return "是";
                             } else {
                                 return "否";
@@ -212,9 +223,9 @@
                     {field: 'applicantTime', width: 200, title: '申请时间', sort: true},
                     {
                         field: 'istransfer', title: '是否为转移申请', minWidth: 120, templet: function (d) {
-                            if (d.istransfer == 1) {
+                            if (d.istransfer === 1) {
                                 return "是";
-                            } else if (d.istransfer == 2) {
+                            } else if (d.istransfer === 2) {
                                 return "否";
                             }
                         }
@@ -373,6 +384,21 @@
             console.log(obj)
         });
 
+        showDetail = function(obj){
+            var index = layer.open({
+                title: '出库信息详情',
+                type: 2,
+                shade: 0.2,
+                maxmin: true,
+                shadeClose: true,
+                area: ['100%', '100%'],
+                content: '/ApplicationOutView?id=' + obj.id,
+            });
+            $(window).on("resize", function () {
+                layer.full(index);
+            });
+        }
+
         table.on('tool(currentTableFilter)', function (obj) {
             let data = obj.data;
             if (obj.event === 'detail') {