Merge branch 'master' of http://git.unissense.tech/mula/unis_sip

ruoyi-admin/src/main/resources/templates/manage/delivery/add.html

@@ -172,7 +172,7 @@
             var options = {
                 title: "选择合同",
                 url: prefix + '/selectOrder',
-                skin: 'layui-layer-gray',
+                // skin: 'layui-layer-gray',
                 maxmin: false,
                 full: false,
                 index:1000,

ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html

@@ -145,7 +145,19 @@
             $.table.init(options);
         });
         function openList(id){
-            $.modal.open('发货清单', prefix + `/import/${id}`)
+            var options = {
+                title: "发货清单",
+                url: prefix + `/import/${id}`,
+                // skin: 'layui-layer-gray',
+                maxmin: false,
+                full: false,
+                index:1000,
+                callBack: doClose
+            };
+            $.modal.openOptions(options)
+        }
+        function doClose(index){
+            $.modal.close(index);
         }
     </script>
 </body>

ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html

@@ -174,7 +174,7 @@
             var options = {
                 title: "选择合同",
                 url: prefix + '/selectOrder',
-                skin: 'layui-layer-gray',
+                // skin: 'layui-layer-gray',
                 maxmin: false,
                 full: false,
                 index:1000,