Merge branch 'score_shop' into api_score_meger

jyy

2021-08-20 d5d3d4e6397f23782958748f46c389b85eaafe47

 zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html

@@ -110,9 +110,14 @@
               + '<ul class="dropdown-menu" role="menu">'
               + '<li><a href="javascript:void(0)" style="display:'
               + value
               + '"  onClick="lookInfo(\''
               + '"  onClick="openEdit(\''
               + value
               + '\')" title="编辑">查看</a></li>'
               + '\')" title="编辑">编辑</a></li>'
               + '<li><a href="javascript:void(0)" style="display:'
               + value
               + '" onClick="myGrid.delItem(\''
               + value
               + '\')" title="删除">删除</a></li>' + '</ul>' + '</div>';
         html += '';
         return html; 
      } 
@@ -126,6 +131,16 @@
            content : [ basePath+'/admin/label/edit']
         }); 
      }

       function openEdit(id) {
          layer.open({
             type : 2,
             title : "添加标签",
             area : [ MUI.SIZE_L, '400px' ],
             maxmin : true,
             content : [ basePath+'/admin/label/edit?id=' + id]
          });
       }
   </script>
</body>
</html>