资金模块放大镜调整

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -132,7 +132,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         modelData = viewModel.getData();
 
         //form里面数据
-        var formData = form.getFormData();
+        var formData = form.getDirtyData();
 
         var params = {
             main:formData.main

frontend/saas-web/app/view/main/Main.scss

@@ -221,26 +221,42 @@ body > .x-mask {
     filter: grayscale(100%);
     filter: gray;
 }
+ .x-main-menu{
+    background: #f8fbff;
+    border: 2px solid #34baf6;
+ }
+ .x-main-menu .x-menu-item-text-default{
+    font-family: PingFangSC-Regular;
+    //font-size: 14px;
+    color: #34BAF6;
+    letter-spacing: 0;
+    text-align: center;
+ }
 .x-main-menu::before{
     content: ' ';
     display: block;
     border-style: solid;
-    box-shadow: 0px 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(15, 136, 232, 0.6);
+    background-color: white;
+    transform: rotate(45deg);
+    box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(15, 136, 232, 0.6);
     box-shadow: aliceblue;
-    border-width: 17px;
-    border-color: #cccccc;
+    border-width: 2px;
+    border-color: #34BAF6;
     /* border-color: #cccccc #6e838e #9c9d9e #bdc3c5; */
     position: fixed;
+    width: 14px;
+    height: 14px;
     /* left: 100%; */
-    top: 26px;
+    top: 25px;
     -moz-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
-    -webkit-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
+    /* -webkit-clip-path: polygon(100% 0px, 0 50%, 100% 100%); */
     -o-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
     -ms-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
     -khtml-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
-    clip-path: polygon(0 100%, 50% 0, 100% 100%);
+    clip-path: polygon(0% 0,100% 0%,0 100%);
     margin-top: 17px;
     margin-left: 7px;
+    z-index: 99;
 }
 .x-main-menu2::before{
     content: ' ';

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

@@ -81,6 +81,10 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     valueField : "value", 
                     xtype : "dbfindtrigger"
                 }
+            },{
+                text : "转出账户余额", 
+                dataIndex : "bk_outthisamount", 
+                ignore:true
             }, {
                 text : "转入账户ID", 
                 dataIndex : "ftd_inbankid", 
@@ -108,8 +112,12 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     valueField : "value", 
                     xtype : "dbfindtrigger"
                 }
+            },{
+                text : "转入账户余额", 
+                dataIndex : "bk_inthisamount", 
+                ignore:true
             }, {
-                text : "金额", 
+                text : "本次转出金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "ftd_nowbalance", 
                 width : 120.0, 
@@ -133,7 +141,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
             }, {
                 text : "结算方式号", 
                 dataIndex : "ftd_paycode", 
-                width : 100,
+                width : 110,
                 editor:{
                     xtype: ''  
                 }

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

@@ -4,7 +4,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
+            //出
             'dbfindtrigger[name=ftd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
@@ -17,7 +17,9 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             from:'bk_bankname',to:'ftd_bankname'
                         },{
-                            from:'id',to:'ftd_bankid'
+                            from:'id',to:'ftd_bankid',ignore:true
+                        },{
+                            from:'bk_thisamount',to:'bk_outthisamount'
                         }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
@@ -74,6 +76,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                     }) ;
                 }
             },
+            //入
             'dbfindtrigger[name=ftd_inbankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
@@ -86,7 +89,9 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             from:'bk_bankname',to:'ftd_inbankname'
                         },{
-                            from:'id',to:'ftd_inbankid'
+                            from:'id',to:'ftd_inbankid',ignore:true
+                        },{
+                            from:'bk_inthisamount',to:'bk_inthisamount'
                         }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100

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

@@ -59,6 +59,10 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         xtype : "dbfindtrigger",
         name : "ftd_inbankname",
         fieldLabel : "转入账号",
+    },{
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -17,7 +17,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
                             },{
                                 from:'bk_bankname',to:'ftd_bankname'
                             },{
-                                from:'id',to:'ftd_bankid'
+                                from:'id',to:'ftd_bankid',ignore:true
                             }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
@@ -86,7 +86,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
                             },{
                                 from:'bk_bankname',to:'ftd_inbankname'
                             },{
-                                from:'id',to:'ftd_inbankid'
+                                from:'id',to:'ftd_inbankid',ignore:true
                             }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100

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

@@ -164,11 +164,11 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         xtype: 'textfield',
         name: 'or_auditman',
         fieldLabel: '审核人',
