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

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

@@ -510,6 +510,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setPu_acceptstatuscode(Status.UNAUDITED.name());
         purchase.setUpdateTime(new Date());
         purchase.setUpdaterId(BaseContextHolder.getUserId());
+        getMapper().updateByPrimaryKey(purchase);
         //更新存在字段
         //日志
         messageLogService.audit(docBaseDTO);

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

@@ -17,7 +17,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             from:'bk_bankname',to:'ftd_bankname'
                         },{
-                            from:'id',to:'ftd_bankid'
+                            from:'id',to:'ftd_bankid',ignore:true
                         }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100

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

@@ -14,7 +14,8 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                         defaultCondition: "cu_statuscode='OPEN'",
                         dbfinds: [{
                             from: 'id',
-                            to: 'or_custid'
+                            to: 'or_custid',
+                            ignore:true
                         }, {
                             from: 'cu_code',
                             to: 'or_custcode'

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

@@ -13,7 +13,8 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                         addTitle: '供应商资料',
                         dbfinds: [{
                             from: 'id',
-                            to: 'os_vendid'
+                            to: 'os_vendid',
+                            ignore:true
                         }, {
                             from: 've_code',
                             to: 'os_vendcode'

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -23,7 +23,8 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             to: 've_leftamount'
                         },{
                             from: 'id',
-                            to: 'pb_vendid'
+                            to: 'pb_vendid',
+                            ignore:true
                         }],
                         dbtpls: [{
                             field: 've_code',

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         addTitle: '客户资料',
                         //赋值 
                         dbfinds:[{
-                            from: 'id', to: 'rb_custid'
+                            from: 'id', to: 'rb_custid',ignore:true
                         }, {
                             from:'cu_code', to:'rb_custcode'
                         },{

frontend/saas-web/ext/packages/modern-locale/overrides/zh_CN/field/Date.js

@@ -6,7 +6,7 @@ Ext.define('Ext.locale.zh_CN.field.Date', {
     override: 'Ext.form.field.Date',
 
     config: {
-        formatText: '当前日期格式为 {0}.',
+        formatText: '',//当前日期格式为 {0}.
         minDateMessage: '该输入项的日期必须在 {0} 之后',
         maxDateMessage: '该输入项的日期必须在 {0} 之前',
         minText: "日期必须大于等于 {0}",