ソースを参照

res.data判空,首页采购未入库,销售未出库,等界面物料顺序补充调整。

rainco 7 年 前
コミット
68c6cf105e

+ 14 - 6
frontend/saas-web/app/view/home/infoCardList/PurchaseIn.js

@@ -52,17 +52,21 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         dataIndex: 'pd_prodcode',
         width: 150
     }, {
-        text: '物料名称',
+        text: '品牌',
         dataIndex: 'pr_detail',
         width: 200
     }, {
-        text: '物料规格',
+        text: '名称',
+        dataIndex: 'pr_detail',
+        width: 200
+    }, {
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
+    }, {
+        text: '规格',
         dataIndex: 'pr_spec',
         width: 150
-    }, {
-        text: '单位',
-        dataIndex: 'pr_unit',
-        width: 80
     }, {
         text: '采购数量',
         dataIndex: 'pd_qty',
@@ -74,6 +78,10 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         },
+    }, {
+        text: '单位',
+        dataIndex: 'pr_unit',
+        width: 80
     }, {
         text: '需求日期',
         dataIndex: 'pd_delivery',

+ 18 - 2
frontend/saas-web/app/view/home/infoCardList/SaleOut.js

@@ -52,11 +52,23 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         dataIndex: 'sd_prodcode',
         width: 150
     }, {
-        text: '物料名称',
+        text: '品牌',
         dataIndex: 'pr_detail',
         width: 200
     }, {
-        text: '物料规格',
+        text: '名称',
+        dataIndex: 'pr_detail',
+        width: 200
+    }, {
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
+    }, {
+        text: '规格',
+        dataIndex: 'pr_spec',
+        width: 150
+    }, {
+        text: '规格',
         dataIndex: 'pr_spec',
         width: 150
     }, {
@@ -70,6 +82,10 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         },
+    }, {
+        text: '单位',
+        dataIndex: 'pr_unit',
+        width: 80
     }, {
         text: '单价(元)',
         dataIndex: 'sd_price',

+ 2 - 2
frontend/saas-web/app/view/main/MainController.js

@@ -143,8 +143,8 @@ Ext.define('saas.view.main.MainController', {
             },
             success: function(fp, o){
                 var res = Ext.decode(fp.responseText);
-                me.InvitationList = res.data.list;
-                if(res.data.list.length>0){
+                me.InvitationList = res.data == null ?[]:res.data.list;
+                if(res.data&&res.data.list.length>0){
                     hasInvitationMsg = true;
                 }else{
                     hasInvitationMsg = false;

+ 2 - 2
frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -50,7 +50,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '供应商编号',
         dataIndex: 'pu_vendcode',
-        width: 150
+        hidden: true
     }, {
         text: '供应商名称',
         dataIndex: 'pu_vendname',
@@ -116,7 +116,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         }
     }, {
         text: '单位',
-        dataIndex: 'pd_unit',
+        dataIndex: 'pr_unit',
         width: 80
     }, {
         text: '单价(元)',

+ 0 - 5
frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -35,11 +35,6 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         text: '付款单号',
         dataIndex: 'pb_code',
         width: 150
-    }, {
-        text: '供应商编号',
-        id: 'pu_vendcode',
-        dataIndex: 'pu_vendcode',
-        width: 150
     }, {
         text: '供应商名称',
         dataIndex: 'pu_vendname',

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

@@ -49,7 +49,7 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {
         text: '客户编号',
         dataIndex: 'sa_custcode',
-        width: 150
+        hidden: true
     }, {
         text: '客户名称',
         dataIndex: 'sa_custname',
@@ -108,7 +108,7 @@ Ext.define('saas.view.sale.report.Sale', {
         }
     }, {
         text: '单位',
-        dataIndex: 'pd_unit',
+        dataIndex: 'pr_unit',
         width: 80
     }, {
         text: '单价(元)',

+ 1 - 1
frontend/saas-web/app/view/sale/report/SaleProfit.js

@@ -98,7 +98,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         }
     }, {
         text: '单位',
-        dataIndex: 'pd_unit',
+        dataIndex: 'pr_unit',
         width: 80
     }, {
         text: '含税单价(元)',