物料、供应商、客户放大镜标准化。客户、供应商备注字段调整_remark

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js

@@ -31,34 +31,22 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
         conditionCode: 'id',
         text: "客户ID",
         dataIndex: "id",
-        hidden:true,
-        xtype: "",
+        hidden:true
     }, {
         conditionCode: 'cu_code',
         text: "客户编号",
         dataIndex: "cu_code",
-        width: 150,
-        xtype: "",
+        width: 150
     }, {
         conditionCode: 'cu_name',
         text: "客户名称",
         dataIndex: "cu_name",
-        width: 200,
-        xtype: "",
+        width: 200
     }, {
         conditionCode: 'cu_type',
         text: "客户类型",
         dataIndex: "cu_type",
-        width: 110,
-        xtype: "",
-    }, {
-        text: "业务员编号",
-        dataIndex: "cu_sellercode",
-        width:150
-    }, {
-        text: "业务员",
-        dataIndex: "cu_sellername",
-        width:110
+        width: 110
     }, {
         text: "税率",
         dataIndex: "cu_taxrate",
@@ -68,21 +56,16 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
             return Ext.util.Format.number(v, '0');
         }
     }, {
-        text: "结算天数",
-        dataIndex: "cu_promisedays",
-        width:110,
-        xtype: 'numbercolumn',
-        renderer: function (v) {
-            return Ext.util.Format.number(v, '0');
-        }
+        text: "业务员编号",
+        dataIndex: "cu_sellercode",
+        width:150
     }, {
-        text: "额度",
-        dataIndex: "cu_credit",
-        width:110,
-        xtype: 'numbercolumn',
+        text: "业务员",
+        dataIndex: "cu_sellername",
+        width:110
     }, {
-        text: "客户地址",
-        dataIndex: "ca_address",
+        text: "备注",
+        dataIndex: "cu_remark",
         width: 250
     }]
 

frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js

@@ -28,38 +28,33 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     dbColumns:[{
         text: "物料ID",
         hidden: true,
-        dataIndex: "id",
+        dataIndex: "id"
     }, {
         text: "物料编号",       
         dataIndex: "pr_code",
-        width: 150,
+        width: 150
     }, {
         text: "物料名称",
         width: 200,
-        dataIndex: "pr_detail",
+        dataIndex: "pr_detail"
     }, {
-        text: "规格",
+        text: "型号规格",
         dataIndex: "pr_spec",
-        width: 150,
+        width: 150
+    }, {
+        text: "类型",
+        dataIndex: "pr_kind",
+        width: 110
     }, {
         text: "单位",
         dataIndex: "pr_spec",
-        width: 80,
-    },{
-        text: "仓库id",
-        dataIndex: "pr_whid",
-        hidden: true,
-    },{
-        text: "仓库编号",
-        dataIndex: "pr_whcode",
-        hidden: true,
+        width: 80
     },{
-        text: "仓库",
-        dataIndex: "pr_whname",
-        width: 200,
-        hidden: true
+        text: "品牌",
+        dataIndex: "pr_brand",
+        width: 110
     },{
-        text: "总库存数",
+        text: "库存",
         dataIndex: "po_onhand",
         width: 110,
         xtype: 'numbercolumn',
@@ -68,43 +63,6 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
             var xr = (new Array(arr[1].length)).fill('0');
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
-        },                            
-        align:'end'
-    },{
-        text: "类型",
-        dataIndex: "pr_kind",
-        width: 110,
-    },{
-        text: "型号",
-        dataIndex: "pr_orispeccode",
-        width: 150,
-    },{
-        text: "品牌",
-        dataIndex: "pr_brand",
-        width: 110,
-    },{
-        text: "供应商",
-        dataIndex: "pr_vendname",
-        width: 250,
-    },{
-        text: "最小包装",
-        dataIndex: "pr_zxbzs",
-        width: 110,
-        xtype: 'numbercolumn',
-        align: 'end',
-        renderer : function(v) {
-            if(!v) {
-                return 0;
-            }
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
         }
-    },{
-        text: "L/T",
-        dataIndex: "pr_leadtime",
-        width: 80
     }]
