代码提交

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

@@ -95,7 +95,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                             }
                         }
                     },{
-                        text: '禁用',
+                        text: '关闭',
                         handler: function(){
                             var form = this.ownerCt.ownerCt.ownerCt;
                             me.onVastDeal(form._batchCloseUrl,'CLOSE');

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

@@ -109,7 +109,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
         unAuditCode: 'CLOSE',
         unAuditText: '已关闭',
         auditBtnText: '启用',
-        unAuditBtnText: '禁用',
+        unAuditBtnText: '关闭',
     },
 
 });

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

@@ -318,6 +318,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         unAuditCode: 'CLOSE',
         unAuditText: '已关闭',
         auditBtnText: '启用',
-        unAuditBtnText: '禁用',
+        unAuditBtnText: '关闭',
     },
 });

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

@@ -91,13 +91,13 @@ Ext.define('saas.view.document.product.FormController', {
                         }],
                         //窗口字段设置
                         dbSearchFields:[{
-                            emptyText:'输入仓库编号或仓库名称',
+                            emptyText:'输入仓库编号或仓库名称或仓库类型',
                             xtype : "textfield", 
                             name : "wh_code", 
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "wh_code like '%" + v + "%' or wh_description like '%"+ v +"%'";
+                                return "wh_code like '%" + v + "%' or wh_description like '%"+ v +"%' or wh_type like '%" + v + "%'";
                             }
                         }],
                         //窗口列设置
@@ -113,7 +113,12 @@ Ext.define('saas.view.document.product.FormController', {
                             "dataIndex": "wh_code",
                             "width": 100,
                             "xtype": "",
-                        }, {
+                        },{
+                            "text": "仓库类型",
+                            "flex": 1,
+                            "dataIndex": "wh_type",
+                            "xtype": "",
+                        },{
                             "text": "仓库名称",
                             "flex": 1,
                             "dataIndex": "wh_description",

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

@@ -145,7 +145,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_whcode", 
         bind : "{pr_whcode}", 
         fieldLabel : "仓库编号", 
-        allowBlank : false, 
+        allowBlank : true, 
         columnWidth : 0.25, 
     }, {
         xtype : "textfield", 
@@ -181,6 +181,6 @@ Ext.define('saas.view.document.product.FormPanel', {
         unAuditCode: 'CLOSE',
         unAuditText: '已关闭',
         auditBtnText: '启用',
-        unAuditBtnText: '禁用',
+        unAuditBtnText: '关闭',
     },
 });

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

@@ -226,6 +226,6 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         unAuditCode: 'CLOSE',
         unAuditText: '已关闭',
         auditBtnText: '启用',
-        unAuditBtnText: '禁用',
+        unAuditBtnText: '关闭',
     },
 });