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

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

@@ -37,8 +37,19 @@ Ext.define('saas.view.core.form.FormPanel', {
     remoteConfig: true, // 是否需要从远端读取form配置
     toolBtns: [], // 自定义按钮
 
+    auditTexts: {
+        auditCode: 'AUDITED',
+        auditText: '已审核',
+        unAuditCode: 'UNAUDITED',
+        unAuditText: '未审核',
+        auditBtnText: '审核',
+        unAuditBtnText: '反审核',
+    },
+
     initComponent: function () {
-        var me = this;
+        var me = this,
+        auditTexts = me.auditTexts;
+
         me.initViewModel();
         me.FormUtil.setItems(me);
 
@@ -78,14 +89,16 @@ Ext.define('saas.view.core.form.FormPanel', {
                     cls: 'x-audited',
                     hidden: true,
                     bind: {
-                        hidden: '{!(' + me._statusCodeField + ' == "AUDITED")}'
+                        // hidden: '{!(' + me._statusCodeField + ' == "AUDITED")}'
+                        hidden: '{!(' + me._statusCodeField + ' == "' + auditTexts.auditCode + '")}'
                     }
                 }, {
                     xtype: 'button',
                     cls: 'x-codeeditor-btn',
                     bind: {
                         iconCls: 'fa {base.codeEditable ? "fa-check-circle" : "fa-edit"}',
-                        hidden: '{(' + me._statusCodeField + ' == "AUDITED")}'
+                        // hidden: '{(' + me._statusCodeField + ' == "AUDITED")}'
+                        hidden: '{(' + me._statusCodeField + ' == "' + auditTexts.auditCode + '")}'
                     },
                     handler: 'codeEditorClick'
                 }, '->'].concat(me.toolBtns.map(function (btn) {
@@ -104,7 +117,8 @@ Ext.define('saas.view.core.form.FormPanel', {
                     text: '保存',
                     handler: 'onSave',
                     bind: {
-                        disabled: '{!base.valid || '+ me._statusCodeField + ' == "AUDITED" || ' + me._statusCodeField + ' == "OPEN"}'
+                        // disabled: '{!base.valid || '+ me._statusCodeField + ' == "AUDITED" || ' + me._statusCodeField + ' == "OPEN"}'
+                        disabled: '{!base.valid || '+ me._statusCodeField + ' == "' + auditTexts.auditCode + '"}'
                     }
                 }, {
                     xtype: 'button',
@@ -155,10 +169,11 @@ Ext.define('saas.view.core.form.FormPanel', {
      */
     initViewModel: function () {
         var me = this,
-            codeField = me._codeField,
-            statusField = me._statusField,
-            statusCodeField = me._statusCodeField,
-            viewModel = me.getViewModel();
+        codeField = me._codeField,
+        statusField = me._statusField,
+        statusCodeField = me._statusCodeField,
+        viewModel = me.getViewModel(),
+        auditTexts = me.auditTexts;
 
         viewModel.set(codeField, '');
         viewModel.set('createTime', Ext.Date.format(new Date(), 'Y-m-d H:i:s'));
@@ -169,16 +184,21 @@ Ext.define('saas.view.core.form.FormPanel', {
             o['bindEditable'] = {
                 bind: '{' + statusCodeField + '}',
                 get: function(value) {
-                    viewModel.set(statusField, value == 'AUDITED' ? '已审核' : '未审核');
-                    viewModel.set('auditBtnText', value == 'AUDITED' ? '反审核' : '审核');
-                    me.setEditable(value != 'AUDITED');
+                    // viewModel.set(statusField, value == 'AUDITED' ? '已审核' : '未审核');
+                    viewModel.set(statusField, value == auditTexts.auditCode ? auditTexts.auditText : auditTexts.unAuditText);
+                    // viewModel.set('auditBtnText', value == 'AUDITED' ? '反审核' : '审核');
+                    viewModel.set('auditBtnText', value == auditTexts.auditCode ? auditTexts.unAuditBtnText : auditTexts.auditBtnText);
+                    // me.setEditable(value != 'AUDITED');
+                    me.setEditable(value != auditTexts.auditCode);
                     return value;
                 }
             };
             viewModel.setFormulas(o);
-            viewModel.set(statusCodeField, "UNAUDITED");
+            // viewModel.set(statusCodeField, "UNAUDITED");
+            viewModel.set(statusCodeField, auditTexts.unAuditCode);
         } else {
-            viewModel.set('auditBtnText', "审核");
+            // viewModel.set('auditBtnText', "审核");
+            viewModel.set('auditBtnText', auditTexts.auditBtnText);
         }
     },
 

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

@@ -24,52 +24,38 @@ Ext.define('saas.view.document.bom.FormPanel', {
         xtype: 'hidden',
         name: 'id',
         fieldLabel: 'id',
-        allowBlank: true,
-        columnWidth: 0.25
     },{
         xtype: 'hidden',
         name: 'bo_motherid',
-        fieldLabel: '母件id',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '母件id'
     },{
         xtype: 'textfield',
         name: 'bo_mothername',
         fieldLabel: 'BOM名称',
-        allowBlank: false,
-        columnWidth: 0.25
+        allowBlank: false
     },{
         xtype: 'textfield',
         name: 'bo_mothercode',
         fieldLabel: 'BOM编号',
-        allowBlank: true,
-        columnWidth: 0.25
+        allowBlank: true
     },{
         xtype: 'textfield',
         name: 'bo_status',
-        fieldLabel: 'BOM状态',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: 'BOM状态'
     },{
         xtype: 'hidden',
         name: 'bo_statuscode',
-        fieldLabel: '状态码',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '状态码'
     },{
-        format : "Y-m-d",
+        format : "Y-m-d H:i:s",
         xtype : "datefield", 
         name : "createTime", 
-        fieldLabel : "创建时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "创建时间"
     },{  
-        format : "Y-m-d",
+        format : "Y-m-d H:i:s",
         xtype : "datefield", 
         name : "updateTime", 
-        fieldLabel : "更新时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "更新时间"
     }, {
         xtype : "detailGridField", 
         detnoColumn:  'bd_detno',
@@ -85,7 +71,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
             {
                 text : "关联ID", 
                 dataIndex : "bd_bomid", 
-                width : 0, 
+                width : 120, 
                 xtype : "numbercolumn"
             },
             {
@@ -94,9 +80,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "bd_soncode", 
-                width : 120.0, 
-                xtype : "", 
-                items : null
+                width : 120.0
             },
             {
                 text : "单位", 
@@ -104,9 +88,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "bd_unit", 
-                width : 120.0, 
-                xtype : "", 
-                items : null
+                width : 120.0
             },
             {
                 text : "单位用量", 
@@ -114,9 +96,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "bd_baseqty", 
-                width : 120.0, 
-                xtype : "", 
-                items : null
+                width : 120.0
             },
             {
                 text : "替代料", 
@@ -124,39 +104,17 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "bd_replace", 
-                width : 120.0, 
-                xtype : "", 
-                items : null
+                width : 120.0
             }]
     }],
 
-    /**
-     * 一些初始化viewModel的方法
-     */
-    initViewModel: function() {
-        var me = this,
-        codeField = me._codeField,
-        statusField = me._statusField,
-        statusCodeField = me._statusCodeField,
-        viewModel = me.getViewModel();
-        
-        viewModel.set(codeField, '');
-        viewModel.set('createTime', new Date());
-        viewModel.set('updateTime', new Date());
+    auditTexts: {
+        auditCode: 'OPEN',
+        auditText: '已开启',
+        unAuditCode: 'CLOSE',
+        unAuditText: '已关闭',
+        auditBtnText: '启用',
+        unAuditBtnText: '禁用',
+    },
 
-        if(statusCodeField) {
-            var o = {};
-            o['auditBtnText'] = {
-                bind: '{' + statusCodeField + '}',
-                get: function(value) {
-                    viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
-                    return value == 'OPEN' ? '禁用' : '启用'
-                }
-            };
-            viewModel.setFormulas(o);
-            viewModel.set(statusCodeField, "OPEN");
-        }else {
-            viewModel.set('auditBtnText', "禁用");
-        }
-    }
 });

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

@@ -320,34 +320,12 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 }
             }]
     }],
-
-    /**
-     * 一些初始化viewModel的方法
-     */
-    initViewModel: function() {
-        var me = this,
-        codeField = me._codeField,
-        statusField = me._statusField,
-        statusCodeField = me._statusCodeField,
-        viewModel = me.getViewModel();
-        
-        viewModel.set(codeField, '');
-        viewModel.set('createTime', new Date());
-        viewModel.set('updateTime', new Date());
-
-        if(statusCodeField) {
-            var o = {};
-            o['auditBtnText'] = {
-                bind: '{' + statusCodeField + '}',
-                get: function(value) {
-                    viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
-                    return value == 'OPEN' ? '禁用' : '启用'
-                }
-            };
-            viewModel.setFormulas(o);
-            viewModel.set(statusCodeField, "OPEN");
-        }else {
-            viewModel.set('auditBtnText', "禁用");
-        }
-    }
+    auditTexts: {
+        auditCode: 'OPEN',
+        auditText: '已开启',
+        unAuditCode: 'CLOSE',
+        unAuditText: '已关闭',
+        auditBtnText: '启用',
+        unAuditBtnText: '禁用',
+    },
 });

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

@@ -177,33 +177,12 @@ Ext.define('saas.view.document.product.FormPanel', {
         columnWidth : 0.25
     }],
 
-    /**
-     * 一些初始化viewModel的方法
-     */
-    initViewModel: function() {
-        var me = this,
-        codeField = me._codeField,
-        statusField = me._statusField,
-        statusCodeField = me._statusCodeField,
-        viewModel = me.getViewModel();
-        
-        viewModel.set(codeField, '');
-        viewModel.set('createTime', new Date());
-        viewModel.set('updateTime', new Date());
-
-        if(statusCodeField) {
-            var o = {};
-            o['auditBtnText'] = {
-                bind: '{' + statusCodeField + '}',
-                get: function(value) {
-                    viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
-                    return value == 'OPEN' ? '禁用' : '启用'
-                }
-            };
-            viewModel.setFormulas(o);
-            viewModel.set(statusCodeField, "OPEN");
-        }else {
-            viewModel.set('auditBtnText', "禁用");
-        }
-    }
+    auditTexts: {
+        auditCode: 'OPEN',
+        auditText: '已开启',
+        unAuditCode: 'CLOSE',
+        unAuditText: '已关闭',
+        auditBtnText: '启用',
+        unAuditBtnText: '禁用',
+    },
 });

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

@@ -227,33 +227,12 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         }
     ],
 
-    /**
-     * 一些初始化viewModel的方法
-     */
-    initViewModel: function() {
-        var me = this,
-        codeField = me._codeField,
-        statusField = me._statusField,
-        statusCodeField = me._statusCodeField,
-        viewModel = me.getViewModel();
-        
-        viewModel.set(codeField, '');
-        viewModel.set('createTime', new Date());
-        viewModel.set('updateTime', new Date());
-
-        if(statusCodeField) {
-            var o = {};
-            o['auditBtnText'] = {
-                bind: '{' + statusCodeField + '}',
-                get: function(value) {
-                    viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
-                    return value == 'OPEN' ? '禁用' : '启用'
-                }
-            };
-            viewModel.setFormulas(o);
-            viewModel.set(statusCodeField, "OPEN");
-        }else {
-            viewModel.set('auditBtnText', "禁用");
-        }
-    }
+    auditTexts: {
+        auditCode: 'OPEN',
+        auditText: '已开启',
+        unAuditCode: 'CLOSE',
+        unAuditText: '已关闭',
+        auditBtnText: '启用',
+        unAuditBtnText: '禁用',
+    },
 });