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

frontend/saas-web/app/util/FormUtil.js

@@ -37,7 +37,7 @@ Ext.define('saas.util.FormUtil', {
                     Ext.Array.each(items, function(item) {
 
                         if(item.xtype == 'datefield') {
-                            item.format = 'Y-m-d';
+                            item.format = 'Y-m-d H:i:s';
                             item.formatText = '';
                         }
 
@@ -89,7 +89,7 @@ Ext.define('saas.util.FormUtil', {
 
                                 if(c.xtype == 'datecolumn') {
                                     Ext.apply(c, {
-                                        format: 'Y-m-d'
+                                        format: 'Y-m-d H:i:s'
                                     });
                                 }else if(c.xtype == 'numbercolumn') {
                                     Ext.applyIf(c, {

frontend/saas-web/app/view/core/base/BasePanelController.js

@@ -102,12 +102,12 @@ Ext.define('saas.view.core.base.BasePanelController', {
     getConditionValue: function(xtype, value) {
         var conditionValue;
         if(xtype == 'datefield') {
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d H:i:s');
         }else if(xtype == 'condatefield') {
             var from = value.from,
             to = value.to;
 
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s') + ',' + Ext.Date.format(new Date(to), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d 00:00:00') + ',' + Ext.Date.format(new Date(to), 'Y-m-d 23:59:59');
         }else if(xtype == 'combobox' || xtype == 'combo') {
             conditionValue = '\'' + value + '\'';
         }else if(xtype == 'multicombo') {

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

@@ -204,12 +204,12 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
     getConditionValue: function(xtype, value) {
         var conditionValue;
         if(xtype == 'datefield') {
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d H:i:s');
         }else if(xtype == 'condatefield') {
             var from = value.from,
             to = value.to;
 
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s') + ',' + Ext.Date.format(new Date(to), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d 00:00:00') + ',' + Ext.Date.format(new Date(to), 'Y-m-d 23:59:59');
         }else if(xtype == 'combobox' || xtype == 'combo') {
             conditionValue = '\'' + value + '\'';
         }else if(xtype == 'multicombo') {

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

@@ -345,12 +345,12 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
     getConditionValue: function(xtype, value) {
         var conditionValue;
         if(xtype == 'datefield') {
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d H:i:s');
         }else if(xtype == 'condatefield') {
             var from = value.from,
             to = value.to;
 
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s') + ',' + Ext.Date.format(new Date(to), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d 00:00:00') + ',' + Ext.Date.format(new Date(to), 'Y-m-d 23:59:59');
         }else if(xtype == 'combobox' || xtype == 'combo') {
             conditionValue = '\'' + value + '\'';
         }else if(xtype == 'multicombo') {

frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -222,7 +222,7 @@ Ext.define('saas.view.core.query.QueryPanel', {
     getConditionValue: function(xtype, value) {
         var conditionValue;
         if(xtype == 'datefield') {
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d H:i:s');
         }else if(xtype == 'condatefield') {
             var from = value.from,
             to = value.to;

frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -47,18 +47,15 @@ Ext.define('saas.view.document.bom.FormPanel', {
         name: 'bo_statuscode',
         fieldLabel: '状态码'
     },{
-        format : "Y-m-d H:i:s",
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "创建时间"
     },{  
-        format : "Y-m-d H:i:s",
         xtype : "datefield", 
         name : "updateTime", 
         fieldLabel : "更新时间"
     }, {
         xtype : "detailGridField", 
-        detnoColumn:  'bd_detno',
         storeModel:'saas.model.document.bomdetail',
         deleteDetailUrl:'/api/document/bom/deleteDetail/',
         columns : [

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -77,14 +77,12 @@ Ext.define('saas.view.document.customer.FormPanel', {
             this.dialog.show();
         }
     },{
-        format : "Y-m-d",
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "创建时间", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "cu_begindate", 
         fieldLabel : "期初日期", 
@@ -132,7 +130,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     },{  
-        format : "Y-m-d",
         xtype : "datefield", 
         name : "updateTime", 
         fieldLabel : "更新时间", 
@@ -141,7 +138,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
     }, {
         height: 169,
         xtype : "detailGridField", 
-        detnoColumn:  'cc_detno',
         storeModel:'saas.model.document.customercontact',
         deleteDetailUrl:'/api/document/customer/deletecontact/',
         columns : [
@@ -233,7 +229,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
     } ,{
         height: 169,
         xtype : "detailGridField", 
-        detnoColumn:  'ca_detno',
         storeModel:'saas.model.document.customeraddress',
         deleteDetailUrl:'/api/document/customer/deleteaddress/',
         columns : [

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -35,7 +35,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'ck_name',
                 allowBlank:false,
-                fieldLabel:'类型'
+                fieldLabel:'客户类型'
             }]
         },
         vendorkind:{
@@ -46,7 +46,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'vk_name',
                 allowBlank:false,
-                fieldLabel:'类型'
+                fieldLabel:'供应商类型'
             }]
         },
         productkind:{
@@ -57,7 +57,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'pt_name',
                 allowBlank:false,
-                fieldLabel:'类型'
+                fieldLabel:'物料类型'
             }]
         },
         bankinformation:{
@@ -94,7 +94,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'pb_name',
                 allowBlank:false,
-                fieldLabel:'类型'
+                fieldLabel:'物料品牌'
             }]
         },  
         productunit:{
@@ -238,6 +238,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 var dataField = form.down('[name='+name+']');
                 if(dataField&&dataField.value){
                     params[name] = dataField.value;
+                    params._value = dataField.value;
                 }
             }
         });
@@ -257,7 +258,9 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                     grid.store.load();
                 }
                 if(combo){
-                    combo.store.load();
+                    combo.store.load(function() {
+                        combo.setValue(params._value);
+                    });
                 }
                 form.ownerCt.close();
             }

frontend/saas-web/app/view/document/product/FormController.js

@@ -65,7 +65,7 @@ Ext.define('saas.view.document.product.FormController', {
 
                 }
             },
-            //从表单选放大镜赋值关系 以及 tpl模板
+            // 仓库编号
             'dbfindtrigger[name=pr_whcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -162,14 +162,12 @@ Ext.define('saas.view.document.product.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        format : "Y-m-d",
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "创建时间", 
         allowBlank : true, 
         columnWidth : 0.25
     },{  
-        format : "Y-m-d",
         xtype : "datefield", 
         name : "updateTime", 
         fieldLabel : "更新时间", 

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -76,14 +76,12 @@ Ext.define('saas.view.document.vendor.FormPanel', {
             this.dialog.show();
         }
     },{
-        format : "Y-m-d",
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "创建时间", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "ve_begindate", 
         fieldLabel : "期初日期", 
@@ -131,7 +129,6 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     },{  
-        format : "Y-m-d",
         xtype : "datefield", 
         name : "updateTime", 
         fieldLabel : "更新时间", 
@@ -139,7 +136,6 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         columnWidth : 0.25
     }, {
         xtype : "detailGridField", 
-        detnoColumn:  'vc_detno',
         storeModel:'saas.model.document.vendorcontact',
         deleteDetailUrl:'/api/document/vendor/deleteContact/',
         columns : [

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

@@ -27,7 +27,6 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         name: 'id',
         fieldLabel: 'id'
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "ft_date", 
         fieldLabel : "单据日期"
@@ -173,7 +172,6 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         fieldLabel : "录入人", 
         readOnly:true
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "ft_recorddate", 
         fieldLabel : "录入日期",

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -8,7 +8,6 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     viewName: 'money-fundtransfer-querypanel',
     
     queryFormItems: [{
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "ft_date", 
         fieldLabel : "单据日期"

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

@@ -149,7 +149,6 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         fieldLabel : "录入人", 
         readOnly:true
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "or_date", 
         fieldLabel : "录入日期",

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

@@ -149,7 +149,6 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         fieldLabel : "录入人", 
         readOnly:true
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "os_date", 
         fieldLabel : "录入日期",

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

@@ -41,7 +41,6 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         fieldLabel: '单据类型',
         defaultValue: '付款单'
     }, {
-        format: 'Y-m-d h:i:s',
         xtype: "datefield",
         name: "pb_date",
         fieldLabel: "日期"
@@ -173,12 +172,10 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         name: 'pb_recorder',
         fieldLabel: '创建人'
     }, {
-        format: "Y-m-d h:i:s",
         xtype: "datefield",
         name: "pb_recorddate",
         fieldLabel: "创建时间"
     }, {
-        format: 'Y-m-d h:i:s',
         xtype: "datefield",
         name: "updatedate",
         fieldLabel: "更新时间"

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

@@ -225,7 +225,6 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         name: 'updatedate',
         fieldLabel: '更新时间'
     }, {
-        format: "Y-m-d h:i:s",
         xtype: "datefield",
         name: "rb_recorddate",
         fieldLabel: "创建时间"

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

@@ -204,11 +204,9 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 dataIndex : "pd_delivery", 
                 xtype:'datecolumn',
                 width : 120.0, 
-                format : "Y-m-d", 
                 editor : {
                     xtype : "datefield",
                     editable : true, 
-                    format : "Y-m-d", 
                     hideTrigger : false
                 }
             },
@@ -219,7 +217,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             }
         ]
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "createTime", 
         bind : "{createTime}", 

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

@@ -284,7 +284,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             }
         ]
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "createTime", 
         bind : "{createTime}", 

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

@@ -246,7 +246,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             }
         ]
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "createTime", 
         bind : "{createTime}", 

frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -164,11 +164,9 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 text : "交货日期", 
                 dataIndex : "sd_delivery", 
                 xtype:'datecolumn',
-                format : "Y-m-d", 
                 editor : {
                     xtype : "datefield",
                     editable : true, 
-                    format : "Y-m-d", 
                     hideTrigger : false
                 }
             },{
@@ -209,7 +207,6 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : "录入人", 
         readOnly:true
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "sa_recorddate", 
         fieldLabel : "录入日期",
@@ -220,7 +217,6 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : "审核人", 
         readOnly:true
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "sa_auditdate", 
         fieldLabel : "审核日期",

frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -200,7 +200,6 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         fieldLabel : "录入人", 
         readOnly:true
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "pi_recorddate", 
         fieldLabel : "录入日期",
@@ -211,7 +210,6 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         fieldLabel : "审核人", 
         readOnly:true
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "pi_auditdate", 
         fieldLabel : "审核日期",

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -210,7 +210,6 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         fieldLabel : "录入人", 
         readOnly:true
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "pi_recorddate", 
         
@@ -222,7 +221,6 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         fieldLabel : "审核人", 
         readOnly:true
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "pi_auditdate", 
         fieldLabel : "审核日期",

frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -261,7 +261,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         //     }
         ]
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "createTime", 
         bind : "{createTime}", 

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -200,11 +200,9 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 dataIndex : "pd_delivery", 
                 flex : 1.0, 
                 xtype:'datecolumn',
-                format : "Y-m-d H:i:s", 
                 editor : {
                     xtype : "datefield",
                     editable : true, 
-                    format : "Y-m-d H:i:s", 
                     hideTrigger : false
                 }
             },
@@ -216,7 +214,6 @@ Ext.define('saas.view.stock.make.FormPanel', {
             }
         ]
     },{
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "createTime", 
         bind : "{createTime}", 

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -226,7 +226,6 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             }
         ]
     }, {
-        format : "Y-m-d", 
         xtype : "datefield", 
         name : "createTime", 
         bind : "{createTime}", 

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -152,7 +152,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "数量",
-                dataIndex: "pd_inqty",
+                dataIndex: "pd_outqty",
                 editor: {
                     xtype: "numberfield"
                 },
@@ -223,7 +223,6 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             }
         ]
     }, {
-        format: "Y-m-d",
         xtype: "datefield",
         name: "createTime",
         bind: "{createTime}",

frontend/saas-web/app/view/sys/finish/DataList.js

@@ -241,12 +241,12 @@ Ext.define('saas.view.sys.finish.DataList', {
     getConditionValue: function(xtype, value) {
         var conditionValue;
         if(xtype == 'datefield') {
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d H:i:s');
         }else if(xtype == 'condatefield') {
             var from = value.from,
             to = value.to;
 
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s') + ',' + Ext.Date.format(new Date(to), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d 00:00:00') + ',' + Ext.Date.format(new Date(to), 'Y-m-d 23:59:59');
         }else if(xtype == 'combobox' || xtype == 'combo') {
             conditionValue = '\'' + value + '\'';
         }else if(xtype == 'multicombo') {

frontend/saas-web/app/view/sys/maxnumbers/DataList.js

@@ -355,12 +355,12 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
     getConditionValue: function(xtype, value) {
         var conditionValue;
         if(xtype == 'datefield') {
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d H:i:s');
         }else if(xtype == 'condatefield') {
             var from = value.from,
             to = value.to;
 
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s') + ',' + Ext.Date.format(new Date(to), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d 00:00:00') + ',' + Ext.Date.format(new Date(to), 'Y-m-d 23:59:59');
         }else if(xtype == 'combobox' || xtype == 'combo') {
             conditionValue = '\'' + value + '\'';
         }else if(xtype == 'multicombo') {

frontend/saas-web/app/view/sys/messagelog/DataList.js

@@ -207,12 +207,12 @@ Ext.define('saas.view.sys.messagelog.DataList', {
     getConditionValue: function(xtype, value) {
         var conditionValue;
         if(xtype == 'datefield') {
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d H:i:s');
         }else if(xtype == 'condatefield') {
             var from = value.from,
             to = value.to;
 
-            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s') + ',' + Ext.Date.format(new Date(to), 'Y-m-d h:i:s');
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d 00:00:00') + ',' + Ext.Date.format(new Date(to), 'Y-m-d 23:59:59');
         }else if(xtype == 'combobox' || xtype == 'combo') {
             conditionValue = '\'' + value + '\'';
         }else if(xtype == 'multicombo') {