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

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

@@ -85,10 +85,6 @@ Ext.define('saas.view.core.form.FormPanel', {
         statusCodeField = me._statusCodeField,
         viewModel = me.getViewModel();
         
-        viewModel.set('createTime', '');
-        viewModel.set('updateTime', '');
-        statusCodeField && viewModel.set(statusCodeField, "UNAUDITED");
-
         var o = {};
         o[statusField] = {
             bind: '{' + statusCodeField + '}',
@@ -103,6 +99,10 @@ Ext.define('saas.view.core.form.FormPanel', {
             }
         };
         viewModel.setFormulas(o);
+
+        viewModel.set('createTime', new Date());
+        viewModel.set('updateTime', new Date());
+        statusCodeField ? viewModel.set(statusCodeField, "UNAUDITED") : viewModel.set('auditBtnText', "审核");
     },
 
     addItems: function(items) {
@@ -160,7 +160,6 @@ Ext.define('saas.view.core.form.FormPanel', {
      * 设置需要绑定的字段
      */
     setBindFields: function(items) {
-        debugger
         var me = this,
         viewModel = me.getViewModel(),
         bindFields = [];

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

@@ -5,8 +5,6 @@ Ext.define('saas.view.core.form.MultiCombo', {
     extend: 'Ext.form.field.Trigger',
     alias: 'widget.multicombo',
     editable : false,
-    displayField:'display',
-    valueField:'value',
     matchFieldWidth: true,
     cachedConfig: {
         menuAlign: 'tl-bl?',
@@ -16,7 +14,26 @@ Ext.define('saas.view.core.form.MultiCombo', {
         var me = this;
         me.callParent(arguments);
     },
-    onTriggerClick:function(f){
+    listeners:{
+        afterrender:function(f){
+            this.mon(f.el,{
+                mouseover: this.onMouseOver,
+                mouseleave:this.onMouseLeave,
+                scope:this
+            });
+        }
+
+    },
+    onMouseOver:function(){
+       this.showMenu();
+    },
+    onMouseLeave:function(a,b,c){
+        console.log(a);
+        console.log(b);
+        console.log(c);
+        this.hideMenu(a.parentEvent?a:b);//el光标离开第二个参数为Event对象
+    },
+    onTriggerClick:function(){
         this.showMenu();
     },
     getMenu: function() {
@@ -26,10 +43,12 @@ Ext.define('saas.view.core.form.MultiCombo', {
 
             me.menu = Ext.create('Ext.menu.Menu',{
                 hideOnParentHide: false,
-                items: me.getMenuItems()
-                //listners
+                items: me.getMenuItems(),
+                listeners:{
+                    mouseleave:me.onMouseLeave,
+                    scope:me
+                }
             });
-            me.fireEvent('menucreate', me, me.menu);
         }
         return me.menu;
     },
@@ -37,8 +56,8 @@ Ext.define('saas.view.core.form.MultiCombo', {
         var me = this,
             i = 0,
             item,
-            items = me.datas;
-        itemsLn = me.datas.length,
+            items = me.datas,
+            itemsLn = me.datas.length,
             menuItems = [];
         for (; i < itemsLn; i++) {
             item = items[i];
@@ -68,22 +87,15 @@ Ext.define('saas.view.core.form.MultiCombo', {
     },
 
     showMenu: function (e, menu) {
-        var isPointerEvent = !e || e.pointerType;
-
         menu = menu || this.getMenu();
         /**
          * menu上边框样式待处理
          * */
         if (menu) {
             if (menu.isVisible()) {
-                // Click/tap toggles the menu visibility.
-                if (isPointerEvent) {
-                    menu.hide();
-                } else {
                     menu.focus();
-                }
             } else {
-                menu.autoFocus = !isPointerEvent;
+                menu.autoFocus = true;
                 if(this.matchFieldWidth){
                     menu.setWidth(this.bodyEl.getWidth());
                 }
@@ -96,5 +108,19 @@ Ext.define('saas.view.core.form.MultiCombo', {
                 }
             }
         }
+    },
+    hideMenu: function(b) {
+        console.log(b);
+        if (this.hasVisibleMenu()) {
+            var target=b.parentEvent.relatedTarget;
+            if(!((target.className && target.className.indexOf('x-menu')!=-1) || (target.name && target.name.indexOf(this.name)!=-1))){
+                this.menu.hide();
+            }
+        }
+        return this;
+    },
+    hasVisibleMenu: function() {
+        var menu = this.menu;
+        return menu && menu.rendered && menu.isVisible();
     }
 });

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -7,7 +7,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     
     _title:'采购验收单',
     _codeField: 'pi_inoutno',
-    _statusField: 'pi_statuscode',
+    _statusField: 'pu_status',
+    _statusCodeField: 'pu_statuscode',
     _idField: 'id',
     _detnoColumn:  'pd_pdno',
     _dataModelUrl:'http://192.168.253.58:8800/purchase/read/',
@@ -239,7 +240,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         ]
     }, {
         format : "Y-m-d", 
-        xtype : "datetimefield", 
+        xtype : "datefield", 
         name : "createTime", 
         bind : "{createTime}", 
         fieldLabel : "创建时间", 
@@ -256,8 +257,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         xtype : "textfield", 
         readOnly : true, 
         editable : false, 
-        name : "puStatus", 
-        bind : "{puStatus}", 
+        name : "pu_status", 
+        bind : "{pu_status}", 
         fieldLabel : "单据状态", 
         allowBlank : true, 
         columnWidth : 0.25