Merge remote-tracking branch 'origin/dev' into dev

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

@@ -39,14 +39,14 @@ Ext.define('saas.view.money.report.AccountBalance', {
         text: '账户名称',
         dataIndex: 'bankname',
         width: 150
-    }, {
-        text: '业务类型',
-        dataIndex: 'kind',
-        width: 100
     },{
         text: '币别',
         dataIndex: 'currency',
         width: 80,
+    }, {
+        text: '业务类型',
+        dataIndex: 'kind',
+        width: 100
     }, {
         text: '收入(元)',
         dataIndex: 'inamount',

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

@@ -88,7 +88,7 @@ Ext.define('saas.view.money.report.PayDetail', {
         renderer : function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
-        summaryLabel: '应收余额(合计)',
+        summaryLabel: '应付余额(合计)',
         summaryType: 'customize_last',
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -353,6 +353,11 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     dataIndex: "pd_ordercode",
                     width: 150.0,
                     ignore: true,
+                },{
+                    text: "对账状态",
+                    dataIndex: "apcheckStatus",
+                    width: 100.0,
+                    ignore: true,
                 }, {
                     text: "备注",
                     dataIndex: "pd_remark",

frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -351,6 +351,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     dataIndex: "iocode",
                     width: 150.0,
                     ignore: true
+                },{
+                    text: "对账状态",
+                    dataIndex: "apcheckStatus",
+                    width: 100.0,
+                    ignore: true,
                 }, {
                     text: "备注",
                     dataIndex: "pd_remark",

frontend/saas-web/app/view/sale/b2b/Purchase.js

@@ -17,43 +17,43 @@ Ext.define('saas.view.sale.b2b.Purchase', {
         Ext.apply(this, {
             searchField: [{
                 xtype: 'textfield',
-                name: 'keyword',
+                name: 'sa_custname',
                 columnWidth: 0.15,
                 emptyText:'请输入客户名称'
             }, {
                 xtype: 'condatefield',
-                name: 'date',
+                name: 'createTime',
                 fieldLabel: '日期',
                 columnWidth: 0.5,
                 labelWidth: 50,
             }, {
                 xtype: 'textfield',
-                name: 'keyword',
+                name: 'sa_salecode',
                 labelWidth: 0,
                 columnWidth: 0.15,
                 emptyText: '销售单号'
             }, {
                 xtype: 'checkbox',
-                name: 'status',
+                name: 'sa_sendstatus',
                 fieldLabel: '已结案',
                 columnWidth: 0.1,
                 labelWidth: 50,
                 getCondition: function(v) {
                     if(v) {
-                        return 'status=' + Number(v);
+                        return "sa_sendstatus='已关闭'";
                     }else {
                         return '1=1';
                     }
                 }
             }, {
                 xtype: 'checkbox',
-                name: 'status',
+                name: 'sa_sendstatus',
                 fieldLabel: '待出货',
                 columnWidth: 0.1,
                 labelWidth: 50,
                 getCondition: function(v) {
                     if(v) {
-                        return 'status=' + Number(v);
+                        return "sa_sendstatus='未出库'";
                     }else {
                         return '1=1';
                     }
@@ -169,35 +169,5 @@ Ext.define('saas.view.sale.b2b.Purchase', {
         }
 
         return conditionValue;
-    },
-
-    getExtraParams: function(store, op, condition) {
-        var temp = {};
-
-        for(let x = 0; x < condition.length; x++) {
-            let c = condition[x];
-            if(c.field == 'keyword') {
-                temp.keyword = c.value;
-            }else if(c.field == 'date') {
-                temp.fromDate = new Date(c.value.split(',')[0]).getTime();
-                temp.endDate = new Date(c.value.split(',')[1]).getTime();
-            }else if(c.field == 'quoted') {
-                temp.quoted = c.value == 'all' ? null : c.value;
-            }else if(c.field == 'closed') {
-                // temp.endDate = c.value == 'all' ? null : (
-                //     c.value == '0' ? 
-                // );
-            }
-        }
-        let obj = {
-            pageNumber: store.exportNumber?store.exportNumber:op._page,
-            pageSize: store.exportPageSize?store.exportPageSize:store.pageSize
-        };
-        for(let k in temp) {
-            if(!!temp[k]) {
-                obj[k] = temp[k];
-            }
-        }
-        return obj;
-     },
+    }
 });

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

@@ -124,7 +124,7 @@ Ext.define('saas.view.sale.b2b.RecDataList', {
                             var idValue = record.get('apId'),
                             id = 'sale-b2b-recformpanel-formpanel-' + idValue;
                             var ar_date = tableView.ownerCt.ownerCt.down('[name=ar_date]');
-                            saas.util.BaseUtil.openTab('sale-b2b-recformpanel-formpanel', "应收对账单("+idValue+")", id, {
+                            saas.util.BaseUtil.openTab('sale-b2b-recformpanel-formpanel', "应收对账单", id, {
                                 currency:record.get('currency'),
                                 customerUU:record.get('custUU'),
                                 suuorname:record.get('custName'),

frontend/saas-web/app/view/sale/b2b/recformpanel/FormPanel.js

@@ -94,10 +94,10 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanel', {
             checkOnly:true,
             type:'checkboxmodel',
             hideCheckField:'haveChecked',
-            hideCheckVal:'已对账',
+            hideCheckVal:1,
             listeners:{
                 select:function(selModel,record,c,d){
-                    if(record.get('haveChecked')=='已对账'){
+                    if(record.get('haveChecked')==1){
                         selModel.deselect(record)
                     }
                 }
@@ -122,6 +122,14 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanel', {
             text: "对账状态",
             width: 100.0,
             dataIndex: "haveChecked",
+            renderer:function(v,m,r){
+                if(v==0){
+                    return '未对账'
+                }else if(v==1){
+                    return '已对账'
+                }
+                return v;
+            }
         }, { 
             text: "客户PO",
             width: 140.0,
@@ -159,7 +167,7 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanel', {
             xtype:'numbercolumn',
             ignore: true,
             renderer: function (v, m, r) {
-                return saas.util.BaseUtil.numberFormat(v, 0, false);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         },{
             text: "发货数量",
@@ -168,7 +176,7 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanel', {
             dataIndex: "qty",
             ignore: true,
             renderer: function (v, m, r) {
-                return saas.util.BaseUtil.numberFormat(v, 0, false);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         },{
             text: "含税单价",
@@ -177,7 +185,7 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanel', {
             dataIndex: "orderprice",
             ignore: true,
             renderer: function (v, m, r) {
-                return saas.util.BaseUtil.numberFormat(v, 2, false);
+                return saas.util.BaseUtil.numberFormat(v, 4, false);
             }
         },{
             text: "税率%",
@@ -194,7 +202,7 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanel', {
             width: 100.0,
             dataIndex: "money",
             renderer: function (v, m, r) {
-                return saas.util.BaseUtil.numberFormat(v, 2, false);
+                return saas.util.BaseUtil.numberFormat(v, 4, false);
             }
         },{
             text: "对账人",
@@ -220,6 +228,7 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanel', {
             xtype: 'combo',
             displayField: 'display',
             value:me.currency,
+            editable:false,
             valueField: 'value',
             emptyText: '请选择',
             fieldLabel:'币别',
@@ -283,14 +292,6 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanel', {
                     thisPeriodSendAmount : main.thisPeriodSendAmount?main.thisPeriodSendAmount.amount:'',
                     totalCount : main.totalCount?main.totalCount.amount:''
                 };
-                Ext.each(res.data.items,function(item,index){
-                    if(item.haveChecked==0){
-                        item.haveChecked = null
-                    }
-                    if(item.haveChecked==1){
-                        item.haveChecked = '已对账'
-                    }
-                })
                 viewModel.setData({detailgrid:res.data.items});
                 var o = [];
                 Ext.each(res.data.currencys,function(item,index){

frontend/saas-web/app/view/sale/b2b/recformpanel/FormPanelController.js

@@ -43,14 +43,6 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanelController', {
                     mainDate.totalCount = main.totalCount.amount
                 }
                 viewModel.setData(mainDate);
-                Ext.each(res.data.items,function(item,index){
-                    if(item.haveChecked==0){
-                        item.haveChecked = null
-                    }
-                    if(item.haveChecked==1){
-                        item.haveChecked = '已对账'
-                    }
-                })
                 viewModel.setData({detailgrid:res.data.items});
                 var o = [];
                 Ext.each(res.data.currencys,function(item,index){

frontend/saas-web/app/view/sale/b2b/reconciliation/DataList.js

@@ -97,7 +97,7 @@ Ext.define('saas.view.sale.b2b.reconciliation.DataList', {
                     xtype:'numbercolumn', 
                     width : 110.0,
                     renderer: function (v, m, r) {
-                        return saas.util.BaseUtil.numberFormat(v, 2, false);
+                        return saas.util.BaseUtil.numberFormat(v, 4, false);
                     }
                 },{
                     text : '对账人', 

frontend/saas-web/app/view/sale/b2b/reconciliation/FormPanel.js

@@ -130,7 +130,7 @@ Ext.define('saas.view.sale.b2b.reconciliation.FormPanel', {
                     dataIndex: "checkQty",
                     ignore: true,
                     renderer: function (v, m, r) {
-                        return saas.util.BaseUtil.numberFormat(v, 0, false);
+                        return saas.util.BaseUtil.numberFormat(v, 3, false);
                     }
                 },{
                     text: "含税单价",
@@ -139,7 +139,7 @@ Ext.define('saas.view.sale.b2b.reconciliation.FormPanel', {
                     xtype:'numbercolumn',
                     ignore: true,
                     renderer: function (v, m, r) {
-                        return saas.util.BaseUtil.numberFormat(v, 2, false);
+                        return saas.util.BaseUtil.numberFormat(v, 4, false);
                     }
                 },{
                     text: "税率%",
@@ -156,7 +156,7 @@ Ext.define('saas.view.sale.b2b.reconciliation.FormPanel', {
                     width: 100.0,
                     dataIndex: "amount",
                     renderer: function (v, m, r) {
-                        return saas.util.BaseUtil.numberFormat(v, 2, false);
+                        return saas.util.BaseUtil.numberFormat(v, 4, false);
                     }
                 }],
                 initColumns: function() {

frontend/saas-web/app/view/sale/b2b/reconciliation/FormPanelModel.js

@@ -17,6 +17,7 @@ Ext.define('saas.view.sale.b2b.reconciliation.FormPanelModel', {
         showCopyBtn: false, // 显示复制按钮
         showAuditBtn: false, // 显示审核、反审核按钮
         showPrintBtn: false, // 显示打印按钮
+        showLogBtn: false, // 显示操作日志按钮
         configurable: false, // 显示界面设置按钮
 
         detailBindeFields: [], // 从表绑定列

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

@@ -11,7 +11,9 @@ Ext.define('saas.view.sale.report.SaleProfit', {
     listUrl: '/api/sale/report/saleProfit',
     defaultCondition: null,
     reportTitle: '销售毛利润表',
-    QueryWidth:0.2, 	
+    QueryWidth:0.2,
+    allowCust: true,
+
     searchItems: [{
         xtype: 'textfield',
         name: 'pr_detail',