Parcourir la source

1:添加商品审核上架的(演示)功能

wangming il y a 2 ans
Parent
commit
9bbd0df10a

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/scm/ZSproducController.java

@@ -135,7 +135,7 @@ public class ZSproducController {
         productInfo.setWidth(StringUtils.isEmpty(product.getWidth()+"") ? "" : String.valueOf(product.getWidth()));
         productInfo.setHeight(StringUtils.isEmpty(product.getHeight()+"") ? "" : String.valueOf(product.getHeight()));
         productInfo.setModelCode(StringUtils.isEmpty(product.getModelCode()+"") ? "" : String.valueOf(product.getModelCode()));
-        productInfo.setType("10");
+        productInfo.setType("0");
         return productInfo;
     }
 

+ 9 - 4
ruoyi-admin/src/main/resources/templates/scm/production/production.html

@@ -285,6 +285,9 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        if ('0' == row.type) { // 待审核
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="up(\'' + row.id + '\')"><i class="fa fa-edit"></i>上架审核</a> ');
+                        }
                         if ('10' == row.type) { // 待审核
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="down(\'' + row.id + '\')"><i class="fa fa-edit"></i>下架</a> ');
                         }
@@ -298,10 +301,12 @@
         });
 
 
-        // 上架页面
-        // function up(id) {
-        //     $.modal.open("审核", "/scm/supplier/approve/" + id, '800', '350');
-        // }
+        上架页面
+        function up(id) {
+            $.modal.confirm("确定上架架本产品?", function () {
+                $.operate.save(prefix + "/edit", {"id": id, "type": "10"});
+            })
+        }
         //商品下架
         function down(id) {
             $.modal.confirm("确定下架本产品?", function () {

+ 10 - 1
ruoyi-system/src/main/java/com/ruoyi/scm/service/impl/ProductInfoServiceImpl.java

@@ -78,9 +78,18 @@ public class ProductInfoServiceImpl implements IProductInfoService
         ProductInfo productInfo1 = productInfoMapper.selectProductInfoById(productInfo.getId());
         String resultJson = null;
         Map<String, Object> resultMap = null;
+        Map<String, Object> map = new HashMap<>();
+        if("10".equals(productInfo.getType())){
+            productInfoMapper.updateProductInfo(productInfo);
+            map.put("success", true);
+            map.put("resultCode", "00");
+            map.put("resultMsg", null);
+            map.put("result", null);
+            return map;
+        }
         if ("20".equals(productInfo.getType())) {
             //下架的情况
-            Map<String, Object> map = new HashMap<>();
+
             map.put("token", "123456");
             map.put("supplierCode", productInfo1.getSupplierId());
             Set<String> strings = new HashSet<>();