From 46b4e48256f1309b0f413564afeedcb355d23ea9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 08 十二月 2023 11:46:14 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OrderController.java |    6 +++---
 src/main/webapp/static/js/order/order.js                  |   11 +++++------
 src/main/webapp/views/order/order.html                    |    2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4106826..bf673f9 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -436,9 +436,9 @@
 
     @RequestMapping(value = "/order/view/labelUp/file/auth")
 //    @ManagerAuth
-    public R viewLabelUpFile(@RequestParam("orderId") String orderId){
-        int id = Integer.parseInt(orderId);
-        String savePath = "D:/order/labelUp/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
+    public R viewLabelUpFile(@RequestParam("orderId") Long orderId){
+//        int id = Integer.parseInt(orderId);
+        String savePath = "D:/order/labelUp/file/"+orderId+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
         try{
             List<FileSaveExampleUtil.FileDTO> fileDTOS = FileSaveExampleUtil.viewFileList(savePath);
             return R.ok(fileDTOS);
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 5a265f1..c58a12b 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -4,7 +4,7 @@
     base: baseUrl + "/static/layui/lay/modules/"
 }).extend({
     notice: 'notice/notice',
-}).use(['layer', 'form', 'table','upload',  'util', 'admin', 'xmSelect', 'laydate', 'tableMerge', 'notice'], function () {
+}).use(['layer', 'form', 'table','upload','element',  'util', 'admin', 'xmSelect', 'laydate', 'tableMerge', 'notice'], function () {
     var $ = layui.jquery;
     var layer = layui.layer;
     var form = layui.form;
@@ -17,6 +17,7 @@
     var laytpl = layui.laytpl;
     var tableMerge = layui.tableMerge;
     var notice = layui.notice;
+    var element = layui.element;
 
     // 娓叉煋鎼滅储妯℃澘
     $.ajax({
@@ -90,7 +91,7 @@
     var uploadListIns = upload.render({
         elem: '#data-btn-file2'
         ,elemList: $('#data-btn-file3') //鍒楄〃鍏冪礌瀵硅薄
-        ,url: '/order/insert/labelUp/file/auth'
+        ,url: baseUrl+'/order/insert/labelUp/file/auth'
         ,accept: 'file'
         ,multiple: true
         ,number: 10
@@ -98,9 +99,6 @@
         ,bindAction: '#testListAction'
         ,choose: function(obj){
             // 璧嬪��
-            console.log(obj)
-            console.log(obj.data)
-            console.log($('.layui-layer-title').text())
             this.data.orderId=$('.layui-layer-title').text()
             var that = this;
             var files = this.files = obj.pushFile(); //灏嗘瘡娆¢�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
@@ -177,13 +175,14 @@
             // 鎵撳紑寮圭獥
             // 鏋勫缓甯﹀弬鏁扮殑鍐呭
             layer.open({
+                area: '1020px',
                 type: 1,
                 title: '涓婁紶鏂囦欢-'+data.id,
                 content: $('#myModal')
             });
             // 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶
             $.ajax({
-                url: '/order/view/labelUp/file/auth',
+                url: baseUrl+'/order/view/labelUp/file/auth',
                 data:{
                     orderId:data.id
                 },
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 78c4762..8a5aeb5 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<div id="myModal"  style="display: none;">
+<div id="myModal"  style="display: none">
     <div style="padding: 10px">
         <div class="layui-upload">
             <button type="button" class="layui-btn layui-btn-normal" id="data-btn-file2">閫夋嫨鏂囦欢</button><input id="data-btn-upload" class="layui-upload-file" type="file" accept="" name="file" multiple="">

--
Gitblit v1.9.1