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

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Operation.java

@@ -65,12 +65,12 @@ public enum Operation {
     /**
      * 转采购验收单
      */
-    PURCHASEIN("msg.TurnPurcCheckin", "msg.TurnPurcCheckinSuccess"),
+    PURCHASEIN("msg.turnPurcCheckin", "msg.turnPurcCheckinSuccess"),
 
     /**
      * 转采购验退单
      */
-    PURCHASEOUT("msg.TurnPurcCheckout", "msg.TurnPurcCheckoutSuccess"),
+    PURCHASEOUT("msg.turnPurcCheckout", "msg.turnPurcCheckoutSuccess"),
 
     /**
      * 转出货单

applications/commons/commons-server/src/main/resources/i18n/messages_zh_CN.properties

@@ -119,4 +119,8 @@ msg.getSuccess=\u83b7\u53d6\u6210\u529f
 msg.endProdudct=\u7ed3\u8d26\u64cd\u4f5c
 msg.endProdudctSuccess=\u7ed3\u8d26\u6210\u529f
 msg.unEndProduct=\u53cd\u7ed3\u8d26\u64cd\u4f5c
-msg.unEndProductSuccess=\u53cd\u7ed3\u8d26\u6210\u529f
+msg.unEndProductSuccess=\u53cd\u7ed3\u8d26\u6210\u529f
+msg.turnPurcCheckin=\u8F6C\u6570\u91C7\u8D2D\u9A8C\u6536\u5355\u64CD\u4F5C
+msg.turnPurcCheckinSuccess=\u8F6C\u6570\u91C7\u8D2D\u9A8C\u6536\u5355\u64CD\u4F5C\u6210\u529F
+msg.turnPurcCheckout=\u8F6C\u91C7\u8D2D\u9A8C\u9000\u5355\u64CD\u4F5C
+msg.turnPurcCheckoutSuccess=\u8F6C\u91C7\u8D2D\u9A8C\u9000\u5355\u64CD\u4F5C\u6210\u529F

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/ProductServiceImpl.java

@@ -123,16 +123,18 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             if (productDetailList.size() > 0){
                 //找到原始单据,反过账并删除
                 String inoutCode = getMapper().selectProdIOCode(product.getPr_code(), BaseContextHolder.getCompanyId(), "库存初始化");
-                post(inoutCode, "反过账");
-                getMapper().deleteProdIODetailByCode(inoutCode, BaseContextHolder.getCompanyId());
-                getMapper().deleteProdIOByCode(inoutCode, BaseContextHolder.getCompanyId());
-
+                if (!StringUtils.isEmpty(inoutCode)) {
+                    post(inoutCode, "反过账");
+                    getMapper().deleteProdIODetailByCode(inoutCode, BaseContextHolder.getCompanyId());
+                    getMapper().deleteProdIOByCode(inoutCode, BaseContextHolder.getCompanyId());
+                }
                 //此种情况不可能发生明细行数量,只会发生明细行数据修改/新增明细行
                 //a.更新明细行数据
                 List<ProductDetail> insertItems = new ArrayList<ProductDetail>();
                 List<ProductDetail> updateItems = new ArrayList<ProductDetail>();
                 for(ProductDetail productDetail : productDetailList){
                     if (productDetail.getId() == 0){
+                        productDetail.setPd_prodid(product.getId());
                         productDetail.setUpdaterId(userId);
                         productDetail.setUpdateTime(new Date());
                         insertItems.add(productDetail);
@@ -373,8 +375,8 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         validEnableDel(id);
 
         String code = getMapper().getCodeById(id);
-        getMapper().deleteByPrimaryKey(id);
         productDetailMapper.deleteByProdId(id);
+        getMapper().deleteByPrimaryKey(id);
         DocBaseDTO docBaseDTO = generateMsgObj(id, code);
         //记录LOG
         messageLogService.delete(docBaseDTO);

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>

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/ProdInOutMapper.java

@@ -23,7 +23,7 @@ public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
 
     int checkQtyFromPurchase(String pu_code);
 
-    int checkQtyFromProdIn(String pu_code);
+    int checkQtyFromProdIn(Long id);
 
     void updateCreator(@Param("userId") Long userId,@Param("userName") String userName,@Param("id") Long pi_id);
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -205,10 +205,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }
 
         //检查更新后数据是否
-        String pu_code = prodInOut.getPi_pucode();
-        if (!StringUtils.isEmpty(pu_code)){
-            checkUpdateQty(pu_code,pi_class);
-        }
+        checkUpdateQty(pi_id,pi_class);
 
         baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
         //计算金额，未税单价，未税金额等
@@ -390,10 +387,10 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }
     }
 
-    private void checkUpdateQty(String pu_code, String pi_class) {
+    private void checkUpdateQty(Long id, String pi_class) {
         int count = 0;
         if ("采购验退单".equals(pi_class)) {
-            count = getMapper().checkQtyFromProdIn(pu_code);
+            count = getMapper().checkQtyFromProdIn(id);
             if (count>0){
                 throw new BizException(BizExceptionCode.PURCHASE_DETAIL_OVERNUM);
             }
@@ -501,12 +498,11 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                  prodIODetailMapper.updateByPrimaryKeySelective(sourcePid);
              }
          }
-        //更新默认仓库
-//        getDefaultWarehouseByProduct(pi_id);
         //采购验退单相关计算
         calcProdInout(pi_id,"采购验退单");
+        DocBaseDTO baselog = new DocBaseDTO(sourcePi.getId(), sourcePi.getPi_inoutno(), BillCodeSeq.PURCHASEIN.getCaller());
+        messageLogService.customizeLog(baselog, Operation.PURCHASEOUT);
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.PURCHASEOUT.getName());
-        messageLogService.customizeLog(baseDTO, Operation.PURCHASEOUT);
         return Result.success(baseDTO);
     }
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -488,8 +488,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
         //采购验收单相关计算
         prodInOutService.calcProdInout(pi_id,"采购验收单");
+        //日志记录到采购单
+        DocBaseDTO baselog = new DocBaseDTO(purchase.getId(), purchase.getPu_code(), BillCodeSeq.PURCHASE.getCaller());
+        messageLogService.customizeLog(baselog, Operation.PURCHASEIN);
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.PURCHASEIN.getName());
-        messageLogService.customizeLog(baseDTO, Operation.PURCHASEIN);
         return Result.success(baseDTO);
     }
 

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -432,9 +432,9 @@
   GROUP BY pd_orderid) t  where t.nowqty>t.totalqty
   </select>
 
-  <select id="checkQtyFromProdIn" resultType="int" parameterType="string">
+  <select id="checkQtyFromProdIn" resultType="int" parameterType="long">
   select count(1) from(
-  select sum(b.pd_outqty) nowqty,(select a.pd_inqty from prodiodetail a where a.pd_id = b.pd_ioid and a.pd_piclass='采购验收单') totalqty from prodiodetail b where b.pd_ordercode=#{pu_code} and b.pd_piclass='采购验退单'
+  select sum(b.pd_outqty) nowqty,(select a.pd_inqty from prodiodetail a where a.pd_id = b.pd_ioid and a.pd_piclass='采购验收单') totalqty from prodiodetail b where b.pd_piid = #{id} and b.pd_piclass='采购验退单'
   GROUP BY b.pd_ioid) t where t.nowqty>t.totalqty
   </select>
 

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

@@ -242,6 +242,7 @@ Ext.define('saas.view.core.base.GridPanel', {
         if(columns[columns.length - 1].flex != 1) {
             columns.push({
                 flex: 1,
+                dataIndex:'virtual',
                 allowBlank: true
             });
         }

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -162,7 +162,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
 
     judge:function(f){
-        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1){
+        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1||f.ownerCt.ownerCt.xtype.trim().toUpperCase().indexOf('BASEPANEL')>-1){
             f.belong = 'form';
             return f.ownerCt.ownerCt
         }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORM')>-1){

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

@@ -125,7 +125,11 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
         datas = me.datas,
         menu = me.menu;
         if(!Ext.isArray(items)) {
-            items = [items]
+            if(items.indexOf(',')>0){
+                items = items.split(',')
+            }else{
+                items = [items]
+            }
         }
         items.map(function(item, index) {
             if(Ext.isString(item)) {

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

@@ -97,7 +97,6 @@ Ext.define('saas.view.document.customer.BasePanel', {
         codeField: 'cu_code',
         statusCodeField:'cu_statuscode',
         dataUrl: '/api/document/customer/list',
-        //dataUrl: 'http://192.168.253.31:8560/api/document/customer/list',
         columns : [
         {
             text : "客户id", 

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

@@ -473,21 +473,17 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         saas.util.BaseUtil.request({
             url: belong.reqUrl,
             params: _params,
-            method: 'POST'
+            method: 'POST',
+            headers:{
+                'Access-Control-Allow-Origin': '*',
+                "Content-Type":'application/x-www-form-urlencoded'
+            }
         })
         .then(function(localJson) {
             me.setLoading(false);
             if(localJson.success){
                 saas.util.BaseUtil.showToast('保存成功');
-                var grid = form.ownerCt._parent.lookup('document-kind-Grid');
-                if(grid){
-                    grid.store.load();
-                }
-                if(combo){
-                    combo.store.load(function() {
-                        typeof combo.setValue == 'function' && combo.setValue(params._value);
-                    });
-                }
+                form.ownerCt._parent.store.load()
                 form.ownerCt.close();
             }
         })

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

@@ -256,7 +256,7 @@ Ext.define('saas.view.document.kind.Kind', {
             },{
                 dataIndex: 'email',
             }],
-            reqUrl:'http://192.168.253.31:8560/api/account/account/bind/roles',
+            reqUrl:'/api/account/account/bind/roles',
         },
         warehouse:{
             columns: [{

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

@@ -75,7 +75,6 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         codeField: 've_code',
         statusCodeField:'ve_statuscode',
         dataUrl: '/api/document/vendor/list',
-        //dataUrl: 'http://192.168.253.31:8560/api/document/vendor/list',
         columns : [{
             text : "供应商id", 
             width : 0, 

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -25,14 +25,22 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         fieldLabel : "单据日期",
         columnWidth: 0.5
     },{
-        xtype: 'multicombo',
+        xtype: 'combobox',
         name: 'ft_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'ft_status',
+        valueField: 'ft_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['ft_statuscode', 'ft_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -47,15 +47,23 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         fieldLabel: '单据日期',
         columnWidth: 0.5,
         operation: 'between'
-    }, {
-        xtype: 'multicombo',
+    },{
+        xtype: 'combobox',
         name: 'or_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'or_status',
+        valueField: 'or_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['or_statuscode', 'or_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -47,14 +47,22 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         columnWidth: 0.5,
         fieldLabel: '单据日期'
     },{
-        xtype: 'multicombo',
+        xtype: 'combobox',
         name: 'os_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'os_status',
+        valueField: 'os_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['os_statuscode', 'os_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -58,10 +58,10 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         allowBlank:false,
         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/account/DataList.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.sys.account.DataList', {
     autoScroll: true,
     frame:true,
     layout:'fit',
-    dataUrl:'http://192.168.253.31:8560/api/account/account/accountRole/list',                 
+    dataUrl:'/api/account/account/accountRole/list',                 
 
     tbar: [{
         width: 150,

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

@@ -7,8 +7,8 @@ Ext.define('saas.view.sys.config.FormPanel', {
     
     //字段属性
     _idField: 'id',
-    _readUrl:'http://192.168.253.31:8560/api/account/company/read/current',
-    _saveUrl:'http://192.168.253.31:8560/api/account/company/save',
+    _readUrl:'/api/account/company/read/current',
+    _saveUrl:'/api/account/company/save',
 
     //基础属性
     frame:true,
@@ -170,7 +170,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     fd.append('file', fileEl.files[0]);
                     form.setLoading(true);
                     Ext.Ajax.request({
-                        url: 'http://192.168.253.31:8560/api/file/upload',//这里是填写需要跨域访问的URL
+                        url: '/api/file/upload',//这里是填写需要跨域访问的URL
                         cors: true,
                         useDefaultXhrHeader: false,
                         method: 'post',
@@ -192,8 +192,9 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 field.setRawValue(name);
                                 //读取图片
                                 if(data.id){
+                                    var serverOptions = Ext.manifest.server;
                                     var img = myForm.down('[name=SignetPhoto]');
-                                    img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+data.fullPath;
+                                    img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+data.fullPath;
                                     var showSignetPhoto = form.down('[name=showSignetPhoto]');
                                     showSignetPhoto.show();
                                 }
@@ -295,7 +296,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     fd.append('file', fileEl.files[0]);
                     form.setLoading(true);
                     Ext.Ajax.request({
-                        url: 'http://192.168.253.31:8560/api/file/upload',//这里是填写需要跨域访问的URL
+                        url: '/api/file/upload',//这里是填写需要跨域访问的URL
                         cors: true,
                         useDefaultXhrHeader: false,
                         method: 'post',
@@ -316,8 +317,9 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 myForm.down('[name=logoUrl]').setValue(data.fullPath);
                                 //读取图片
                                 if(data.id){
+                                    var serverOptions = Ext.manifest.server;
                                     var img = myForm.down('[name=LogoPhoto]');
-                                    img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+data.fullPath;
+                                    img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+data.fullPath;
                                     var showLogoPhoto = form.down('[name=showLogoPhoto]');
                                     showLogoPhoto.show();
                                 }
@@ -401,14 +403,12 @@ Ext.define('saas.view.sys.config.FormPanel', {
     },
 
     load:function(form){
+        var serverOptions = Ext.manifest.server;
         //打印章
         var signet = form.down('[name=signet]').value;
         if(signet&&signet!=''){
             var img = form.down('[name=SignetPhoto]');
-            img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+signet;
-            // var name = data.name + "  (" + Ext.util.Format.fileSize(data.size) + ")";
-            // myForm.down('[name=signet]').setValue(data.fullPath);
-            // field.setRawValue(name);
+            img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+signet;
             var showSignetPhoto = form.down('[name=showSignetPhoto]');
             showSignetPhoto.show();
         }
@@ -416,7 +416,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
         var logoUrl = form.down('[name=logoUrl]').value;
         if(logoUrl&&logoUrl!=''){
             var img = form.down('[name=LogoPhoto]');
-            img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+logoUrl;
+            img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+logoUrl;
             var showLogoPhoto = form.down('[name=showLogoPhoto]');
             showLogoPhoto.show();
         }
@@ -465,10 +465,9 @@ Ext.define('saas.view.sys.config.FormPanel', {
     },
 
     downLoad:function(path){
+        var serverOptions = Ext.manifest.server;
+        window.location.href = serverOptions.basePath + '/api/file/download?path='+path;
         //ajax 响应下载必须要创建一个form实例
-
-        window.location.href = 'http://192.168.253.31:8560/api/file/download?path='+path;
-
         // if (!Ext.fly('ext-attach-download')) {  
 		// 	var frm = document.createElement('form');  
 		// 	frm.id = 'ext-attach-download';  

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", 

frontend/saas-web/app/view/sys/manager/FormPanel.scss

@@ -51,7 +51,17 @@
     .x-panel-body-default-framed{
         padding:0 !important;
     }
+    .x-grid-item-focused{
+        outline: none !important;
+        border:none !important;
+    }
     .x-keyboard-mode .x-grid-item-focused .x-grid-cell-inner:before{
-        border:1px solid #ffffff;
+        border:0px solid #ffffff !important;
+    }
+    .x-keyboard-mode .x-grid-item-focused{
+        border:0px solid #ffffff !important;
+    }
+    .x-grid-cell-inner .x-grid-cell-inner-action-col::before{
+        border:0px solid #ffffff !important;
     }
 }

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.sys.power.FormPanel', {
     frame:true,
     layout: 'border',
     autoScroll: true,
-    saveUrl:'http://192.168.253.31:8560/api/account/role/save/bind/resource',
+    saveUrl:'/api/account/role/save/bind/resource',
 
     items: [{
         region:'west',

frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -24,7 +24,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         groupHeaderTpl: '{name}'+'模块'
 	})],
     initId:0,
-    dataUrl:'http://192.168.253.31:8560/api/account/role/power/resource',
+    dataUrl:'/api/account/role/power/resource',
     selModel: {
         showHeaderCheckbox:false,
         checkOnly:true,