Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

pages/store/index.vue

@@ -113,7 +113,7 @@ export default {
                 "op",
                 {
                   attrs: { oprate: "delete" },
-                  on: { click: () => this.remove(params.row.id) }
+                  on: { click: () => this.remove(params.row) }
                 },
                 "删除"
               )
@@ -253,14 +253,22 @@ export default {
       this.detail = () => import("./edit");
       this.modal = true;
     },
-    remove(id) {
-      Api.delete(id).then(r => {
+    remove(row) {
+      if(row.children&&row.children.length==0)
+      {
+      Api.delete(row.id).then(r => {
         if (r.success) {
           this.$Message.success("删除成功");
           var name = this.searchValue;
           this.laodaction(name);
         }
       });
+      }
+      else
+      {
+        this.$Message.error("此节点有子节点，不能删除！");
+        return false
+      }
     },
     cancel() {
       this.curId = 0;