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

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

@@ -33,6 +33,7 @@ Ext.define('saas.view.core.base.BasePanel', {
         gridDataUrl = gridConfig.dataUrl,
         gridIdField = gridConfig.idField,
         gridCodeField = gridConfig.codeField,
+        gridStatusCodeField = gridConfig.statusCodeField,
         gridColumns = gridConfig.columns;
 
         Ext.apply(me, {
@@ -55,7 +56,8 @@ Ext.define('saas.view.core.base.BasePanel', {
                 dataUrl: gridDataUrl,
                 idField: gridIdField,
                 codeField: gridCodeField,
-                columns: gridColumns
+                columns: gridColumns,
+                statusCodeField : gridStatusCodeField
             }]
         });
         me.callParent(arguments);

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

@@ -97,7 +97,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                         text: '禁用',
                         handler: function(){
                             var form = this.ownerCt.ownerCt.ownerCt;
-                            me.onVastDeal(form._batchCloseUrl);
+                            me.onVastDeal(form._batchCloseUrl,'CLOSE');
                         },
                         menu: {
                             width: 80,
@@ -105,7 +105,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                                 text:'启用',
                                 handler:function(){
                                     var form = this.ownerCt.ownerCmp.ownerCt.ownerCt.ownerCt;
-                                    me.onVastDeal(form._batchOpenUrl);
+                                    me.onVastDeal(form._batchOpenUrl,'OPEN');
                                 }
                             }],
                             listeners: {
@@ -139,10 +139,14 @@ Ext.define('saas.view.core.base.GridPanel', {
         me.callParent(arguments);
     },
 
-    onVastDeal:function(url){
+    onVastDeal:function(url,type){
         var form = this.ownerCt;
         var grid = this;
-        var data = grid.getGridSelected();
+        var data = grid.getGridSelected(type);
+        if(!data){
+            showToast('请勾选符合条件的行进行操作。');
+            return false;
+        }
         if(data&&data.length>0){
             var params = JSON.stringify({baseDTOs:data});
             form.BaseUtil.request({
@@ -229,22 +233,30 @@ Ext.define('saas.view.core.base.GridPanel', {
         return columns;
     },
 
-    getGridSelected:function(){
+    getGridSelected:function(type){
+        var isErrorSelect = false;
+        var checkField = this.statusCodeField;
         var me = this,
-            items = me.selModel.getSelection(),
-            data = new Array() ;
-            Ext.each(items, function(item, index){
-                if(!Ext.isEmpty(item.data[me.idField])&&!Ext.isEmpty(item.data[me.codeField])){
-                    var o = new Object();
-                    if(me.idField){
-                        o['id'] = item.data[me.idField];
-                    }
-                    if(me.codeField){
-                        o['code'] = item.data[me.codeField];
-                    }
-                    data.push(o);
+        items = me.selModel.getSelection(),
+        data = new Array() ;
+        Ext.each(items, function(item, index){
+            if(!Ext.isEmpty(item.data[me.idField])){
+                var o = new Object();
+                if(me.idField){
+                    o['id'] = item.data[me.idField];
                 }
-            });
+                if(me.codeField){
+                    o['code'] = item.data[me.codeField];
+                }
+                if(type&&type==item.data[checkField]){
+                    isErrorSelect = true
+                }
+                data.push(o);
+            }
+        });
+        if(isErrorSelect){
+            return false;
+        }
 		return data;
     } 
 });

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

@@ -18,6 +18,7 @@ Ext.define('saas.view.document.bom.BasePanel', {
     gridConfig: {
         idField: 'id',
         codeField: 'bo_mothercode',
+        statusCodeField:'bo_statuscode',
         dataUrl: '/api/document/bom/list',
         columns : [{
             text : "id", 
@@ -45,6 +46,11 @@ Ext.define('saas.view.document.bom.BasePanel', {
             width : 120.0, 
         }, 
         {
+            text : "BOM状态码", 
+            dataIndex : "bo_statuscode", 
+            width : 0, 
+        },
+        {   
             text : "BOM版本", 
             dataIndex : "bo_version", 
             width : 120.0, 

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

@@ -10,7 +10,7 @@ Ext.define('saas.view.document.bom.FormModel', {
         showAuditBtn:{
             bind:'{id}',
             get:function(value){
-                return !value;
+                return value;
             }
         }
     }

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

@@ -149,14 +149,14 @@ Ext.define('saas.view.document.bom.FormPanel', {
             o['auditBtnText'] = {
                 bind: '{' + statusCodeField + '}',
                 get: function(value) {
-                    viewModel.set(statusField, value == 'OPEN' ? '启用' : '禁用');
-                    return value == 'OPEN' ? '禁用' : '启用'
+                    viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
+                    return value == 'OPEN' ? '已关闭' : '已开启'
                 }
             };
             viewModel.setFormulas(o);
             viewModel.set(statusCodeField, "OPEN");
         }else {
-            viewModel.set('auditBtnText', "禁用");
+            viewModel.set('auditBtnText', "已关闭");
         }
     }
 });

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

@@ -51,6 +51,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
     gridConfig: {
         idField: 'id',
         codeField: 'cu_code',
+        statusCodeField:'cu_statuscode',
         dataUrl: '/api/document/customer/list',
         columns : [{
             text : "客户id", 
@@ -72,6 +73,11 @@ Ext.define('saas.view.document.customer.BasePanel', {
             dataIndex : "cu_status", 
             width : 120.0, 
         }, 
+        {
+            text : "客户状态码", 
+            dataIndex : "cu_statuscode", 
+            width : 0, 
+        }, 
         {
             text : "客户UU", 
             dataIndex : "cu_uu", 

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

@@ -146,6 +146,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     }, {
+        height: 169,
         xtype : "detailGridField", 
         detnoColumn:  'cc_detno',
         storeModel:'saas.model.document.customercontact',
@@ -237,6 +238,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 }
             }]
     } ,{
+        height: 169,
         xtype : "detailGridField", 
         detnoColumn:  'ca_detno',
         storeModel:'saas.model.document.customeraddress',
@@ -345,14 +347,14 @@ Ext.define('saas.view.document.customer.FormPanel', {
             o['auditBtnText'] = {
                 bind: '{' + statusCodeField + '}',
                 get: function(value) {
-                    viewModel.set(statusField, value == 'OPEN' ? '启用' : '禁用');
-                    return value == 'OPEN' ? '禁用' : '启用'
+                    viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
+                    return value == 'OPEN' ? '已关闭' : '已开启'
                 }
             };
             viewModel.setFormulas(o);
             viewModel.set(statusCodeField, "OPEN");
         }else {
-            viewModel.set('auditBtnText', "禁用");
+            viewModel.set('auditBtnText', "已关闭");
         }
     }
 });

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

@@ -108,7 +108,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 fieldLabel:'类型'
             }]
         },
-        storeinformation:{
+        warehouse:{
             items:[{
                 xtype:'hidden',
                 name:'id'

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

@@ -144,7 +144,7 @@ Ext.define('saas.view.document.kind.Kind', {
             reqUrl: '/api/document/fundinouttype/save',
             delUrl: '/api/document/fundinouttype/delete'
         },
-        storeinformation:{
+        warehouse:{
             columns: [{
                 text: '仓库编号',
                 dataIndex: 'wh_code',

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

@@ -40,7 +40,8 @@ Ext.define('saas.view.document.kind.KindController', {
         me.createDialog(dataKind);
     },
     onRefresh:function(){
-
+        var me = this;
+        me.view.items.items[0].store.load();
     },
     insertActionColumn:function(columns){
         var me=this;

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

@@ -102,7 +102,7 @@ Ext.define('saas.view.document.kind.KindModel', {
                 },
                 reader: {
                     type: 'json',
-                    rootProperty: 'data.list'
+                    rootProperty: 'data'
                 }
             },
             pageSize: null,
@@ -128,7 +128,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             pageSize: null,
             autoLoad: false
         },
-        storeinformation: {
+        warehouse: {
             fields:[
                 {name: 'id', type: 'int'},
                 {name: 'wh_code',  type: 'string'},

frontend/saas-web/app/view/document/other/StoreInformation.js → frontend/saas-web/app/view/document/other/Warehouse.js

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.other.StoreInformation', {
+Ext.define('saas.view.document.other.Warehouse', {
     extend: 'saas.view.document.kind.Kind',
-    xtype: 'other-storeinformation',
+    xtype: 'other-warehouse',
     autoScroll: true,
     layout:'fit',
-    defaultType:'storeinformation',
+    defaultType:'warehouse',
     tbar: ['->',{
         xtype:'button',
         text:'新增',

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

@@ -51,6 +51,7 @@ Ext.define('saas.view.document.product.BasePanel', {
     gridConfig: {
         idField: 'id',
         codeField: 'pr_code',
+        statusCodeField:'pr_statuscode',
         dataUrl: '/api/document/product/list',
         columns : [{
             text : "id", 
@@ -75,6 +76,12 @@ Ext.define('saas.view.document.product.BasePanel', {
             width : 120.0, 
             xtype : ""
         }, 
+        {
+            text : "状态码", 
+            dataIndex : "pr_statuscode", 
+            width : 0, 
+            xtype : ""
+        }, 
         {
             text : "物料种类", 
             dataIndex : "pr_type", 

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

@@ -221,14 +221,14 @@ Ext.define('saas.view.document.product.FormPanel', {
             o['auditBtnText'] = {
                 bind: '{' + statusCodeField + '}',
                 get: function(value) {
-                    viewModel.set(statusField, value == 'OPEN' ? '启用' : '禁用');
-                    return value == 'OPEN' ? '禁用' : '启用'
+                    viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
+                    return value == 'OPEN' ? '已关闭' : '已开启'
                 }
             };
             viewModel.setFormulas(o);
             viewModel.set(statusCodeField, "OPEN");
         }else {
-            viewModel.set('auditBtnText', "禁用");
+            viewModel.set('auditBtnText', "已关闭");
         }
     }
 });

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

@@ -51,6 +51,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
     gridConfig: {
         idField: 'id',
         codeField: 've_code',
+        statusCodeField:'ve_statuscode',
         dataUrl: '/api/document/vendor/list',
         columns : [{
             text : "供应商id", 
@@ -75,6 +76,12 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             width : 120.0, 
             xtype : ""
         }, 
+        {
+            text : "供应商状态码", 
+            dataIndex : "ve_statuscode", 
+            width : 0, 
+            xtype : ""
+        },
         {
             text : "供应商UU", 
             dataIndex : "ve_uu", 

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

@@ -254,14 +254,14 @@ Ext.define('saas.view.document.vendor.FormPanel', {
             o['auditBtnText'] = {
                 bind: '{' + statusCodeField + '}',
                 get: function(value) {
-                    viewModel.set(statusField, value == 'OPEN' ? '启用' : '禁用');
-                    return value == 'OPEN' ? '禁用' : '启用'
+                    viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
+                    return value == 'OPEN' ? '已关闭' : '已开启'
                 }
             };
             viewModel.setFormulas(o);
             viewModel.set(statusCodeField, "OPEN");
         }else {
-            viewModel.set('auditBtnText', "禁用");
+            viewModel.set('auditBtnText', "已关闭");
         }
     }
 });

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

@@ -164,8 +164,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 dataIndex : "pd_price", 
                 width : 120.0, 
                 xtype : "numbercolumn",
-                items : null,
-                summaryType: 'sum'
             }, 
             {
                 text : "税率", 
@@ -174,8 +172,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 },
                 dataIndex : "pd_taxrate", 
                 width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
+                xtype : "numbercolumn",
             },
             {
                 text : "含税金额", 

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

@@ -170,9 +170,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             },            {
                 text : "已转数", 
                 dataIndex : "pd_yqty", 
-                editor : {
-                    xtype : "numberfield"
-                },
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 format:'0',
@@ -209,11 +206,13 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }
             },
             {
-                text : "单价", 
+                text : "单价",
+                editor : {
+                    xtype : "numberfield"
+                }, 
                 dataIndex : "pd_orderprice", 
                 width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
+                xtype : "numbercolumn"
             }, 
            {
                 text : "含税金额", 
@@ -222,10 +221,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 xtype : "numbercolumn"
             }, {
                 text : "税率", 
+                editor : {
+                    xtype : "numberfield"
+                }, 
                 dataIndex : "pd_taxrate", 
                 width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
+                xtype : "numbercolumn"
             },
             {
                 text : "未税金额", 

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

@@ -138,7 +138,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:'/api/document/warehouse/list',
                         // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-storeinformation',
+                        addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          

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

@@ -165,9 +165,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },            {
                 text : "已转数", 
                 dataIndex : "pd_yqty", 
-                editor : {
-                    xtype : "numberfield"
-                },
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 format:'0',
@@ -204,11 +201,13 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 }
             },
             {
-                text : "单价", 
+                text : "单价",
+                editor : {
+                    xtype : "numberfield"
+                },  
                 dataIndex : "pd_orderprice", 
                 width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
+                xtype : "numbercolumn"
             }, 
            {
                 text : "含税金额", 
@@ -217,10 +216,12 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 xtype : "numbercolumn"
             }, {
                 text : "税率", 
-                dataIndex : "pd_taxrate", 
+                dataIndex : "pd_taxrate",
+                editor : {
+                    xtype : "numberfield"
+                },   
                 width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
+                xtype : "numbercolumn"
             },
             {
                 text : "未税金额", 

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

@@ -137,7 +137,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:'/api/document/warehouse/list',
                         // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-storeinformation',
+                        addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          

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

@@ -227,7 +227,10 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             },
             {
                 text : "单价", 
-                dataIndex : "pd_orderprice", 
+                dataIndex : "pd_orderprice",
+                editor : {
+                    xtype : "numberfield"
+                },   
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 items : null
@@ -239,7 +242,10 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                 xtype : "numbercolumn"
             }, {
                 text : "税率", 
-                dataIndex : "pd_taxrate", 
+                dataIndex : "pd_taxrate",
+                editor : {
+                    xtype : "numberfield"
+                },   
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 items : null

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

@@ -183,7 +183,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                 Ext.apply(f,{
                     dataUrl:'/api/document/warehouse/list',
                     // dataUrl:'http://localhost:9480/warehouse/list',
-                    addXtype: 'other-storeinformation',
+                    addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
                     dbfinds:[{
                         from:'id',to:'pd_whid'                          
@@ -228,7 +228,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
              Ext.apply(f,{
                  dataUrl:'/api/document/warehouse/list',
                 //  dataUrl:'http://localhost:9480/warehouse/list',
-                addXtype: 'other-storeinformation',
+                addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
                  dbfinds:[{
                      from:'id',to:'pd_inwhid'                          

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

@@ -167,9 +167,6 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },            {
                 text : "已转数", 
                 dataIndex : "pd_yqty", 
-                editor : {
-                    xtype : "numberfield"
-                },
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 format:'0',
@@ -207,7 +204,10 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "单价", 
-                dataIndex : "pd_orderprice", 
+                dataIndex : "pd_orderprice",
+                editor : {
+                    xtype : "numberfield"
+                },   
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 items : null
@@ -219,7 +219,10 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 xtype : "numbercolumn"
             }, {
                 text : "税率", 
-                dataIndex : "pd_taxrate", 
+                dataIndex : "pd_taxrate",
+                editor : {
+                    xtype : "numberfield"
+                },   
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 items : null

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

@@ -193,7 +193,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                     Ext.apply(f, {
                         dataUrl: '/api/document/warehouse/list',
                         // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-storeinformation',
+                        addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
                         dbfinds: [{
                             from: 'id',

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

@@ -164,9 +164,6 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             }, {
                 text: "已转数",
                 dataIndex: "pd_yqty",
-                editor: {
-                    xtype: "numberfield"
-                },
                 width: 120.0,
                 xtype: "numbercolumn",
                 format: '0',
@@ -205,6 +202,9 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             {
                 text: "单价",
                 dataIndex: "pd_orderprice",
+                editor : {
+                    xtype : "numberfield"
+                },  
                 width: 120.0,
                 xtype: "numbercolumn",
                 items: null
@@ -217,6 +217,9 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             }, {
                 text: "税率",
                 dataIndex: "pd_taxrate",
+                editor : {
+                    xtype : "numberfield"
+                },  
                 width: 120.0,
                 xtype: "numbercolumn",
                 items: null

frontend/saas-web/resources/json/navigation.json

@@ -183,9 +183,9 @@
             "addType":"document-product-formpanel",
             "leaf": true
         }, {
-            "id":"other-storeinformation",
+            "id":"other-warehouse",
             "text": "仓库资料",
-            "viewType": "other-storeinformation",
+            "viewType": "other-warehouse",
             "leaf": true
         }, {
             "id":"document-bom-basepanel",