فهرست منبع

请求结果解析

zhuth 7 سال پیش
والد
کامیت
761e78e37d
21فایلهای تغییر یافته به همراه47 افزوده شده و 63 حذف شده
  1. 6 2
      frontend/saas-web/app/model/money/RecBalance1.js
  2. 7 6
      frontend/saas-web/app/model/money/RecBalance2.js
  3. 1 0
      frontend/saas-web/app/model/purchase/prodIODetail.js
  4. 2 2
      frontend/saas-web/app/util/BaseUtil.js
  5. 3 6
      frontend/saas-web/app/util/FormUtil.js
  6. 1 2
      frontend/saas-web/app/view/core/baseform/GridPanel.js
  7. 7 9
      frontend/saas-web/app/view/core/form/FormPanelController.js
  8. 2 4
      frontend/saas-web/app/view/document/customer/panel/FormController.js
  9. 1 2
      frontend/saas-web/app/view/document/kind/ChildForm.js
  10. 1 2
      frontend/saas-web/app/view/document/kind/KindController.js
  11. 2 4
      frontend/saas-web/app/view/document/product/panel/FormController.js
  12. 2 4
      frontend/saas-web/app/view/document/vendor/panel/FormController.js
  13. 4 4
      frontend/saas-web/app/view/purchase/purchase/FormPanel.js
  14. 1 2
      frontend/saas-web/app/view/purchase/purchase/FormPanelController.js
  15. 1 2
      frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js
  16. 1 2
      frontend/saas-web/app/view/sale/sale/FormPanelController.js
  17. 1 2
      frontend/saas-web/app/view/sale/saleOut/FormPanelController.js
  18. 1 2
      frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js
  19. 1 2
      frontend/saas-web/app/view/stock/make/FormPanelController.js
  20. 1 2
      frontend/saas-web/app/view/stock/otherIn/FormPanelController.js
  21. 1 2
      frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

+ 6 - 2
frontend/saas-web/app/model/money/RecBalance1.js

