要货查询

suishenbang-order/src/main/java/com/dgtly/order/controller/SalesOrderBaseController.java

@@ -2,6 +2,7 @@ package com.dgtly.order.controller;
 
 import java.util.List;
 
+import com.dgtly.order.domain.OrderSalesGroup;
 import com.dgtly.order.domain.SalesOrderBase;
 import com.dgtly.order.service.ISalesOrderBaseService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -76,5 +77,16 @@ public class SalesOrderBaseController extends BaseController
         ExcelUtil<SalesOrderBase> util = new ExcelUtil<SalesOrderBase>(SalesOrderBase.class);
         return util.exportExcel(list, "要货查询");
     }
+//
+//    /**
+//     * 修改【销售分部目标达成】
+//     */
+//    @GetMapping("/edit/{id}")
+//    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+//    {
+////        OrderSalesGroup orderSalesGroup = orderSalesGroupService.selectOrderSalesGroupById(id);
+////        mmap.put("orderSalesGroup", orderSalesGroup);
+//        return prefix + "/edit";
+//    }
 
 }

suishenbang-order/src/main/java/com/dgtly/order/domain/SalesOrderBase.java

@@ -20,7 +20,7 @@ public class SalesOrderBase extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** id */
-    private Long id;
+    private String id;
 
     /** 是否删除 */
 //    @Excel(name = "是否删除")
@@ -109,15 +109,14 @@ public class SalesOrderBase extends BaseEntity
         this.customerCode = customerCode;
     }
 
-    public void setId(Long id)
-    {
-        this.id = id;
+    public String getId() {
+        return id;
     }
 
-    public Long getId()
-    {
-        return id;
+    public void setId(String id) {
+        this.id = id;
     }
+
     public void setIsDelete(String isDelete)
     {
         this.isDelete = isDelete;

suishenbang-order/src/main/resources/templates/order/salesOrderBase/test.html

@@ -38,6 +38,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
+
             <a class="btn btn-warning" onclick="$.table.exportExcel()"
                shiro:hasPermission="order:salesOrderBase:export">
                 <i class="fa fa-download"></i> 导出
@@ -50,14 +51,15 @@
 </div>
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
-    var editFlag = [[${@permission.hasPermi('order:salesOrderBaseTest:edit')}]];
+    var editFlag = [[${@permission.hasPermi('order:salesOrderBase:edit')}]];
     var prefix = ctx + "order/salesOrderBase";
 
     $(function () {
         var options = {
             url: prefix + "/list",
+            updateUrl: prefix + "/edit/{id}",
             exportUrl: prefix + "/export",
-
+            // editUrl: prefix + "/info/{id}",
             modalName: "要货查询",
             columns: [{
                 checkbox: true
@@ -91,15 +93,7 @@
                     field: 'createTime',
                     title: '操作时间'
                 },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function (value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                        return actions.join('');
-                    }
-                }]
+                ]
         };
         $.table.init(options);
     });