Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -240,7 +240,8 @@ import { setTimeout } from 'timers';
         created() {
             if (!this.mytoken) {
                 this.$router.push({path:'/home'})
-            }
+            };
+            document.documentElement.scrollTop = 0;
         },
         mounted(){
             let phone = this.mytoken.mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');

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

@@ -1,5 +1,5 @@
 <template>
-    <div id="scroll">
+    <div id="scroll" @mousewheel="scrollout">
       <div class="top-nav">
         <div class="container">
           <ul>
@@ -22,7 +22,7 @@
 								<span id="user-info">{{account.realname || account.username}} | </span>
                 <span @click="loginout">[退出]</span>
 							</span>
-              <router-link to="/enterprise"><a><span @click="home" style="color: white">账户中心</span></a></router-link>
+              <router-link to="/enterprise"><a><span style="color: white">账户中心</span></a></router-link>
             </li>
           </ul>
         </div>
@@ -44,7 +44,8 @@
             </div>
         <div class="collapse navbar-collapse navbar-right" role="navigation" style="position: absolute;left: 35%;">
           <ul @click="gohome" id="nav" class="nav navbar-nav menu">
-            <li><a href="#" @click="setTurnHome"><span>首页</span></a></li>
+            <!-- <li><a href="#" @click="setTurnHome"><span>首页</span></a></li> -->
+            <li class="xs"><a @click="home"><span>首页</span></a></li>
             <li class="xs"><a @click="feature2"><span>特色</span></a></li>
             <li class="xs"><a @click="service2"><span>功能</span></a></li>
             <li class="xs"><a @click="download"><span>下载</span></a></li>
@@ -299,6 +300,7 @@
         isexperience: false,
         isproblem: true,//常见问题
         isfeature:this.$route.params.isfeature,
+        timer:null,
       }
     },
     components: {
@@ -350,6 +352,9 @@
         }
       })
     },