@@ -1,9 +1,13 @@
 Ext.define('saas.model.money.RecBalance1', {
     extend: 'saas.model.Base',
     fields: [
-        { name: 'rd_detno', type: 'number' },
+        { name: 'id', type: 'int' },
+        { name: 'rd_detno', type: 'int' },
+        { name: 'rd_ym', type: 'int' },
+        { name: 'rd_bankid', type: 'int' },
+        { name: 'rd_bankcode', type: 'string' },
         { name: 'rd_bankname', type: 'string' },
-        { name: 'rd_amount', type: 'number' },
+        { name: 'rd_amount', type: 'float' },
         { name: 'rd_paymethod', type: 'string' },
         { name: 'rd_paycode', type: 'string' },
         { name: 'rd_remark', type: 'string' }

+ 7 - 6
frontend/saas-web/app/model/money/RecBalance2.js

@@ -1,14 +1,15 @@
 Ext.define('saas.model.money.RecBalance2', {
     extend: 'saas.model.Base',
     fields: [
-        { name: 'rbd_detno', type: 'number' },
+        { name: 'id', type: 'int' },
+        { name: 'rbd_detno', type: 'int' },
+        { name: 'rbd_ym', type: 'int' },
+        { name: 'rbd_slid', type: 'int' },
         { name: 'rbd_slcode', type: 'string' },
         { name: 'rbd_slkind', type: 'string' },
         { name: 'rbd_sldate', type: 'date' },
-        { name: 'rbd_amount', type: 'number' },
-        { name: 'rbd_remark', type: 'number' },
-        { name: 'pbd_nowbalance', type: 'number' },
-        { name: 'pbd_nowbalance', type: 'number' },
-        { name: 'pbd_nowbalance', type: 'number' }
+        { name: 'rbd_amount', type: 'float' },
+        { name: 'rbd_nowbalance', type: 'float' },
+        { name: 'rbd_remark', type: 'string' }
     ]
 });

+ 1 - 0
frontend/saas-web/app/model/purchase/prodIODetail.js

@@ -36,6 +36,7 @@ Ext.define('saas.model.purchase.ProdIODetail', {
         { name: 'pd_yqty', type: 'int' },
         { name: 'pd_remark', type: 'string' },
         { name: 'pd_ioid', type: 'int' },
+        { name: 'pd_delivery', type: 'date' }
     ],
     //一对一映射
     associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'product'}]

+ 2 - 2
frontend/saas-web/app/util/BaseUtil.js

@@ -27,12 +27,12 @@ Ext.define('saas.util.BaseUtil', {
                 success: function (response, opts) {
                     var res = Ext.decode(response.responseText);
                     if(res.success) {
-                        return resolve(response);
+                        return resolve(res);
                     }else {
                         // Ext.toast(res.message || '请求错误');
                         console.error('server request failure with code ' + res.code + '.');
                         console.error('failure message: ' + res.message);
-                        return reject(response);
+                        return reject(res);
                     }
                 },
                 failure: function (response, opts) {

+ 3 - 6
frontend/saas-web/app/util/FormUtil.js

@@ -23,8 +23,7 @@ Ext.define('saas.util.FormUtil', {
         brr = brr.concat(form.defaultItems);
 
         this.BaseUtil.request({url, async: false})
-        .then(function(response) {
-            var res = Ext.decode(response.responseText);
+        .then(function(res) {
             if(res.success) {
                 var config = res.data || true, items = defaultItems || [];
                 if(config) {
@@ -88,9 +87,8 @@ Ext.define('saas.util.FormUtil', {
         if(form.initId && form.initId!=0) {
             var url = form._readUrl + form.initId;
             me.BaseUtil.request({url })
-            .then(function(response) {
+            .then(function(res) {
                 form.setLoading(false);
-                var res = Ext.decode(response.responseText);
                 if(res.success) {
                     var d = res.data;
                     var o = {
@@ -123,9 +121,8 @@ Ext.define('saas.util.FormUtil', {
                     caller:form.caller
                 },
                 method: 'POST',
-            }).then(function(response) {
+            }).then(function(res) {
                 form.setLoading(false);
-                var res = Ext.decode(response.responseText);
                 if(res.success){
                     var code = res.data;
                     var viewModel = form.getViewModel();

+ 1 - 2
frontend/saas-web/app/view/core/baseform/GridPanel.js

@@ -179,8 +179,7 @@ Ext.define('saas.view.core.baseform.GridPanel', {
                         url: form._deleteUrl+id,
                         method: 'POST',
                     })
-                    .then(function(res) {
-                        var localJson = new Ext.decode(res.responseText);
+                    .then(function(localJson) {
                         if(localJson.success){
                             //解析参数
                             Ext.Msg.alert('提示','删除成功');

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

@@ -31,8 +31,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 url: form._deleteUrl+id.value,
                 method: 'POST',
             })
-            .then(function(res) {
-                var localJson = new Ext.decode(res.responseText);
+            .then(function(localJson) {
                 if(localJson.success){
                     var mainTab = Ext.getCmp('main-tab-panel');
                     mainTab.getActiveTab().close();
@@ -111,15 +110,15 @@ Ext.define('saas.view.core.form.FormPanelController', {
             params: JSON.stringify(params),
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.toast('保存成功');
                 form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
             }
         })
-        .catch(function() {
+        .catch(function(e) {
+            console.error(e);
             Ext.toast('保存失败');
         });
     },
@@ -181,8 +180,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
             params: JSON.stringify(params),
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.toast('审核成功');
                 form.initId = localJson.data.id;
@@ -190,8 +188,8 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 viewModel.set('base.editable', false);
             }
         })
-        .catch(function() {
-            Ext.toast('审核失败');
+        .catch(function(res) {
+            Ext.toast('审核失败: ' + res.message);
         });
     },
     unAudit: function() {

+ 2 - 4
frontend/saas-web/app/view/document/customer/panel/FormController.js

@@ -220,8 +220,7 @@ Ext.define('saas.view.document.customer.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','启用成功');
                 form.initId = localJson.data.id;
@@ -243,8 +242,7 @@ Ext.define('saas.view.document.customer.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','禁用成功');
                 form.initId = localJson.data.id;

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

@@ -157,8 +157,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             params: JSON.stringify(params),
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','保存成功');
                 var grid = form.ownerCt._parent.lookup('document-kind-Grid');

+ 1 - 2
frontend/saas-web/app/view/document/kind/KindController.js

@@ -82,8 +82,7 @@ Ext.define('saas.view.document.kind.KindController', {
             url: view.etc[dataKind].delUrl+'/'+keyV,
             method: 'POST'
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','删除成功');
                 grid.store.load();

+ 2 - 4
frontend/saas-web/app/view/document/product/panel/FormController.js

@@ -219,8 +219,7 @@ Ext.define('saas.view.document.product.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','启用成功');
                 form.initId = localJson.data.id;
@@ -242,8 +241,7 @@ Ext.define('saas.view.document.product.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','禁用成功');
                 form.initId = localJson.data.id;

+ 2 - 4
frontend/saas-web/app/view/document/vendor/panel/FormController.js

@@ -219,8 +219,7 @@ Ext.define('saas.view.document.vendor.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','启用成功');
                 form.initId = localJson.data.id;
@@ -242,8 +241,7 @@ Ext.define('saas.view.document.vendor.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','禁用成功');
                 form.initId = localJson.data.id;

+ 4 - 4
frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -187,14 +187,15 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 xtype : "numbercolumn"
             }, 
             {
-                text : "未税金额", 
+                text : "未税金额", 
                 dataIndex : "pd_taxtotal", 
+                width : 120.0, 
                 xtype : "numbercolumn"
             },{
                 text : "需求日期", 
                 dataIndex : "pd_delivery", 
-                flex : 1.0, 
                 xtype:'datecolumn',
+                width : 120.0, 
                 format : "Y-m-d H:i:s", 
                 editor : {
                     xtype : "datefield",
@@ -206,8 +207,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             {
                 text : "关联销售单号", 
                 dataIndex : "pd_salecode", 
-                width : 120.0,
-                flex : 1.0
+                width : 120.0
             }
         ]
     }, {

+ 1 - 2
frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -200,8 +200,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

+ 1 - 2
frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -158,8 +158,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             url: form._turnOutUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

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

@@ -119,8 +119,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             url: form._turnOutUrl+id.value,
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
             }

+ 1 - 2
frontend/saas-web/app/view/sale/saleOut/FormPanelController.js

@@ -186,8 +186,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

+ 1 - 2
frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -144,8 +144,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

+ 1 - 2
frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -200,8 +200,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

+ 1 - 2
frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -144,8 +144,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

+ 1 - 2
frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -143,8 +143,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');