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

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -512,6 +512,8 @@ public class SaleServiceImpl implements SaleService{
         saleMapper.updateByPrimaryKeySelective(sale);
         prodIODetailMapper.updatePDSaleOut(pi_id);
         prodInOutMapper.updatePiTotal(pi_id);
+        //更新创建人
+        prodInOutMapper.updateCreator(BaseContextHolder.getUserId(), BaseContextHolder.getUserName(), pi_id);
         //日志记录
         DocBaseDTO log = new DocBaseDTO(id, sale.getSa_code(), BillCodeSeq.SALEOUT.getCaller());
         messageLogService.customizeLog(log, Operation.TURNPRODOUT);

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

@@ -63,14 +63,14 @@ Ext.define('saas.view.core.form.FormPanelController', {
         main[form._statusCodeField] = auditTexts.unAuditCode;
         main[form._statusField] = auditTexts.unAuditText;
         //录入人，录入日期，审核人，审核日期清空
-        main['creatorId'] = null;
-        main['creatorName'] = null;
-        main['createTime'] = null;
-        main['updaterId'] = null;
-        main['updaterName'] = null;
-        main['updateTime'] = null;
-        main[form._auditmanField] = null;
-        main[form._auditdateField] = null;
+        main['creatorId'] = undefined;
+        main['creatorName'] = undefined;
+        main['createTime'] = undefined;
+        main['updaterId'] = undefined;
+        main['updaterName'] = undefined;
+        main['updateTime'] = undefined;
+        main[form._auditmanField] = undefined;
+        main[form._auditdateField] = undefined;
 
 
 

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

@@ -14,6 +14,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
      _codeField: 'ft_code',
      _statusField: 'ft_status',
      _statusCodeField: 'ft_statuscode',
+     _auditmanField: 'ft_auditman',
+     _auditdateField:'ft_auditdate',
      _relationColumn: 'ftd_ftid',
      _readUrl:'/api/money/fundtransfer/read',
      _saveUrl:'/api/money/fundtransfer/save',

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

@@ -14,6 +14,8 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _codeField: 'or_code',
      _statusField: 'or_status',
      _statusCodeField: 'or_statuscode',
+     _auditmanField: 'or_auditman',
+     _auditdateField:'or_auditdate',
      _relationColumn: 'ord_orid',
      _readUrl:'/api/money/othreceipts/read',
      _saveUrl:'/api/money/othreceipts/save',

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

@@ -14,6 +14,8 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      _codeField: 'os_code',
      _statusField: 'os_status',
      _statusCodeField: 'os_statuscode',
+     _auditmanField: 'os_auditman',
+     _auditdateField:'os_auditdate',
      _relationColumn: 'osd_osid',
      _readUrl:'/api/money/othspendings/read',
      _saveUrl:'/api/money/othspendings/save',

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

@@ -14,7 +14,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _codeField: 'pb_code',
     _statusField: 'pb_status',
     _statusCodeField: 'pb_statuscode',
-    
+    _auditmanField: 'pb_auditman',
+    _auditdateField:'pb_auditdate',
     _readUrl: '/api/money/paybalance/read',
     _saveUrl: '/api/money/paybalance/save',
     _auditUrl: '/api/money/paybalance/audit',

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

@@ -15,7 +15,8 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     _codeField: 'rb_code',
     _statusField: 'rb_status',
     _statusCodeField: 'rb_statuscode',
-    
+    _auditmanField: 'rb_auditman',
+    _auditdateField:'rb_auditdate',
     _readUrl: '/api/money/recbalance/read',
     _saveUrl: '/api/money/recbalance/save',
     _auditUrl: '/api/money/recbalance/audit',

frontend/saas-web/app/view/money/verification/FormPanel.js

@@ -16,7 +16,8 @@ Ext.define('saas.view.money.verification.FormPanel', {
     _codeField: 'vc_code',
     _statusField: 'vc_status',
     _statusCodeField: 'vc_statuscode',
-
+    _auditmanField: 'vc_auditman',
+    _auditdateField:'vc_auditdate',
     _readUrl: '/api/money/verification/read',
     _saveUrl: '/api/money/verification/save',
     _auditUrl: '/api/money/verification/audit',

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

@@ -14,7 +14,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
      _codeField: 'sa_code',
      _statusField: 'sa_status',
      _statusCodeField: 'sa_statuscode',
-     
+     _auditmanField: 'sa_auditman',
+     _auditdateField:'sa_auditdate',
      _relationColumn: 'sd_puid',
      _readUrl:'/api/sale/sale/read',
      _saveUrl:'/api/sale/sale/save',

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

@@ -14,7 +14,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     _codeField: 'pi_inoutno',
     _statusField: 'pi_status',
     _statusCodeField: 'pi_statuscode',
-    
+    _auditmanField: 'pi_auditman',
+    _auditdateField:'pi_auditdate',
     _relationColumn: 'pd_piid',
     _readUrl:'/api/sale/prodinout/read',
     _saveUrl:'/api/sale/prodinout/save',

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

@@ -14,7 +14,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     _codeField: 'pi_inoutno',
     _statusField: 'pi_status',
     _statusCodeField: 'pi_statuscode',
-    
+    _auditmanField: 'pi_auditman',
+    _auditdateField:'pi_auditdate',
     _relationColumn: 'pd_piid',
     _readUrl:'/api/sale/prodinout/read',
     _saveUrl:'/api/sale/prodinout/save',