+    beforeDestroy(){
+      clearInterval(this.timer)
+    },
     mounted() {
       this.clientId = Math.random().toString(36).substr(2)
       // 从本地加载已经登录的信息
@@ -450,9 +455,6 @@
       },
     },
     methods: {
-      home() {
-        document.documentElement.scrollTop = 0;
-      },
       listenOnCallback() {
         const me = this
         subscribe(this.clientId, '/sso/callback').then(data => {
@@ -512,13 +514,10 @@
         let url = 'https://saas-assets.usoftchina.com/UsoftchinaSaasClient_setup.exe';
         let alink = document.createElement("a");
         alink.style.display = 'none';
-        // let blob = new Blob([url]);
-        // alink.href = URL.createObjectURL(blob);
         alink.href = url;//下载地址
         // alink.download = "pic"; //文件名(自定义)
         document.body.appendChild(alink);
         alink.click();
-        // URL.revokeObjectURL(alink.href);
       },
       //体验
       experience(){
@@ -579,26 +578,53 @@
       //常见问题
       navproblem(){
         this.$store.commit('problemfalse');
-        document.documentElement.scrollTop = 0;
+        // document.documentElement.scrollTop = 0;
+        clearInterval(this.timer);
+        this.animate(0);
+      },
+      home() {
+        clearInterval(this.timer);
+        this.animate(0);
+        this.setTurnHome();
       },
       //特色
       feature2(){
-        document.documentElement.scrollTop = 690;
+        clearInterval(this.timer);
+        this.animate(690);
         this.setTurnHome();
       },
       //功能
       service2(){
-        document.documentElement.scrollTop = 3530;
+        clearInterval(this.timer);
+        this.animate(3530);
         this.setTurnHome();
       },
       // 下载
       download(){
-        document.documentElement.scrollTop = 4190;
-        // $('html,body').animate({
-        //       scrollTop: 4400
-        // },2000);
+        // document.documentElement.scrollTop = 4190;
+        // window.scrollTo(0,4190);
+        clearInterval(this.timer);
+        this.animate(4190);
         this.setTurnHome();
       },
+      //添加鼠标滚轮事件，鼠标滚动的时候清除定时器，否则无法滚动
+      scrollout(){
+        clearInterval(this.timer);
+      },
+      //滚动动画封装
+      animate(target) {
+        clearInterval(this.timer);
+        this.timer = setInterval(function () {
+            var leader = document.documentElement.scrollTop;
+            var step = (target - leader) / 10;
+            step = step > 0 ? Math.ceil(step) : Math.floor(step);
+            leader = leader + step;
+            document.documentElement.scrollTop = leader;
+            if (leader === target) {
+                clearInterval(this.timer);
+            }
+        }, 5);
+      },
       gohome(e){
         this.$store.commit('problemtrue')
         // this.isproblem = true

frontend/saas-web/app/view/core/dbfind/ConDbfindTrigger.js

@@ -22,12 +22,15 @@ Ext.define('saas.view.core.form.field.ConDbfindTrigger', {
         dbType = me.dbType,
         dbfinds = me.dbfinds,
         name0 = dbfinds[0].to,
-        name1 = dbfinds[1].to;
+        name1 = dbfinds[1].to,
+        fieldLabel = me.fieldLabel;
 
         Ext.apply(me, {
             items: [Ext.Object.merge({
                 xtype: dbType,
                 name: name0,
+                fieldLabel: fieldLabel,
+                hideLabel: true,
                 allowBlank: allowBlank,
                 msgTarget: 'none',
                 bind: {
@@ -38,6 +41,8 @@ Ext.define('saas.view.core.form.field.ConDbfindTrigger', {
             }, me.mainFieldConfig), Ext.Object.merge({
                 xtype: 'textfield',
                 name: name1,
+                fieldLabel: fieldLabel,
+                hideLabel: true,
                 allowBlank: allowBlank,
                 readOnly: true,
                 defaultReadOnly: true,

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -264,13 +264,27 @@ Ext.define('saas.view.core.form.FormPanel', {
     addItems: function (items) {
         let me = this;
         me.setBindFields(items);
-        let formItems = me.add(items);
+        let addItems = me.add(items);
+        let formItems = [];
+        
+        for(let i = 0; i < addItems.length; i++) {
+            let item = addItems[i];
+
+            if(item.getXTypes().split('/').indexOf('condbfindtrigger') != -1) {
+                let confields = item.items.items;
+                formItems.push(confields[0]);
+                formItems.push(confields[1]);
+            }else {
+                formItems.push(item); 
+            }
+        }
         let codeField = me.getForm().findField(me._codeField);
         if(codeField && !Ext.Array.findBy(formItems, function(i) {
             return i.name == me._codeField;
         })) {
             formItems.push(codeField);
         }
+
         me.formItems = formItems;
         return formItems;
     },

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

@@ -48,7 +48,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 items = FormUtil.initItems(items);
                 items = FormUtil.applyCusMainItemConfig(items, cfg);
                 items = FormUtil.applyCusDetailItemConfig(items, cfg);
-                
+
                 me.configItems = items;
 
                 items = FormUtil.applyDefaultItems(me, items);
@@ -180,11 +180,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         xtype: 'numbercolumn',
                         dataIndex: "vd_amount",
                         width: 110,
-                        renderer: function(v, m, r) {
+                        renderer: function (v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
-                        summaryRenderer: function(v, d, f, m) {
+                        summaryRenderer: function (v, d, f, m) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         }
                     }, {
@@ -193,11 +193,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         dataIndex: "sl_yamount",
                         width: 120,
                         ignore: true,
-                        renderer: function(v, m, r) {
+                        renderer: function (v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
-                        summaryRenderer: function(v, d, f, m) {
+                        summaryRenderer: function (v, d, f, m) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         }
                     }, {
@@ -206,11 +206,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         dataIndex: "sl_namount",
                         width: 120,
                         ignore: true,
-                        renderer: function(v, m, r) {
+                        renderer: function (v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
-                        summaryRenderer: function(v, d, f, m) {
+                        summaryRenderer: function (v, d, f, m) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         }
                     }, {
@@ -223,11 +223,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             decimalPrecision: 2
                         },
                         allowBlank: false,
-                        renderer: function(v, m, r) {
+                        renderer: function (v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
-                        summaryRenderer: function(v, d, f, m) {
+                        summaryRenderer: function (v, d, f, m) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         }
                     }, {
@@ -324,11 +324,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         xtype: 'numbercolumn',
                         dataIndex: "vcd_amount",
                         width: 110,
-                        renderer: function(v, m, r) {
+                        renderer: function (v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
-                        summaryRenderer: function(v, d, f, m) {
+                        summaryRenderer: function (v, d, f, m) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         }
                     }, {
@@ -337,11 +337,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         dataIndex: "sl_yamount",
                         width: 120,
                         ignore: true,
-                        renderer: function(v, m, r) {
+                        renderer: function (v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
-                        summaryRenderer: function(v, d, f, m) {
+                        summaryRenderer: function (v, d, f, m) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         }
                     }, {
@@ -350,11 +350,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         dataIndex: "sl_namount",
                         width: 120,
                         ignore: true,
-                        renderer: function(v, m, r) {
+                        renderer: function (v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
-                        summaryRenderer: function(v, d, f, m) {
+                        summaryRenderer: function (v, d, f, m) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         }
                     }, {
@@ -367,11 +367,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             xtype: "numberfield",
                             decimalPrecision: 2
                         },
-                        renderer: function(v, m, r) {
+                        renderer: function (v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
-                        summaryRenderer: function(v, d, f, m) {
+                        summaryRenderer: function (v, d, f, m) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         }
                     }, {
@@ -531,13 +531,15 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         allowBlank: false,
                         dbType: 'currencyDbfindTrigger',
                         dbfinds: [{
-                            from: 'cr_name', to: 'vc_currency'
+                            from: 'cr_name',
+                            to: 'vc_currency'
                         }, {
-                            from: 'cr_rate', to: 'vc_rate'
+                            from: 'cr_rate',
+                            to: 'vc_rate'
                         }],
-                        listeners: {
-                            change: 'clearDetails'
-                        },
+                        // listeners: {
+                        //     change: 'clearDetails'
+                        // },
                         supFieldConfig: {
                             xtype: 'numberfield',
                             readOnly: false,
@@ -545,7 +547,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             decimalPrecision: 6,
                             vtype: 'positiveNumber'
                         },
-                    },{
+                    }, {
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',
@@ -585,19 +587,21 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         defaultValue: new Date(),
                         allowBlank: false,
                         name: 'vc_date'
-                    },  {
+                    }, {
                         xtype: 'condbfindtrigger',
                         fieldLabel: '币别汇率',
                         allowBlank: false,
                         dbType: 'currencyDbfindTrigger',
                         dbfinds: [{
-                            from: 'cr_name', to: 'vc_currency'
+                            from: 'cr_name',
+                            to: 'vc_currency'
                         }, {
-                            from: 'cr_rate', to: 'vc_rate'
+                            from: 'cr_rate',
+                            to: 'vc_rate'
                         }],
-                        listeners: {
-                            change: 'clearDetails'
-                        },
+                        // listeners: {
+                        //     change: 'clearDetails'
+                        // },
                         supFieldConfig: {
                             xtype: 'numberfield',
                             readOnly: false,
@@ -605,7 +609,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             decimalPrecision: 6,
                             vtype: 'positiveNumber'
                         },
-                    },{
+                    }, {
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',
@@ -666,8 +670,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         }, {
                             from: 've_name',
                             to: 'vc_vendname'
-                        }
-                        ],
+                        }],
                     }, {
                         fieldLabel: '日期',
                         xtype: 'datefield',
@@ -675,26 +678,28 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         allowBlank: false,
                         name: 'vc_date'
                     }, {
-                            xtype: 'condbfindtrigger',
-                            fieldLabel: '币别汇率',
-                            allowBlank: false,
-                            dbType: 'currencyDbfindTrigger',
-                            dbfinds: [{
-                                from: 'cr_name', to: 'vc_currency'
-                            }, {
-                                from: 'cr_rate', to: 'vc_rate'
-                            }],
-                            listeners: {
-                                change: 'clearDetails'
-                            },
-                            supFieldConfig: {
-                                xtype: 'numberfield',
-                                readOnly: false,
-                                defaultReadOnly: false,
-                                decimalPrecision: 6,
-                                vtype: 'positiveNumber'
-                            },
-                        },{
+                        xtype: 'condbfindtrigger',
+                        fieldLabel: '币别汇率',
+                        allowBlank: false,
+                        dbType: 'currencyDbfindTrigger',
+                        dbfinds: [{
+                            from: 'cr_name',
+                            to: 'vc_currency'
+                        }, {
+                            from: 'cr_rate',
+                            to: 'vc_rate'
+                        }],
+                        // listeners: {
+                        //     change: 'clearDetails'
+                        // },
+                        supFieldConfig: {
+                            xtype: 'numberfield',
+                            readOnly: false,
+                            defaultReadOnly: false,
+                            decimalPrecision: 6,
+                            vtype: 'positiveNumber'
+                        },
+                    }, {
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',
@@ -750,19 +755,21 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         defaultValue: new Date(),
                         allowBlank: false,
                         name: 'vc_date'
-                    },  {
+                    }, {
                         xtype: 'condbfindtrigger',
                         fieldLabel: '币别汇率',
                         allowBlank: false,
                         dbType: 'currencyDbfindTrigger',
                         dbfinds: [{
-                            from: 'cr_name', to: 'vc_currency'
+                            from: 'cr_name',
+                            to: 'vc_currency'
                         }, {
-                            from: 'cr_rate', to: 'vc_rate'
+                            from: 'cr_rate',
+                            to: 'vc_rate'
                         }],
-                        listeners: {
-                            change: 'clearDetails'
-                        },
+                        // listeners: {
+                        //     change: 'clearDetails'
+                        // },
                         supFieldConfig: {
                             xtype: 'numberfield',
                             readOnly: false,
@@ -770,7 +777,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             decimalPrecision: 6,
                             vtype: 'positiveNumber'
                         },
-                    },{
+                    }, {
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',
@@ -826,19 +833,21 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         defaultValue: new Date(),
                         allowBlank: false,
                         name: 'vc_date'
-                    },  {
+                    }, {
                         xtype: 'condbfindtrigger',
                         fieldLabel: '币别汇率',
                         allowBlank: false,
                         dbType: 'currencyDbfindTrigger',
                         dbfinds: [{
-                            from: 'cr_name', to: 'vc_currency'
+                            from: 'cr_name',
+                            to: 'vc_currency'
                         }, {
-                            from: 'cr_rate', to: 'vc_rate'
+                            from: 'cr_rate',
+                            to: 'vc_rate'
                         }],
-                        listeners: {
-                            change: 'clearDetails'
-                        },
+                        // listeners: {
+                        //     change: 'clearDetails'
+                        // },
                         supFieldConfig: {
                             xtype: 'numberfield',
                             readOnly: false,
@@ -846,7 +855,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             decimalPrecision: 6,
                             vtype: 'positiveNumber'
                         },
-                    },{
+                    }, {
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',

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

@@ -211,9 +211,10 @@ Ext.define('saas.view.money.verification.FormPanelController', {
 
         arr.map(function(a) {
             var fieldName = a.replace(/[{|}]/g, '');
-            var fieldLabel = Ext.Array.findBy(formItems, function(f) {
+            var field = Ext.Array.findBy(formItems, function(f) {
                 return f.name == fieldName;
             });
+            var fieldLabel = field.fieldLabel || field.name;
             var fieldValue = viewModel.get(fieldName);
             fields[fieldName] = fieldValue;