Merge remote-tracking branch 'origin/dev' into dev

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -101,7 +101,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     DELETE_NOT_EXIS(74008,"删除失败，当前单据不存在!"),
     DOCUMENTS_AUDITED(74009,"存在已审核单据:%S"),
     DOCUMENTS_UNAUDITED(74010,"存在未审核单据:%S"),
-    BANK_AMOUNT_NOTENOUGHS(74011, "资金账号不足:%S"),
+    BANK_AMOUNT_NOTENOUGHS(74011, "资金账户余额不足:%S"),
 
     //反结账
     EARLY_USERING(74012, "期初余额被使用，无法反结账"),

frontend/saas-web/Dockerfile.dev

@@ -0,0 +1,6 @@
+FROM hub.c.163.com/library/nginx
+MAINTAINER USOFTCHINA <yingp@usoftchina.com>
+RUN rm /etc/nginx/conf.d/default.conf
+ADD runtime/nginx/default.conf /etc/nginx/conf.d/
+COPY build/development/saas/ /usr/share/nginx/html/
+COPY set-token.html /usr/share/nginx/html/

frontend/saas-web/app.json

@@ -344,7 +344,7 @@
             "accountEnterprise":"http://192.168.0.181:8000/#/enterprise",
             "basePath": {
                 "https": "https://saas-api-dev.usoftchina.com:5443",
-                "http": "http://192.168.253.58:8560"
+                "http": "http://192.168.0.181:8560"
             },
             "urlPattern": "^\/api\/"
         }

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

