修改 批次入库导出

ruoyi-admin/src/main/resources/templates/demo/table/exportSelected.html

@@ -22,7 +22,7 @@
 				</form>
 			</div>
 			<div class="btn-group-sm" id="toolbar" role="group">
-		        <i class="fa fa-info-circle" style="color: red;"></i>  勾选数据导出指定列，否则为全部   
+<!--		        <i class="fa fa-info-circle" style="color: red;"></i>  勾选数据导出指定列，否则为全部   -->
 		        <a class="btn btn-warning" onclick="exportSelected()">
 		            <i class="fa fa-download"></i> 导出
 		        </a>

ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java

@@ -40,9 +40,10 @@ public class RecordInspectionImgController extends BaseController
     {
         return prefix + "/record_inspection_location";
     }
-    @GetMapping("/img")
+    @GetMapping("/img/{location}")
-    public String record_inspection_img()
+    public String record_inspection_img(@PathVariable("location") String location,ModelMap modelMap)
     {
+        modelMap.put("location",location);
         return prefix + "/record_inspection_img";
     }
 

ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java

@@ -1,10 +1,13 @@
 package com.ruoyi.manage.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 轮挡入库记录对象 record_in
  *
@@ -17,7 +20,9 @@ public class RecordInSort extends BaseEntity
 
     /** 主键 */
     private Long objid;
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "入库时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createTime;
     /** 批次码 */
     @Excel(name = "批次码")
     private String batchCode;
@@ -25,6 +30,16 @@ public class RecordInSort extends BaseEntity
     @Excel(name = "数量")
     public int recordCount;
 
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     public void setObjid(Long objid)
     {
         this.objid = objid;

ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html

@@ -52,7 +52,7 @@
             <table id="bootstrap-table"></table>
         </div>
         <div class="btn-group-sm" id="toolbar" role="group">
-            <i class="fa fa-info-circle" style="color: red;"></i> 勾选数据导出指定列，否则为全部
+<!--            <i class="fa fa-info-circle" style="color: red;"></i> 勾选数据导出指定列，否则为全部-->
             <a class="btn btn-warning" onclick="exportSelected()">
                 <i class="fa fa-download"></i> 导出
             </a>
@@ -238,7 +238,7 @@
 
     function exportSelected() {
         var $table =$('#bootstrap-table');
-        var selections = $table.bootstrapTable('getSelections');
+  /*      var selections = $table.bootstrapTable('getSelections');
         var objIds = $.map(selections, function (row) {
             return row.batchCode; // 假设objid是父表每行的唯一标识
         });
@@ -251,8 +251,8 @@
         var dataParam = {
             objIds: objIds.join(',')
         };
-
+*/
-        $.modal.confirm("确定导出勾选的" + objIds.length + "条数据吗？", function() {
+        $.modal.confirm("确定导出数据吗？", function() {
             $.ajax({
                 url: prefix + "/export_sort", // 修改为您的导出接口URL
                 method: 'POST',

ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html

@@ -10,14 +10,14 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
+<!--                            <li>-->
-                                <label>巡检id：</label>
+<!--                                <label>巡检id：</label>-->
-                                <input type="text" name="inspectionId"/>
+<!--                                <input type="text" name="inspectionId"/>-->
-                            </li>
+<!--                            </li>-->
-                            <li>
+<!--                            <li>-->
-                                <label>任务表id：</label>
+<!--                                <label>任务表id：</label>-->
-                                <input type="text" name="taskId"/>
+<!--                                <input type="text" name="taskId"/>-->
-                            </li>
+<!--                            </li>-->
                             <li>
                                 <label>机位码：</label>
                                 <input type="text" name="locationCode"/>
@@ -77,17 +77,18 @@
                 columns: [{
                     checkbox: true
                 },
-                {
+                // {
-                    field: 'inspectionId',
+                //     field: 'inspectionId',
-                    title: '巡检id'
+                //     title: '巡检id'
-                },
+                // },
-                {
+                // {
-                    field: 'taskId',
+                //     field: 'taskId',
-                    title: '任务表id'
+                //     title: '任务表id'
-                },
+                // },
                 {
                     field: 'locationCode',
-                    title: '机位码'
+                    title: '机位码',
+                    visible:false
                 },
                 {
                     field: 'imgPath',

ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_location.html

@@ -50,7 +50,7 @@
      <template id="profileTemplate">
          <div class="col-sm-2">
              <div class="contact-box">
-                 <a  onclick="$.modal.openTab('图片详情','device/fileinfo/%locationCode%')">
+                 <a  onclick="$.modal.openTab('图片详情','manage/record_inspection_img/img/%locationCode%')">
                      <div class="col-sm-12" >
                          <div class="text-center">
                              <img alt="image" class=" m-t-xs img-responsive col-sm-12" src="/img/folder.png"