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

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerServiceImpl.java

@@ -298,6 +298,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
             map.put("v_id",id);
             map.put("v_code", docBaseDTO.getCode());
             map.put("v_type","cust");
+            map.put("v_companyid",BaseContextHolder.getCompanyId());
             map.put("v_res","");
             customerMapper.check(map);
             Object result =  map.get("v_res");

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -264,14 +264,15 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             map.put("v_id",id);
             map.put("v_code", code);
             map.put("v_type","vend");
+            map.put("v_companyid",BaseContextHolder.getCompanyId());
             map.put("v_res","");
             vendorMapper.check(map);
             Object result =  map.get("v_res");
             if(!StringUtils.isEmpty(result)){
                 throw new BizException(BizExceptionCode.USING_EXISTS.getCode(),result.toString());
             }else{
-                getMapper().deleteByPrimaryKey(id);
                 vendorcontactMapper.deleteByFK(id);
+                getMapper().deleteByPrimaryKey(id);
                 //删除中间表
                 subledgerMapper.deleteVendor("期初余额", "期初余额", Math.toIntExact(id));
                 //记录LOG

applications/document/document-server/src/main/resources/mapper/CustomerMapper.xml

@@ -392,12 +392,13 @@
   and companyId =#{companyId};
   </select>
   <select id="check" parameterMap="checkParamMap" statementType="CALLABLE">
-        CALL SP_LIMITBASE(?, ?, ?, ?)
+        CALL SP_LIMITBASE(?, ?, ?, ?, ?)
     </select>
   <parameterMap id="checkParamMap" type="java.util.Map">
     <parameter property="v_type" jdbcType="VARCHAR" mode="IN" />
     <parameter property="v_id" jdbcType="INTEGER" mode="IN" />
     <parameter property="v_code" jdbcType="VARCHAR" mode="IN" />
+    <parameter property="v_companyid" jdbcType="VARCHAR" mode="IN" />
     <parameter property="v_res" jdbcType="VARCHAR" mode="OUT" />
   </parameterMap>
 

applications/document/document-server/src/main/resources/mapper/VendorMapper.xml

@@ -478,12 +478,13 @@
     </select>
 
     <select id="check" parameterMap="checkParamMap" statementType="CALLABLE">
-        CALL SP_LIMITBASE(?, ?, ?, ?)
+        CALL SP_LIMITBASE(?, ?, ?, ?, ?)
     </select>
     <parameterMap id="checkParamMap" type="java.util.Map">
         <parameter property="v_type" jdbcType="VARCHAR" mode="IN" />
         <parameter property="v_id" jdbcType="INTEGER" mode="IN" />
         <parameter property="v_code" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="v_companyid" jdbcType="VARCHAR" mode="IN" />
         <parameter property="v_res" jdbcType="VARCHAR" mode="OUT" />
     </parameterMap>
 </mapper>

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

@@ -58,7 +58,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
                 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: 'bcode'

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

@@ -85,11 +85,17 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             xtype: 'numbercolumn',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
+            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);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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);
             }
         }, {
@@ -101,15 +107,21 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             xtype: 'numbercolumn',
             dataIndex: 'pd_nettotal',
             xtype: 'numbercolumn',
+            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);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                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: 'pd_text1'
+            dataIndex: 'pd_remark'
         }]
 });

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

@@ -57,34 +57,55 @@ Ext.define('saas.view.money.report.PayDetail', {
             dataIndex: 've_beginapamount',
             xtype: 'numbercolumn',
             width: 140,
+            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);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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: '本期付款金额',
             xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
             xtype: 'numbercolumn',
-            summaryType: 'sum',
             width: 140,
+            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);
+            },
+            summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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: '应付余额',
             xtype: 'numbercolumn',
             dataIndex: 'mustpay',
             xtype: 'numbercolumn',