@@ -118,7 +118,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                                 text:'启用',
                                 handler:function(){
                                     var form = this.ownerCt.ownerCmp.ownerCt.ownerCt.ownerCt;
-                                    me.onVastDeal(form._batchOpenUrl,'OPEN');
+                                    me.onVastDeal(form._batchOpenUrl,'ENABLE');
                                 }
                             }],
                             listeners: {

frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -9,7 +9,6 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
     dataUrl:'/api/document/vendor/list',
     addXtype: 'document-vendor-formpanel',
     addTitle: '供应商资料',
-    defaultCondition:"ve_statuscode='ENABLE'",
 
     //联想设置
     dbtpls:[{
@@ -17,7 +16,7 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
     },{
         field:'ve_name',width:200
     }],
-    defaultCondition: "ve_statuscode='OPEN'",
+    defaultCondition: "ve_statuscode='ENABLE'",
     dbSearchFields:[{
         emptyText:'输入供应商编号或名称',
         xtype : "textfield", 

frontend/saas-web/app/view/core/dbfind/types/WarehouseDbfindTrigger.js

@@ -83,7 +83,7 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
                     items: [{
                         iconCls:'',
                         getClass: function(v, meta, rec) {
-                            if(rec.get('wh_statuscode')=='OPEN'){
+                            if(rec.get('wh_statuscode')=='ENABLE'){
                                 return 'x-grid-checkcolumn-checked-btn';
                             }else{
                                 return 'x-grid-checkcolumn-btn';
@@ -91,7 +91,7 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
                         },
                         handler: function(view, rowIndex, colIndex) {
                             var rec = view.getStore().getAt(rowIndex);
-                            var type=rec.get('wh_statuscode')=='OPEN'?true:false;
+                            var type=rec.get('wh_statuscode')=='ENABLE'?true:false;
                             //  禁用/启用
                             var form = this.ownerCt.ownerCt.ownerCt;
                             var grid = this.ownerCt.ownerCt;

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

@@ -68,7 +68,7 @@ Ext.define('saas.view.document.bom.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
 
     audit: function(){

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

@@ -219,9 +219,9 @@ Ext.define('saas.view.document.bom.FormPanel', {
     }],
 
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

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

@@ -27,7 +27,7 @@ Ext.define('saas.view.document.customer.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
 
     audit: function(){

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

@@ -437,9 +437,9 @@ Ext.define('saas.view.document.customer.FormPanel', {
         handler: "auditBtnClick",
     }],
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

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

@@ -478,7 +478,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'hidden',
                 fieldLabel: '仓库状态码',
                 name: 'wh_statuscode',
-                value:'OPEN'
+                value:'ENABLE'
             }]
         },
         employee:{

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

@@ -354,7 +354,7 @@ Ext.define('saas.view.document.kind.Kind', {
                 items: [{
                     iconCls:'',
                     getClass: function(v, meta, rec) {
-                        if(rec.get('wh_statuscode')=='OPEN'){
+                        if(rec.get('wh_statuscode')=='ENABLE'){
                             return 'x-grid-checkcolumn-checked-btn';
                         }else{
                             return 'x-grid-checkcolumn-btn';
@@ -362,7 +362,7 @@ Ext.define('saas.view.document.kind.Kind', {
                     },
                     handler: function(view, rowIndex, colIndex) {
                         var rec = view.getStore().getAt(rowIndex);
-                        var type=rec.get('wh_statuscode')=='OPEN'?true:false;
+                        var type=rec.get('wh_statuscode')=='ENABLE'?true:false;
                         //  禁用/启用
                         var form = this.ownerCt.ownerCt.ownerCt;
                         var grid = this.ownerCt.ownerCt;

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

@@ -98,7 +98,7 @@ Ext.define('saas.view.document.product.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
     audit: function(){
         var me = this,

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

@@ -356,9 +356,9 @@ Ext.define('saas.view.document.product.FormPanel', {
         handler: "auditBtnClick",
     }],
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

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

@@ -12,7 +12,7 @@ Ext.define('saas.view.document.vendor.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
 
     audit: function(){

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

@@ -321,9 +321,9 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         handler: "auditBtnClick",
     }],
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

frontend/saas-web/app/view/money/report/AccountBalance.js

@@ -10,7 +10,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
     groupField: 'bankname',
     listUrl: '/api/money/report/accountBalance',
     defaultCondition: null,
-    reportTitle: '资金账户余额表',
+    reportTitle: '账户收支明细表',
     QueryWidth: 0.25,
     //筛选：账户、日期（必填）
     searchItems: [{
@@ -78,18 +78,20 @@ Ext.define('saas.view.money.report.AccountBalance', {
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
-    }, {
-        text: '账户余额',
-        dataIndex: 'thisamount',
-        xtype: 'numbercolumn',
-        width: 110,
-        renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
-    }, {
+    },
+    //     {
+    //     text: '账户余额',
+    //     dataIndex: 'thisamount',
+    //     xtype: 'numbercolumn',
+    //     width: 110,
+    //     renderer: function (v) {
+    //         var arr = (v + '.').split('.');
+    //         var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+    //         var format = '0,000.' + xr.join();
+    //         return Ext.util.Format.number(v, format);
+    //     }
+    // },
+        {
         text: '往来单位',
         dataIndex: 'bname',
         width: 150

frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -41,19 +41,15 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         text: 'id',
         dataIndex: 'pi_id',
         hidden: true
-    }, {
-        text: '单号',
-        dataIndex: 'pi_inoutno',
-        width: 150
-    }, {
-        text: '单据类型',
-        dataIndex: 'pi_class',
-        width: 110
-    }, {
+    },  {
         text: '单据日期',
         dataIndex: 'pi_date',
         xtype: 'datecolumn',
         width: 110
+    }, {
+        text: '单号',
+        dataIndex: 'pi_inoutno',
+        width: 150
     }, {
         text: '序号',
         dataIndex: 'pd_pdno',
@@ -135,9 +131,9 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         //     return Ext.util.Format.number(v, format);
         // }
     }, {
-        text: '备注',
-        dataIndex: 'pd_remark',
-        width: 250
+        text: '单据类型',
+        dataIndex: 'pi_class',
+        width: 110
     }, {
         text: '期初应收',
         dataIndex: 'beginamount',

frontend/saas-web/app/view/money/report/PayDetail.js

@@ -29,27 +29,19 @@ Ext.define('saas.view.money.report.PayDetail', {
             text: 'id',
             dataIndex: 'pi_id',
             hidden: true
+        }, {
+            text: '单据日期',
+            xtype: 'datecolumn',
+            dataIndex: 'pb_date',
+            width: 110
         }, {
             text: '单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        },{
-            text:'供应商编号',
-            dataIndex:'pi_vendcode',
-            width: 150
-        },{
-            text:'供应商名称',
-            width: 200,
-            dataIndex:'pi_vendname'
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 110
-        }, {
-            text: '单据日期',
-            xtype: 'datecolumn',
-            dataIndex: 'pb_date',
-            width: 110
         }, {
             text: '采购员',
             dataIndex: 'pu_buyercode',

frontend/saas-web/app/view/money/report/RecDetail.js

@@ -34,14 +34,6 @@ Ext.define('saas.view.money.report.RecDetail', {
             text: '单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        }, {
-            text: '客户编号',
-            dataIndex: 'pi_custcode',
-            width: 150
-        }, {
-            text: '客户名称',
-            dataIndex: 'pi_custname',
-            width: 200
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
@@ -54,12 +46,14 @@ Ext.define('saas.view.money.report.RecDetail', {
             text: '单据日期',
             dataIndex: 'rb_date',
             width: 110
-        }, {
-            text: '序号',
-            dataIndex: 'pd_pdno',
-            xtype: 'numbercolumn',
-            width: 80
-        },{
+        },
+        // }, {
+        //     text: '序号',
+        //     dataIndex: 'pd_pdno',
+        //     xtype: 'numbercolumn',
+        //     width: 80
+        // },{
+        {
             text:'期初应收',
             dataIndex:'cu_beginaramount',
             xtype: 'numbercolumn',
@@ -115,11 +109,6 @@ Ext.define('saas.view.money.report.RecDetail', {
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
-        }, {
-            text: '应收日期',
-            dataIndex: 'mustdate',
-            xtype:'datecolumn',
-            width: 110
         }, {
             text: '单据总金额',
             dataIndex: 'pi_total',

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -41,20 +41,16 @@ Ext.define('saas.view.money.report.VendorCheck', {
         text: 'id',
         dataIndex: 'pi_id',
         hidden: true
-    }, {
-        text: '单号',
-        dataIndex: 'pi_inoutno',
-        width: 150
-    }, {
-        text: '单据类型',
-        dataIndex: 'pi_class',
-        width: 110
     }, {
         text: '单据日期',
         dataIndex: 'pi_date',
         xtype:'datecolumn',
         width: 110
     }, {
+        text: '单号',
+        dataIndex: 'pi_inoutno',
+        width: 150
+    },  {
         text: '序号',
         dataIndex: 'pd_pdno',
         width: 80
@@ -85,7 +81,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         dataIndex: 'pd_unit',
         width: 80
     }, {
-        text: '采购数量',
+        text: '数量',
         xtype: 'numbercolumn',
         dataIndex: 'qty',
         xtype: 'numbercolumn',
@@ -143,9 +139,9 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'numbercolumn',
         width: 110
     }, {
-        text: '备注',
-        dataIndex: 'pd_remark',
-        width: 250
+        text: '单据类型',
+        dataIndex: 'pi_class',
+        width: 110
     }, {
         text: '期初应付',
         dataIndex: 'beginamount',

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

@@ -8,14 +8,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     viewName: 'purchase-purchase-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'pu_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        getCondition: function(value) {
-            return 'pu_id=' + value;
-        }
-    }, {
         xtype: 'textfield',
         name: 'pu_code',
         fieldLabel: ' ',
@@ -36,12 +28,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         fieldLabel: '物料',
         showDetail: true,
         emptyText:'输入物料编号或名称',
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        showDetail: true,
-        hidden:true
     }, {
         xtype: 'combobox',
         name: 'pu_statuscode',

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

@@ -8,11 +8,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
     viewName: 'purchase-purchasein-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
@@ -31,12 +26,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',

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

@@ -8,14 +8,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     viewName: 'purchase-purchaseout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        columnWidth: 0,
-        getCondition: function(value) {
-            return 'pi_id=' + value;
-        }
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
@@ -34,12 +26,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -8,14 +8,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
     viewName: 'sale-sale-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'sa_id',
-        fieldLabel: 'ID',
-        columnWidth: 0,
-        getCondition: function(value) {
-            return 'sa_id=' + value;
-        }
-    },{
         xtype: 'textfield',
         name: 'sa_code',
         emptyText:'请输入单号或客户',
@@ -254,20 +246,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             },
-        },
-        //  {
-        //     text: '已审核采购单数',
-        //     dataIndex: 'sd_pdqty',
-        //     xtype: 'numbercolumn',
-        //     width: 180,
-        //     renderer : function(v) {
-        //         var arr = (v + '.').split('.');
-        //         var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-        //         var format = '0.' + xr.join();
-        //         return Ext.util.Format.number(v, format);
-        //     },
-        // } 
-        {
+        }, {
             text: '备注',
             dataIndex: 'sd_remark',
             width: 250

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -8,10 +8,6 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
     viewName: 'sale-salein-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID'
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户',

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -8,11 +8,6 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     viewName: 'sale-saleout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'pi_id',
-        fieldLabel: 'ID',
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户',

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

@@ -8,12 +8,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
     viewName: 'stock-appropriationinout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号',

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

@@ -8,14 +8,6 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     viewName: 'stock-make-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'ma_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        getCondition: function(value) {
-            return 'ma_id=' + value;
-        }
-    },{
         xtype: 'textfield',
         name: 'ma_code',
         emptyText :'请输入单号',

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

@@ -8,12 +8,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
     viewName: 'stock-otherin-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号',
@@ -36,12 +30,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
     }, {
         xtype: 'vendorDbfindTrigger',
         name: 'pi_vendcode',

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

@@ -8,12 +8,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
     viewName: 'stock-otherout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号',

frontend/saas-web/overrides/form/field/TrimVtype.js

@@ -8,8 +8,5 @@ Ext.define('saas.override.form.field.TrimVtype', {
     // RegExp for the value to be tested against within the validation function
     trimRe: /^(?! ).*(?<! )$/i,
     // vtype Text property: The error text to display when the validation function returns false
-    trimText: '请不要在内容的开头和结尾添加空格',
-    // vtype Mask property: The keystroke filter mask
-    trimMask: /[\d\s:amp]/i
-
+    trimText: '请不要在内容的开头和结尾添加空格'
 });

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

@@ -169,7 +169,7 @@
             "id": "monry-report-recdetail",
             "viewType":"monry-report-recdetail"
         }, {
-            "text": "资金账户余额表",
+            "text": "账户收支明细表",
             "id": "monry-report-accountbalance",
             "viewType":"monry-report-accountbalance"
         }, {