zhuth 6 anni fa
parent
commit
9868d07225

+ 13 - 1
frontend/saas-web/app/view/main/Navigation.js

@@ -96,7 +96,19 @@ Ext.define('saas.view.main.Navigation', {
                 if(item.items.length>0){
                 if(item.items.length>0){
                     var l = item.items.length;
                     var l = item.items.length;
                     for(var i = 0;i<l;i++){
                     for(var i = 0;i<l;i++){
-                        if(item.items[i].b2b){
+                        if(item.items[i].hasOwnProperty('b2b') && item.items[i].b2b == true){
+                            item.items.splice(i--,1);
+                            l--;
+                        }
+                    };
+                }
+            })
+        }else {
+            Ext.each(menuItems,function(item,index){
+                if(item.items.length>0){
+                    var l = item.items.length;
+                    for(var i = 0;i<l;i++){
+                        if(item.items[i].hasOwnProperty('b2b') && item.items[i].b2b == false){
                             item.items.splice(i--,1);
                             item.items.splice(i--,1);
                             l--;
                             l--;
                         }
                         }

+ 77 - 0
frontend/saas-web/app/view/sale/b2b/RecDataList.js

@@ -0,0 +1,77 @@
+/**
+ * 应收对账单
+ */
+Ext.define('saas.view.sale.b2b.RecDataList', {
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'sale-b2b-recdatalist',
+
+    viewName: 'sale-b2b-recdatalist',
+
+
+    // dataUrl: 'http://10.1.80.35:8560/api/sale/saledown/list',
+    dataUrl: '/api/sale/saledown/list',
+
+    initComponent: function() {
+        var me = this;
+        Ext.apply(this, {
+            searchField: [{
+                xtype: 'textfield',
+                emptyText: '请输入客户名称'
+            }, {
+                xtype: 'condatefield',
+                fieldLabel: '日期',
+                columnWidth: 0.5
+            }],
+            gridConfig: {
+                idField: null,
+                codeField: null,
+                statusCodeField: null,
+                dataUrl: me.dataUrl,
+                caller: null,
+                rootProperty: 'data.list',
+                totalProperty: 'data.total',
+                actionColumn: [],
+                selModel: {
+                    type: 'cellmodel'
+                },
+                hiddenTools: true,
+                data: [],
+                columns : [{
+                    text: '客户名称',
+                    dataIndex: 'khmc',
+                    width: 200
+                }, {
+                    text: '币别',
+                    dataIndex: 'bb',
+                }, {
+                    text: '本期应收',
+                    dataIndex: 'bqys'
+                }, {
+                    text: '本期发货',
+                    dataIndex: 'bqfh'
+                }, {
+                    text: '本期未对账',
+                    dataIndex: 'bqwdz'
+                }, {
+                    text: '本期已对账',
+                    dataIndex: 'bqydz'
+                }, {
+                    text: '本期已收',
+                    dataIndex: 'bqys'
+                }, {
+                    text: '应收总额',
+                    dataIndex: 'ysze'
+                }, {
+                    text: '操作',
+                    dataIndex: 'xx',
+                    ignore: true,
+                    renderer: function() {
+                        return '<span style="color: blue;">明细</span>';
+                    }
+                }]
+            }
+        });
+
+        me.callParent(arguments);
+    }
+});

+ 9 - 7
frontend/saas-web/resources/json/navigation.json

@@ -23,20 +23,15 @@
             "id": "deviceQuery",
             "id": "deviceQuery",
             "text": "器件查询",
             "text": "器件查询",
             "viewType": "purchase-b2b-devicequery-datalist"
             "viewType": "purchase-b2b-devicequery-datalist"
-        },{
-            "b2b":true,
-            "id": "sendQuotation",
-            "text": "发起询价",
-            "viewType": "purchase-b2b-sendquotation-datalist"
         },{
         },{
             "b2b":true,
             "b2b":true,
             "id": "quotationList",
             "id": "quotationList",
-            "text": "询价信息查询",
+            "text": "采购询价",
             "viewType": "purchase-b2b-quotationList-datalist"
             "viewType": "purchase-b2b-quotationList-datalist"
         },{
         },{
             "b2b":true,
             "b2b":true,
             "id":"reconciliation",  
             "id":"reconciliation",  
-            "text":"平台对账单",  
+            "text":"应付对账单",  
             "viewType": "purchase-b2b-reconciliation-datalist"
             "viewType": "purchase-b2b-reconciliation-datalist"
         }]
         }]
     }, {
     }, {
@@ -50,6 +45,7 @@
             "text": "采购付款一览表",
             "text": "采购付款一览表",
             "viewType": "purchase-report-purchasepay"
             "viewType": "purchase-report-purchasepay"
         }, {
         }, {
+            "b2b": false,
             "text": "供应商对账单",
             "text": "供应商对账单",
             "id": "monry-report-vendorcheck",
             "id": "monry-report-vendorcheck",
             "viewType":"monry-report-vendorcheck"
             "viewType":"monry-report-vendorcheck"
@@ -95,6 +91,11 @@
             "id": "sale-b2b-purchase",
             "id": "sale-b2b-purchase",
             "text": "客户采购单",
             "text": "客户采购单",
             "viewType": "sale-b2b-purchase"  
             "viewType": "sale-b2b-purchase"  
+        },{
+            "b2b":true,
+            "id":"sale-b2b-recdatalist",  
+            "text":"应收对账单",  
+            "viewType": "sale-b2b-recdatalist"
         }]
         }]
     }, {
     }, {
         "text": "报表",
         "text": "报表",
@@ -115,6 +116,7 @@
             "id": "monry-report-profitdetail",
             "id": "monry-report-profitdetail",
             "viewType":"monry-report-profitdetail"
             "viewType":"monry-report-profitdetail"
         },{
         },{
+            "b2b": false,
             "text": "客户对账单",
             "text": "客户对账单",
             "id": "monry-report-customercheck",
             "id": "monry-report-customercheck",
             "viewType":"monry-report-customercheck"
             "viewType":"monry-report-customercheck"