Merge branch 'master' of ssh://47.110.145.204:2222/godwithdh/wx_h5

src/view/tiip/kanban/unit_operateDetail.vue

@@ -210,7 +210,9 @@ export default {
 
         this.mode=this.$route.query.mode||0
         this.upbCustomerGUID=this.$route.query.upbCustomerGUID||""
+
         this.isFooter=true
+        this.tableStyle.tbodyHeight="calc(100vh - 125px)"
 
         if(this.mode==1){
             this.columns=[
@@ -238,7 +240,6 @@ export default {
                     field:"sStatus"
                 }
             ]
-            this.tableStyle.tbodyHeight="calc(100vh - 125px)"
             this.$store.dispatch("CAHNGE_META_INFO", {title:"销售列表"});
         }else if(this.mode==2){
             this.columns=[
@@ -266,7 +267,6 @@ export default {
                     field:"nAmountHTML"
                 }
             ]
-            this.tableStyle.tbodyHeight="calc(100vh - 125px)"
             this.$store.dispatch("CAHNGE_META_INFO", {title:"退货列表"});
         }
 
@@ -322,12 +322,13 @@ export default {
                 params:params||{},
             },'加载中',{})
             if(this.mode==0){
-                this.list = res.map(x=>{
-                    x.sMaterial = `<div>${x.sSampleMaterialNo&&`<span style="color:#FF6633;text-decoration:${i<res.length-1?'underline':'none'}">${x.sSampleMaterialNo}</span><br>`}<span style="color:black;">${ x.sSampleMaterialName||''}</span></div>`
+                this.list = res.map((x,i)=>{
+                    x.sMaterial = `<div>${x.sSampleMaterialNo&&`<span style="color:#FF6633;">${x.sSampleMaterialNo}</span><br>`}<span style="color:black;">${ x.sSampleMaterialName||''}</span></div>`
                     x.nAmountHTML = `<div><span style="color:#339966;">${(x.nAmount||0).toLocaleString()}</span></div>`;
                     x.nQtyHTML = `<div><span">${(x.nQty || x.nOutQty || x.nInQty||0).toLocaleString()}</span></div>`;
                     return x;
                 })
+                console.log(this.list,"---------lsit-===========------------")
             }else if(/^1$|^2$/.test(this.mode)){
                 this.per_page=res.length
                 this.page++