Browse Source

销售出货单反审核完善

rainco 7 years ago
parent
commit
b19d26f576

+ 6 - 6
frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -222,11 +222,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         });
     },
     onAudit: function(me){
-        console.log('审核');
         me.up('grid').vastOperation("batchAudit");
     },
     onUnAudit:function(me){
-        console.log('反审核');
         me.up('grid').vastOperation("batchUnAudit");
     },
     onPrint: function (me) {
@@ -242,10 +240,8 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         console.log("导出");
     },
     onCloseOrder:function(me){
-        console.log("关闭订单");
         me.up('grid').vastOperation("batchClose");
     },onOpenOrder:function(me){
-        console.log("开启订单");
         me.up('grid').vastOperation("batchOpen");
     },
     onDelete: function (btn) {
@@ -262,8 +258,12 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 method: 'POST',
                 async:false
             })
-            .then(function() {
-                showToast('操作成功');
+            .then(function(res) {
+                if(res.data){
+                    showToast(res.data);
+                }else{
+                    showToast('操作成功');
+                }
                 me.getStore().loadPage(1);
             })
             .catch(function(res) {

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

@@ -17,6 +17,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
      _relationColumn: 'ftd_ftid',
      _readUrl:'/api/money/fundtransfer/read/',
      _saveUrl:'/api/money/fundtransfer/save',
+     _auditUrl:'/api/money/fundtransfer/audit/',
+     _unAuditUrl: '/api/money/fundtransfer/unAudit/',
      _deleteUrl:'/api/money/fundtransfer/delete/',
      initId:0,
 

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

@@ -16,7 +16,9 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _statusCodeField: 'or_statuscode',
      _relationColumn: 'ord_orid',
      _readUrl:'/api/money/othreceipts/read/',
-     _saveUrl:'/api/money/othreceipts/save',
+     _saveUrl:'/api/money/othreceipts/save/',
+     _auditUrl:'/api/money/othreceipts/audit/',
+     _unAuditUrl: '/api/money/othreceipts/unAudit/',
      _deleteUrl:'/api/money/othreceipts/delete/',  
      initId:0,
 

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

@@ -16,7 +16,9 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      _statusCodeField: 'os_statuscode',
      _relationColumn: 'osd_orid',
      _readUrl:'/api/money/othspendings/read/',
-     _saveUrl:'/api/money/othspendings/save',
+     _saveUrl:'/api/money/othspendings/save/',
+     _auditUrl:'/api/money/othspendings/audit/',
+     _unAuditUrl: '/api/money/othspendings/unAudit/',
      _deleteUrl:'/api/money/othspendings/delete/', 
      initId:0,
 

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

@@ -17,8 +17,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
      
      _relationColumn: 'sd_puid',
      _readUrl:'/api/sale/sale/read/',
-     _saveUrl:'/api/sale/sale/save',
-     _auditUrl:'/api/sale/sale/audit',
+     _saveUrl:'/api/sale/sale/save/',
+     _auditUrl:'/api/sale/sale/audit/',
      _unAuditUrl: '/api/sale/sale/unAudit/',
      _deleteUrl:'/api/sale/sale/delete/',
      _turnOutUrl:'/api/sale/sale/turnProdOut/', 

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

@@ -17,9 +17,9 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     
     _relationColumn: 'pd_piid',
     _readUrl:'/api/sale/prodinout/read/',
-    _saveUrl:'/api/sale/prodinout/save',
-    _auditUrl:'/api/sale/prodinout/audit',
-    _unAuditUrl: '/api/sale/prodinout/unAudit',
+    _saveUrl:'/api/sale/prodinout/save/',
+    _auditUrl:'/api/sale/prodinout/audit/',
+    _unAuditUrl:'/api/sale/prodinout/unAudit/',
     _deleteUrl:'/api/sale/prodinout/delete/',
     _turnInUrl:'/api/sale/prodinout/turnProdIn/',
     initId:0,

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

@@ -17,8 +17,9 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     
     _relationColumn: 'pd_piid',
     _readUrl:'/api/sale/prodinout/read/',
-    _saveUrl:'/api/sale/prodinout/save',
-    _auditUrl:'/api/sale/prodinout/audit',
+    _saveUrl:'/api/sale/prodinout/save/',
+    _auditUrl:'/api/sale/prodinout/audit/',
+    _unAuditUrl:'/api/sale/prodinout/unAudit/',
     _deleteUrl:'/api/sale/prodinout/delete/',
     _turnInUrl:'/api/sale/prodinout/turnProdIn/',
     initId:0,
@@ -26,7 +27,10 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     toolBtns: [{
         xtype: 'button',
         text: '转销售验退',
-        handler: 'turnProdIn'
+        handler: 'turnProdIn',
+        bind: {
+            hidden: '{pi_statuscode!="AUDITED"}'
+        }
     }],
 
     defaultItems: [{