Browse Source

放大镜统一配置

zhuth 8 years ago
parent
commit
cae61cef05
100 changed files with 825 additions and 7777 deletions
  1. 62 0
      frontend/saas-web/app/view/core/dbfind/types/BankInfoDbfindTrigger.js
  2. 57 0
      frontend/saas-web/app/view/core/dbfind/types/BomDbfindTrigger.js
  3. 96 0
      frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js
  4. 58 0
      frontend/saas-web/app/view/core/dbfind/types/EmployeeDbfindTrigger.js
  5. 102 0
      frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js
  6. 143 0
      frontend/saas-web/app/view/core/dbfind/types/ProductMultiDbfindTrigger.js
  7. 79 0
      frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js
  8. 54 0
      frontend/saas-web/app/view/core/dbfind/types/WarehouseDbfindTrigger.js
  9. 3 271
      frontend/saas-web/app/view/document/bom/FormController.js
  10. 3 3
      frontend/saas-web/app/view/document/bom/FormPanel.js
  11. 0 136
      frontend/saas-web/app/view/document/employee/FormController.js
  12. 3 151
      frontend/saas-web/app/view/document/product/FormController.js
  13. 3 13
      frontend/saas-web/app/view/document/product/FormPanel.js
  14. 1 1
      frontend/saas-web/app/view/document/vendor/BasePanel.js
  15. 1 69
      frontend/saas-web/app/view/document/vendor/BasePanelController.js
  16. 0 4
      frontend/saas-web/app/view/home/charts/MonthSale.js
  17. 2 2
      frontend/saas-web/app/view/money/fundtransfer/FormPanel.js
  18. 2 112
      frontend/saas-web/app/view/money/fundtransfer/FormPanelController.js
  19. 2 2
      frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js
  20. 2 112
      frontend/saas-web/app/view/money/fundtransfer/QueryPanelController.js
  21. 2 2
      frontend/saas-web/app/view/money/othreceipts/FormPanel.js
  22. 2 152
      frontend/saas-web/app/view/money/othreceipts/FormPanelController.js
  23. 2 2
      frontend/saas-web/app/view/money/othreceipts/QueryPanel.js
  24. 2 141
      frontend/saas-web/app/view/money/othreceipts/QueryPanelController.js
  25. 2 2
      frontend/saas-web/app/view/money/othspendings/FormPanel.js
  26. 2 124
      frontend/saas-web/app/view/money/othspendings/FormPanelController.js
  27. 2 2
      frontend/saas-web/app/view/money/othspendings/QueryPanel.js
  28. 0 124
      frontend/saas-web/app/view/money/othspendings/QueryPanelController.js
  29. 2 2
      frontend/saas-web/app/view/money/payBalance/FormPanel.js
  30. 0 125
      frontend/saas-web/app/view/money/payBalance/FormPanelController.js
  31. 2 2
      frontend/saas-web/app/view/money/payBalance/QueryPanel.js
  32. 0 207
      frontend/saas-web/app/view/money/payBalance/QueryPanelController.js
  33. 2 2
      frontend/saas-web/app/view/money/recBalance/FormPanel.js
  34. 3 214
      frontend/saas-web/app/view/money/recBalance/FormPanelController.js
  35. 1 1
      frontend/saas-web/app/view/money/recBalance/QueryPanel.js
  36. 0 248
      frontend/saas-web/app/view/money/recBalance/QueryPanelController.js
  37. 1 1
      frontend/saas-web/app/view/money/report/AccountBalance.js
  38. 0 55
      frontend/saas-web/app/view/money/report/AccountBalanceController.js
  39. 1 1
      frontend/saas-web/app/view/money/report/CustomerCheck.js
  40. 0 70
      frontend/saas-web/app/view/money/report/CustomerCheckController.js
  41. 1 1
      frontend/saas-web/app/view/money/report/PayDetail.js
  42. 0 67
      frontend/saas-web/app/view/money/report/PayDetailController.js
  43. 1 1
      frontend/saas-web/app/view/money/report/RecDetail.js
  44. 0 70
      frontend/saas-web/app/view/money/report/RecDetailController.js
  45. 1 1
      frontend/saas-web/app/view/money/report/VendorCheck.js
  46. 0 67
      frontend/saas-web/app/view/money/report/VendorCheckController.js
  47. 3 13
      frontend/saas-web/app/view/purchase/purchase/FormPanel.js
  48. 2 227
      frontend/saas-web/app/view/purchase/purchase/FormPanelController.js
  49. 4 4
      frontend/saas-web/app/view/purchase/purchase/QueryPanel.js
  50. 0 157
      frontend/saas-web/app/view/purchase/purchase/QueryPanelController.js
  51. 3 3
      frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js
  52. 0 211
      frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js
  53. 3 3
      frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js
  54. 0 159
      frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js
  55. 3 3
      frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js
  56. 1 212
      frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js
  57. 3 3
      frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js
  58. 0 157
      frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelController.js
  59. 1 1
      frontend/saas-web/app/view/purchase/report/Purchase.js
  60. 0 67
      frontend/saas-web/app/view/purchase/report/PurchaseController.js
  61. 1 1
      frontend/saas-web/app/view/purchase/report/PurchasePay.js
  62. 0 66
      frontend/saas-web/app/view/purchase/report/PurchasePayController.js
  63. 1 1
      frontend/saas-web/app/view/sale/report/Sale.js
  64. 1 90
      frontend/saas-web/app/view/sale/report/SaleController.js
  65. 2 2
      frontend/saas-web/app/view/sale/report/SaleProfit.js
  66. 1 177
      frontend/saas-web/app/view/sale/report/SaleProfitController.js
  67. 1 1
      frontend/saas-web/app/view/sale/report/SaleRec.js
  68. 0 91
      frontend/saas-web/app/view/sale/report/SaleRecController.js
  69. 3 3
      frontend/saas-web/app/view/sale/sale/FormPanel.js
  70. 0 229
      frontend/saas-web/app/view/sale/sale/FormPanelController.js
  71. 2 2
      frontend/saas-web/app/view/sale/sale/QueryPanel.js
  72. 0 174
      frontend/saas-web/app/view/sale/sale/QueryPanelController.js
  73. 3 3
      frontend/saas-web/app/view/sale/saleIn/FormPanel.js
  74. 50 269
      frontend/saas-web/app/view/sale/saleIn/FormPanelController.js
  75. 1 1
      frontend/saas-web/app/view/sale/saleIn/QueryPanel.js
  76. 1 169
      frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js
  77. 3 3
      frontend/saas-web/app/view/sale/saleOut/FormPanel.js
  78. 0 230
      frontend/saas-web/app/view/sale/saleOut/FormPanelController.js
  79. 2 2
      frontend/saas-web/app/view/sale/saleOut/QueryPanel.js
  80. 0 174
      frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js
  81. 5 5
      frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js
  82. 0 325
      frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js
  83. 3 3
      frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js
  84. 0 221
      frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js
  85. 4 4
      frontend/saas-web/app/view/stock/make/FormPanel.js
  86. 0 292
      frontend/saas-web/app/view/stock/make/FormPanelController.js
  87. 1 1
      frontend/saas-web/app/view/stock/make/QueryPanel.js
  88. 0 197
      frontend/saas-web/app/view/stock/make/QueryPanelController.js
  89. 3 3
      frontend/saas-web/app/view/stock/otherIn/FormPanel.js
  90. 0 281
      frontend/saas-web/app/view/stock/otherIn/FormPanelController.js
  91. 3 3
      frontend/saas-web/app/view/stock/otherIn/QueryPanel.js
  92. 0 224
      frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js
  93. 3 3
      frontend/saas-web/app/view/stock/otherOut/FormPanel.js
  94. 0 273
      frontend/saas-web/app/view/stock/otherOut/FormPanelController.js
  95. 2 2
      frontend/saas-web/app/view/stock/otherOut/QueryPanel.js
  96. 0 224
      frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js
  97. 2 2
      frontend/saas-web/app/view/stock/report/ProdinoutCount.js
  98. 0 141
      frontend/saas-web/app/view/stock/report/ProdinoutCountController.js
  99. 2 103
      frontend/saas-web/app/view/stock/report/ProdiodetailController.js
  100. 0 2
      frontend/saas-web/overrides/form/field/Number.js

+ 62 - 0
frontend/saas-web/app/view/core/dbfind/types/BankInfoDbfindTrigger.js

@@ -0,0 +1,62 @@
+Ext.define('saas.view.core.dbfind.types.BankInfoDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'bandinfoDbfindTrigger',
+
+    dataUrl: '/api/document/bankinformation/list',
+    addXtype: 'other-bankinformation',
+    addTitle: '资金账户',
+    dbtpls: [{
+        field: 'bk_bankcode',
+        width: 100
+    }, {
+        field: 'bk_bankname',
+        width: 100
+    }],
+    dbSearchFields: [{
+        emptyText: '查找资金账户',
+        xtype: "textfield",
+        name: "search",
+        getCondition: function (v) {
+            return "(upper(bk_bankcode) like '%" + v.toUpperCase() + "%' or upper(bk_bankname) like '%" + v.toUpperCase() + "%')";
+        },
+        allowBlank: true,
+        columnWidth: 0.25
+    }],
+    dbColumns: [{
+        text: "账户ID",
+        flex: 0,
+        dataIndex: "id",
+        width: 0,
+        xtype: ""
+    }, {
+        text: "资金账户",
+        flex: 1,
+        dataIndex: "bk_bankcode",
+        width: 120,
+        xtype: ""
+    }, {
+        text: "账户名称",
+        flex: 1,
+        dataIndex: "bk_bankname",
+        width: 150,
+        xtype: ""
+    }, {
+        text: "账户类别",
+        flex: 1,
+        dataIndex: "bk_type",
+        width: 120,
+        xtype: ""
+    }, {
+        text: "账户余额",
+        flex: 1,
+        dataIndex: "bk_thisamount",
+        width: 120,
+        xtype: 'numbercolumn',
+    }, {
+        text: "建帐日期",
+        flex: 1,
+        dataIndex: "bk_date",
+        width: 120,
+        xtype: "datecolumn"
+    }]
+});

+ 57 - 0
frontend/saas-web/app/view/core/dbfind/types/BomDbfindTrigger.js

