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

pages/aps/supprotMain/accessory.vue

@@ -350,7 +350,7 @@ export default {
           }
         });
       } else {
-        this.$Message.error("已出库完成！");
+        this.$Message.success("已出库完成！");
       }
     },
     getMetaiAll() {

pages/aps/supprotMain/outbound.vue

@@ -7,11 +7,15 @@
       <span class="ml20">申请时间：{{row.creationTime}}</span>
       <span class="ml20">
         状态：
-       <state code="accessory.status" :value="row.status+''" type="text"></state>
+        <state code="accessory.status" :value="row.status+''" type="text"></state>
       </span>
     </p>
     <Card :padding="0">
-      <p slot="title">申请单物料列表</p>
+      <p slot="title">
+        <Tooltip max-width="300" content="点击显示所有出库物料库房库位">
+          <a href="#" @click="clickTitle">申请单物料列表</a>
+        </Tooltip>
+      </p>
       <div slot="extra">
         <Button
           type="primary"
@@ -242,7 +246,7 @@ export default {
           this.butTxt = "更多";
           this.iconLabel = "md-arrow-dropdown";
 
-          let parm = { supportMainId : v };
+          let parm = { supportMainId: v };
           this.curRowId = 0;
           Api.listbysupportitem(parm).then((res) => {
             if (res.success) {
@@ -252,6 +256,16 @@ export default {
         }
       });
     },
+    clickTitle() {
+      this.$refs.gridTable.clearCurrentRow();
+      let parm = { supportMainId: this.eid };
+      this.curRowId = 0;
+      Api.listbysupportitem(parm).then((res) => {
+        if (res.success) {
+          this.dataList = res.result;
+        }
+      });
+    },
     //状态名称过滤
     setName(list, v) {
       let outPar = {
@@ -377,5 +391,4 @@ export default {
 };
 </script>
 <style scoped>
-
 </style>
\ No newline at end of file