-
 });

frontend/saas-web/app/view/core/dbfind/types/ProductMultiDbfindTrigger.js

@@ -56,86 +56,42 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     dbColumns: [{
         text: "物料ID",
         hidden: true,
-        dataIndex: "id",
+        dataIndex: "id"
     }, {
-        text: "物料编号",
+        text: "物料编号",       
         dataIndex: "pr_code",
-        width: 150,
+        width: 150
     }, {
         text: "物料名称",
         width: 200,
-        dataIndex: "pr_detail",
+        dataIndex: "pr_detail"
     }, {
-        text: "规格",
+        text: "型号规格",
         dataIndex: "pr_spec",
-        width: 150,
-    }, {
-        text: "单位",
-        dataIndex: "pr_unit",
-        width: 80
-    }, {
-        text: "最新采购单价",
-        dataIndex: "pr_purcprice",
-        xtype: 'numbercolumn',
-        hidden:true,
-    }, {
-        text: "仓库id",
-        dataIndex: "pr_whid",
-        hidden: true,
-    }, {
-        text: "仓库编号",
-        dataIndex: "pr_whcode",
-        hidden: true,
-    }, {
-        text: "仓库",
-        dataIndex: "pr_whname",
-        width: 200,
-        hidden: true
-    }, {
-        text: "总库存数",
-        dataIndex: "po_onhand",
-        width: 110,
-        xtype: 'numbercolumn',
-        renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
+        width: 150
     }, {
         text: "类型",
         dataIndex: "pr_kind",
         width: 110
     }, {
-        text: "型号",
-        dataIndex: "pr_orispeccode",
-        width: 150
-    }, {
+        text: "单位",
+        dataIndex: "pr_spec",
+        width: 80
+    },{
         text: "品牌",
         dataIndex: "pr_brand",
         width: 110
-    }, {
-        text: "供应商",
-        dataIndex: "pr_vendname",
-        width: 200
-    }, {
-        text: "最小包装",
-        dataIndex: "pr_zxbzs",
+    },{
+        text: "库存",
+        dataIndex: "po_onhand",
         width: 110,
         xtype: 'numbercolumn',
         renderer : function(v) {
-            if(!v) {
-                return 0;
-            }
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
-        },
-    }, {
-        text: "L/T",
-        dataIndex: "pr_leadtime",
-        width: 80
+        }
     }]
 
 });

frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -61,27 +61,10 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
             var format = '0.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
-    },{
-        text: "结算天数",
-        dataIndex: "ve_promisedays",
-        width: 110,
-        xtype: 'numbercolumn',
-        align: 'end', 
-        renderer : function(v) {
-            return Ext.util.Format.number(v, '0');
-        }
     }, {
-        text: "纳税人识别号",
-        dataIndex: "ve_nsrzh",
-        width: 150
-    }, {
-        text: "开户银行",
-        dataIndex: "ve_bankcode",
-        width: 150
-    }, {
-        text: "银行账户",
-        dataIndex: "ve_bankaccount",
-        width: 200
+        text: "备注",
+        dataIndex: "ve_remark",
+        width: 250
     }]
 
 });

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -125,7 +125,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
             width: 110
         }, {
             text : "备注", 
-            dataIndex : "cu_text1",
+            dataIndex : "cu_remark",
             width: 250
         }]
     },

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

@@ -217,7 +217,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
     },{
         fieldLabel : "备注", 
         xtype:'textfield',
-        name : "cu_text1",
+        name : "cu_remark",
         columnWidth : 0.75
     }, {
         xtype : "detailGridField", 

frontend/saas-web/app/view/document/vendor/BasePanel.js

@@ -115,7 +115,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             }
         }, {
             text : "备注", 
-            dataIndex : "ve_text1", 
+            dataIndex : "ve_remark", 
             width : 250.0
         }]
     },

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

@@ -191,7 +191,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
     },{
         fieldLabel : "备注", 
         xtype:'textfield',
-        name : "ve_text1",
+        name : "ve_remark",
         columnWidth : 1
     }, {
         xtype : "detailGridField",