فهرست منبع

去掉放大镜idtoid

rainco 7 سال پیش
والد
کامیت
25bf1119ae

+ 1 - 1
frontend/saas-web/app/view/document/customer/BasePanelController.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.document.customer.BasePanelController', {
                     Ext.apply(f,{
                         //赋值 
                         dbfinds:[{
-                            from:'id',to:'id',ignore:true
+                            from:'id',to:'cu_id',ignore:true
                         },{
                             from:'cu_code',to:'cu_code'
                         },{

+ 15 - 1
frontend/saas-web/app/view/document/customer/FormController.js

@@ -4,7 +4,21 @@ Ext.define('saas.view.document.customer.FormController', {
     
     init: function (form) {
         var me = this;
-        this.control({});
+        this.control({
+            'employeeDbfindTrigger[name=cu_sellername]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'id',to:'cu_sellerid',ignore:true
+                        },{
+                            from:'em_code',to:'cu_sellercode'
+                        },{
+                            from:'em_name',to:'cu_sellername'
+                        }],
+                    }) ;   
+                }
+            }
+        });
     },
 
     auditBtnClick: function() {

+ 11 - 9
frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -126,7 +126,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype : "numberfield", 
         hideTrigger:true,
         name : "cu_promisedays", 
-        fieldLabel : "承付天数", 
+        fieldLabel : "结算天数", 
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision:0,
@@ -146,31 +146,34 @@ Ext.define('saas.view.document.customer.FormPanel', {
             var format = '0.' + xr.join();
             return Ext.util.Format.number(v, format);
         },
-    },{
-        xtype : "textfield", 
+    }, {
+        xtype : "hidden", 
+        name : "cu_sellerid", 
+        fieldLabel : "业务员id"
+    }, {
+        xtype : "hidden", 
+        name : "cu_sellercode", 
+        fieldLabel : "业务员code",
+    }, {
+        xtype : "employeeDbfindTrigger", 
         name : "cu_sellername", 
         fieldLabel : "业务员", 
-        ignore:true,
         editable:false,
-        readOnly:true,
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        ignore:true,
         xtype : "hidden", 
         name : "cu_nsrzh", 
         fieldLabel : "纳税人识别号", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        ignore:true,
         xtype : "hidden", 
         name : "cu_bankaccount", 
         fieldLabel : "开户银行", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        ignore:true,
         xtype : "hidden",  
         name : "cu_bankcode", 
         fieldLabel : "银行账户", 
@@ -190,7 +193,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         fieldLabel : "应收款余额", 
         allowBlank : true, 
         readOnly:true,
-        ignore:true,
         columnWidth : 0.25,
         decimalPrecision: 8,
         renderer : function(v) {

+ 1 - 1
frontend/saas-web/app/view/document/product/BasePanelController.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.document.product.BasePanelController', {
                         }, {
                             from:'pr_orispeccode',to:'pr_orispeccode'
                         }, {
-                            from:'id',to:'id',ignore:true
+                            from:'id',to:'pr_id',ignore:true
                         }],
                     }) ;   
 

+ 1 - 1
frontend/saas-web/app/view/document/vendor/BasePanelController.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.document.vendor.BasePanelController', {
                     Ext.apply(f,{
                         //赋值 
                         dbfinds:[{
-                            from:'id',to:'id',ignore:true
+                            from:'id',to:'ve_id',ignore:true
                         },{
                             from:'ve_code',to:'ve_code'
                         },{

+ 1 - 1
frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -133,7 +133,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype : "numberfield", 
         hideTrigger:true,
         name : "ve_promisedays", 
-        fieldLabel : "承付天数", 
+        fieldLabel : "结算天数", 
         allowBlank : true, 
         columnWidth : 0.25,
         minValue:0,

+ 1 - 1
frontend/saas-web/app/view/money/verification/QueryPanelController.js

@@ -61,7 +61,7 @@ Ext.define('saas.view.money.verification.QueryPanelController', {
                             "dataIndex": "ve_taxrate",
                             "width": 100
                         }, {
-                            "text": "承付天数",
+                            "text": "结算天数",
                             "flex": 1,
                             "dataIndex": "ve_promisedays",
                             "width": 100

+ 2 - 0
frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -18,6 +18,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pu_code',
+        fieldLabel: ' ',
+        labelSeparator:' ',
         emptyText:'请输入单号或供应商',
         getCondition: function(value) {
             return  ' (pu_code like\'%' + value + '%\' or pu_vendcode like \'%'+value+'%\' or pu_vendname like \'%'+value+'%\') ';

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.report.SaleController', {
                     Ext.apply(f,{
                         dbfinds:[
                             {
-                                from:'id',to:'id',ignore:true
+                                from:'id',to:'cu_id',ignore:true
                             },{
                                 from:'cu_code',to:'cu_code'
                             },{

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                     Ext.apply(f,{
                         dbfinds:[
                             {
-                                from:'id',to:'id',ignore:true
+                                from:'id',to:'sa_custid',ignore:true
                             },{
                                 from:'cu_code',to:'sa_custcode'
                             },{

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                     Ext.apply(f,{
                         dbfinds:[
                             {
-                                from:'id',to:'id',ignore:true
+                                from:'id',to:'cu_id',ignore:true
                             },{
                                 from:'cu_code',to:'cu_code'
                             },{

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

@@ -26,7 +26,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'id',to:'id',ignore:true
+                            from:'id',to:'sa_sellerid',ignore:true
                         },{
                             from:'em_code',to:'sa_sellercode'
                         },{

+ 1 - 1
frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -125,8 +125,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "数量", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
+                width : 110.0, 
                 allowBlank:false,
-                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 3,

+ 1 - 1
frontend/saas-web/app/view/stock/inventory/EditDataList.js

@@ -27,7 +27,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         name: 'wh_description',
         emptyText: '仓库',
         dbfinds:[{
-            from:'id',to:'id',ignore:true 
+            from:'id',to:'wh_id',ignore:true 
         }, { 
             from:'wh_code',to:'wh_code'
         }, {

+ 1 - 1
frontend/saas-web/app/view/stock/report/ProdinoutCountController.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'id',to:'id',ignore:true 
+                            from:'id',to:'wh_id',ignore:true 
                         }, { 
                             from:'wh_code',to:'wh_code'
                         }, {