-        hidden: true
+        readOnly:true
     },{
         xtype: "datefield",
         name: "or_auditdate",
         fieldLabel: "审核日期",
-        hidden: true
+        readOnly:true
     }]
 });

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                         defaultCondition: "cu_statuscode='OPEN'",
                         dbfinds: [{
                             from: 'id',
-                            to: 'or_custid'
+                            to: 'or_custid',ignore:true
                         }, {
                             from: 'cu_code',
                             to: 'or_custcode'
@@ -39,77 +39,74 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             allowBlank: true,
                             columnWidth: 0.25
                         }],
-                        dbColumns: [{
-                            conditionCode: 'id',
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode: 'cu_code',
-                            "text": "客户编号",
-                            "flex": 1,
-                            "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode: 'cu_name',
-                            "text": "客户名称",
-                            "flex": 1,
-                            "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode: 'cu_type',
-                            "text": "客户类型",
-                            "flex": 1,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "业务员编号",
-                            "flex": 1,
-                            "dataIndex": "cu_sellercode",
-                            "width": 100
-                        }, {
-                            "text": "业务员",
-                            "flex": 1,
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        }, {
-                            "text": "税率",
-                            "flex": 1,
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "flex": 1,
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "额度",
-                            "flex": 1,
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "客户地址",
-                            "flex": 1,
-                            "dataIndex": "ca_address",
-                            "width": 250
-                        }]
+                        dbColumns:[
+                            {
+                                "text": "客户ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                "text": "客户编号",
+                                "flex": 1,
+                                "dataIndex": "cu_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "客户名称",
+                                "flex": 1,
+                                "dataIndex": "cu_name",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "客户类型",
+                                "flex": 1,
+                                "dataIndex": "cu_type",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "业务员编号",
+                                "flex": 1,
+                                "dataIndex": "cu_sellercode",
+                                "width": 100
+                            }, {
+                                "text": "业务员",
+                                "flex": 1,
+                                "dataIndex": "cu_sellername",
+                                "width": 100
+                            }, {
+                                "text": "税率",
+                                "flex": 1,
+                                "dataIndex": "cu_taxrate",
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align:'end'
+                            }, {
+                                "text": "承付天数",
+                                "flex": 1,
+                                "dataIndex": "cu_promisedays",
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align:'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
+                            }, {
+                                "text": "额度",
+                                "flex": 1,
+                                "dataIndex": "cu_credit",
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align:'end'
+                            }, {
+                                "text": "客户地址",
+                                "flex": 2,
+                                "dataIndex": "ca_address",
+                                "width": 300
+                            }]
                     });
 
                 }
@@ -129,7 +126,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             to: 'or_bankname'
                         }, {
                             from: 'id',
-                            to: 'or_bankid'
+                            to: 'or_bankid',ignore:true
                         }],
                         // defaultCondition: "bk_statuscode='OPEN'",
                         dbtpls: [{

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

@@ -40,7 +40,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
     },  {
         xtype: 'dbfindtrigger',
         name: 'or_bankname',
-        fieldLabel: '账户名称'
+        fieldLabel: '结算账户'
     }, {
         xtype: 'condatefield',
         name: 'or_date',
@@ -60,6 +60,10 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         fieldLabel: '收入类别',
         xtype : "remotecombo",
         storeUrl:'/api/document/fundinouttype/getCombo?condition=收入',
+    },{
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
@@ -69,7 +73,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         addXtype: 'money-othreceipts-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/money/othreceipts/',
-        // baseVastUrl: 'http://192.168.253.35:8880/othreceipts/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
@@ -93,7 +96,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             dataIndex: 'or_custname',
             width: 120
         },  {
-            text: '结算账号',
+            text: '结算账户',
             dataIndex: 'or_bankname',
             width: 120
         },{

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

@@ -12,7 +12,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[{
-                            from:'id',to:'or_custid'
+                            from:'id',to:'or_custid',ignore:true
                         },{
                             from:'cu_code',to:'or_custcode'
                         },{
@@ -23,9 +23,18 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         },{
                             field:'cu_name',width:100
                         }],
+                        dbSearchFields: [{
+                            emptyText: '输入客户编号或客户名称',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank: true,
+                            columnWidth: 0.25
+                        }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -33,7 +42,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -41,14 +49,12 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",
@@ -115,7 +121,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         },{
                             from:'bk_bankname',to:'or_bankname'
                         },{
-                            from:'id',to:'or_bankid'
+                            from:'id',to:'or_bankid',ignore:true
                         }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100

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

@@ -164,11 +164,11 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         xtype: 'textfield',
         name: 'os_auditman',
         fieldLabel: '审核人',
-        hidden: true
+        readOnly:true
     },{
         xtype: "datefield",
         name: "os_auditdate",
         fieldLabel: "审核日期",
-        hidden: true
+        readOnly:true
     }]
 });

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