@@ -0,0 +1,57 @@
+/**
+ * 客户资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.BomDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'bomDbfindTrigger',
+
+    //数据接口
+    dataUrl: '/api/document/bom/list',
+    addXtype: 'document-bom-formpanel',
+    addTitle: 'BOM资料',
+    //联想设置
+    dbtpls: [{
+        field: 'bo_mothercode',
+        width: 100
+    }, {
+        field: 'bo_mothername',
+        width: 100
+    }],
+    
+    defaultCondition: "bo_statuscode='OPEN'",
+    //窗口字段设置
+    dbSearchFields: [{
+        emptyText: '输入BOM编号或名称',
+        xtype: "textfield",
+        name: "search",
+        width: 200,
+        getCondition: function (v) {
+            return "(upper(bo_mothercode) like '%" + v.toUpperCase() + "%' or upper(bo_mothername) like '%" + v.toUpperCase() + "%')";
+        },
+        allowBlank: true,
+        columnWidth: 0.25
+    }],
+    //窗口列设置
+    dbColumns: [{
+        text: "物料ID",
+        hidden: true,
+        dataIndex: "id",
+    }, {
+        text: "产品编号",
+        dataIndex: "bo_mothercode",
+        width: 200,
+    }, {
+        text: "产品名称",
+        width: 200,
+        dataIndex: "bo_mothername",
+    }, {
+        text: "产品规格",
+        width: 200,
+        dataIndex: "pr_spec",
+    }, {
+        text: "版本",
+        width: 200,
+        dataIndex: "bo_version",
+    }]
+
+});

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

@@ -0,0 +1,96 @@
+/**
+ * 客户资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'customerDbfindTrigger',
+
+    dataUrl: '/api/document/customer/dbfind',
+    addXtype: 'document-customer-formpanel',
+    addTitle: '客户资料',
+    defaultCondition: "cu_statuscode='OPEN'",
+    
+    dbtpls: [{
+        field: 'cu_code',
+        width: 100
+    }, {
+        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",
+        width: 0,
+        xtype: "",
+    }, {
+        conditionCode: 'cu_code',
+        text: "客户编号",
+        flex: 1,
+        dataIndex: "cu_code",
+        width: 100,
+        xtype: "",
+    }, {
+        conditionCode: 'cu_name',
+        text: "客户名称",
+        flex: 1,
+        dataIndex: "cu_name",
+        xtype: "",
+    }, {
+        conditionCode: 'cu_type',
+        text: "客户类型",
+        flex: 1,
+        dataIndex: "cu_type",
+        width: 200,
+        xtype: "",
+    }, {
+        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',
+    }, {
+        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',
+    }, {
+        text: "客户地址",
+        flex: 1,
+        dataIndex: "ca_address",
+        width: 250
+    }]
+
+});

+ 58 - 0
frontend/saas-web/app/view/core/dbfind/types/EmployeeDbfindTrigger.js

@@ -0,0 +1,58 @@
+/**
+ * 人员资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.EmployeeDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'employeeDbfindTrigger',
+
+    //数据接口
+    dataUrl:'/api/document/employee/list',
+    addXtype: 'document-vendor-formpanel',
+    addTitle: '供应商资料',
+    //联想设置
+    dbtpls:[{
+        field:'em_code',width:100
+    },{
+        field:'em_name',width:100
+    }],
+    defaultCondition: "em_class='正式'",
+    dbSearchFields:[{
+        emptyText:'输入人员编号或名称',
+        xtype : "textfield", 
+        name : "search", 
+        getCondition: function(v) {
+            return "(upper(em_code) like '%"+v.toUpperCase()+"%' or upper(em_name) like '%"+v.toUpperCase()+"%')";
+        },
+        allowBlank : true, 
+        columnWidth : 0.25
+    }],
+    //放大镜窗口列表
+    dbColumns:[{
+        text: "人员ID",
+        hidden: true,
+        dataIndex: "id",
+        width: 0,
+        xtype: "numbercolumn"
+    },{
+        text: "人员编号",
+        dataIndex: "em_code",
+        width: 200
+    }, {
+        text: "人员名称",
+        dataIndex: "em_name",
+        width: 200
+    }, {
+        text: "类型",
+        dataIndex: "em_class",
+        width: 180,
+    }, {
+        text: "手机",
+        dataIndex: "em_mobile",
+        width: 180,
+    }, {
+        text: "邮箱",
+        dataIndex: "em_email",
+        width: 180,
+    }]
+
+});

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

@@ -0,0 +1,102 @@
+/**
+ * 物料资料放大镜(单选)
+ */
+Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'productDbfindTrigger',
+
+    conditionCode:'pr_code',
+    dataUrl:'/api/document/product/list',
+    addXtype: 'document-product-formpanel',
+    addTitle: '物料资料',
+    dbtpls:[{
+        field:'pr_code',width:100
+    },{
+        field:'pr_detail',width:100
+    }],
+    defaultCondition: "pr_statuscode='OPEN'",
+    dbSearchFields:[{
+        emptyText:'输入物料编号、名称或规格',
+        xtype : "textfield", 
+        name : "search", 
+        width: 200,
+        getCondition: function(v) {
+            return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+        },
+        allowBlank : true, 
+        columnWidth : 0.25
+    }],
+    dbColumns:[{
+        text: "物料ID",
+        hidden: true,
+        dataIndex: "id",
+    }, {
+        text: "物料编号",       
+        dataIndex: "pr_code",
+        width: 200,
+    }, {
+        text: "物料名称",
+        width: 200,
+        dataIndex: "pr_detail",
+    }, {
+        text: "规格",
+        dataIndex: "pr_spec",
+        width: 100,
+    }, {
+        text: "单位",
+        dataIndex: "pr_spec",
+        width: 100,
+    },{
+        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: 100,
+        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);
+        },                            
+        align:'end'
+    },{
+        text: "类型",
+        dataIndex: "pr_kind",
+        width: 100,
+    },{
+        text: "型号",
+        dataIndex: "pr_orispeccode",
+        width: 100,
+    },{
+        text: "品牌",
+        dataIndex: "pr_brand",
+        width: 100,
+    },{
+        text: "供应商",
+        dataIndex: "pr_vendname",
+        width: 100,
+    },{
+        text: "最小包装",
+        dataIndex: "pr_zxbzs",
+        width: 100,
+        xtype: 'numbercolumn',
+        align: 'end'
+    },{
+        text: "L/T",
+        dataIndex: "pr_leadtime",
+        width: 100,
+    }]
+
+});

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

@@ -0,0 +1,143 @@
+/**
+ * 物料资料放大镜(多选)
+ */
+Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.MultiDbfindTrigger',
+    xtype: 'productMultiDbfindTrigger',
+
+    //数据接口
+    // dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
+    // dataUrl:'http://localhost:9480/product/list',
+    dataUrl: '/api/document/product/list',
+    addXtype: 'document-product-formpanel',
+    addTitle: '物料资料',
+    //放大镜赋值设置
+    dbfinds: [{
+        from: 'id',
+        to: 'pd_prodid',
+        ignore: true
+    }, {
+        from: 'pr_code',
+        to: 'pd_prodcode'
+    }, {
+        from: 'pr_detail',
+        to: 'pr_detail'
+    }, {
+        from: 'pr_spec',
+        to: 'pr_spec'
+    }, {
+        from: 'pr_purcprice',
+        to: 'pd_price'
+    }, {
+        from: 'pr_zxbzs',
+        to: 'pr_zxbzs'
+    }],
+    //联想设置
+    dbtpls: [{
+        field: 'pr_code',
+        width: 100
+    }, {
+        field: 'pr_detail',
+        width: 100
+    }],
+    defaultCondition: "pr_statuscode='OPEN'",
+    dbSearchFields: [{
+        emptyText: '输入物料编号、名称或规格',
+        width: 200,
+        xtype: "textfield",
+        name: "search",
+        allowBlank: true,
+        columnWidth: 0.25,
+        getCondition: function (v) {
+            return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%' or upper(pr_spec) like '%" + v.toUpperCase() + "%')";
+        }
+    }],
+    //窗口列设置
+    dbColumns: [{
+        text: "物料ID",
+        hidden: true,
+        dataIndex: "id",
+    }, {
+        text: "物料编号",
+        dataIndex: "pr_code",
+        width: 200,
+    }, {
+        text: "物料名称",
+        width: 200,
+        dataIndex: "pr_detail",
+    }, {
+        text: "规格",
+        dataIndex: "pr_spec",
+        width: 100,
+    }, {
+        text: "单位",
+        dataIndex: "pr_unit",
+        width: 100,
+    }, {
+        text: "最新采购单价",
+        dataIndex: "pr_purcprice",
+        align: 'end',
+        xtype: 'numbercolumn',
+        width: 0,
+    }, {
+        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: 100,
+        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);
+        },
+        align: 'end'
+    }, {
+        text: "类型",
+        dataIndex: "pr_kind",
+        width: 100,
+    }, {
+        text: "型号",
+        dataIndex: "pr_orispeccode",
+        width: 100,
+    }, {
+        text: "品牌",
+        dataIndex: "pr_brand",
+        width: 100,
+    }, {
+        text: "供应商",
+        dataIndex: "pr_vendname",
+        width: 100,
+    }, {
+        text: "最小包装",
+        dataIndex: "pr_zxbzs",
+        width: 100,
+        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();
+            return Ext.util.Format.number(v, format);
+        },
+    }, {
+        text: "L/T",
+        dataIndex: "pr_leadtime",
+        width: 100,
+    }]
+
+});

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

