bug

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

@@ -42,8 +42,7 @@ Ext.define('saas.view.core.form.FormPanel', {
         unAuditCode: 'UNAUDITED',
         unAuditText: '未审核',
         auditBtnText: '审核',
-        unAuditBtnText: '反审核',
-        messageLogText:'操作日志'
+        unAuditBtnText: '反审核'
     },
     initComponent: function () {
         let me = this,

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

@@ -202,7 +202,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 saas.util.FormUtil.loadData(form);
 
                 var newId = form.xtype + '-' + id;
-                var newTitle = form._title + '(' + code + ')';
+                var newTitle = form._title + (code ? '(' + code + ')' : '');
 
                 saas.util.BaseUtil.refreshTabTitle(newId, newTitle);
 
@@ -292,7 +292,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                     form.initId = id;
 
                     var newId = form.xtype + '-' + id;
-                    var newTitle = form._title + '(' + code + ')';
+                    var newTitle = form._title + (code ? '(' + code + ')' : '');
 
                     saas.util.BaseUtil.refreshTabTitle(newId, newTitle);
                 }
@@ -304,19 +304,6 @@ Ext.define('saas.view.core.form.FormPanelController', {
         })
         .catch(function(e) {
             form.setLoading(false);
-            // console.error(e);
-            // if(res.data) {
-            //     var id = localJson.data.id;
-            //     var code = localJson.data.code;
-                
-            //     form.initId = id;
-
-            //     var newId = form.xtype + '-' + id;
-            //     var newTitle = form._title + '(' + code + ')';
-
-            //     saas.util.BaseUtil.refreshTabTitle(newId, newTitle);
-            //     saas.util.FormUtil.loadData(form);
-            // }
             saas.util.BaseUtil.showErrorToast('审核失败: ' + e.message);
             form.fireEvent('afteraudit', false, form);
         });
@@ -406,7 +393,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 cls:'x-window-dbfind',
                 height: height*0.8,
                 width: width*0.8,
-                title: '操作日志('+viewModel.get(form._codeField)+')',
+                title: '操作日志',
                 scrollable: true,
                 constrain: true,
                 closable: true,

frontend/saas-web/app/view/core/tab/Controller.js

@@ -37,7 +37,7 @@ Ext.define('saas.view.core.tab.Controller', {
          
                 if (me.fireEvent('beforeclose', me) !== false) {
                     if (me.tabBar) {
-                        if(tabView.fireEvent('beforeclose', tabView) !== false && tabView.promiseCloseTab && typeof tabView.promiseCloseTab == 'function') {
+                        if(tabView && tabView.fireEvent('beforeclose', tabView) !== false && tabView.promiseCloseTab && typeof tabView.promiseCloseTab == 'function') {
                             tabView.promiseCloseTab()
                             .then(function(close) {
                                 console.log();
@@ -53,7 +53,7 @@ Ext.define('saas.view.core.tab.Controller', {
                             }
                         }
                     } else {
-                        if(tabView.fireEvent('beforeclose', tabView) !== false && tabView.promiseCloseTab && typeof tabView.promiseCloseTab == 'function') {
+                        if(tabView && tabView.fireEvent('beforeclose', tabView) !== false && tabView.promiseCloseTab && typeof tabView.promiseCloseTab == 'function') {
                             tabView.promiseCloseTab()
                             .then(function(close) {
                                 console.log();

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

@@ -117,6 +117,8 @@ Ext.define('saas.view.document.product.FormPanel', {
                 name: 'pr_spec',
                 fieldLabel: '规格',
                 //allowBlank: false,
+                columnWidth: 0.5,
+                maxLength: 200,
                 group: '基础信息',
             }, {
                 editable: false,

frontend/saas-web/app/view/sale/b2b/Purchase.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.sale.b2b.Purchase', {
                 xtype: 'textfield',
                 name: 'keyword',
                 columnWidth: 0.15,
-                emptyText:'请输入供应商名称'
+                emptyText:'请输入客户名称'
             }, {
                 xtype: 'condatefield',
                 name: 'date',

frontend/saas-web/app/view/sale/b2b/PurchaseDetail.js

@@ -49,10 +49,14 @@ Ext.define('saas.view.sale.b2b.PurchaseDetail', {
                 }, {
                     from: 'cr_rate', to: 'sa_rate'
                 }],
+                mainFieldConfig: {
+                    readOnly: true,
+                    defaultReadOnly: true,
+                },
                 supFieldConfig: {
                     xtype: 'numberfield',
-                    readOnly: false,
-                    defaultReadOnly: false,
+                    readOnly: true,
+                    defaultReadOnly: true,
                     defaultValue: 1,
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'