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

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -34,7 +34,11 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.FundTransfer',
         detnoColumn:  'ftd_detno',
+<<<<<<< HEAD
+        deleteDetailUrl:basePath+'fundtransfer/deleteItem/',
+=======
         _deleteDetailUrl:'/api/fundtransfer/deleteItem/',
+>>>>>>> 12e93723100fb3a14b86475ac9edfc82a3c9e52e
         columnWidth : 1,
         columns : [
             {
@@ -44,7 +48,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 width:0
             }, {
                 text : "期间", 
-                dataIndex : "ftd_ym ", 
+                dataIndex : "ftd_ym", 
                 editor : {
                     xtype : "numberfield"
                 },
@@ -58,7 +62,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
             }, {
                 text : "转出账户编号", 
                 dataIndex : "ftd_bankcode", 
-                width : 0
+                width :0
             }, {
                 text : "转出账户", 
                 width : 200.0, 
@@ -85,7 +89,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
             }, {
                 text : "转入账户编号", 
                 dataIndex : "ftd_inbankcode", 
-                width : 0
+                width :0
             }, {
                 text : "转入账户", 
                 width : 200.0, 
@@ -119,7 +123,10 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
             }, {
                 text : "结算方式号", 
                 dataIndex : "ftd_paycode", 
-                width : 0
+                width : 100,
+                editor:{
+                    xtype: ''  
+                }
             }, {
                 text : "结算方式", 
                 width : 200.0, 
@@ -144,7 +151,6 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 dataIndex : "ftd_remark",
                 width : 120.0, 
                 items : null,
-                ignore:true,
                 flex : 1.0,
                 editor : {
                     xtype : ""

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -8,78 +8,66 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     viewName: 'money-fundtransfer-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'or_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    }, {
-        xtype : 'hidden',
-        name : 'or_custid', 
-        fieldLabel : '客户ID'
-   }, {
-        xtype: 'hidden',
-        name: 'or_custcode',
-        fieldLabel: '客户编号'
-    }, {
-        xtype: 'dbfindtrigger',
-        name: 'or_custname',
-        fieldLabel: '客户名称'
-    }, {
-        xtype : 'hidden',
-        name : 'or_bankid', 
-        fieldLabel : '账户ID'
-     }, {
-        xtype: 'hidden',
-        name: 'or_bankcode',
-        fieldLabel: '账户编号'
-    }, {
-        xtype: 'dbfindtrigger',
-        name: 'or_bankname',
-        fieldLabel: '账户名称'
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "ft_date", 
+        fieldLabel : "单据日期"
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
-        idField: 'or_id',
-        codeField: 'or_code',
+        idField: 'id',
+        codeField: 'ft_code',
         addTitle: '其它收入单',
         addXtype: 'money-fundtransfer-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/money/fundtransfer/',
         baseColumn: [{
             text: 'id',
-            dataIndex: 'or_id',
+            dataIndex: 'id',
             width: 0,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
-            dataIndex: 'or_code',
+            dataIndex: 'ft_code',
             width: 120
         }, {
             text: '单据状态',
-            dataIndex: 'or_status',
+            dataIndex: 'ft_status',
             width: 120
         }, {
             text: '录入人',
-            dataIndex: 'or_recorder',
+            dataIndex: 'ft_recorder',
             width: 120
         }, {
             text: '单据日期',
-            dataIndex: 'or_date',
+            dataIndex: 'ft_date',
             xtype: 'datecolumn',
             width: 200
         }, {
-            text: '客户名称',
-            dataIndex: 'or_custname',
+            text: '期间',
+            dataIndex: 'ftd_ym',
+            xtype : "numbercolumn", 
+            width: 120
+        }, {
+            text: '转出账户',
+            dataIndex: 'ftd_bankname',
+            width: 120
+        }, {
+            text: '转入账户',
+            dataIndex: 'ftd_inbankname',
             width: 120
         }, {
             text: '金额',
-            dataIndex: 'or_amount',
-            xtype: 'numbercolumn',
+            dataIndex: 'ftd_nowbalance',
+            xtype : "numbercolumn",
+            width: 120
+        }, {
+            text: '结算方式',
+            dataIndex: 'ftd_paymethod',
             width: 120
         }, {
             text: '备注',
-            dataIndex: 'or_remark',
+            dataIndex: 'ft_remark',
             width: 250,
             flex: 1
         }],

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -15,9 +15,15 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _statusField: 'or_status',
      _statusCodeField: 'or_statuscode',
      _relationColumn: 'ord_orid',
+<<<<<<< HEAD
+     _readUrl:basePath+'money/othreceipts/read/',
+     _saveUrl:basePath+'money/othreceipts/save',
+     _deleteUrl:basePath+'money/othreceipts/delete/',  
+=======
      _readUrl:'/api/money/othreceipts/read/',
      _saveUrl:'/api/money/othreceipts/save',
      _deleteUrl:'/api/money/othreceipts/delete/', 
+>>>>>>> 12e93723100fb3a14b86475ac9edfc82a3c9e52e
      initId:0,
 
     defaultItems: [{
@@ -137,7 +143,6 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 dataIndex : "ord_remark",
                 width : 120.0, 
                 items : null,
-                ignore:true,
                 flex : 1.0,
                 editor : {
                     xtype : ""

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -40,22 +40,26 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
-        idField: 'or_id',
+        idField: 'id',
         codeField: 'or_code',
         addTitle: '其它收入单',
         addXtype: 'money-othreceipts-formpanel',
         defaultCondition:'',
+<<<<<<< HEAD
+        baseVastUrl: basePath+'money/othreceipts/',
+=======
        // baseVastUrl: '/api/money/othreceipts/',
         baseVastUrl: 'http://192.168.253.129:8940/othreceipts/',
+>>>>>>> 12e93723100fb3a14b86475ac9edfc82a3c9e52e
         baseColumn: [{
             text: 'id',
-            dataIndex: 'or_id',
-            width: 0,
+            dataIndex: 'id',
+            width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'or_code',
-            width: 120
+            width: 150
         }, {
             text: '单据状态',
             dataIndex: 'or_status',

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -15,9 +15,9 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      _statusField: 'os_status',
      _statusCodeField: 'os_statuscode',
      _relationColumn: 'osd_orid',
-     _readUrl:'/api/money/othspendings/read/',
-     _saveUrl:'/api/money/othspendings/save',
-     _deleteUrl:'/api/money/othspendings/delete/',
+     _readUrl:basePath+'money/othspendings/read/',
+     _saveUrl:basePath+'money/othspendings/save',
+     _deleteUrl:basePath+'money/othspendings/delete/', 
      initId:0,
 
     defaultItems: [{
@@ -137,7 +137,9 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 dataIndex : "osd_remark",
                 width : 120.0, 
                 items : null,
-                ignore:true,
+                editor : {
+                    xtype : ""
+                },
                 flex : 1.0,
             }
         ]

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -40,7 +40,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
-        idField: 'os_id',
+        idField: 'id',
         codeField: 'os_code',
         addTitle: '其它支出单',
         addXtype: 'money-othspendings-formpanel',
@@ -48,8 +48,8 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         baseVastUrl: '/api/money/othspendings/',
         baseColumn: [{
             text: 'id',
-            dataIndex: 'os_id',
-            width: 0,
+            dataIndex: 'id',
+            width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',

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

@@ -124,8 +124,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 dataIndex : "sd_price", 
                 width : 120.0, 
                 xtype : "numbercolumn",
-                items : null,
-                summaryType: 'sum'
+                items : null
             }, 
             {
                 text : "税率", 

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -80,11 +80,19 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             width: 0,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '销售单号',
             dataIndex: 'sa_code',
             width: 120
         }, {
-            text: '单据状态',
+            text: '客户编号',
+            dataIndex: 'sa_cucode',
+            width: 120
+        }, {
+            text: '客户名称',
+            dataIndex: 'sa_cuname',
+            width: 120
+        }, {
+            text: '业务状态',
             dataIndex: 'sa_status',
             width: 120
         }, {
@@ -92,16 +100,25 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             dataIndex: 'sa_recorddate',
             xtype: 'datecolumn',
             width: 200
-        }, {
-            text: '客户名称',
-            dataIndex: 'sa_cuname',
-            width: 120
         }, {
             text: '金额',
             dataIndex: 'sa_total',
             xtype: 'numbercolumn',
             width: 120
-        }],
+        }, {
+            text: '制单人',
+            dataIndex: 'sa_recorder',
+            width: 120
+        }, {
+            text: '审核人',
+            dataIndex: 'sa_auditman',
+            width: 120
+        }, {
+            text: '收货地址',
+            dataIndex: 'sa_toplace',
+            width: 120
+        }
+    ],
         relativeColumn: [ {
             text: 'id',
             dataIndex: 'sa_id',