@@ -0,0 +1,79 @@
+/**
+ * 供应商资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'vendorDbfindTrigger',
+
+    //数据接口
+    dataUrl:'/api/document/vendor/list',
+    addXtype: 'document-vendor-formpanel',
+    addTitle: '供应商资料',
+    defaultCondition:"ve_statuscode='OPEN'",
+
+    //联想设置
+    dbtpls:[{
+        field:'ve_code',width:100
+    },{
+        field:'ve_name',width:100
+    }],
+    defaultCondition: "ve_statuscode='OPEN'",
+    dbSearchFields:[{
+        emptyText:'输入供应商编号或名称',
+        xtype : "textfield", 
+        name : "search", 
+        getCondition: function(v) {
+            return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
+        },
+        allowBlank : true, 
+        columnWidth : 0.25
+    }],
+    //放大镜窗口列表
+    dbColumns:[{
+        text: "供应商ID",
+        hidden: true,
+        dataIndex: "id",
+        width: 100,
+        xtype: "numbercolumn"
+    },{
+        text: "供应商编号",
+        dataIndex: "ve_code",
+        width: 200
+    }, {
+        text: "供应商名称",
+        dataIndex: "ve_name",
+        width: 200
+    }, {
+        text: "供应商类型",
+        dataIndex: "ve_type",
+        width: 180,
+    }, {
+        text: "税率",
+        dataIndex: "ve_taxrate",
+        width: 100,
+        xtype: 'numbercolumn',
+        align:'end'
+    }, {
+        text: "承付天数",
+        dataIndex: "ve_promisedays",
+        width: 100,
+        xtype: 'numbercolumn',
+        align: 'end', 
+        renderer : function(v) {
+            return Ext.util.Format.number(v, '0');
+        }
+    }, {
+        text: "纳税人识别号",
+        dataIndex: "ve_bankaccount",
+        width: 150
+    }, {
+        text: "开户银行",
+        dataIndex: "ve_bankaccount",
+        width: 150
+    }, {
+        text: "银行账户",
+        dataIndex: "ve_bankcode",
+        flex:1
+    }]
+
+});

+ 54 - 0
frontend/saas-web/app/view/core/dbfind/types/WarehouseDbfindTrigger.js

@@ -0,0 +1,54 @@
+/**
+ * 仓库资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'warehouseDbfindTrigger',
+
+    dataUrl: '/api/document/warehouse/list',
+    // dataUrl:'http://localhost:9480/warehouse/list',
+    addXtype: 'other-warehouse',
+    addTitle: '仓库资料',
+    defaultCondition: "wh_statuscode='OPEN'",
+    dbtpls: [{
+        field: 'wh_code',
+        width: 100
+    }, {
+        field: 'wh_description',
+        width: 100
+    }],
+    dbSearchFields: [{
+        emptyText: '输入仓库编号或名称',
+        xtype: "textfield",
+        name: "wh_code",
+        allowBlank: true,
+        columnWidth: 0.25,
+        getCondition: function (v) {
+            return "(upper(wh_code) like '%" + v.toUpperCase() + "%' or upper(wh_description) like '%" + v.toUpperCase() + "%')";
+        }
+    }],
+    dbColumns: [{
+        text: "仓库ID",
+        flex: 0,
+        dataIndex: "id",
+        width: 0,
+        xtype: "",
+    }, {
+        text: "仓库编号",
+        flex: 1,
+        dataIndex: "wh_code",
+        width: 100,
+        xtype: "",
+    }, {
+        text: "仓库名称",
+        flex: 1,
+        dataIndex: "wh_description",
+        xtype: "",
+    }, {
+        text: "仓库类型",
+        flex: 1,
+        dataIndex: "wh_type",
+        xtype: "",
+    }]
+
+});

+ 3 - 271
frontend/saas-web/app/view/document/bom/FormController.js

@@ -6,12 +6,9 @@ Ext.define('saas.view.document.bom.FormController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=bo_mothercode]':{
+            'productDbfindTrigger[name=bo_mothercode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[
                         {
                             from:'pr_code',to:'bo_mothercode'
@@ -22,99 +19,14 @@ Ext.define('saas.view.document.bom.FormController', {
                         }, {
                             from:'id',to:'bo_motherid',ignore:true
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }
             },
             //从表多选放大镜赋值关系 以及 tpl模板
-            'multidbfindtrigger[name=bd_soncode]':{
+            'productMultiDbfindTrigger[name=bd_soncode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'bd_soncode'                          
@@ -127,105 +39,12 @@ Ext.define('saas.view.document.bom.FormController', {
                         },{
                             from:'id',to:'bd_sonid',ignore:true 
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            width: 200,
-                            xtype : "textfield", 
-                            name : "search", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%')";
-                            }
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        }, {
-                            "text": "最新采购单价",
-                            "dataIndex": "pr_purcprice",
-                            "width": 0,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库名称",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
                 }
             },
-            'multidbfindtrigger[name=bd_replace]':{
+            'productMultiDbfindTrigger[name=bd_replace]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         //放大镜赋值设置
                         dbfinds:[
                         {
@@ -237,93 +56,6 @@ Ext.define('saas.view.document.bom.FormController', {
                         },{
                             from:'pr_unit',to:'pr_unit'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            width: 200,
-                            xtype : "textfield", 
-                            name : "search", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%')";
-                            }
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        }, {
-                            "text": "最新采购单价",
-                            "dataIndex": "pr_purcprice",
-                            "width": 0,
-                            xtype: 'numbercolumn',
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            xtype: 'numbercolumn',
-                            "width": 100,
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
                 }
             }

+ 3 - 3
frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -55,7 +55,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
         name: 'bo_motherid',
         fieldLabel: '产品id'
     },{
-        xtype : "dbfindtrigger", 
+        xtype : "productDbfindTrigger", 
         name: 'bo_mothercode',
         fieldLabel: '产品编号',
         allowBlank: false
@@ -114,7 +114,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             }, {
                 allowBlank:false,
@@ -178,7 +178,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             }, {
                 text : "备注", 

+ 0 - 136
frontend/saas-web/app/view/document/employee/FormController.js

@@ -1,142 +1,6 @@
 Ext.define('saas.view.document.employee.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
     alias: 'controller.document-employee-formpanel',
-    init: function (form) {
-        var me = this;
-        this.control({
-            //主表单选放大镜模板
-            'dbfindtrigger[name=pr_vendcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/vendor/getVendorsByCondition',
-                        //赋值 
-                        dbfinds:[{
-                            from:'id',to:'pr_vendid',ignore:true
-                        },{
-                            from:'ve_code',to:'pr_vendcode'
-                        },{
-                            from:'ve_name',to:'pr_vendname'
-                        }],
-                        //新增地址
-                        addXtype:'document-vendor-formpanel',
-                        //新增标题
-                        addTitle:'供应商资料', 
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: 've_statuscode="OPEN"',
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            xtype : "textfield",
-                            name: 'name',
-                            getCondition: function(v) {
-                                return "((ve_code) like '%"+v.toUpperCase()+"%' or (ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            emptyText : "请输入供应商编号或名称", 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                        },{
-                            "text": "供应商编号",
-                            "flex": 1,
-                            "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                        }, {
-                            "text": "供应商名称",
-                            "flex": 1,
-                            "dataIndex": "ve_name",
-                            "xtype": "",
-                        }, {
-                            "text": "供应商类型",
-                            "flex": 0,
-                            "dataIndex": "ve_type",
-                            "width": 200,
-                            "xtype": "",
-                        }]
-                    }) ;   
-
-                }
-            },
-            // 仓库编号
-            'dbfindtrigger[name=pr_whcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/warehouse/list',
-                        //放大镜赋值设置
-                        dbfinds:[{
-                            from:'id',to:'pr_whid',ignore:true
-                        },{
-                            from:'wh_code',to:'pr_whcode'
-                        },{
-                            from:'wh_description',to:'pr_whname'
-                        }],
-                        //新增地址
-                        addXtype:'other-warehouse',
-                        //新增标题
-                        addTitle:'仓库资料', 
-                        //联想查询条件
-                        defaultCondition:"wh_statuscode='OPEN'",
-                        //联想设置
-                        dbtpls:[{
-                            field:'wh_code',width:180
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或仓库名称或仓库类型',
-                            xtype : "textfield", 
-                            name : "name", 
-                            allowBlank : true, 
-                            width:260,
-                            getCondition:function(v){
-                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%'"+
-                                " or (wh_type) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                        },{
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                        },{
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                        }]
-                    }) ;   
-
-                }
-            }
-        });
-
-    },
 
     auditBtnClick: function() {
         var me = this,

+ 3 - 151
frontend/saas-web/app/view/document/product/FormController.js

@@ -5,76 +5,24 @@ Ext.define('saas.view.document.product.FormController', {
         var me = this;
         this.control({
             //主表单选放大镜模板
-            'dbfindtrigger[name=pr_vendcode]':{
+            'vendorDbfindTrigger[name=pr_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/vendor/getVendorsByCondition',
-                        //赋值 
                         dbfinds:[{
                             from:'id',to:'pr_vendid',ignore:true
                         },{
                             from:'ve_code',to:'pr_vendcode'
                         },{
                             from:'ve_name',to:'pr_vendname'
-                        }],
-                        //新增地址
-                        addXtype:'document-vendor-formpanel',
-                        //新增标题
-                        addTitle:'供应商资料', 
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: 've_statuscode="OPEN"',
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            xtype : "textfield",
-                            name: 'name',
-                            getCondition: function(v) {
-                                return "((ve_code) like '%"+v.toUpperCase()+"%' or (ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            emptyText : "请输入供应商编号或名称", 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                        },{
-                            "text": "供应商编号",
-                            "flex": 1,
-                            "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                        }, {
-                            "text": "供应商名称",
-                            "flex": 1,
-                            "dataIndex": "ve_name",
-                            "xtype": "",
-                        }, {
-                            "text": "供应商类型",
-                            "flex": 0,
-                            "dataIndex": "ve_type",
-                            "width": 200,
-                            "xtype": "",
                         }]
                     }) ;   
 
                 }
             },
             // 仓库编号
-            'dbfindtrigger[name=pr_whcode]':{
+            'warehouseDbfindTrigger[name=pr_whcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/warehouse/list',
-                        //放大镜赋值设置
                         dbfinds:[{
                             from:'id',to:'pr_whid',ignore:true
                         },{
@@ -82,66 +30,14 @@ Ext.define('saas.view.document.product.FormController', {
                         },{
                             from:'wh_description',to:'pr_whname'
                         }],
-                        //新增地址
-                        addXtype:'other-warehouse',
-                        //新增标题
-                        addTitle:'仓库资料', 
-                        //联想查询条件
-                        defaultCondition:"wh_statuscode='OPEN'",
-                        //联想设置
-                        dbtpls:[{
-                            field:'wh_code',width:180
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或仓库名称或仓库类型',
-                            xtype : "textfield", 
-                            name : "name", 
-                            allowBlank : true, 
-                            width:260,
-                            getCondition:function(v){
-                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%'"+
-                                " or (wh_type) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                        },{
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                        },{
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                        }]
                     }) ;   
 
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_whcode]': {
+            'warehouseDbfindTrigger[name=pd_whcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/warehouse/list',
-                        addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
-                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds: [{
                             from: 'id', to: 'pd_whid',ignore:true
                         }, {
@@ -149,50 +45,6 @@ Ext.define('saas.view.document.product.FormController', {
                         }, {
                             from: 'wh_description', to: 'pd_whname'
                         }],
-                        dbtpls: [{
-                            field: 'wh_code',
-                            width: 100
-                        }, {
-                            field: 'wh_description',
-                            width: 100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或名称',
-                            xtype : "textfield", 
-                            name : "wh_code", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns: [{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                            "items": null
-                        }]
                     });
                 },
             }

+ 3 - 13
frontend/saas-web/app/view/document/product/FormPanel.js

@@ -133,7 +133,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_whid", 
         fieldLabel : "仓库ID"
     },{  
-        xtype : "dbfindtrigger",     
+        xtype : "warehouseDbfindTrigger",     
         name : "pr_whcode", 
         fieldLabel : "仓库编号", 
     }, {
@@ -148,7 +148,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         fieldLabel : "供应商ID", 
         columnWidth : 0
     },{
-        xtype : "dbfindtrigger",   
+        xtype : "vendorDbfindTrigger",   
         name : "pr_vendcode", 
         fieldLabel : "供应商编号"
     }, {
@@ -232,17 +232,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             text : "仓库编号", 
             dataIndex : "pd_whcode", 
             editor : {
-                displayField : "display", 
-                editable : true, 
-                format : "", 
-                hideTrigger : false, 
-                maxLength : 100.0, 
-                minValue : null, 
-                positiveNum : false, 
-                queryMode : "local", 
-                store : null, 
-                valueField : "value", 
-                xtype : "dbfindtrigger"
+                xtype : "warehouseDbfindTrigger"
             },
             xtype : "", 
             items : null

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

@@ -5,7 +5,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
     viewModel: 'document-vendor-basepanel',
 
     searchField:[{
-        xtype : "dbfindtrigger", 
+        xtype : "vendorDbfindTrigger", 
         name : "ve_code", 
         emptyText : "供应商编号", 
         width:140,

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

@@ -6,14 +6,9 @@ Ext.define('saas.view.document.vendor.BasePanelController', {
         var me = this;
         this.control({
             // 主表-供应商名称
-            'dbfindtrigger[name=ve_code]':{
+            'vendorDbfindTrigger[name=ve_code]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'id',ignore:true
@@ -30,69 +25,6 @@ Ext.define('saas.view.document.vendor.BasePanelController', {
                         },{
                             from:'ve_name',to:'ve_name'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }

+ 0 - 4
frontend/saas-web/app/view/home/charts/MonthSale.js

@@ -65,10 +65,6 @@ Ext.define('saas.view.home.charts.MonthSale', {
                     lineWidth: 0,
                     stroke: "#789"
                 },
-                // interactions: [{
-                //     type: 'panzoom',
-                //     zoomOnPan: true
-                // }],
                 series: [{
                     type: 'pie',
                     angleField: 'y',

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

@@ -79,7 +79,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "bandinfoDbfindTrigger"
                 }
             }, {
                 text : "转入账户ID", 
@@ -106,7 +106,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "bandinfoDbfindTrigger"
                 }
             }, {
                 text : "金额", 

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

@@ -5,12 +5,9 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=ftd_bankname]':{
+            'bandinfoDbfindTrigger[name=ftd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle:'资金账户',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_bankcode'
@@ -19,67 +16,12 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             from:'id',to:'ftd_bankid',ignore:true
                         }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }) ;
                 }
             },
-            'dbfindtrigger[name=ftd_inbankname]':{
+            'bandinfoDbfindTrigger[name=ftd_inbankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle:'资金账户',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_inbankcode'
@@ -88,58 +30,6 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             from:'id',to:'ftd_inbankid'
                         }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }) ;   
 
                 }

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

@@ -60,11 +60,11 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             ]
         })
     },{
-        xtype : "dbfindtrigger",
+        xtype : "bandinfoDbfindTrigger",
         name : "ftd_bankname",
         fieldLabel : "转出账号",
     },{
-        xtype : "dbfindtrigger",
+        xtype : "bandinfoDbfindTrigger",
         name : "ftd_inbankname",
         fieldLabel : "转入账号",
     }],

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

@@ -5,12 +5,9 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=ftd_bankname]':{
+            'bandinfoDbfindTrigger[name=ftd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle:'资金账户',
                         dbfinds:[
                             {
                                 from:'bk_bankcode',to:'ftd_bankcode'
@@ -19,67 +16,12 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
                             },{
                                 from:'id',to:'ftd_bankid'
                             }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }) ;
                 }
             },
-            'dbfindtrigger[name=ftd_inbankname]':{
+            'bandinfoDbfindTrigger[name=ftd_inbankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle:'资金账户',
                         dbfinds:[
                             {
                                 from:'bk_bankcode',to:'ftd_inbankcode'
@@ -88,58 +30,6 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
                             },{
                                 from:'id',to:'ftd_inbankid'
                             }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }) ;
 
                 }

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

@@ -35,7 +35,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
          name : 'or_custcode', 
          fieldLabel : '客户编号'
      }, {
-         xtype : "dbfindtrigger", 
+         xtype : "customerDbfindTrigger", 
          name : "or_custname", 
          fieldLabel : "客户名称",
          allowBlank : false
@@ -48,7 +48,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
          name : 'or_bankcode', 
          fieldLabel : '账户编号'
      }, {
-         xtype : "dbfindtrigger", 
+         xtype : "bandinfoDbfindTrigger", 
          name : "or_bankname", 
          fieldLabel : "账户名称",
          allowBlank : false

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

@@ -5,13 +5,9 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=or_custname]': {
+            'customerDbfindTrigger[name=or_custname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition: "cu_statuscode='OPEN'",
                         dbfinds: [{
                             from: 'id',
                             to: 'or_custid',
@@ -23,105 +19,14 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             from: 'cu_name',
                             to: 'or_custname'
                         }],
-                        dbtpls: [{
-                            field: 'cu_code',
-                            width: 100
-                        }, {
-                            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",
-                            "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
-                        }]
                     });
 
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=or_bankname]': {
+            'bandinfoDbfindTrigger[name=or_bankname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'or_bankcode'
@@ -132,61 +37,6 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             from: 'id',
                             to: 'or_bankid'
                         }],
-                        // defaultCondition: "bk_statuscode='OPEN'",
-                        dbtpls: [{
-                            field: 'bk_bankcode',
-                            width: 100
-                        }, {
-                            field: 'bk_bankname',
-                            width: 100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     });
 
                 }

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

@@ -26,7 +26,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         name: 'or_custcode',
         fieldLabel: '客户编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'or_custname',
         fieldLabel: '客户名称',
     }, {
@@ -38,7 +38,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         name: 'or_auditman',
         fieldLabel: '审核人'
     },  {
-        xtype: 'dbfindtrigger',
+        xtype: 'bandinfoDbfindTrigger',
         name: 'or_bankname',
         fieldLabel: '账户名称'
     }, {

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

@@ -5,12 +5,9 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=or_custname]':{
+            'customerDbfindTrigger[name=or_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         dbfinds:[{
                             from:'id',to:'or_custid'
                         },{
@@ -18,98 +15,14 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         },{
                             from:'cu_name',to:'or_custname'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        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',
-                            }, {
-                                "text": "承付天数",
-                                "flex": 1,
-                                "dataIndex": "cu_promisedays",
-                                align: 'end',
-                                xtype: 'numbercolumn',
-                                "width": 100, 
-                                renderer : function(v) {
-                                    return Ext.util.Format.number(v, '0');
-                                }
-                            }, {
-                                "text": "额度",
-                                "flex": 1,
-                                "dataIndex": "cu_credit",
-                                "width": 100,
-                                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);
-                                }
-                            }, {
-                                "text": "客户地址",
-                                "flex": 1,
-                                "dataIndex": "ca_address",
-                                "width": 250
-                            }]
                     }) ;   
 
                 }
           },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=or_bankname]':{
+            'bandinfoDbfindTrigger[name=or_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds:[{
                             from:'bk_bankcode',to:'or_bankcode'
                         },{
@@ -117,58 +30,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         },{
                             from:'id',to:'or_bankid'
                         }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     });
 
                 }

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

@@ -35,7 +35,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
          name : 'os_vendcode', 
          fieldLabel : '供应商编号'
      }, {
-         xtype : "dbfindtrigger",
+         xtype : "vendorDbfindTrigger",
          name : "os_vendname", 
          fieldLabel : "供应商名称",
          allowBlank : false
@@ -48,7 +48,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
          name : 'os_bankcode', 
          fieldLabel : '结算账户编号'
      }, {
-         xtype : "dbfindtrigger",
+         xtype : "bandinfoDbfindTrigger",
          name : "os_bankname", 
          fieldLabel : "账户名称",
          allowBlank : false

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

@@ -5,12 +5,9 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=os_vendname]': {
+            'vendorDbfindTrigger[name=os_vendname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds: [{
                             from: 'id',
                             to: 'os_vendid',
@@ -22,79 +19,14 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             from: 've_name',
                             to: 'os_vendname'
                         }],
-                        dbtpls: [{
-                            field: 've_code',
-                            width: 100
-                        }, {
-                            field: 've_name',
-                            width: 100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     });
 
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=os_bankname]': {
+            'bandinfoDbfindTrigger[name=os_bankname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'os_bankcode'
@@ -105,60 +37,6 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             from: 'id',
                             to: 'os_bankid'
                         }],
-                        dbtpls: [{
-                            field: 'bk_bankcode',
-                            width: 100
-                        }, {
-                            field: 'bk_bankname',
-                            width: 100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     });
 
                 }

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

@@ -26,7 +26,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         name: 'os_vendcode',
         fieldLabel: '供应商编号',
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'os_vendname',
         fieldLabel: '供应商名称'
     }, {
@@ -38,7 +38,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         name: 'os_auditman',
         fieldLabel: '审核人',
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'bandinfoDbfindTrigger',
         name: 'os_bankname',
         fieldLabel: '结算账户',
     },{

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

@@ -8,9 +8,6 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
             'dbfindtrigger[name=os_vendname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds: [{
                             from: 'id',
                             to: 'os_vendid'
@@ -21,71 +18,6 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             from: 've_name',
                             to: 'os_vendname'
                         }],
-                        dbtpls: [{
-                            field: 've_code',
-                            width: 100
-                        }, {
-                            field: 've_name',
-                            width: 100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     });
 
                 }
@@ -94,10 +26,6 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
             'dbfindtrigger[name=os_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'os_bankcode',
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds:[{
                             from:'bk_bankcode',to:'os_bankcode'
                         },{
@@ -105,58 +33,6 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                         },{
                             from:'id',to:'os_bankid'
                         }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }); 
 
                 }

+ 2 - 2
frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -50,7 +50,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         name: "pb_vendcode",
         fieldLabel: "供应商编号"
     }, {
-        xtype: "dbfindtrigger",
+        xtype: "vendorDbfindTrigger",
         name: "pb_vendname",
         fieldLabel: "供应商名称",
         allowBlank : false
@@ -120,7 +120,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             dataIndex: 'pd_bankname',
             allowBlank : false,
             editor:{
-                xtype:'dbfindtrigger'
+                xtype:'bandinfoDbfindTrigger'
             }
         },{
             text: '资金账户编号',

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

@@ -9,9 +9,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             'dbfindtrigger[name=pb_vendname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds: [{
                             from: 've_code',
                             to: 'pb_vendcode'
@@ -26,70 +23,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             to: 'pb_vendid',
                             ignore:true
                         }],
-                        dbtpls: [{
-                            field: 've_code',
-                            width: 100
-                        }, {
-                            field: 've_name',
-                            width: 100
-                        },{
-                            field:'ve_leftamount',
-                            width: 100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100, 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     });
 
                 }
@@ -192,9 +125,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             'dbfindtrigger[name=pd_bankname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
                             to: 'pd_bankid'
@@ -205,61 +135,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             from: 'bk_bankname',
                             to: 'pd_bankname'
                         }],
-                        dbtpls: [{
-                            field: 'bk_bankcode',
-                            width: 100
-                        }, {
-                            field: 'bk_bankname',
-                            width: 100
-                        }],
-                        otherConditon:'',
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     });
 
                 }

+ 2 - 2
frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -12,7 +12,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         name: 'pb_code',
         fieldLabel: '单据编号',
     },{
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pb_vendname',
         fieldLabel: '供应商',
     },{
@@ -20,7 +20,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         name: 'pb_manname',
         fieldLabel: '付款人',
     },{
-        xtype: 'dbfindtrigger',
+        xtype: 'bandinfoDbfindTrigger',
         name: 'pd_bankname',
         fieldLabel: '资金账户',
     },{

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

@@ -9,73 +9,9 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
             'dbfindtrigger[name=pb_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_name',to:'pb_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -84,96 +20,11 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }
@@ -181,9 +32,6 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
             'dbfindtrigger[name=pd_bankname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
                             to: 'pd_bankid'
@@ -194,61 +42,6 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                             from: 'bk_bankname',
                             to: 'pd_bankname'
                         }],
-                        dbtpls: [{
-                            field: 'bk_bankcode',
-                            width: 100
-                        }, {
-                            field: 'bk_bankname',
-                            width: 100
-                        }],
-                        otherConditon:'',
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     });
 
                 }

+ 2 - 2
frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -49,7 +49,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         name: 'rb_custcode',
         fieldLabel: '客户编号'
     }, {
-        xtype: "dbfindtrigger",
+        xtype: "customerDbfindTrigger",
         name: "rb_custname",
         fieldLabel: "客户名称",
         allowBlank : false
@@ -126,7 +126,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             allowBlank : false,
             width: 200,
             editor:{
-                xtype:'dbfindtrigger'
+                xtype:'bandinfoDbfindTrigger'
             }
         }, {
             text: "收款金额",

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

@@ -8,10 +8,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
             'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/customer/list',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid',ignore:true
@@ -22,74 +18,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         },{
                             from:'cu_leftamount', to:'cu_leftamount'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        },{
-                            field:'cu_leftamount',width:100
-                        }],
-                        defaultCondition: 'cu_statuscode="OPEN"',
-                        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:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "应收款余额",
-                            "dataIndex": "cu_leftamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     }) ;   
 
                 }
@@ -97,79 +25,14 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
             'dbfindtrigger[name=rd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/customer/list',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         //赋值 
                         dbfinds:[{
-                            from: 'id', to: 'rb_custid'
+                            from: 'id', to: 'rb_bankid'
                         }, {
-                            from:'cu_code', to:'rb_custcode'
-                        },{
-                            from:'cu_name', to:'rb_custname'
-                        }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'cu_code',width:100
+                            from:'bk_bankcode', to:'rd_bankcode'
                         },{
-                            field:'cu_name',width:100
+                            from:'bk_bankname', to:'rd_bankname'
                         }],
-                        //联想查询条件
-                        defaultCondition: 'cu_statuscode="OPEN"',
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            name : "cu_name", 
-                            getCondition: function(v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            fieldLabel : "客户名称", 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     }) ;   
 
                 }
@@ -268,80 +131,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
 
                 }
             },
-            'dbfindtrigger[name=rd_bankname]':{
-                beforerender: function (f) {
-                    Ext.apply(f, {
-                        dataUrl: '/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
-                        dbfinds: [{
-                            from: 'id',
-                            to: 'rd_bankid'
-                        }, {
-                            from: 'bk_bankcode',
-                            to: 'rd_bankcode'
-                        },{
-                            from: 'bk_bankname',
-                            to: 'rd_bankname'
-                        }],
-                        dbtpls: [{
-                            field: 'bk_bankcode',
-                            width: 100
-                        }, {
-                            field: 'bk_bankname',
-                            width: 100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
-                    });
-
-                }
-            }
         });
     },
     addCombo:function(){

+ 1 - 1
frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -20,7 +20,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         name: 'rb_code',
         fieldLabel: '单据编号',
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'rb_custname',
         fieldLabel: '客户名',
     }, {

+ 0 - 248
frontend/saas-web/app/view/money/recBalance/QueryPanelController.js

@@ -5,189 +5,9 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=rd_bankname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl: '/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
-                        },{
-                            from:'ve_name',to:'pu_vendname'
-                        }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
-                    }) ;   
-
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl: '/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',
-                        }, {
-                            from:'pr_detail',to:'pr_detail'
-                        }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
-                    }) ;   
-
-                }
-            },
             'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/customer/list',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         //赋值
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'
@@ -197,74 +17,6 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                             from:'cu_name', to:'rb_custname'
                         },{
                             from:'cu_leftamount', to:'cu_leftamount'
-                        }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        },{
-                            field:'cu_leftamount',width:100
-                        }],
-                        defaultCondition: 'cu_statuscode="OPEN"',
-                        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:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "应收款余额",
-                            "dataIndex": "cu_leftamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end',
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
                         }]
                     }) ;
 

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
     QueryWidth:0.25,
     //筛选:账户、日期(必填)
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'bandinfoDbfindTrigger',
         name: 'bankcode',
         fieldLabel: '账户名称',
         columnWidth: 0.25

+ 0 - 55
frontend/saas-web/app/view/money/report/AccountBalanceController.js

@@ -7,65 +7,10 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
             'dbfindtrigger[name=bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds:[
                             {
                                 from:'bk_bankname',to:'bankname'
                             }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }) ;
                 }
             }

+ 1 - 1
frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
     QueryWidth:0.25,
     //筛选:客户、日期(必填)
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称',
         columnWidth: 0.25

+ 0 - 70
frontend/saas-web/app/view/money/report/CustomerCheckController.js

@@ -6,80 +6,10 @@ Ext.define('saas.view.money.report.CustomerCheckController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/customer/list',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         //赋值
                         dbfinds:[{
                             from: 'cu_name', to: 'pi_custname'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        defaultCondition: 'cu_statuscode="OPEN"',
-                        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:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "应收款余额",
-                            "dataIndex": "cu_leftamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     }) ;
 
                 }

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

@@ -13,7 +13,7 @@ Ext.define('saas.view.money.report.PayDetail', {
     QueryWidth:0.25,
     //筛选:供应商、日期(必填)
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         columnWidth: 0.25

+ 0 - 67
frontend/saas-web/app/view/money/report/PayDetailController.js

@@ -7,76 +7,9 @@ Ext.define('saas.view.money.report.PayDetailController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[
-                            {
-                                "text": "供应商ID",
-                                "hidden": true,
-                                "dataIndex": "id",
-                                "width": 100,
-                                "xtype": "numbercolumn"
-                            },{
-                                "text": "供应商编号",
-                                "dataIndex": "ve_code",
-                                "width": 200
-                            }, {
-                                "text": "供应商名称",
-                                "dataIndex": "ve_name",
-                                "width": 200
-                            }, {
-                                "text": "供应商类型",
-                                "dataIndex": "ve_type",
-                                "width": 180,
-                                "items": null
-                            }, {
-                                "text": "税率",
-                                "dataIndex": "ve_taxrate",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end'
-                            }, {
-                                "text": "承付天数",
-                                "dataIndex": "ve_promisedays",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end', 
-                                renderer : function(v) {
-                                    return Ext.util.Format.number(v, '0');
-                                }
-                            }, {
-                                "text": "纳税人识别号",
-                                "dataIndex": "ve_bankaccount",
-                                "width": 150
-                            }, {
-                                "text": "开户银行",
-                                "dataIndex": "ve_bankaccount",
-                                "width": 100
-                            }, {
-                                "text": "银行账户",
-                                "dataIndex": "ve_bankcode",
-                                "width": 100
-                            }]
                     }) ;
 
                 }

+ 1 - 1
frontend/saas-web/app/view/money/report/RecDetail.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.report.RecDetail', {
     QueryWidth:0.25,
     //筛选:客户、日期(必填)
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称',
         columnWidth: 0.25

+ 0 - 70
frontend/saas-web/app/view/money/report/RecDetailController.js

@@ -6,80 +6,10 @@ Ext.define('saas.view.money.report.RecDetailController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/customer/list',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         //赋值
                         dbfinds:[{
                             from: 'cu_name', to: 'pi_custname'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        defaultCondition: 'cu_statuscode="OPEN"',
-                        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:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "应收款余额",
-                            "dataIndex": "cu_leftamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     }) ;
 
                 }

+ 1 - 1
frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
     QueryWidth:0.25,
     //筛选:供应商、日期(必填)
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         columnWidth: 0.25

+ 0 - 67
frontend/saas-web/app/view/money/report/VendorCheckController.js

@@ -7,76 +7,9 @@ Ext.define('saas.view.money.report.VendorCheckController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[
-                            {
-                                "text": "供应商ID",
-                                "hidden": true,
-                                "dataIndex": "id",
-                                "width": 100,
-                                "xtype": "numbercolumn"
-                            },{
-                                "text": "供应商编号",
-                                "dataIndex": "ve_code",
-                                "width": 200
-                            }, {
-                                "text": "供应商名称",
-                                "dataIndex": "ve_name",
-                                "width": 200
-                            }, {
-                                "text": "供应商类型",
-                                "dataIndex": "ve_type",
-                                "width": 180,
-                                "items": null
-                            }, {
-                                "text": "税率",
-                                "dataIndex": "ve_taxrate",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end'
-                            }, {
-                                "text": "承付天数",
-                                "dataIndex": "ve_promisedays",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end', 
-                                renderer : function(v) {
-                                    return Ext.util.Format.number(v, '0');
-                                }
-                            }, {
-                                "text": "纳税人识别号",
-                                "dataIndex": "ve_bankaccount",
-                                "width": 150
-                            }, {
-                                "text": "开户银行",
-                                "dataIndex": "ve_bankaccount",
-                                "width": 100
-                            }, {
-                                "text": "银行账户",
-                                "dataIndex": "ve_bankcode",
-                                "width": 100
-                            }]
                     }) ;
 
                 }

+ 3 - 13
frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -47,7 +47,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         name : "pu_vendcode", 
         fieldLabel : "供应商编号"
     }, {
-        xtype : "dbfindtrigger", 
+        xtype : "vendorDbfindTrigger", 
         name : "pu_vendname", 
         fieldLabel : "供应商名称",
         allowBlank : false,
@@ -110,17 +110,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 items : null,
                 allowBlank : false,
                 editor : {
-                    displayField : "display", 
-                    editable : true, 
-                    format : "", 
-                    hideTrigger : false, 
-                    maxLength : 100.0, 
-                    minValue : null, 
-                    positiveNum : false, 
-                    queryMode : "local", 
-                    store : null, 
-                    valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },
             {
@@ -333,7 +323,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         readOnly:true,
         columnWidth : 0.25,
     },{
-        xtype : "dbfindtrigger", 
+        xtype : "employeeDbfindTrigger", 
         name : "pu_buyercode", 
         fieldLabel : "采购员编号",
     },{

+ 2 - 227
frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -8,11 +8,6 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'pu_vendid',ignore:true
@@ -21,83 +16,13 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             from:'ve_name',to:'pu_vendname'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            flex:1
-                        }]
-                    }) ;   
-
+                    }) ; 
                 }
             },
             // 主表-采购员名称
             'dbfindtrigger[name=pu_buyercode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/employee/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'pu_buyerid',ignore:true
@@ -105,54 +30,6 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             from:'em_code',to:'pu_buyercode'
                         },{
                             from:'em_name',to:'pu_buyername'
-                        }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'em_code',width:100
-                        },{
-                            field:'em_name',width:100
-                        }],
-                        defaultCondition: "em_class='正式'",
-                        dbSearchFields:[{
-                            emptyText:'输入人员编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(em_code) like '%"+v.toUpperCase()+"%' or upper(em_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "人员ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "人员编号",
-                            "dataIndex": "em_code",
-                            "width": 200
-                        }, {
-                            "text": "人员名称",
-                            "dataIndex": "em_name",
-                            "width": 200
-                        }, {
-                            "text": "类型",
-                            "dataIndex": "em_class",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "手机",
-                            "dataIndex": "em_mobile",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "邮箱",
-                            "dataIndex": "em_email",
-                            "width": 180,
-                            "items": null
                         }]
                     }) ;   
                 }
@@ -161,12 +38,6 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
             'multidbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        // dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
-                        // dataUrl:'http://localhost:9480/product/list',
-                        dataUrl: '/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'id',to:'pd_prodid',ignore:true                          
@@ -181,103 +52,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             from:'pr_zxbzs',to:'pr_zxbzs'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            width: 200,
-                            xtype : "textfield", 
-                            name : "search", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%')";
-                            }
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        }, {
-                            "text": "最新采购单价",
-                            "dataIndex": "pr_purcprice",
-                            align:'end',
-                            xtype: 'numbercolumn',
-                            "width": 0,
-                        },{
-                            "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": 100,
-                            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);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
-                    }) ;   
+                    });
 
                 }
             },

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

@@ -26,23 +26,23 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         columnWidth: 0.5,
         operation: 'between'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pu_vendcode',
         fieldLabel: '供应商编号',
         hidden:true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pu_vendname',
         fieldLabel: '供应商名称',
         emptyText:'输入供应商编号或名称'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         showDetail: true,
         hidden:true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         showDetail: true,

+ 0 - 157
frontend/saas-web/app/view/purchase/purchase/QueryPanelController.js

@@ -9,75 +9,11 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
                             from:'ve_name',to:'pu_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -86,104 +22,11 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            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);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }

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

@@ -57,7 +57,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         name: 'pi_vendcode',
         fieldLabel: '供应商编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         allowBlank : false,
@@ -123,7 +123,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -227,7 +227,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "warehouseDbfindTrigger"
                 }
             },
             {

+ 0 - 211
frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -15,12 +15,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-
-                        dataUrl:'/api/document/vendor/list',
-                        // dataUrl:'http://localhost:9480/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pi_vendid',ignore:true
                         },{
@@ -28,69 +22,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -99,10 +30,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'multidbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        // dataUrl:'http://localhost:9480/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'id',to:'pd_prodid',ignore:true                          
                         },{
@@ -120,97 +47,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             from:'pr_purcprice',to:'pd_orderprice'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        },{
-                            field:'pr_spec',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            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);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]                    
                     });   
                 }
             },
@@ -219,11 +55,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/warehouse/list',
-                        // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
-                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid',ignore:true                          
                         },{
@@ -231,48 +62,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             from:'wh_description',to:'pd_whname'
                         }],
-                        dbtpls:[{
-                            field:'wh_code',width:100
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或名称',
-                            xtype : "textfield", 
-                            name : "wh_code", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                            "items": null
-                        }]
                     }) ;   
 
                 }

+ 3 - 3
frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js

@@ -33,20 +33,20 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         emptyText:'输入供应商编号或名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         hidden:true,
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         emptyText:'输入物料编号或名称',

+ 0 - 159
frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js

@@ -9,77 +9,11 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pi_vendcode'
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -88,10 +22,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_detail',to:'pr_detail',
                         },{
@@ -99,95 +29,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length)).fill('0');
-                                var format = '0.' + xr.join();
-                                return Ext.util.Format.number(v, format);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }

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

@@ -52,7 +52,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         name: 'pi_vendcode',
         fieldLabel: '供应商编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         allowBlank : false,
@@ -122,7 +122,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -212,7 +212,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "warehouseDbfindTrigger"
                 }
             },
             {

+ 1 - 212
frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -15,11 +15,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        // dataUrl:'http://localhost:9480/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pi_vendid',ignore:true
                         },{
@@ -27,69 +22,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -98,10 +30,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'multidbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        // dataUrl:'http://localhost:9480/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'id',to:'pd_prodid',ignore:true                          
                         },{
@@ -116,101 +44,9 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             from:'pr_whcode',to:'pd_whcode'
                         },{
                             from:'pr_whname',to:'pd_whname'
-                        },,{
-                            from:'pr_purcprice',to:'pd_orderprice'
-                        }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
                         },{
-                            field:'pr_detail',width:100
-                        },{
-                            field:'pr_unit',width:100
+                            from:'pr_purcprice',to:'pd_orderprice'
                         }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],                      
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            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);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }
@@ -220,11 +56,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/warehouse/list',
-                        // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
-                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid',ignore:true                          
                         },{
@@ -232,48 +63,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             from:'wh_description',to:'pd_whname'
                         }],
-                        dbtpls:[{
-                            field:'wh_code',width:100
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或名称',
-                            xtype : "textfield", 
-                            name : "wh_code", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                            "items": null
-                        }]
                     }) ;   
 
                 }

+ 3 - 3
frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -40,20 +40,20 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         emptyText:'输入供应商编号或名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         hidden:true,
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         emptyText:'输入物料编号或名称',

+ 0 - 157
frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelController.js

@@ -9,76 +9,11 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pi_vendcode'
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -87,103 +22,11 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            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);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }

+ 1 - 1
frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     QueryWidth:0.2,
     //筛选:供应商、日期(必填)、业务状态			
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pu_vendname',
         fieldLabel: '供应商名称',
         columnWidth: 0.2

+ 0 - 67
frontend/saas-web/app/view/purchase/report/PurchaseController.js

@@ -7,76 +7,9 @@ Ext.define('saas.view.purchase.report.PurchaseController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_name',to:'pu_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[
-                        {
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }

+ 1 - 1
frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     QueryWidth:0.25,
     searchItems: [
     {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pu_vendname',
         fieldLabel: '供应商名称',
         columnWidth: 0.25

+ 0 - 66
frontend/saas-web/app/view/purchase/report/PurchasePayController.js

@@ -7,77 +7,11 @@ Ext.define('saas.view.purchase.report.PurchasePayController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
                             from:'ve_name',to:'pu_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.report.Sale', {
     QueryWidth:0.2,
     searchItems: [
     {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'sa_custname',
         fieldLabel: '客户名称',
         columnWidth: 0.2

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

@@ -7,10 +7,6 @@ Ext.define('saas.view.sale.report.SaleController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
                                 from:'id',to:'id',ignore:true
@@ -21,92 +17,7 @@ Ext.define('saas.view.sale.report.SaleController', {
                             },{
                                 from:'ca_address',to:'ca_address'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            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",
-                                "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',
-                            }, {
-                                "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',
-                            }, {
-                                "text": "客户地址",
-                                "flex": 1,
-                                "dataIndex": "ca_address",
-                                "width": 250
-                            }]
-                    }) ;   
+                    }) ;
                 }
             }
         });

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

@@ -14,12 +14,12 @@ Ext.define('saas.view.sale.report.SaleProfit', {
 //筛选:客户、物料、时间	
     QueryWidth:0.2, 	
     searchItems: [{
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'sa_custname',
         fieldLabel: '客户',
         columnWidth: 0.2
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_code',
         fieldLabel: '物料',
         columnWidth: 0.2

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

@@ -7,10 +7,6 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
                                 from:'id',to:'id',ignore:true
@@ -21,103 +17,13 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                             },{
                                 from:'ca_address',to:'ca_address'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            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",
-                                "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
-                            }]
-                    }) ;   
+                    }) ;
                 }
             },
             //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pr_code]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[
                         {
                             from:'pr_code',to:'pr_code'
@@ -126,88 +32,6 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                         }, {
                             from:'pr_spec',to:'pr_spec'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }

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

@@ -13,7 +13,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
     reportTitle: '销售收款报表',
     QueryWidth:0.25,
     searchItems: [{//筛选:客户、日期	
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'rb_custname',
         fieldLabel: '客户',
         columnWidth: 0.25

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

@@ -7,10 +7,6 @@ Ext.define('saas.view.sale.report.SaleRecController', {
             'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
                                 from:'id',to:'id',ignore:true
@@ -21,93 +17,6 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                             },{
                                 from:'ca_address',to:'ca_address'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            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",
-                                "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
-                            }]
                     }) ;   
                 }
             }

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

@@ -48,7 +48,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         name : 'sa_custcode', 
         fieldLabel : '客户编号'
     }, {
-        xtype : "dbfindtrigger", 
+        xtype : "customerDbfindTrigger", 
         name : "sa_custname", 
         fieldLabel : "客户名称",
         allowBlank : false
@@ -112,7 +112,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -300,7 +300,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : "单据金额",
         readOnly:true
     },{
-        xtype : "dbfindtrigger", 
+        xtype : "employeeDbfindTrigger", 
         name : "sa_sellercode", 
         fieldLabel : "业务员编号",
     },{

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

@@ -8,10 +8,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
                                 from:'id',to:'sa_custid',ignore:true
@@ -22,93 +18,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             },{
                                 from:'ca_address',to:'sa_toplace'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            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",
-                                "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": 2,
-                                "dataIndex": "ca_address",
-                                "width": 300
-                            }]
                     }) ;   
 
                 }
@@ -116,11 +25,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'dbfindtrigger[name=sa_sellercode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/employee/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        //赋值 
                         dbfinds:[{
                             from:'id',to:'id',ignore:true
                         },{
@@ -128,54 +32,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         },{
                             from:'em_name',to:'sa_seller'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'em_code',width:100
-                        },{
-                            field:'em_name',width:100
-                        }],
-                        defaultCondition: "em_class='正式'",
-                        dbSearchFields:[{
-                            emptyText:'输入人员编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(em_code) like '%"+v.toUpperCase()+"%' or upper(em_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "人员ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "人员编号",
-                            "dataIndex": "em_code",
-                            "width": 200
-                        }, {
-                            "text": "人员名称",
-                            "dataIndex": "em_name",
-                            "width": 200
-                        }, {
-                            "text": "类型",
-                            "dataIndex": "em_class",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "手机",
-                            "dataIndex": "em_mobile",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "邮箱",
-                            "dataIndex": "em_email",
-                            "width": 180,
-                            "items": null
-                        }]
                     }) ;   
                 }
             },
@@ -183,9 +39,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'multidbfindtrigger[name=sd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[
                         {
                             from:'pr_code',to:'sd_prodcode'
@@ -198,88 +51,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         }, {
                             from:'id',to:'sd_prodid',ignore:true
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }

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

@@ -26,7 +26,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         name: 'sa_custcode',
         fieldLabel: '客户编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'sa_custname',
         fieldLabel: '客户名称'
     }, {
@@ -35,7 +35,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         fieldLabel: '物料编号',
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         showDetail: true

+ 0 - 174
frontend/saas-web/app/view/sale/sale/QueryPanelController.js

@@ -8,9 +8,6 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[{
                             from:'cu_id',to:'sa_custid',ignore:true
@@ -19,92 +16,6 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         },{
                             from:'cu_name',to:'sa_custname'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            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",
-                                "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',
-                            }, {
-                                "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
-                            }]
                     }) ;   
 
                 }
@@ -113,96 +24,11 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'sd_prodcode'
                         },{
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }

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

@@ -45,7 +45,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         name : "pi_custcode",  
         fieldLabel : "客户编号"
     }, {
-        xtype : "dbfindtrigger", 
+        xtype : "customerDbfindTrigger", 
         name : "pi_custname", 
         fieldLabel : "客户名称",
         allowBlank:false,
@@ -93,7 +93,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -169,7 +169,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "warehouseDbfindTrigger"
                 }
             },
             {

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

@@ -5,283 +5,64 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pi_custname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
-                        dbfinds:[
-                            {
-                                from:'id',to:'pi_custid',ignore:true
-                            },{
-                                from:'cu_code',to:'pi_custcode'
-                            },{
-                                from:'cu_name',to:'pi_custname'
-                            },{
-                                from:'ca_address',to:'pi_address'
-                        }],
-                        dbtpls:[
-                        {
-                            field:'cu_code',width:100
-                        },{
-                            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
+            'dbfindtrigger[name=pi_custname]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'pi_custid',
+                            ignore: true
+                        }, {
+                            from: 'cu_code',
+                            to: 'pi_custcode'
+                        }, {
+                            from: 'cu_name',
+                            to: 'pi_custname'
+                        }, {
+                            from: 'ca_address',
+                            to: 'pi_address'
                         }],
-                        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
-                        }]
-                    }) ;   
+                    });
                 }
             },
-            'multidbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
-                        dbfinds:[
-                        {
-                            from:'id',to:'pd_prodid',ignore:true
-                        },
-                        {
-                            from:'pr_code',to:'pd_prodcode'
-                        }, {
-                            from:'pr_detail',to:'pr_detail'
-                        }, {
-                            from:'pr_spec',to:'pr_spec'
-                        }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+            'multidbfindtrigger[name=pd_prodcode]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                                from: 'id',
+                                to: 'pd_prodid',
+                                ignore: true
                             },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
-                    }) ;   
+                            {
+                                from: 'pr_code',
+                                to: 'pd_prodcode'
+                            }, {
+                                from: 'pr_detail',
+                                to: 'pr_detail'
+                            }, {
+                                from: 'pr_spec',
+                                to: 'pr_spec'
+                            }
+                        ],
+                    });
 
                 }
             },
-            'dbfindtrigger[name=pd_whname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:'/api/document/warehouse/list',
-                        addXtype: 'other-storeinformation',
-                        addTitle: '仓库资料',
-                        dbfinds:[{
-                            from:'id',to:'pd_whid',ignore:true
-                        }, { 
-                            from:'wh_code',to:'pd_whcode'
-                        }, {
-                            from:'wh_description',to:'pd_whname'
-                        }],
-                        dbtpls:[{
-                            field:'wh_code',width:100
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        defaultCondition: "wh_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(wh_code) like '%" + v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
+            'dbfindtrigger[name=pd_whname]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'pd_whid',
+                            ignore: true
+                        }, {
+                            from: 'wh_code',
+                            to: 'pd_whcode'
+                        }, {
+                            from: 'wh_description',
+                            to: 'pd_whname'
                         }],
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库类型",
-                            "flex": 0,
-                            "dataIndex": "wh_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库状态",
-                            "flex": 0,
-                            "dataIndex": "wh_status",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
+                    });
 
                 }
             }

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

@@ -29,7 +29,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         name: 'pi_custname',
         fieldLabel: '客户名称'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         showDetail: true

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

@@ -8,10 +8,6 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                         {
                             from:'id',to:'pi_custid',ignore:true
@@ -20,85 +16,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                         },{
                             from:'cu_name',to:'pi_custname'
                         }],
-                        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:[
-                            {
-                                "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": 1,
-                                "dataIndex": "ca_address",
-                                "width": 250
-                            }]
-                    }) ;   
+                    }) ;
 
                 }
             },
@@ -107,97 +25,11 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',ignore:true
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[
-                        {
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }

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

@@ -54,7 +54,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         name : "pi_custcode", 
         fieldLabel : "客户编号" 
     }, {
-        xtype : "dbfindtrigger", 
+        xtype : "customerDbfindTrigger", 
         name : "pi_custname", 
         fieldLabel : "客户名称",
         allowBlank:false,
@@ -104,7 +104,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -181,7 +181,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "warehouseDbfindTrigger"
                 }
             },
             {

+ 0 - 230
frontend/saas-web/app/view/sale/saleOut/FormPanelController.js

@@ -9,10 +9,6 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                         {
                             from:'id',to:'pi_custid',ignore:true 
@@ -23,100 +19,12 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         },{
                             from:'ca_address',to:'pi_address'
                         }],
-                        dbtpls:[
-                        {
-                            field:'cu_code',width:100
-                        },{
-                            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:[
-                            {
-                                "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": 1,
-                                "dataIndex": "ca_address",
-                                "width": 250
-                            }]
                     }) ;   
                 }
             },
             'multidbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'id',to:'pd_prodid',ignore:true 
                         },
@@ -127,88 +35,6 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         }, {
                             from:'pr_spec',to:'pr_spec'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }
@@ -216,10 +42,6 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'wh_code',
-                        dataUrl:'/api/document/warehouse/list',
-                        addXtype: 'other-storeinformation',
-                        addTitle: '仓库资料',
                         dbfinds:[{
                             from:'id',to:'pd_whid',ignore:true 
                         }, { 
@@ -227,58 +49,6 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         }, {
                             from:'wh_description',to:'pd_whname'
                         }],
-                        dbtpls:[{
-                            field:'wh_code',width:100
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        defaultCondition: "wh_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(wh_code) like '%" + v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库类型",
-                            "flex": 0,
-                            "dataIndex": "wh_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库状态",
-                            "flex": 0,
-                            "dataIndex": "wh_status",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
                     }) ;   
 
                 }

+ 2 - 2
frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -27,11 +27,11 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         name: 'pi_custcode',
         fieldLabel: '客户编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         showDetail: true

+ 0 - 174
frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js

@@ -9,10 +9,6 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                         {
                             from:'id',to:'pi_custid',ignore:true
@@ -23,90 +19,6 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                         },{
                             from:'ca_address',to:'ca_address'
                         }],
-                        dbtpls:[
-                        {
-                            field:'cu_code',width:100
-                        },{
-                            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:[
-                            {
-                                "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": 1,
-                                "dataIndex": "ca_address",
-                                "width": 250
-                            }]
                     }) ;   
 
                 }
@@ -115,97 +27,11 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[
-                        {
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }

+ 5 - 5
frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -48,7 +48,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         name: 'pi_vendcode',
         fieldLabel: '供应商编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称'
     },{
@@ -62,7 +62,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         name: 'pi_custcode',
         fieldLabel: '客户编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称'
     },{
@@ -108,7 +108,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -189,7 +189,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "warehouseDbfindTrigger"
                 }
             },{
                 text : "拨入仓库id", 
@@ -219,7 +219,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "warehouseDbfindTrigger"
                 }
             },{
                 text : "备注", 

+ 0 - 325
frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -15,11 +15,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'pi_vendid',ignore:true
@@ -28,71 +23,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -101,10 +31,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pi_custname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        dataUrl: '/api/document/customer/list',
-                        // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds: [{
                             from: 'id',to: 'pi_custid',ignore:true
                         }, {
@@ -112,67 +38,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         }, {
                             from: 'cu_name',to: 'pi_custname'
                         }],
-                        dbtpls: [{
-                            field: 'cu_code',
-                            width: 100
-                        }, {
-                            field: 'cu_name',
-                            width: 100
-                        }],
-                        defaultCondition:"cu_statuscode='OPEN'",
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            xtype : "textfield", 
-                            name : "cu_name", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     });
 
                 }
@@ -181,10 +46,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'multidbfindtrigger[name=pd_prodcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/product/list',
-                        // dataUrl:'http://localhost:9480/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds: [{
                             from: 'id',
                             to: 'pd_prodid',ignore:true
@@ -206,100 +67,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         },{
                             from:'pr_purcprice',to:'pd_orderprice'
                         }],
-                        dbtpls: [{
-                            field: 'pr_code',
-                            width: 100
-                        }, {
-                            field: 'pr_detail',
-                            width: 100
-                        }, {
-                            field: 'pr_spec',
-                            width: 100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],                        
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length > 3 ? 3 : 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": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     });
 
                 }
@@ -308,10 +75,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
            'dbfindtrigger[name=pd_whname]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    dataUrl:'/api/document/warehouse/list',
-                    addXtype: 'other-warehouse',
-                    addTitle: '仓库资料',
-                    defaultCondition:"wh_statuscode='OPEN'",
                     dbfinds:[{
                         from:'id',to:'pd_whid',ignore:true                          
                     },{
@@ -319,48 +82,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                     },{
                         from:'wh_description',to:'pd_whname'
                     }],
-                    dbtpls:[{
-                        field:'wh_code',width:100
-                    },{
-                        field:'wh_description',width:100
-                    }],
-                    dbSearchFields:[{
-                        emptyText:'输入仓库编号或名称',
-                        xtype : "textfield", 
-                        name : "wh_code", 
-                        allowBlank : true, 
-                        columnWidth : 0.25,
-                        getCondition:function(v){
-                            return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                        }
-                    }],                        
-                    dbColumns:[{
-                        "text": "仓库ID",
-                        "flex": 0,
-                        "dataIndex": "id",
-                        "width": 0,
-                        "xtype": "",
-                        "items": null
-                    },{
-                        "text": "仓库编号",
-                        "flex": 1,
-                        "dataIndex": "wh_code",
-                        "width": 100,
-                        "xtype": "",
-                        "items": null
-                    }, {
-                        "text": "仓库名称",
-                        "flex": 1,
-                        "dataIndex": "wh_description",
-                        "xtype": "",
-                        "items": null
-                    }, {
-                        "text": "仓库类型",
-                        "flex": 1,
-                        "dataIndex": "wh_type",
-                        "xtype": "",
-                        "items": null
-                    }]
                 }) ;   
 
             }
@@ -369,10 +90,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
         'dbfindtrigger[name=pd_inwhname]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    dataUrl:'/api/document/warehouse/list',
-                    addXtype: 'other-warehouse',
-                    addTitle: '仓库资料',
-                    defaultCondition:"wh_statuscode='OPEN'",
                     dbfinds:[{
                         from:'id',to:'pd_inwhid',ignore:true                          
                     },{
@@ -380,48 +97,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                     },{
                         from:'wh_description',to:'pd_inwhname'
                     }],
-                    dbtpls:[{
-                        field:'wh_code',width:100
-                    },{
-                        field:'wh_description',width:100
-                    }],
-                    dbSearchFields:[{
-                        emptyText:'输入仓库编号或名称',
-                        xtype : "textfield", 
-                        name : "wh_code", 
-                        allowBlank : true, 
-                        columnWidth : 0.25,
-                        getCondition:function(v){
-                            return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                        }
-                    }],                        
-                    dbColumns:[{
-                        "text": "仓库ID",
-                        "flex": 0,
-                        "dataIndex": "id",
-                        "width": 0,
-                        "xtype": "",
-                        "items": null
-                    },{
-                        "text": "仓库编号",
-                        "flex": 1,
-                        "dataIndex": "wh_code",
-                        "width": 100,
-                        "xtype": "",
-                        "items": null
-                    }, {
-                        "text": "仓库名称",
-                        "flex": 1,
-                        "dataIndex": "wh_description",
-                        "xtype": "",
-                        "items": null
-                    }, {
-                        "text": "仓库类型",
-                        "flex": 1,
-                        "dataIndex": "wh_type",
-                        "xtype": "",
-                        "items": null
-                    }]
                 }) ;   
 
             }

+ 3 - 3
frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -33,7 +33,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         allowBlank: true,
@@ -46,7 +46,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称',
         allowBlank: true,
@@ -57,7 +57,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         fieldLabel: '物料编号',
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         showDetail: true

+ 0 - 221
frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js

@@ -9,77 +9,11 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pi_vendcode'
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -88,10 +22,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_detail',to:'pr_detail',
                         },{
@@ -99,95 +29,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            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);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }
@@ -195,10 +36,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
             'dbfindtrigger[name=pi_custname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        dataUrl: '/api/document/customer/list',
-                        // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds: [{
                             from: 'id',to: 'pi_custid',ignore:true
                         }, {
@@ -206,64 +43,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                         }, {
                             from: 'cu_name',to: 'pi_custname'
                         }],
-                        dbtpls: [{
-                            field: 'cu_code',
-                            width: 100
-                        }, {
-                            field: 'cu_name',
-                            width: 100
-                        }],
-                        defaultCondition:"cu_statuscode='OPEN'",
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            xtype : "textfield", 
-                            name : "cu_name", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     });
 
                 }

+ 4 - 4
frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -54,7 +54,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
         name: 'ma_prodid',
         fieldLabel: '产品id'
     },{
-        xtype : "dbfindtrigger",
+        xtype : "productDbfindTrigger",
         name : "ma_prodcode", 
         fieldLabel : "产品编号",
         allowBlank : false,
@@ -100,7 +100,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
         name : "ma_whcode", 
         fieldLabel : "仓库编号"
     },{
-        xtype : "dbfindtrigger",
+        xtype : "warehouseDbfindTrigger",
         name : "ma_whname",
         fieldLabel : "仓库名称",
         allowBlank : false,
@@ -159,7 +159,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -280,7 +280,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     queryMode : "local",
                     store : null,
                     valueField : "value",
-                    xtype : "dbfindtrigger"
+                    xtype : "warehouseDbfindTrigger"
                 }
             },{
                 text : "成本单价", 

+ 0 - 292
frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -8,11 +8,6 @@ Ext.define('saas.view.stock.make.FormPanelController', {
             'dbfindtrigger[name=ma_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/warehouse/list',
-                        // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
-                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'ma_whid',ignore:true                          
                         },{
@@ -20,48 +15,6 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         },{
                             from:'wh_description',to:'ma_whname'
                         }],
-                        dbtpls:[{
-                            field:'wh_code',width:100
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或名称',
-                            xtype : "textfield", 
-                            name : "wh_code", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                            "items": null
-                        }]
                     }) ;   
 
                 }
@@ -70,59 +23,12 @@ Ext.define('saas.view.stock.make.FormPanelController', {
             'dbfindtrigger[name=mm_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/warehouse/list',
-                        // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
-                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'mm_whid',ignore:true                          
                         },{
                             from:'wh_code',to:'mm_whcode'                          
                         },{
                             from:'wh_description',to:'mm_whname'
-                        }],
-                        dbtpls:[{
-                            field:'wh_code',width:100
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或名称',
-                            xtype : "textfield", 
-                            name : "wh_code", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                            "items": null
                         }]
                     }) ;   
 
@@ -131,11 +37,6 @@ Ext.define('saas.view.stock.make.FormPanelController', {
             'multidbfindtrigger[name=mm_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
-                        //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'mm_prodcode'
                         },{
@@ -147,100 +48,6 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         },{
                             from:'pr_unit',to:'pr_unit'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        },{
-                            field:'pr_spec',width:100
-                        }],
-                        defaultCondition:"pr_statuscode='OPEN'",
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            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);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }
@@ -248,10 +55,6 @@ Ext.define('saas.view.stock.make.FormPanelController', {
             'dbfindtrigger[name=ma_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/bom/list',
-                        addXtype: 'document-bom-formpanel',
-                        addTitle: 'BOM资料',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'bo_motherid',to:'ma_prodid'
@@ -266,108 +69,13 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         },{
                             from:'bo_version',to:'ma_version'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'bo_mothercode',width:100
-                        },{
-                            field:'bo_mothername',width:100
-                        }],
                         aftertrigger:function(f,record){
                             me.getBomData(record.data.id)
-                        },
-                        defaultCondition:"bo_statuscode='OPEN'",
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入BOM编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(bo_mothercode) like '%"+v.toUpperCase()+"%' or upper(bo_mothername) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "产品编号",       
-                            "dataIndex": "bo_mothercode",
-                            "width": 200,
-                        }, {
-                            "text": "产品名称",
-                            "width": 200,
-                            "dataIndex": "bo_mothername",
-                        }, {
-                            "text": "产品规格",
-                            "width": 200,
-                            "dataIndex": "pr_spec",
-                        }, {
-                            "text": "版本",
-                            "width": 200,
-                            "dataIndex": "bo_version",
                         }
-                        // ,{
-                        //     "text": "规格",
-                        //     "dataIndex": "pr_spec",
-                        //     "width": 100,
-                        // }, {
-                        //     "text": "单位",
-                        //     "dataIndex": "pr_spec",
-                        //     "width": 100,
-                        // },{
-                        //     "text": "仓库id",
-                        //     "dataIndex": "pr_whid",
-                        //     "hidden": true,
-                        // },{
-                        //     "text": "仓库编号",
-                        //     "dataIndex": "pr_whcode",
-                        //     "hidden": true,
-                        // },{
-                        //     "text": "仓库",
-                        //     "dataIndex": "pr_whname",
-                        //     "width": 200,
-                        // },{
-                        //     "text": "总库存数",
-                        //     "dataIndex": "po_onhand",
-                        //     "width": 100,
-                        //     align:'end'
-                        // },{
-                        //     "text": "类型",
-                        //     "dataIndex": "pr_kind",
-                        //     "width": 100,
-                        // },{
-                        //     "text": "型号",
-                        //     "dataIndex": "pr_orispeccode",
-                        //     "width": 100,
-                        // },{
-                        //     "text": "品牌",
-                        //     "dataIndex": "pr_brand",
-                        //     "width": 100,
-                        // },{
-                        //     "text": "供应商",
-                        //     "dataIndex": "pr_vendname",
-                        //     "width": 100,
-                        // },{
-                        //     "text": "最小包装",
-                        //     "dataIndex": "pr_zxbzs",
-                        //     "width": 100,
-                        //     align:'end'
-                        // },{
-                        //     "text": "L/T",
-                        //     "dataIndex": "pr_leadtime",
-                        //     "width": 100,
-                        // }
-                    
-                    ]
                     }) ;   
 
                 }
             },
-            //从表多选放大镜赋值关系 以及 tpl模板
 
         });
     },

+ 1 - 1
frontend/saas-web/app/view/stock/make/QueryPanel.js

@@ -44,7 +44,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             }
         }
     },{
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'ma_prodcode',
         fieldLabel: '产品编号'
     }],

+ 0 - 197
frontend/saas-web/app/view/stock/make/QueryPanelController.js

@@ -9,77 +9,11 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
                             from:'ve_name',to:'pu_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -88,97 +22,11 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }
@@ -186,10 +34,6 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
             'dbfindtrigger[name=ma_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/bom/list',
-                        addXtype: 'document-bom-formpanel',
-                        addTitle: 'BOM资料',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'bo_motherid',to:'ma_prodid'
@@ -202,47 +46,6 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                         },{
                             from:'bo_version',to:'ma_version'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'bo_mothercode',width:100
-                        },{
-                            field:'bo_mothername',width:100
-                        }],
-                        defaultCondition:"bo_statuscode='OPEN'",
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入BOM编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(bo_mothercode) like '%"+v.toUpperCase()+"%' or upper(bo_mothername) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "产品编号",       
-                            "dataIndex": "bo_mothercode",
-                            "width": 200,
-                        }, {
-                            "text": "产品名称",
-                            "width": 200,
-                            "dataIndex": "bo_mothername",
-                        }, {
-                            "text": "产品规格",
-                            "width": 200,
-                            "dataIndex": "pr_spec",
-                        }, {
-                            "text": "版本",
-                            "width": 200,
-                            "dataIndex": "bo_version",
-                        }]
                     }) ;   
 
                 }

+ 3 - 3
frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -77,7 +77,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         name: 'pi_vendcode',
         fieldLabel: '供应商编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         allowBlank : false,
@@ -134,7 +134,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -214,7 +214,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "warehouseDbfindTrigger"
                 }
             },
             {

+ 0 - 281
frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -9,12 +9,6 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-
-                        dataUrl:'/api/document/vendor/list',
-                        // dataUrl:'http://localhost:9480/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pi_vendid',ignore:true
                         },{
@@ -22,69 +16,6 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -93,10 +24,6 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pi_custname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        dataUrl: '/api/document/customer/list',
-                        // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds: [{
                             from: 'id',to: 'pi_custid',ignore:true
                         }, {
@@ -104,67 +31,6 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         }, {
                             from: 'cu_name',to: 'pi_custname'
                         }],
-                        dbtpls: [{
-                            field: 'cu_code',
-                            width: 100
-                        }, {
-                            field: 'cu_name',
-                            width: 100
-                        }],
-                        defaultCondition:"cu_statuscode='OPEN'",
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            xtype : "textfield", 
-                            name : "cu_name", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     });
 
                 }
@@ -173,10 +39,6 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'multidbfindtrigger[name=pd_prodcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/product/list',
-                        // dataUrl:'http://localhost:9480/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds: [{
                             from: 'id',
                             to: 'pd_prodid',ignore:true
@@ -198,100 +60,6 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         },{
                             from:'pr_purcprice',to:'pd_orderprice'
                         }],
-                        dbtpls: [{
-                            field: 'pr_code',
-                            width: 100
-                        }, {
-                            field: 'pr_detail',
-                            width: 100
-                        }, {
-                            field: 'pr_spec',
-                            width: 100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],                        
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length > 3 ? 3 : 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": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     });
 
                 }
@@ -300,11 +68,6 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pd_whname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/warehouse/list',
-                        // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
-                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds: [{
                             from: 'id',
                             to: 'pd_whid',ignore:true
@@ -315,50 +78,6 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             from: 'wh_description',
                             to: 'pd_whname'
                         }],
-                        dbtpls: [{
-                            field: 'wh_code',
-                            width: 100
-                        }, {
-                            field: 'wh_description',
-                            width: 100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或名称',
-                            xtype : "textfield", 
-                            name : "wh_code", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns: [{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                            "items": null
-                        }]
                     });
                 },
             },

+ 3 - 3
frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -36,7 +36,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         emptyText:'输入供应商编号或名称',
@@ -50,7 +50,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称',
         emptyText:'输入客户编号或名称',
@@ -64,7 +64,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         hidden: true,
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         emptyText:'输入物料编号或名称',

+ 0 - 224
frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js

@@ -9,77 +9,11 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pi_vendcode'
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -88,10 +22,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_detail',to:'pr_detail',
                         },{
@@ -99,95 +29,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            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);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }
@@ -195,10 +36,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
             'dbfindtrigger[name=pi_custname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        dataUrl: '/api/document/customer/list',
-                        // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds: [{
                             from: 'id',to: 'pi_custid',ignore:true
                         }, {
@@ -206,67 +43,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                         }, {
                             from: 'cu_name',to: 'pi_custname'
                         }],
-                        dbtpls: [{
-                            field: 'cu_code',
-                            width: 100
-                        }, {
-                            field: 'cu_name',
-                            width: 100
-                        }],
-                        defaultCondition:"cu_statuscode='OPEN'",
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            xtype : "textfield", 
-                            name : "cu_name", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     });
 
                 }

+ 3 - 3
frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         bind: '{pi_custcode}',
         fieldLabel: '客户编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         bind: '{pi_custname}',
         allowBlank : false,
@@ -116,7 +116,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     queryMode: "local",
                     store: null,
                     valueField: "value",
-                    xtype: "multidbfindtrigger"
+                    xtype: "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -190,7 +190,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     queryMode: "local",
                     store: null,
                     valueField: "value",
-                    xtype: "dbfindtrigger"
+                    xtype: "warehouseDbfindTrigger"
                 }
             },
             {

+ 0 - 273
frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -9,11 +9,6 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        // dataUrl:'http://localhost:9480/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pi_vendid',ignore:true
                         },{
@@ -21,69 +16,6 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "ve_name", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -92,10 +24,6 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        dataUrl:'/api/document/customer/list',
-                        // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds:[{
                             from:'id',to:'pi_custid',ignore:true
                         },{
@@ -103,65 +31,6 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             from:'cu_name',to:'pi_custname'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        defaultCondition:"cu_statuscode='OPEN'",
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            xtype : "textfield", 
-                            name : "cu_name", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     }) ;   
 
                 }
@@ -170,10 +39,6 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             'multidbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        // dataUrl:'http://localhost:9480/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'id',to:'pd_prodid',ignore:true                          
                         },{
@@ -191,97 +56,6 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             from:'pr_purcprice',to:'pd_orderprice'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        },{
-                            field:'pr_spec',width:100
-                        }],
-                        defaultCondition:"pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],                      
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length > 3 ? 3 : 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": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }
@@ -291,11 +65,6 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/warehouse/list',
-                        // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
-                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid',ignore:true                          
                         },{
@@ -303,48 +72,6 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             from:'wh_description',to:'pd_whname'
                         }],
-                        dbtpls:[{
-                            field:'wh_code',width:100
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或名称',
-                            xtype : "textfield", 
-                            name : "wh_code", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                            "items": null
-                        }]
                     }) ;   
 
                 }

+ 2 - 2
frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -33,7 +33,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称',
         emptyText:'输入客户编号或名称',
@@ -46,7 +46,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         hidden: true,
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         emptyText:'输入物料编号或名称',

+ 0 - 224
frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js

@@ -9,77 +9,11 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pi_vendname'
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition:"ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "ve_name", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],  
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -88,10 +22,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_detail',to:'pr_detail',
                         },{
@@ -99,95 +29,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "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": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length > 3 ? 3 : 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": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }
@@ -195,10 +36,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
             'dbfindtrigger[name=pi_custname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        dataUrl: '/api/document/customer/list',
-                        // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds: [{
                             from: 'id',to: 'pi_custid',ignore:true
                         }, {
@@ -206,67 +43,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                         }, {
                             from: 'cu_name',to: 'pi_custname'
                         }],
-                        dbtpls: [{
-                            field: 'cu_code',
-                            width: 100
-                        }, {
-                            field: 'cu_name',
-                            width: 100
-                        }],
-                        defaultCondition:"cu_statuscode='OPEN'",
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            xtype : "textfield", 
-                            name : "cu_name", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     });
 
                 }

+ 2 - 2
frontend/saas-web/app/view/stock/report/ProdinoutCount.js

@@ -14,12 +14,12 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     QueryWidth:0.4,
     //筛选:仓库、物料、物料类型、时间			
     searchItems: [{		
-        xtype: 'dbfindtrigger',
+        xtype: 'warehouseDbfindTrigger',
         name: 'wh_description',
         fieldLabel: '仓库',
         columnWidth: 0.2
     }, {		
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         columnWidth: 0.2

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

@@ -7,9 +7,6 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
            'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[
                         {
                             from:'pr_code',to:'pd_prodcode'
@@ -18,88 +15,6 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                         }, {
                             from:'pr_spec',to:'pr_spec'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }
@@ -107,10 +22,6 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
             'dbfindtrigger[name=wh_description]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'wh_code',
-                        dataUrl:'/api/document/warehouse/list',
-                        addXtype: 'other-storeinformation',
-                        addTitle: '仓库资料',
                         dbfinds:[{
                             from:'id',to:'id',ignore:true 
                         }, { 
@@ -118,58 +29,6 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                         }, {
                             from:'wh_description',to:'wh_description'
                         }],
-                        dbtpls:[{
-                            field:'wh_code',width:100
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        defaultCondition: "wh_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(wh_code) like '%" + v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库类型",
-                            "flex": 0,
-                            "dataIndex": "wh_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库状态",
-                            "flex": 0,
-                            "dataIndex": "wh_status",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
                     }) ;   
 
                 }

+ 2 - 103
frontend/saas-web/app/view/stock/report/ProdiodetailController.js

@@ -4,107 +4,6 @@ Ext.define('saas.view.stock.report.ProdiodetailController', {
     init: function (form) {
         this.control({
 
-            //放大镜赋值关系 以及 tpl模板
-            // 'dbfindtrigger[name=pd_prodcode]':{
-            //     beforerender:function(f){
-            //         Ext.apply(f,{
-            //             dataUrl:'/api/document/product/list',
-            //             addXtype: 'document-product-formpanel',
-            //             addTitle: '物料资料',
-            //             dbfinds:[
-            //             {
-            //                 from:'pr_code',to:'pd_prodcode'
-            //             }, {
-            //                 from:'pr_detail',to:'pr_detail'
-            //             }, {
-            //                 from:'pr_spec',to:'pr_spec'
-            //             }],
-            //             dbtpls:[{
-            //                 field:'pr_code',width:100
-            //             },{
-            //                 field:'pr_detail',width:100
-            //             }],
-            //             defaultCondition: "pr_statuscode='OPEN'",
-            //             dbSearchFields:[{
-            //                 emptyText:'输入物料编号、名称或规格',
-            //                 xtype : "textfield", 
-            //                 name : "search", 
-            //                 width: 200,
-            //                 getCondition: function(v) {
-            //                     return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-            //                 },
-            //                 allowBlank : true, 
-            //                 columnWidth : 0.25
-            //             }],
-            //             dbColumns:[{
-            //                 "text": "物料ID",
-            //                 "hidden": true,
-            //                 "dataIndex": "id",
-            //             }, {
-            //                 "text": "物料编号",       
-            //                 "dataIndex": "pr_code",
-            //                 "width": 200,
-            //             }, {
-            //                 "text": "物料名称",
-            //                 "width": 200,
-            //                 "dataIndex": "pr_detail",
-            //             }, {
-            //                 "text": "规格",
-            //                 "dataIndex": "pr_spec",
-            //                 "width": 100,
-            //             }, {
-            //                 "text": "单位",
-            //                 "dataIndex": "pr_unit",
-            //                 "width": 100,
-            //             },{
-            //                 "text": "仓库id",
-            //                 "dataIndex": "pr_whid",
-            //                 "hidden": true,
-            //             },{
-            //                 "text": "仓库编号",
-            //                 "dataIndex": "pr_whcode",
-            //                 "hidden": true,
-            //             },{
-            //                 "text": "仓库",
-            //                 "dataIndex": "pr_whname",
-            //                 "width": 200,
-            //             },{
-            //                 "text": "总库存数",
-            //                 "dataIndex": "po_onhand",
-            //                 "width": 100,
-            //                 xtype: 'numbercolumn',
-            //                 align:'end'
-            //             },{
-            //                 "text": "类型",
-            //                 "dataIndex": "pr_kind",
-            //                 "width": 100,
-            //             },{
-            //                 "text": "型号",
-            //                 "dataIndex": "pr_orispeccode",
-            //                 "width": 100,
-            //             },{
-            //                 "text": "品牌",
-            //                 "dataIndex": "pr_brand",
-            //                 "width": 100,
-            //             },{
-            //                 "text": "供应商",
-            //                 "dataIndex": "pr_vendname",
-            //                 "width": 100,
-            //             },{
-            //                 "text": "最小包装",
-            //                 "dataIndex": "pr_zxbzs",
-            //                 "width": 100,
-            //                 xtype: 'numbercolumn',
-            //                 align:'end'
-            //             },{
-            //                 "text": "L/T",
-            //                 "dataIndex": "pr_leadtime",
-            //                 "width": 100,
-            //             }]
-            //         }) ;   
-
-            //     }
-            // }            
-         });
-        }
+        });
+    }
 });

+ 0 - 2
frontend/saas-web/overrides/form/field/Number.js

@@ -71,13 +71,11 @@ Ext.define("saas.override.form.field.Number", {
         value = me.parseValue(Ext.util.Format.number(value, format));
         value = me.fixPrecision(value);
         value = Ext.isNumber(value) ? value : parseFloat(me.toRawNumber(value));
-        console.log('v1', format, value);
 
         // var l = (value+'').split('.')[1] ? (value+'').split('.')[1] : 0;
         // format = format.split('.')[0] + new Array(l).map(function() {return '0'}).join('');
 
         value = isNaN(value) ? '' : String(Ext.util.Format.number(value, format)).replace('.', me.decimalSeparator);
-        console.log('v2', format, value);
         return value;
     },