@@ -102,7 +102,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             to: 'os_bankname'
                         }, {
                             from: 'id',
-                            to: 'os_bankid'
+                            to: 'os_bankid',ignore:true
                         }],
                         dbtpls: [{
                             field: 'bk_bankcode',

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

@@ -59,6 +59,10 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         fieldLabel: '支出类别',
         xtype : "remotecombo",
         storeUrl:'/api/document/fundinouttype/getCombo?condition=支出',
+    },{
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -103,7 +103,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                         },{
                             from:'bk_bankname',to:'os_bankname'
                         },{
-                            from:'id',to:'os_bankid'
+                            from:'id',to:'os_bankid',ignore:true
                         }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -196,7 +196,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
-                            to: 'pd_bankid'
+                            to: 'pd_bankid',ignore:true
                         }, {
                             from: 'bk_bankcode',
                             to: 'pd_bankcode'

frontend/saas-web/app/view/money/payBalance/QueryPanelController.js

@@ -186,7 +186,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                         addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
-                            to: 'pd_bankid'
+                            to: 'pd_bankid',ignore:true
                         }, {
                             from: 'bk_bankcode',
                             to: 'pd_bankcode'

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -276,7 +276,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
-                            to: 'rd_bankid'
+                            to: 'rd_bankid',ignore:true
                         }, {
                             from: 'bk_bankcode',
                             to: 'rd_bankcode'

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

@@ -199,7 +199,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 8 ? 8 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 },

frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -97,7 +97,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         //数据接口
                         dataUrl:'/api/document/employee/list',
                         addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
+                        addTitle: '人员资料',
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'pu_buyerid',ignore:true

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

@@ -38,7 +38,6 @@ Ext.define('saas.view.sale.report.SaleController', {
                         }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -46,7 +45,6 @@ Ext.define('saas.view.sale.report.SaleController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -54,14 +52,12 @@ Ext.define('saas.view.sale.report.SaleController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",

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

@@ -38,7 +38,6 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                         }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -46,7 +45,6 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -54,14 +52,12 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",

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

@@ -38,7 +38,6 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                         }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -46,7 +45,6 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -54,14 +52,12 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",

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

@@ -199,14 +199,10 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 8 ? 8 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
                     var format = '0,000.' + xr.join();
-                    if(!v){
-                        return Ext.util.Format.number(v, '0.00');
-                    }else{
-                        return Ext.util.Format.number(v, format);
-                    }
-                }
+                    return Ext.util.Format.number(v, format);
+               }
             }, 
             {
                 text : "税率", 

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

@@ -39,7 +39,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -47,7 +46,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -55,14 +53,12 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",
@@ -119,7 +115,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         //数据接口
                         dataUrl:'/api/document/employee/list',
                         addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
+                        addTitle: '人员资料',
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'id',ignore:true

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

@@ -36,7 +36,6 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -44,7 +43,6 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -52,14 +50,12 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",

frontend/saas-web/app/view/sale/saleIn/FormPanelController.js

@@ -40,7 +40,6 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         }],
                         dbColumns:[
                         {
-                            conditionCode:'id',
                             "text": "客户ID",
                             "flex": 0,
                             "dataIndex": "id",
@@ -48,7 +47,6 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "xtype": "",
                             "items": null
                         },{
-                            conditionCode:'cu_code',
                             "text": "客户编号",
                             "flex": 1,
                             "dataIndex": "cu_code",
@@ -56,14 +54,12 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "xtype": "",
                             "items": null
                         }, {
-                            conditionCode:'cu_name',
                             "text": "客户名称",
                             "flex": 1,
                             "dataIndex": "cu_name",
                             "xtype": "",
                             "items": null
                         }, {
-                            conditionCode:'cu_type',
                             "text": "客户类型",
                             "flex": 1,
                             "dataIndex": "cu_type",

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

@@ -229,6 +229,9 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     decimalPrecision: 0,
                     minValue: 0,
                     maxValue: 100
+                }, 
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
                 }
             },
             {

frontend/saas-web/resources/json/navigation.json

@@ -140,12 +140,14 @@
             "text": "收款单",
             "addType": "money-recbalance-formpanel",
             "viewType": "money-recbalance-querypanel"
-        }, {
-            "id": "verification",
-            "text": "核销单",
-            "addType": "money-verification-formpanel",
-            "viewType": "money-verification-querypanel"
-        }, {
+        }, 
+        //{
+          //  "id": "verification",
+          //  "text": "核销单",
+          //  "addType": "money-verification-formpanel",
+          //  "viewType": "money-verification-querypanel"
+       // },
+         {
             "id": "othReceipts",
             "text": "其它收入单",
             "addType": "money-othreceipts-formpanel",