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

src/view/tiip/kanban/unit_operateDetail.vue

@@ -210,6 +210,8 @@ export default {
 
         this.mode=this.$route.query.mode||0
         this.upbCustomerGUID=this.$route.query.upbCustomerGUID||""
+        this.isFooter=true
+
         if(this.mode==1){
             this.columns=[
                 {
@@ -237,7 +239,6 @@ export default {
                 }
             ]
             this.tableStyle.tbodyHeight="calc(100vh - 125px)"
-            this.isFooter=true
             this.$store.dispatch("CAHNGE_META_INFO", {title:"销售列表"});
         }else if(this.mode==2){
             this.columns=[
@@ -266,7 +267,6 @@ export default {
                 }
             ]
             this.tableStyle.tbodyHeight="calc(100vh - 125px)"
-            this.isFooter=true
             this.$store.dispatch("CAHNGE_META_INFO", {title:"退货列表"});
         }
 
@@ -323,7 +323,7 @@ export default {
             },'加载中',{})
             if(this.mode==0){
                 this.list = res.map(x=>{
-                    x.sMaterial = `<div>${x.sSampleMaterialNo&&`<span style="color:#FF6633">${x.sSampleMaterialNo}</span><br>`}<span style="color:black;">${ x.sSampleMaterialName||''}</span></div>`
+                    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>`
                     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;

src/view/tiip/searchOrder/index.vue

@@ -201,8 +201,8 @@ export default {
         delete data.dBeginDate;
         delete data.dEndDate;
 
-        // let res = await this.apiGet(`${this.host}${this.$route.params.userId}/fabricorder/hdr/`,data,'加载中')
-        let res = await this.apiGet(`http://weixin.huansi.net/apiproxy/huansi/hszh_HSFabricTradeTest/fabricorder/hdr/`,data,'加载中')
+        let res = await this.apiGet(`${this.host}${this.$route.params.userId}/fabricorder/hdr/`,data,'加载中')
+        // let res = await this.apiGet(`http://weixin.huansi.net/apiproxy/huansi/hszh_HSFabricTradeTest/fabricorder/hdr/`,data,'加载中')
         
         if(res.table.length > 0){
             res.table.map(x=>{