+            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);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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: '应付日期',
@@ -95,11 +116,18 @@ Ext.define('saas.view.money.report.PayDetail', {
             xtype: 'numbercolumn',
             dataIndex: 'pi_total',
             xtype: 'numbercolumn',
+            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);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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: '备注',

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

@@ -62,37 +62,59 @@ Ext.define('saas.view.money.report.RecDetail', {
             text:'期初应收',
             dataIndex:'cu_beginaramount',
             xtype: 'numbercolumn',
+            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);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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:'本期收款金额',
             xtype: 'numbercolumn',
             dataIndex:'pb_pdamount',
             xtype: 'numbercolumn',
+            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);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                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: '应收余额',
             xtype: 'numbercolumn',
             dataIndex: 'mustpay',
             xtype: 'numbercolumn',
+            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);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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: 'mustdate'
+            dataIndex: 'mustdate',
+            xtype:'datecolumn'
         }, {
             text: '单据总金额',
             dataIndex: 'pi_total',

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

@@ -72,11 +72,18 @@ Ext.define('saas.view.money.report.VendorCheck', {
             xtype: 'numbercolumn',
             dataIndex: 'qty',
             xtype: 'numbercolumn',
+            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);
+            },
             summaryType: 'sum',
             summaryRenderer: 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();
+	            var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: '单价',
@@ -91,11 +98,18 @@ Ext.define('saas.view.money.report.VendorCheck', {
             xtype: 'numbercolumn',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
+            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);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                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: '不含税单价',

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

@@ -59,10 +59,10 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         defaultValue: new Date(),
         columnWidth : 0.25,
     },{
+        name : "pu_shipaddresscode", 
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/address/getCombo',
-        name : "pu_shipaddresscode", 
         fieldLabel : "交货地址", 
         allowBlank : false, 
         columnWidth : 0.5,

frontend/saas-web/app/view/sale/report/SaleProfit.js

@@ -140,14 +140,14 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         dataIndex: 'pd_profitpresent',
         xtype: 'numbercolumn',
         renderer : function(v) {
-            var arr = (v*100 + '.').split('.');
+            var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0.' + xr.join();
-            return Ext.util.Format.number(v*100, format);
+            return Ext.util.Format.number(v, format);
         }
     }, {
         text : "备注", 
-        dataIndex : "pd_text1",
+        dataIndex : "pd_remark",
         width : 250 
     }]
 

frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -104,7 +104,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
         dataIndex: 'rb_backrate',
         xtype: 'numbercolumn',
         renderer : function(v) {
-            var arr = (v*100 + '.').split('.');
+            var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0.' + xr.join();
             return Ext.util.Format.number(v*100, format);

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

@@ -53,14 +53,14 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : "客户名称",
         allowBlank : false
     }, {
-        name : "sa_toplace", 
+        name : "pu_shipaddresscode", 
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/address/getCombo',
         fieldLabel : "交货地址", 
         allowBlank : false, 
         columnWidth : 0.5,
-        hiddenBtn:true,//true 则会关闭新增按钮功能
+        hiddenBtn:false,//true 则会关闭新增按钮功能
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
             var form = this.ownerCmp.ownerCt;

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

@@ -261,7 +261,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             },{
                 text : "备注", 
-                dataIndex : "pd_text1",
+                dataIndex : "pd_remark",
                 width : 250, 
                 items : null,
                 editor : {

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

@@ -188,7 +188,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             align:'right'
         }, {
             text: '备注',
-            dataIndex: 'pd_text1',
+            dataIndex: 'pd_remark',
             width: 250
         }]
     }

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

@@ -267,7 +267,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             },{
                 text : "备注", 
-                dataIndex : "pd_text1",
+                dataIndex : "pd_remark",
                 width : 250, 
                 items : null,
                 editor : {

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

@@ -186,7 +186,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             width: 120
         }, {
             text: '备注',
-            dataIndex: 'pd_text1',
+            dataIndex: 'pd_remark',
             width: 250
         }]
     }

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

@@ -223,7 +223,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                 }
             },{
                 text : "备注", 
-                dataIndex : "pd_text1",
+                dataIndex : "pd_remark",
                 width : 250, 
                 items : null,
                 editor : {

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -129,7 +129,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         width: 200
     },{
         text: '备注',
-        dataIndex: 'pd_text1',
+        dataIndex: 'pd_remark',
         width: 250
     }]
 

frontend/saas-web/app/view/sys/feedback/FormPanel.js

@@ -25,18 +25,18 @@ Ext.define('saas.view.sys.feedback.FormPanel', {
         name: 'id',
         fieldLabel: 'id',
         readOnly:true,
-        defaultVale:saas.util.BaseUtil.getCurrentUser().id
+        defaultVale:saas.util.BaseUtil.getCurrentUser() ? saas.util.BaseUtil.getCurrentUser().id:null
     }, {
         xtype : "textfield", 
         name : "fb_name", 
         fieldLabel : "姓名",
         readOnly:true,
-        defaultVale:saas.util.BaseUtil.getCurrentUser().realname
+        defaultVale:saas.util.BaseUtil.getCurrentUser() ? saas.util.BaseUtil.getCurrentUser().realname:null
     }, {
         xtype : "textfield", 
         name : "fb_mobile", 
         fieldLabel : "手机号",
-        defaultVale:saas.util.BaseUtil.getCurrentUser().mobile
+        defaultVale:saas.util.BaseUtil.getCurrentUser() ? saas.util.BaseUtil.getCurrentUser().mobile:null
     }, {
         xtype : "textfield", 
         name : "fb_QQ",