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

frontend/saas-web/app/view/money/report/OtherIODetail.js

@@ -0,0 +1,70 @@
+/**
+ * 其他收支明细表
+ */
+Ext.define('saas.view.money.report.OtherIODetail', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-otheriodetail',
+
+    controller: 'money-report-otheriodetail',
+    viewModel: 'money-report-otheriodetail',
+
+    viewName: 'money-report-otheriodetail',
+
+    groupField: null,
+    // listUrl: '/api/money/report/recDetail',
+    defaultCondition: null,
+    reportTitle: '其他收支明细表',
+    QueryWidth: 0.25,
+    searchItems: [{
+        xtype: 'customerDbfindTrigger',
+        name: 'pi_custname',
+        fieldLabel: '资金账户',
+        columnWidth: 0.25
+    }, {
+        xtype : "remotecombo", 
+        storeUrl:'/api/document/customerkind/getCombo',
+        name : "cu_type", 
+        emptyText : "收支类别", 
+        columnWidth: 0.25,
+        hiddenBtn:true
+    }, {
+        xtype: 'condatefield',
+        name: 'rb_date',
+        fieldLabel: '日期',
+        columnWidth: 0.25
+    }],
+
+    reportColumns: [{
+        text: '日期',
+        dataIndex: 'pi_inoutno',
+        width: 200
+    }, {
+        text: '单据编号',
+        dataIndex: 'pi_custcode',
+        width: 200,
+    }, {
+        text: '收支类别',
+        dataIndex: 'pi_custname',
+        width: 200,
+    }, {
+        text: '资金账户',
+        dataIndex: 'pi_class',
+        width: 150
+    }, {
+        text: '收入',
+        dataIndex: 'pu_buyername',
+        width: 150
+    }, {
+        text: '支出',
+        dataIndex: 'rb_date',
+        width: 150
+    }, {
+        text: '往来单位',
+        dataIndex: 'pd_pdno',
+        width: 150,
+    }, {
+        text: '备注',
+        dataIndex: 'cu_beginaramount',
+        width: 150
+    }]
+});

frontend/saas-web/app/view/money/report/OtherIODetailController.js

@@ -0,0 +1,5 @@
+Ext.define('saas.view.money.report.OtherIODetailController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-otheriodetail',
+    
+});

frontend/saas-web/app/view/money/report/OtherIODetailModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.OtherIODetailModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-otheriodetail'
+});

frontend/saas-web/app/view/money/report/ProfitDetail.js

@@ -0,0 +1,70 @@
+/**
+ * 毛利润分析表
+ */
+Ext.define('saas.view.money.report.ProfitDetail', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-profitdetail',
+
+    controller: 'money-report-profitdetail',
+    viewModel: 'money-report-profitdetail',
+
+    viewName: 'money-report-profitdetail',
+
+    groupField: null,
+    listUrl: '/api/money/report/recDetail',
+    defaultCondition: null,
+    reportTitle: '毛利润分析表',
+    QueryWidth: 0.25,
+    searchItems: [{
+        xtype: 'customerDbfindTrigger',
+        name: 'pi_custname',
+        fieldLabel: '客户名称',
+        columnWidth: 0.25
+    }, {
+        xtype : "remotecombo", 
+        storeUrl:'/api/document/customerkind/getCombo',
+        name : "cu_type", 
+        emptyText : "客户类型", 
+        columnWidth: 0.25,
+        hiddenBtn:true
+    }, {
+        xtype: 'condatefield',
+        name: 'rb_date',
+        fieldLabel: '日期',
+        columnWidth: 0.25
+    }],
+
+    reportColumns: [{
+        text: '客户编号',
+        dataIndex: 'pi_inoutno',
+        width: 200
+    }, {
+        text: '客户类型',
+        dataIndex: 'pi_custcode',
+        width: 200,
+    }, {
+        text: '业务员',
+        dataIndex: 'pi_custname',
+        width: 200,
+    }, {
+        text: '销售总额',
+        dataIndex: 'pi_class',
+        width: 150
+    }, {
+        text: '不含税金额',
+        dataIndex: 'pu_buyername',
+        width: 150
+    }, {
+        text: '成本金额',
+        dataIndex: 'rb_date',
+        width: 150
+    }, {
+        text: '毛利润',
+        dataIndex: 'pd_pdno',
+        width: 150,
+    }, {
+        text: '毛利率',
+        dataIndex: 'cu_beginaramount',
+        width: 150
+    }]
+});

frontend/saas-web/app/view/money/report/ProfitDetailController.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.ProfitDetailController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-profitdetail',
+});

frontend/saas-web/app/view/money/report/ProfitDetailModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.ProfitDetailModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-profitdetail'
+});

frontend/saas-web/app/view/money/report/TotalPayDetail.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
     listUrl: '/api/money/report/vendormonthdetails',
     // listUrl: 'http://192.168.253.139:8560/api/money/report/vendormonthdetails',
     defaultCondition: null,
-    reportTitle: '应收总账',
+    reportTitle: '应付总账',
     QueryWidth: 0.35,
     allowPaging: false,