Merge remote-tracking branch 'origin/dev' into dev

frontend/saas-portal-web/src/components/conenter/home.vue

@@ -371,9 +371,7 @@
           this.download()
           break;
       };
-      // document.documentElement.scrollTop = this.isfeature;
       window.addEventListener("scroll",this.handleFun);
-        // this.scrollH = Math.floor($('#feature').offset().top) - 260;
     },
     computed: {
       setTokenPage() {
@@ -395,7 +393,6 @@
     },
     methods: {
       handleFun(){
-        let top = $(document).scrollTop();
         let Y = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop;
         if ($('#feature').offset()) {
           // var scrollH = Math.floor($('#feature').offset().top) - 260;//500
@@ -611,7 +608,6 @@
           let featH = Math.floor($('#feature').offset().top) - 70;
           this.animate(featH);//690
         },10);
-        // console.log($(document).scrollTop())
       },
       //功能
       service2(){
@@ -623,7 +619,6 @@
       },
       // 下载
       download(){
-        // document.documentElement.scrollTop = 4190;
         // window.scrollTo(0,4190);
         clearInterval(this.timer);
         setTimeout(()=>{
@@ -644,12 +639,6 @@
             step = step > 0 ? Math.ceil(step) : Math.floor(step);
             leader = leader + step;
             $(document).scrollTop(leader);
-        //     document.documentElement.scrollTop++;
-        //     if(document.documentElement.scrollTop ){
-        //       document.documentElement.scrollTop = leader;
-        // 　　}else if(document.body.scrolltop){
-        //       document.body.scrolltop = leader;
-        // 　　}
             if (leader == target) {
                 clearInterval(this.timer);
             }
@@ -662,7 +651,6 @@
         } else {
           this.$store.commit('problemtrue')
         }
-        // this.isproblem = true
       }
     }
   }

frontend/saas-portal-web/static/css/main.css

@@ -334,7 +334,8 @@ main > section {
     width: 14px;
     height: 14px;
     border-radius: 50%;
-    margin: 7px 8px 0 0;
+    margin-top: 1.2%;
+    margin-right: 1%;
 }
 .bz-right-conent li {
     border-bottom: 1px solid #E8ECEF;

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -99,7 +99,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         return false;
                     }
                     Ext.apply(f, {
-                        defaultCondition: "sl_vendid = "+pb_vendid+" and sl_currency ='"+pb_currency+"' AND sl_custid <> 0 AND (  sl_kind IN ( '采购验收单','采购验退单' ) OR ( sl_kind = '期初余额' AND sl_ym = (select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid) ) "+
+                        defaultCondition: "sl_vendid = "+pb_vendid+" and sl_currency ='"+pb_currency+"' AND sl_custid = 0 AND (  sl_kind IN ( '采购验收单','采购验退单' ) OR ( sl_kind = '期初余额' AND sl_ym = (select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid) ) "+
                         ") and sl_namount<>0 "
                     });
                 }

frontend/saas-web/app/view/money/verification/FormPanel.js

@@ -510,6 +510,15 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         listeners: {
                             change: 'clearDetails'
                         }
+                    }, {
+                        fieldLabel: '客户编号',
+                        xtype: 'hidden',
+                        name: 'vc_custcode',
+                    }, {
+                        fieldLabel: '客户名称',
+                        xtype: 'customerDbfindTrigger',
+                        name: 'vc_custname',
+                        allowBlank: false
                     }, {
                         xtype: 'condbfindtrigger',
                         fieldLabel: '币别汇率',
@@ -533,15 +542,6 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             vtype: 'positiveNumber'
                         },
                     },  {
-                        fieldLabel: '客户编号',
-                        xtype: 'hidden',
-                        name: 'vc_custcode',
-                    }, {
-                        fieldLabel: '客户名称',
-                        xtype: 'customerDbfindTrigger',
-                        name: 'vc_custname',
-                        allowBlank: false
-                    }, {
                         fieldLabel: '日期',
                         xtype: 'datefield',
                         defaultValue: new Date(),