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

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BomServiceImpl.java

@@ -56,6 +56,8 @@ public class BomServiceImpl extends CommonBaseServiceImpl<BomMapper, Bom> implem
 //                String code = pushMaxnubmer(bom.getBo_mothercode(), bom.getId());
                 String code = bom.getBo_mothercode();
                 bom.setBo_mothercode(code);
+                bom.setBo_statuscode(Status.ENABLE.name());
+                bom.setBo_status(Status.ENABLE.getDisplay());
                 bom.setCompanyId(companyId);
                 bom.setCreatorId(userId);
                 bom.setCreatorName(userName);

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

@@ -42,6 +42,26 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
             var pageSize = Math.floor(gridBodyBoxHeight / 33);
 
             store.setPageSize(pageSize);
+        },
+        itemdblclick:function( view, record, item, index, e, eOpts ) {
+            var grid = view.ownerCt;
+            var index = -1;
+            index = grid.selectRecordArr.findIndex(function(f){
+                return f.id==record.id
+            });
+            grid.selModel.noChange = true;
+            if(index==-1){
+                grid.selectRecordArr.push(record);
+                grid.selModel.select(grid.selectRecordArr);
+                // grid.store.loadPage(grid.store.currentPage);
+                grid.updateLayout();
+                grid.view.updateLayout();
+                Ext.resumeLayouts();
+            }else{
+                grid.selectRecordArr.splice(index,1);
+                grid.selModel.deselect(record);
+            }
+            grid.selModel.noChange = false;
         }
     },
 

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

@@ -235,7 +235,7 @@ Ext.define('saas.view.core.form.FormPanel', {
                 bind: '{' + statusCodeField + '}',
                 get: function(value) {
                     // viewModel.set(statusField, value == 'AUDITED' ? '已审核' : '未审核');
-                    viewModel.set(statusField, value == auditTexts.auditCode ? auditTexts.auditText : auditTexts.unAuditText);
+                    viewModel.set(statusField, value ? (value == auditTexts.auditCode ? auditTexts.auditText : auditTexts.unAuditText) : null);
                     // viewModel.set('auditBtnText', value == 'AUDITED' ? '反审核' : '审核');
                     viewModel.set('auditBtnText', value == auditTexts.auditCode ? auditTexts.unAuditBtnText : auditTexts.auditBtnText);
                     // me.setEditable(value != 'AUDITED');
@@ -395,7 +395,7 @@ Ext.define('saas.view.core.form.FormPanel', {
                 item.bind = '{' + name + '}';
             }
             // 设置默认值
-            if (defaultValue) {
+            if (defaultValue != undefined) {
                 viewModel.set(name, defaultValue);
             }
 

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

@@ -63,17 +63,13 @@ Ext.define('saas.view.document.bom.FormPanel', {
         xtype: 'textfield',
         name: 'bo_mothername',
         fieldLabel: '产品名称',
-        reddOnly:true,
+        readOnly:true,
         allowBlank: false
     },{
         xtype: 'textfield',
         name: 'pr_spec',
         fieldLabel: '产品规格',
-        reddOnly:true,
-    },{
-        xtype: 'hidden',
-        name: 'bo_statuscode',
-        fieldLabel: '状态码'
+        readOnly:true,
     },{
         xtype: 'textfield',
         name: 'bo_version',
@@ -202,15 +198,22 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     xtype : "textfield"
                 },
             }]
-    },{
+    }, {
+        xtype: 'hidden',
+        name: 'bo_statuscode',
+        fieldLabel: '状态码',
+        readOnly:true,
+        defaultValue: ''
+    }, {
         xtype: 'textfield',
         name: 'bo_status',
         fieldLabel: '产品状态',
-        reddOnly:true
+        readOnly:true,
+        defaultValue: ''
     },{  
         xtype : "textfield", 
         name : "creatorName", 
-        reddOnly:true,
+        readOnly:true,
         fieldLabel : "录入人"
     },{
         xtype : "datefield", 

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

@@ -77,6 +77,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: '来源单号',
                 dataIndex: 'vd_slcode',
                 width: 150,
+                allowBlank:false,
                 editor:{
                     displayField : "display",
                     editable : true,
@@ -198,6 +199,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: '来源单号',
                 dataIndex: 'vcd_slcode',
                 width: 150,
+                allowBlank:false,
                 editor:{
                     displayField : "display",
                     editable : true,

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

@@ -184,7 +184,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 dataIndex: 'pr_detail',
                 width: 200
             },{
-                text: '型号规格',
+                text: '规格',
                 dataIndex: 'pr_spec',
                 width: 150
             },{

frontend/saas-web/app/view/sys/guide/FormPanel.js

@@ -244,7 +244,7 @@ Ext.define('saas.view.sys.guide.FormPanel', {
             title = '供应商资料'
         }
         if(type=='begin'){
-            message = '<span>欢迎您使用优企云进销存！</br>'+
+            message = '<span>欢迎您使用U企云进销存！</br>'+
             '温馨提示：开账后您还是可以通过左侧菜单栏对基础资料进行维护。</span>';
             xtype = "begin";
             icon = 'x-gudie-end';