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

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -163,4 +163,8 @@ public class SaleController {
         return Result.success();
     }
 
+    @GetMapping("/test")
+    public String test() {
+        return "配置构建success";
+    }
 }

frontend/saas-web/app.json

@@ -316,7 +316,7 @@
             "delay": 250
         },
         "server": {
-            "basePath": "http://192.168.0.181:8570",
+            "basePath": "http://192.168.0.181:8560",
             "urlPattern": "^\/api\/"
         }
     },

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.FundTransfer',
         detnoColumn:  'ftd_detno',
-        deleteDetailUrl:basePath+'fundtransfer/deleteItem/',
+        deleteDetailUrl:'/api/fundtransfer/deleteItem/',
         columnWidth : 1,
         columns : [
             {

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

@@ -15,9 +15,9 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _statusField: 'or_status',
      _statusCodeField: 'or_statuscode',
      _relationColumn: 'ord_orid',
-     _readUrl:basePath+'money/othreceipts/read/',
-     _saveUrl:basePath+'money/othreceipts/save',
-     _deleteUrl:basePath+'money/othreceipts/delete/',  
+     _readUrl:'/api/money/othreceipts/read/',
+     _saveUrl:'/api/money/othreceipts/save',
+     _deleteUrl:'/api/money/othreceipts/delete/',  
      initId:0,
 
     defaultItems: [{

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

@@ -45,7 +45,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         addTitle: '其它收入单',
         addXtype: 'money-othreceipts-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'money/othreceipts/',
+        baseVastUrl: '/api/money/othreceipts/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

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

@@ -15,9 +15,9 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      _statusField: 'os_status',
      _statusCodeField: 'os_statuscode',
      _relationColumn: 'osd_orid',
-     _readUrl:basePath+'money/othspendings/read/',
-     _saveUrl:basePath+'money/othspendings/save',
-     _deleteUrl:basePath+'money/othspendings/delete/', 
+     _readUrl:'/api/money/othspendings/read/',
+     _saveUrl:'/api/money/othspendings/save',
+     _deleteUrl:'/api/money/othspendings/delete/', 
      initId:0,
 
     defaultItems: [{

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

@@ -18,6 +18,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _readUrl: '/api/money/paybalance/read/',
     _saveUrl: '/api/money/paybalance/save/',
     _auditUrl: '/api/money/paybalance/audit/',
+    _unAuditUrl: 'api/money/paybalance/unAudit/',
     _deleteUrl: '/api/money/paybalance/delete/',
 
     // _readUrl: 'http://192.168.253.129:8940/money/paybalance/read/',

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

@@ -106,7 +106,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         xtype : "detailGridField",
         storeModel:'saas.model.document.ProductDTO',
         // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
-        deleteDetailUrl:basePath+'purchase/prodinout/deleteDetail/',
+        deleteDetailUrl:'api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -101,7 +101,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         xtype : "detailGridField",
         storeModel:'saas.model.document.ProductDTO',
         // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
-        deleteDetailUrl:basePath+'purchase/prodinout/deleteDetail/',
+        deleteDetailUrl:'api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
             {