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

src/view/tiip/IntReportForms/liabilities_detail.vue

@@ -54,17 +54,19 @@ export default {
     methods:{
         async getDetail(){
             this.columns[1].field=this.$route.params.sCustomerType=='客户'?'应收':'应付'
-            this.list=await this.request("getTiipLiabilities",{
+            var value=await this.request("getTiipLiabilities",{
                 params:{
                     iCustomerId:this.$route.params.iCustomerId,
                     sType:'Details',
                     sCustomerType:this.$route.params.sCustomerType,
                 }
             },"加载中",{})
-            this.list.map(x=>{
-                x['应收'] = ((Math.round(x['应收']*100)/100)||"").toLocaleString();
+            this.list=value.filter(v=>v[this.columns[1].field]).map(v=>{
+                v[this.columns[1].field] = ((Math.round(v[this.columns[1].field]*100)/100)).toLocaleString();
+                return v;
             })
         }
     },
 }
 </script>
+ 
\ No newline at end of file

src/view/tiip/kanban/unit_operateDetail.vue

@@ -300,7 +300,8 @@ export default {
                     {key:"url",value: 'Operation gai sType-material'},
                     {key:"sType",value:"销售"},
                     {key:"begin_date",value:Util.dateFormat(this.DateValue[0],"yyyy-MM-dd")},
-                    {key:"end_date",value:Util.dateFormat(this.DateValue[1]||this.DateValue[0],"yyyy-MM-dd 23:59")}
+                    {key:"end_date",value:Util.dateFormat(this.DateValue[1]||this.DateValue[0],"yyyy-MM-dd 23:59")},
+                    {key:"upbCustomerGUID",value:this.upbCustomerGUID}
                 ]
             }else if(/^1$|^2$/.test(this.mode)){
                 if(this.per_page<50)return;