修改URL

frontend/saas-web/app/model/document/product.js

@@ -1,4 +1,4 @@
-Ext.define('saas.model.document.product', {
+Ext.define('saas.model.document.Product', {
     extend: 'saas.model.Base',
     fields: [
         { name: 'pr_detail', type: 'string' },

frontend/saas-web/app/model/purchase/prodIODetail.js

@@ -1,4 +1,4 @@
-Ext.define('saas.model.purchase.prodIODetail', {
+Ext.define('saas.model.purchase.ProdIODetail', {
     extend: 'saas.model.Base',
 
     fields: [
@@ -37,5 +37,5 @@ Ext.define('saas.model.purchase.prodIODetail', {
         { name: 'pd_ioid', type: 'int' },
     ],
     //一对一映射
-    associations: [{ type: 'hasOne', model: 'saas.model.document.product', associationKey: 'product'}]
+    associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'product'}]
 });

frontend/saas-web/app/model/purchase/purchasedetail.js

@@ -1,4 +1,4 @@
-Ext.define('saas.model.purchase.purchasedetail', {
+Ext.define('saas.model.purchase.Purchasedetail', {
     extend: 'saas.model.Base',
 
     fields: [
@@ -14,5 +14,5 @@ Ext.define('saas.model.purchase.purchasedetail', {
         { name: 'pd_taxtotal', type: 'float' }
     ],
     //一对一映射
-    associations: [{ type: 'hasOne', model: 'saas.model.document.product', associationKey: 'product'}]
+    associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'product'}]
 });

frontend/saas-web/app/model/sale/ProdIODetail.js

@@ -0,0 +1,39 @@
+Ext.define('saas.model.sale.ProdIODetail', {
+    extend: 'saas.model.Base',
+
+    fields: [
+
+        { name: 'id', type: 'int' },
+        { name: 'pd_piid', type: 'int' },
+        { name: 'pd_inoutno', type: 'string' },
+        { name: 'pd_piclass', type: 'string' },
+        { name: 'pd_pdno', type: 'int' },
+        { name: 'pd_ordercode', type: 'string' },
+        { name: 'pd_orderdetno', type: 'int' },
+        { name: 'pd_prodid', type: 'int' },
+        { name: 'pd_prodcode', type: 'string' },
+        { name: 'pd_unit', type: 'string' },
+        { name: 'pd_inqty', type: 'int' },
+        { name: 'pd_outqty', type: 'int' },
+        { name: 'pd_orderprice', type: 'float' },
+        { name: 'pd_sendprice', type: 'float' },
+        { name: 'pd_price', type: 'float' },
+        { name: 'pd_total', type: 'float' },
+        { name: 'pd_taxrate', type: 'float' },
+        { name: 'pd_netprice', type: 'float' },
+        { name: 'pd_nettotal', type: 'float' },
+        { name: 'pd_whid', type: 'int' },
+        { name: 'pd_whcode', type: 'string' },
+        { name: 'pd_whname', type: 'string' },
+        { name: 'pd_inwhid', type: 'int' },
+        { name: 'pd_inwhcode', type: 'string' },
+        { name: 'pd_inwhname', type: 'string' },
+        { name: 'pd_orderid', type: 'int' },
+        { name: 'pd_sdid', type: 'int' },
+        { name: 'pd_status', type: 'string' },
+        { name: 'pd_ym', type: 'int' },
+        { name: 'pd_yqty', type: 'int' },
+        { name: 'pd_remark', type: 'string' },
+        { name: 'pd_ioid', type: 'int' },
+    ]
+});

frontend/saas-web/app/model/sale/Saledetail.js

@@ -0,0 +1,16 @@
+Ext.define('saas.model.sale.Saledetail', {
+    extend: 'saas.model.Base',
+
+    fields: [
+        { name: 'sd_detno', type: 'int' },
+        { name: 'id', type: 'int' },
+        { name: 'sd_prodcode', type: 'string' },
+        { name: 'sd_qty', type: 'int' },
+        { name: 'sd_yqty', type: 'int' },
+        { name: 'sd_price', type: 'float' },
+        { name: 'sd_taxrate', type: 'float' },
+        { name: 'sd_total', type: 'float' },
+        { name: 'sd_delivery', type: 'date' },
+        { name: 'sd_taxtotal', type: 'float' }
+    ]
+});

frontend/saas-web/app/model/stock/ProdIODetail.js

@@ -0,0 +1,39 @@
+Ext.define('saas.model.stock.ProdIODetail', {
+    extend: 'saas.model.Base',
+
+    fields: [
+
+        { name: 'id', type: 'int' },
+        { name: 'pd_piid', type: 'int' },
+        { name: 'pd_inoutno', type: 'string' },
+        { name: 'pd_piclass', type: 'string' },
+        { name: 'pd_pdno', type: 'int' },
+        { name: 'pd_ordercode', type: 'string' },
+        { name: 'pd_orderdetno', type: 'int' },
+        { name: 'pd_prodid', type: 'int' },
+        { name: 'pd_prodcode', type: 'string' },
+        { name: 'pd_unit', type: 'string' },
+        { name: 'pd_inqty', type: 'int' },
+        { name: 'pd_outqty', type: 'int' },
+        { name: 'pd_orderprice', type: 'float' },
+        { name: 'pd_sendprice', type: 'float' },
+        { name: 'pd_price', type: 'float' },
+        { name: 'pd_total', type: 'float' },
+        { name: 'pd_taxrate', type: 'float' },
+        { name: 'pd_netprice', type: 'float' },
+        { name: 'pd_nettotal', type: 'float' },
+        { name: 'pd_whid', type: 'int' },
+        { name: 'pd_whcode', type: 'string' },
+        { name: 'pd_whname', type: 'string' },
+        { name: 'pd_inwhid', type: 'int' },
+        { name: 'pd_inwhcode', type: 'string' },
+        { name: 'pd_inwhname', type: 'string' },
+        { name: 'pd_orderid', type: 'int' },
+        { name: 'pd_sdid', type: 'int' },
+        { name: 'pd_status', type: 'string' },
+        { name: 'pd_ym', type: 'int' },
+        { name: 'pd_yqty', type: 'int' },
+        { name: 'pd_remark', type: 'string' },
+        { name: 'pd_ioid', type: 'int' },
+    ]
+});

frontend/saas-web/app/util/FormUtil.js

@@ -3,7 +3,7 @@ Ext.define('saas.util.FormUtil', {
     BaseUtil: Ext.create('saas.util.BaseUtil'),
 
     // 请求页面组件接口模板
-    baseUrl: 'http://192.168.0.181:8560/api/ui/co_view/config?name={viewName}',
+    baseUrl: basePath+'ui/co_view/config?name={viewName}',
     // 模板替换正则
     urlRe: /(.*){viewName}(.*)/g,
     

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

@@ -22,9 +22,9 @@ Ext.define('saas.view.document.customer.FormPanel', {
 
     //字段属性
     _title:'客户管理',
-    _dataUrl:'http://192.168.253.228:9480/customer/list',
-    _saveUrl:'http://192.168.253.228:8800/api/document/vendor/save',
-    _deleteUrl:'http://192.168.253.228:8800/api/document/vendor/delete',
+    _dataUrl:basePath+'document/customer/list',
+    _saveUrl:basePath+'document/vendor/save',
+    _deleteUrl:basePath+'document/vendor/delete',
 
     initComponent: function () {
         var me = this;

frontend/saas-web/app/view/document/kind/Kind.js

@@ -68,8 +68,8 @@ Ext.define('saas.view.document.kind.Kind', {
             }],
             keyField:'id',
             dataField:'ck_name',
-            reqUrl:'http://192.168.253.41:9480/customerkind/save',
-            delUrl:'http://192.168.253.41:9480/customerkind/delete'
+            reqUrl:basePath + 'document/customerkind/save',
+            delUrl:basePath + 'document/customerkind/delete'
         },
         vendorkind:{
             columns: [{
@@ -79,8 +79,8 @@ Ext.define('saas.view.document.kind.Kind', {
             }],
             keyField:'id',
             dataField:'vk_name',
-            reqUrl:'http://192.168.253.41:9480/vendorkind/save',
-            delUrl:'http://192.168.253.41:9480/vendorkind/delete'
+            reqUrl:basePath + 'document/vendorkind/save',
+            delUrl:basePath + 'document/vendorkind/delete'
         },
         productkind:{
             columns: [{
@@ -90,8 +90,8 @@ Ext.define('saas.view.document.kind.Kind', {
             }],
             keyField:'id',
             dataField:'pt_name',
-            reqUrl:'http://192.168.253.41:9480/producttype/save',
-            delUrl:'http://192.168.253.41:9480/producttype/delete'
+            reqUrl:basePath + 'document/producttype/save',
+            delUrl:basePath + 'document/producttype/delete'
         },
         productbrand:{
             columns: [{
@@ -101,8 +101,8 @@ Ext.define('saas.view.document.kind.Kind', {
             }],
             keyField:'id',
             dataField:'pb_name',
-            reqUrl:'http://192.168.253.41:9480/productbrand/save',
-            delUrl:'http://192.168.253.41:9480/productbrand/delete'
+            reqUrl:basePath + 'document/productbrand/save',
+            delUrl:basePath + 'document/productbrand/delete'
         },
         inoutkind:{
             columns: [{

frontend/saas-web/app/view/document/kind/KindModel.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: 'http://192.168.253.41:9480/customerkind/getAll',
+                url: basePath + 'document/customerkind/getAll',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -34,7 +34,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: 'http://192.168.253.41:9480/vendorkind/getAll',
+                url: basePath + 'document/vendorkind/getAll',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -53,7 +53,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: 'http://192.168.253.41:9480/producttype/getAll',
+                url: basePath + 'document/producttype/getAll',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -72,7 +72,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: 'http://192.168.253.41:9480/productbrand/getAll',
+                url: basePath + 'document/productbrand/getAll',
                 actionMethods: {
                     read: 'GET'
                 },

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

@@ -23,9 +23,9 @@ Ext.define('saas.view.document.vendor.FormPanel', {
 
     //字段属性
     _title:'供应商管理',
-    _dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
-    _saveUrl:'http://192.168.253.228:8800/api/document/vendor/save',
-    _deleteUrl:'http://192.168.253.228:8800/api/document/vendor/delete',
+    _dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+    _saveUrl:basePath + 'document/vendor/save',
+    _deleteUrl:basePath + 'document/vendor/delete',
 
     initComponent: function () {
         var me = this;

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

@@ -6,8 +6,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     viewModel: 'money-paybalance-formpanel',
 
     viewName: 'money-paybalance-formpanel',
-
-    caller: 'Purchase',
+    caller: 'PayBalance',
 
     //字段属性
     _title: '付款单',
@@ -17,19 +16,15 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _statusCodeField: 'pu_statuscode',
     
     _relationColumn: 'pd_puid',
-    _readUrl: 'http://192.168.0.181:8560/api/purchase/purchase/read/',
-    _saveUrl: 'http://192.168.0.181:8560/api/purchase/purchase/save',
-    _auditUrl: 'http://192.168.0.181:8560/api/purchase/purchase/audit',
-    _deleteUrl: 'http://192.168.0.181:8560/api/purchase/purchase/delete/',
-    _deleteDetailUrl: 'http://192.168.0.181:8560/api/purchase/purchase/deleteItem/',
-    _turnInUrl: 'http://192.168.253.228:8800/purchase/turnProdin/',
+    _readUrl: basePath + 'money/paybalance/read/',
+    _saveUrl: basePath + 'money/paybalance/save',
+    _auditUrl: basePath + 'money/paybalance/audit',
+    _deleteUrl: basePath + 'money/paybalance/delete/',
+    _deleteDetailUrl: basePath + 'money/paybalance/deleteItem/',
+    _turnInUrl: basePath + 'money/paybalance/turnProdin/',
     initId: 0,
 
-    // toolBtns: [{
-    //     xtype: 'button',
-    //     text: '转采购验收单',
-    //     handler: 'turnIn'
-    // }],
+    toolBtns: [],
 
     defaultItems: [{
         xtype: 'hidden',

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.money.paybalance.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.0.181:8570/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -67,7 +67,7 @@ Ext.define('saas.view.money.paybalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.0.181:8570/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }],

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

@@ -101,7 +101,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         addTitle: '采购单',
         addXtype: 'purchase-purchase-formpanel',
         defaultCondition:'',
-        baseVastUrl: 'http://192.168.253.58:8800/purchase/',
+        baseVastUrl: basePath + 'purchase/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -61,7 +61,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -6,7 +6,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     viewModel: 'purchase-purchase-formpanel',
 
     viewName: 'purchase-purchase-formpanel',
-    
     caller:'Purchase',
     
      //字段属性
@@ -113,7 +112,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
-        storeModel:'saas.model.purchase.purchasedetail',
+        storeModel:'saas.model.purchase.ProdIODetail',
         _detnoColumn:  'pd_detno',
         columns : [
             {

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         bind: '{pu_vendcode}',
         fieldLabel: '供应商编号'
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pu_vendname',
         bind: '{pu_vendname}',
         fieldLabel: '供应商名称'
@@ -53,7 +53,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     }, {
         xtype: 'combobox',
         name: 'pu_statuscode',
-       // bind: '{pu_statuscode}',
         fieldLabel: '审核状态',
         queryMode: 'local',
         displayField: 'pu_status',

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

@@ -4,6 +4,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
 
     controller: 'purchase-purchasein-formpanel',
     viewModel: 'purchase-purchasein-formpanel',
+
+    viewName: 'purchase-purchasein-formpanel',
     caller:'PurchaseIn',
     
      //字段属性
@@ -58,21 +60,16 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         fieldLabel : "供应商ID", 
         allowBlank : true, 
         columnWidth : 0.0
+    },{
+        xtype: 'hidden',
+        name: 'pu_vendcode',
+        bind: '{pu_vendcode}',
+        fieldLabel: '供应商编号'
     }, {
-        xtype : "textfield", 
-        name : "pi_vendcode", 
-        bind : "{pi_vendcode}", 
-        fieldLabel : "供应商编号", 
-        hidden:true,
-        allowBlank : true, 
-        columnWidth : 0, 
-    }, {
-        xtype : "dbfindtrigger", 
-        name : "pi_vendname", 
-        bind : "{pi_vendname}", 
-        fieldLabel : "供应商名称", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        xtype: 'dbfindtrigger',
+        name: 'pu_vendname',
+        bind: '{pu_vendname}',
+        fieldLabel: '供应商名称'
     },{
         xtype : "datefield", 
         name : "pi_date", 
@@ -105,7 +102,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     }, {
         name : "detailGridField", 
         xtype : "detailGridField",
-        storeModel:'saas.model.purchase.prodIODetail', 
+        storeModel:'saas.model.purchase.ProdIODetail', 
         _detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -48,18 +48,13 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         name: 'pd_prodcode',
         bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
-        fieldMode: 'DETAIL',
-        queryType:'VAG',
-        hidden:true,
-        allowBlank: true,
-        columnWidth: 0.25
+        showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
-        name: 'pr_detail#pd_prodcode',
+        xtype: 'textfield',
+        name: 'pr_detail',
         bind: '{pr_detail}',
         fieldLabel: '物料名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
@@ -73,11 +68,18 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         store: Ext.create('Ext.data.ArrayStore', {
             fields: ['pi_statuscode', 'pi_status'],
             data: [
-                ["$ALL", "全部"],
+                ["ALL", "全部"],
                 ["AUDITED", "已审核"],
                 ["UNAUDITED", "未审核"]
             ]
-        })
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'pi_statuscode=\'' + value + '\'';
+            }
+        }
     }],
     moreQueryFormItems: [{
         xtype: 'textfield',

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

@@ -100,6 +100,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     },{
         name : "detailGridField", 
         xtype : "detailGridField", 
+        storeModel:'saas.model.purchase.ProdIODetail', 
         _detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -77,7 +77,14 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                 ["AUDITED", "已审核"],
                 ["UNAUDITED", "未审核"]
             ]
-        })
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'pi_statuscode=\'' + value + '\'';
+            }
+        }
     }],
     moreQueryFormItems: [{
         xtype: 'textfield',

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

@@ -4,7 +4,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
 
     controller: 'sale-sale-formpanel',
     viewModel: 'sale-sale-formpanel',
-    
+
+    viewName: 'sale-sale-formpanel',
     caller:'Sale',
     
      //字段属性
@@ -114,6 +115,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
     ,{
         name : "detailGridField", 
         xtype : "detailGridField", 
+        storeModel:'saas.model.sale.Saledetail',
         _detnoColumn:  'sd_detno',
         columnWidth : 1,
         columns : [

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

@@ -72,11 +72,18 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['sa_statuscode', 'sa_status'],
         data: [
-            ["$ALL", "全部"],
+            ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
         ]
-        })
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'sa_statuscode=\'' + value + '\'';
+            }
+        }
     }, {
         xtype: 'multicombo',
         name: 'sa_sendstatuscode',

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

@@ -4,7 +4,9 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
 
     controller: 'sale-salein-formpanel',
     viewModel: 'sale-salein-formpanel',
-    caller:'ProdInOut!SaleReturn',
+    
+    viewName: 'sale-salein-formpanel',
+    caller:'SaleIn',
     
      //字段属性
     _title:'销售退货单',
@@ -23,88 +25,52 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     _turnOutUrl:basePath+'sale/prodinout/turnProdOut/',
     initId:0,
 
-    // toolBtns: [{
-    //     xtype: 'button',
-    //     text: '',
-    //     handler: 'turnOut'
-    // }],
-
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
-        allowBlank: true,
         columnWidth: 0
-    }, {
+    },{
         xtype : "textfield", 
         name : "pi_inoutno", 
-        bind : "{pi_inoutno}", 
-        fieldLabel : "退货单号", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "单据编号"
     },{
         xtype : "textfield", 
-        name : "pi_class", 
-        bind : "{pi_class}", 
-        fieldLabel : "单据类型", 
+        name : "pi_status", 
+        fieldLabel : "状态", 
         readOnly:true,
-        allowBlank : true, 
-        columnWidth : 0.25
-    }, {
-        xtype : "hidden", 
-        name : "pi_custid", 
-        bind : "{pi_custid}", 
-        fieldLabel : "客户ID", 
-        allowBlank : true, 
-        columnWidth : 0.0
-    }, {
-        xtype : "textfield", 
-        name : "pi_custcode", 
-        bind : "{pi_custcode}", 
-        fieldLabel : "客户编号", 
-        hidden:true,
-        allowBlank : true, 
-        columnWidth : 0, 
-    }, {
-        xtype : "dbfindtrigger", 
-        name : "pi_custname", 
-        bind : "{pi_custname}", 
-        fieldLabel : "客户名称", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        allowBlank : false, 
+        defaultValue:'未审核'
     },{
-        xtype : "datefield", 
-        name : "pi_date", 
-        bind : "{pi_date}", 
-        fieldLabel : "单据日期", 
+        xtype : "hidden", 
+        name : "pi_statuscode", 
+        fieldLabel : "状态码", 
+        readOnly:true,
         allowBlank : false, 
-        columnWidth : 0.25
+        defaultValue:'UNAUDITED', 
     },{
         xtype : "textfield", 
-        name : "pi_total", 
-        bind : "{pi_total}", 
-        fieldLabel : "总额", 
-        allowBlank : true,
-        readOnly: true,
-        columnWidth : 0.25
-    }, {
+        name : "pi_class", 
+        fieldLabel : "单据类型", 
+        readOnly:true,
+        allowBlank : false, 
+        defaultValue:'销售入库单'
+    },{
+        xtype : "hidden", 
+        name : "pi_custid",  
+        fieldLabel : "客户ID"
+    },{
         xtype : "hidden", 
-        name : "pi_said", 
-        bind : "{pi_said}", 
-        fieldLabel : "销售单id", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_custcode",  
+        fieldLabel : "客户编号"
     },{
         xtype : "textfield", 
-        name : "pi_sacode", 
-        bind : "{pi_sacode}", 
-        fieldLabel : "采购单号", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_custname",  
+        fieldLabel : "客户"
     }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
+        storeModel:'saas.model.sale.ProdIODetail',
         _detnoColumn:  'pd_pdno',
         columns : [
             {
@@ -172,9 +138,6 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             },            {
                 text : "已转数", 
                 dataIndex : "pd_yqty", 
-                editor : {
-                    xtype : "numberfield"
-                },
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 format:'0',
@@ -204,6 +167,9 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "单价", 
                 dataIndex : "pd_sendprice", 
                 width : 120.0, 
+                editor : {
+                    xtype : "numberfield"
+                },
                 xtype : "numbercolumn", 
                 items : null
             }, 
@@ -216,6 +182,9 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "税率", 
                 dataIndex : "pd_taxrate", 
                 width : 120.0, 
+                editor : {
+                    xtype : "numberfield"
+                },
                 xtype : "numbercolumn", 
                 items : null
             },
@@ -241,38 +210,24 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 flex:1
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_recordman", 
+        fieldLabel : "录入人",
+        readOnly:true,
     }, {
         format : "Y-m-d", 
         xtype : "datefield", 
         name : "createTime", 
-        bind : "{createTime}", 
-        fieldLabel : "创建时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    }, {
-        xtype : "datefield", 
-        name : "updateTime", 
-        bind : "{updateTime}", 
-        fieldLabel : "更新时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "创建时间"
     }, {
         xtype : "textfield", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_status", 
-        bind : "{pi_status}", 
-        fieldLabel : "单据状态", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_auditman", 
+        fieldLabel : "过账人"
     }, {
-        xtype : "hidden", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_statuscode", 
-        bind : "{pi_statuscode}", 
-        fieldLabel : "单据状态码", 
-        allowBlank : true, 
-        columnWidth : 0.0
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "pi_auditman", 
+        fieldLabel : "过账时间"
     }]
 });

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

@@ -98,24 +98,6 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
             renderTo:this.ownerCmp.ownerCt.getEl()
         }).show();
 
-    },
-    turnOut: function() {
-        var me = this,
-        form = me.getView(),
-        id = form.getForm().findField(form._idField);
-        form.BaseUtil.request({
-            url: form._turnOutUrl+id.value,
-            method: 'GET',
-        })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
-            if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
-              
-            }
-        })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
-        });
-     }
+    }
+    
 });

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

@@ -1,7 +1,4 @@
 Ext.define('saas.view.sale.saleIn.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.sale-salein-formpanel',
-    data: {
-        pi_class: '销售退货单'
-     }
 });

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

@@ -77,16 +77,23 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                 ["AUDITED", "已审核"],
                 ["UNAUDITED", "未审核"]
             ]
-        })
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'pi_statuscode=\'' + value + '\'';
+            }
+        }
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
         idField:'id',
         codeField:'pi_inoutno',
-        addTitle:'销售出货单',
-        addXtype:'purchase-purchaseIn-formpanel',
-        defaultCondition:' pi_class = \'销售出货单\'',
-        baseVastUrl: basePath+'sale/sale/',
+        addTitle:'销售退货单',
+        addXtype:'sale-salein-formpanel',
+        defaultCondition:' pi_class = \'销售退货单\'',
+        baseVastUrl: basePath+'sale/prodinout/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -6,8 +6,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     viewModel: 'sale-saleout-formpanel',
 
     viewName: 'sale-saleout-formpanel',
-    
-    caller:'ProdInOut!Sale',
+    caller:'SaleOut',
     
     //字段属性
     _title:'销售出货单',
@@ -23,11 +22,15 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     _auditUrl:basePath+'sale/prodinout/audit',
     _deleteUrl:basePath+'sale/prodinout/delete/',
     _deleteDetailUrl:basePath+'sale/prodinout/deleteItem/',
-    _turnInUrl:basePath+'sale/prodinout/turnProdin/',
+    _turnInUrl:basePath+'sale/prodinout/turnProdIn/',
     _turnOutUrl:basePath+'sale/prodinout/turnProdOut/',
     initId:0,
 
-    toolBtns: [],
+    toolBtns: [{
+        xtype: 'button',
+        text: '转销售验退',
+        handler: 'turnProdIn'
+    }],
 
     defaultItems: [{
         xtype: 'hidden',
@@ -49,7 +52,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
-        allowBlank : true, 
+        allowBlank : false, 
+        defaultValue:'销售出货单',
         columnWidth : 0.25
     }, {
         xtype : "hidden", 
@@ -112,6 +116,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     },{
         name : "detailGridField", 
         xtype : "detailGridField", 
+        storeModel:'saas.model.sale.ProdIODetail',
         _detnoColumn:  'pd_pdno',
         columns : [
             {
@@ -194,6 +199,9 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             {
                 text : "单价", 
                 dataIndex : "pd_sendprice", 
+                editor : {
+                    xtype : "numberfield"
+                },
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 items : null

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

@@ -93,5 +93,24 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
             renderTo:this.ownerCmp.ownerCt.getEl()
         }).show();
 
-    }
+    },
+    turnProdIn: function() {
+        var me = this,
+        form = me.getView(),
+        id = form.getForm().findField(form._idField);
+        form.BaseUtil.request({
+            url: form._turnInUrl+id.value,
+            method: 'GET',
+        })
+        .then(function(res) {
+            var localJson = new Ext.decode(res.responseText);
+            if(localJson.success){
+                Ext.Msg.alert('提示','转单成功');
+              
+            }
+        })
+        .catch(function() {
+            Ext.Msg.alert('提示','转单失败');
+        });
+     }
 });

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

@@ -1,8 +1,5 @@
 Ext.define('saas.view.sale.saleout.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.sale-saleout-formpanel',
-    
-    data: {
-        pi_class: '销售出货单'
-     }
+
 });

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

@@ -63,7 +63,6 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        bind: '{pi_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
         columnWidth: 0.25,
@@ -77,7 +76,14 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                 ["AUDITED", "已审核"],
                 ["UNAUDITED", "未审核"]
             ]
-        })
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'pi_statuscode=\'' + value + '\'';
+            }
+        }
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
@@ -86,7 +92,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         addTitle:'销售出货单',
         addXtype:'sale-saleout-formpanel',
         defaultCondition:' pi_class = \'销售出货单\'',
-        baseVastUrl: basePath+'sale/sale/',
+        baseVastUrl: basePath+'sale/prodinout/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -5,60 +5,44 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
     controller: 'stock-appropriationinout-formpanel',
     viewModel: 'stock-appropriationinout-formpanel',
     
+    viewName: 'stock-appropriationinout-formpanel',
+    caller:'AppropriationInOut',
+
      //字段属性
-     _title:'其它入库单',
+     _title:'调拨单',
      _idField: 'id',
      _codeField: 'pi_inoutno',
      _statusField: 'pi_status',
      _statusCodeField: 'pi_statuscode',
      
      _relationColumn: 'pd_piid',
-     _readUrl:'http://localhost:9000/prodinout/read/',
-     _saveUrl:'http://localhost:9000/prodinout/save',
-     _auditUrl:'http://localhost:9000/prodinout/audit',
-     _deleteUrl:'http://localhost:9000/prodinout/delete/',
-     _deleteDetailUrl:'http://localhost:9000/prodinout/deleteItem/',
+     _readUrl:basePath+'storage/prodinout/read/',
+     _saveUrl:basePath+'storage/prodinout/save',
+     _auditUrl:basePath+'storage/prodinout/audit',
+     _deleteUrl:basePath+'storage/prodinout/delete/',
+     _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
      initId:0,
- 
-     toolBtns: [{
-         xtype: 'button',
-         text: '转其他出库',
-         handler: 'turnIn'
-     }],
 
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
-        allowBlank: true,
         columnWidth: 0
-    },{
-        xtype : "textfield", 
-        name : "pi_inoutno", 
-        bind : "{pi_inoutno}", 
-        fieldLabel : "调拨单号", 
-        allowBlank : true, 
-        columnWidth : 0.25
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
-        allowBlank : true,
-        hidden:true, 
-        columnWidth : 0.25
+        allowBlank : false, 
+        defaultValue:'调拨单'
     },{
-        xtype : "datefield", 
-        name : "pi_date", 
-        bind : "{pi_date}", 
-        fieldLabel : "单据日期", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        xtype : "hidden", 
+        name : "pi_total",  
+        fieldLabel : "单据金额"
     },{
         name : "detailGridField", 
         xtype : "detailGridField", 
+        storeModel:'saas.model.stock.ProdIODetail',
         _detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -67,7 +67,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }],

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelModel.js

@@ -1,8 +1,5 @@
 Ext.define('saas.view.stock.appropriationInOut.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.stock-appropriationinout-formpanel',
-    data: {
-        pi_class: '调拨单'
-     }
+    alias: 'viewmodel.stock-appropriationinout-formpanel'
 
 });

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

@@ -17,36 +17,30 @@ Ext.define('saas.view.stock.appropriationinout.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pu_code',
-        bind: '{pu_code}',
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
         name: 'pu_date',
-        bind: '{pu_date}',
         fieldLabel: '采购日期',
         allowBlank: true,
         columnWidth: 0.5
     }, {
         xtype: 'dbfindtrigger',
         name: 'pu_vendcode',
-        bind: '{pu_vendcode}',
         fieldLabel: '供应商编号',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'textfield',
         name: 'pu_vendname',
-        bind: '{pu_vendname}',
         fieldLabel: '供应商名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode#pd_prodcode',
-        //#pr_detail
-        bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
         fieldMode: 'DETAIL',
         queryType: 'VAG',
@@ -62,7 +56,6 @@ Ext.define('saas.view.stock.appropriationinout.QueryPanel', {
     }, {
         xtype: 'combobox',
         name: 'pu_statuscode',
-       // bind: '{pu_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
         columnWidth: 0.25,
@@ -73,11 +66,18 @@ Ext.define('saas.view.stock.appropriationinout.QueryPanel', {
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['pu_statuscode', 'pu_status'],
         data: [
-            ["$ALL", "全部"],
+            ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
         ]
-        })
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'pi_statuscode=\'' + value + '\'';
+            }
+        }
     }, {
         xtype: 'multicombo',
         name: 'pu_acceptstatuscode',
@@ -114,10 +114,10 @@ Ext.define('saas.view.stock.appropriationinout.QueryPanel', {
     queryGridConfig: {
         idField: 'pu_id',
         codeField: 'pu_code',
-        addTitle: '采购单',
-        addXtype: 'purchase-purchase-formpanel',
+        addTitle: '调拨单',
+        addXtype: 'stock-appropriationinout-formpanel',
         defaultCondition:' pi_class = \'调拨单\'',
-        baseVastUrl: 'http://localhost:8800/purchase/',
+        baseVastUrl: basePath+'storage/prodinout/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -8,7 +8,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'

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

@@ -5,6 +5,9 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     controller: 'stock-otherin-formpanel',
     viewModel: 'stock-otherin-formpanel',
     
+    viewName: 'stock-otherin-formpanel',
+    caller:'OtherIn',
+
      //字段属性
      _title:'其它入库单',
      _idField: 'id',
@@ -13,82 +16,35 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
      _statusCodeField: 'pi_statuscode',
      
      _relationColumn: 'pd_piid',
-     _readUrl:'http://localhost:9000/prodinout/read/',
-     _saveUrl:'http://localhost:9000/prodinout/save',
-     _auditUrl:'http://localhost:9000/prodinout/audit',
-     _deleteUrl:'http://localhost:9000/prodinout/delete/',
-     _deleteDetailUrl:'http://localhost:9000/prodinout/deleteItem/',
-     _turnInUrl:'http://localhost:9000/prodinout/turnProdin/',
-     initId:0,
+    _readUrl:basePath+'storage/prodinout/read/',
+    _saveUrl:basePath+'storage/prodinout/save',
+    _auditUrl:basePath+'storage/prodinout/audit',
+    _deleteUrl:basePath+'storage/prodinout/delete/',
+    _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
+    initId:0,
  
-     toolBtns: [{
-         xtype: 'button',
-         text: '转其他出库',
-         handler: 'turnIn'
-     }],
+    toolBtns: [],
 
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
-        allowBlank: true,
         columnWidth: 0
-    },{
-        xtype : "textfield", 
-        name : "pi_inoutno", 
-        bind : "{pi_inoutno}", 
-        fieldLabel : "入库单号", 
-        allowBlank : true, 
-        columnWidth : 0.25
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
-        allowBlank : true,
-        hidden:true, 
-        columnWidth : 0.25
+        allowBlank : false, 
+        defaultValue:'其它入库单'
     },{
         xtype : "hidden", 
-        name : "pi_vendid", 
-        bind : "{pi_vendid}", 
-        fieldLabel : "供应商ID", 
-        allowBlank : true, 
-        columnWidth : 0.0
-    }, {
-        xtype : "textfield", 
-        name : "pi_vendcode", 
-        bind : "{pi_vendcode}", 
-        fieldLabel : "供应商编号", 
-        hidden:true,
-        allowBlank : true, 
-        columnWidth : 0, 
-    }, {
-        xtype : "dbfindtrigger", 
-        name : "pi_vendname", 
-        bind : "{pi_vendname}", 
-        fieldLabel : "供应商名称", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    }, {
-        xtype : "datefield", 
-        name : "pi_date", 
-        bind : "{pi_date}", 
-        fieldLabel : "单据日期", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    },{
-        xtype : "numberfield", 
-        name : "pi_total", 
-        bind : "{pi_total}", 
-        fieldLabel : "单据金额", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_total",  
+        fieldLabel : "单据金额"
     }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
+        storeModel:'saas.model.stock.ProdIODetail',
         _detnoColumn:  'pd_pdno',
         columns : [
             {
@@ -218,38 +174,24 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 flex : 1.0
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_recordman", 
+        fieldLabel : "录入人",
+        readOnly:true,
     }, {
         format : "Y-m-d", 
         xtype : "datefield", 
         name : "createTime", 
-        bind : "{createTime}", 
-        fieldLabel : "创建时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    }, {
-        xtype : "datefield", 
-        name : "updateTime", 
-        bind : "{updateTime}", 
-        fieldLabel : "更新时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "创建时间"
     }, {
         xtype : "textfield", 
-        readOnly : true, 
-        editable : false, 
-        name : "pu_status", 
-        bind : "{pi_status}", 
-        fieldLabel : "单据状态", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_auditman", 
+        fieldLabel : "过账人"
     }, {
-        xtype : "hidden", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_statuscode", 
-        bind : "{pi_statuscode}", 
-        fieldLabel : "单据状态码", 
-        allowBlank : true, 
-        columnWidth : 0.0
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "pi_auditman", 
+        fieldLabel : "过账时间"
     }]
 });

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -67,7 +67,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }],

frontend/saas-web/app/view/stock/otherIn/FormPanelModel.js

@@ -1,8 +1,4 @@
 Ext.define('saas.view.stock.otherIn.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.stock-otherin-formpanel',
-    data: {
-        pi_class: '其它入库单'
-     }
-
 });

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

@@ -9,204 +9,186 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
 
     queryFormItems: [{
         xtype: 'hidden',
-        name: 'pu_id',
-        bind: '{pu_id}',
+        name: 'id',
+        bind: '{id}',
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
     }, {
         xtype: 'textfield',
-        name: 'pu_code',
-        bind: '{pu_code}',
+        name: 'pi_inoutno',
+        bind: '{pi_inoutno}',
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
-        name: 'pu_date',
-        bind: '{pu_date}',
-        fieldLabel: '采购日期',
+        name: 'pi_date',
+        bind: '{pi_date}',
+        fieldLabel: '单据日期',
         allowBlank: true,
         columnWidth: 0.5
     }, {
-        xtype: 'dbfindtrigger',
-        name: 'pu_vendcode',
-        bind: '{pu_vendcode}',
+        xtype: 'textfield',
+        name: 'pi_vendcode',
+        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号',
         allowBlank: true,
+        hidden:true,
         columnWidth: 0.25
     }, {
         xtype: 'textfield',
-        name: 'pu_vendname',
-        bind: '{pu_vendname}',
+        name: 'pi_vendname',
+        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'dbfindtrigger',
-        name: 'pd_prodcode#pd_prodcode',
-        //#pr_detail
+        name: 'pd_prodcode',
         bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
         fieldMode: 'DETAIL',
-        queryType: 'VAG',
+        queryType:'VAG',
+        hidden:true,
         allowBlank: true,
         columnWidth: 0.25
     }, {
-        xtype: 'textfield',
-        name: 'pr_detail',
+        xtype: 'dbfindtrigger',
+        name: 'pr_detail#pd_prodcode',
         bind: '{pr_detail}',
         fieldLabel: '物料名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'combobox',
-        name: 'pu_statuscode',
-       // bind: '{pu_statuscode}',
+        name: 'pi_statuscode',
+        bind: '{pi_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
         columnWidth: 0.25,
         queryMode: 'local',
-        displayField: 'pu_status',
-        valueField: 'pu_statuscode',
-        editable:false,
+        displayField: 'pi_status',
+        valueField: 'pi_statuscode',
         store: Ext.create('Ext.data.ArrayStore', {
-        fields: ['pu_statuscode', 'pu_status'],
-        data: [
-            ["$ALL", "全部"],
-            ["AUDITED", "已审核"],
-            ["UNAUDITED", "未审核"]
-        ]
-        })
-    }, {
-        xtype: 'multicombo',
-        name: 'pu_acceptstatuscode',
-        bind: '{pu_acceptstatuscode}',
-        fieldLabel: '入库状态',
-        allowBlank: true,
-        columnWidth: 0.25,
-        datas: [
-            ["TURNIN", "已入库"],
-            ["UNTURNIN", "未入库"],
-            ["PARTIN", "部分入库"]
-        ]
-    }],
-    moreQueryFormItems: [{
-        xtype: 'textfield',
-        name: 'pu_buyername',
-        bind: '{pu_buyername}',
-        fieldLabel: '采购员',
-        allowBlank: true
-    }, {
-        xtype: 'textfield',
-        name: 'pu_total',
-        bind: '{pu_total}',
-        fieldLabel: '金额',
-        allowBlank: true
-    }, {
-        xtype: 'condatefield',
-        name: 'pu_delivery',
-        bind: '{pu_delivery}',
-        fieldLabel: '交货日期',
-        allowBlank: true,
-        columnWidth: 1
+            fields: ['pi_statuscode', 'pi_status'],
+            data: [
+                ["ALL", "全部"],
+                ["AUDITED", "已审核"],
+                ["UNAUDITED", "未审核"]
+            ]
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'pi_statuscode=\'' + value + '\'';
+            }
+        }
     }],
+    moreQueryFormItems: [],
     queryGridConfig: {
-        idField: 'pu_id',
-        codeField: 'pu_code',
+        idField: 'id',
+        codeField: 'pi_inoutno',
         addTitle: '其它入库单',
         addXtype: 'stock-otherin-formpanel',
         defaultCondition:' pi_class = \'其它入库单\'',
-        baseVastUrl: 'http://localhost:9000/prodinout/',
+        baseVastUrl: basePath+'storage/prodinout/',
         baseColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'
         }, {
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
-            dataIndex: 'pu_code',
+            dataIndex: 'pi_inoutno',
             width: 120
         }, {
             text: '单据状态',
-            dataIndex: 'pu_status',
+            dataIndex: 'pi_status',
+            width: 120
+        }, {
+            text: '单据类型',
+            dataIndex: 'pi_class',
             width: 120
         }, {
             text: '下单日期',
-            dataIndex: 'pu_indate',
-            xtype: 'datecolumn',
+            dataIndex: 'pi_date',
+            xtype:'datecolumn',
             width: 200
-        }, {
+        },{
             text: '供应商名称',
-            dataIndex: 'pu_vendname',
+            dataIndex: 'pi_vendname',
             width: 120
-        }, {
+        },{
             text: '含税金额',
-            dataIndex: 'pu_taxtotal',
-            xtype: 'numbercolumn',
+            dataIndex: 'pi_total',
+            xtype:'numbercolumn',
             width: 120
-        }, {
-            text: '金额',
-            dataIndex: 'pu_total',
-            xtype: 'numbercolumn',
+        },{
+            text: '不含税金额',
+            dataIndex: 'pi_nettotal',
+            xtype:'numbercolumn',
             width: 120,
             flex: 1
         }],
         relativeColumn: [{
-            text: '序号',
-            width: 80,
-            xtype: 'rownumberer'
+            text : "序号", 
+            dataIndex : "pd_pdno", 
+            width : 100, 
+            xtype : "numbercolumn",
+            align : 'center'
         }, {
             text: 'id',
             dataIndex: 'pu_id',
-            width: 100,
+            width: 0,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
-            dataIndex: 'pu_code',
+            dataIndex: 'pd_inoutno',
             width: 120
         }, {
             text: '单据状态',
-            dataIndex: 'pu_status',
+            dataIndex: 'pi_status',
             width: 120
         }, {
             text: '下单日期',
-            dataIndex: 'pu_indate',
-            xtype: 'datecolumn',
+            dataIndex: 'pi_date',
+            xtype:'datecolumn',
             width: 200
-        }, {
+        },{
             text: '供应商名称',
-            dataIndex: 'pu_vendname',
-            width: 120
-        }, {
-            text: '采购序号',
-            dataIndex: 'pd_detno',
-            xtype: 'numbercolumn',
+            dataIndex: 'pi_vendname',
             width: 120
-        }, {
+        },{
             text: '物料编号',
             dataIndex: 'pd_prodcode',
             width: 120
-        }, {
-            text: '数量',
-            dataIndex: 'pd_qty',
-            xtype: 'numbercolumn',
+        },{
+            text: '入库数量',
+            dataIndex: 'pd_inqty',
+            xtype:'numbercolumn',
             width: 120
-        }, {
-            text: '单价',
+        },{
+            text: '成本单价',
             dataIndex: 'pd_price',
-            xtype: 'numbercolumn',
-            width: 120
-        }, {
-            text: '已转数',
-            dataIndex: 'pd_ytqy',
-            xtype: 'numbercolumn',
+            xtype:'numbercolumn',
             width: 120,
             flex: 1
+        },{
+            text: '金额',
+            dataIndex: 'pd_total',
+            xtype:'numbercolumn',
+            width: 120
+        },{
+            text: '税率',
+            dataIndex: 'pd_taxrate',
+            xtype:'numbercolumn',
+            width: 120
         }]
     }
 });

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

@@ -8,7 +8,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'

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

@@ -5,20 +5,22 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     controller: 'stock-otherout-formpanel',
     viewModel: 'stock-otherout-formpanel',
     
+    viewName: 'stock-otherout-formpanel',
+    caller:'OtherOut',
+
      //字段属性
-     _title:'其它入库单',
+     _title:'其它出库单',
      _idField: 'id',
      _codeField: 'pi_inoutno',
      _statusField: 'pi_status',
      _statusCodeField: 'pi_statuscode',
      
      _relationColumn: 'pd_piid',
-     _readUrl:'http://localhost:8800/purchase/read/',
-     _saveUrl:'http://localhost:8800/purchase/save',
-     _auditUrl:'http://localhost:8800/purchase/audit',
-     _deleteUrl:'http://localhost:8800/purchase/delete/',
-     _deleteDetailUrl:'http://localhost:8800/purchase/deleteItem/',
-     _turnInUrl:'http://localhost:8800/purchase/turnProdin/',
+     _readUrl:basePath+'storage/prodinout/read/',
+    _saveUrl:basePath+'storage/prodinout/save',
+    _auditUrl:basePath+'storage/prodinout/audit',
+    _deleteUrl:basePath+'storage/prodinout/delete/',
+    _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
      initId:0,
  
      toolBtns: [],
@@ -26,65 +28,23 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
-        allowBlank: true,
         columnWidth: 0
-    },{
-        xtype : "textfield", 
-        name : "pi_inoutno", 
-        bind : "{pi_inoutno}", 
-        fieldLabel : "出库单号", 
-        allowBlank : true, 
-        columnWidth : 0.25
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
-        allowBlank : true,
-        hidden:true, 
-        columnWidth : 0.25
+        allowBlank : false, 
+        defaultValue:'其它出库单'
     },{
         xtype : "hidden", 
-        name : "pi_vendid", 
-        bind : "{pi_vendid}", 
-        fieldLabel : "供应商ID", 
-        allowBlank : true, 
-        columnWidth : 0.0
-    }, {
-        xtype : "textfield", 
-        name : "pi_vendcode", 
-        bind : "{pi_vendcode}", 
-        fieldLabel : "供应商编号", 
-        hidden:true,
-        allowBlank : true, 
-        columnWidth : 0, 
-    }, {
-        xtype : "dbfindtrigger", 
-        name : "pi_vendname", 
-        bind : "{pi_vendname}", 
-        fieldLabel : "供应商名称", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    }, {
-        xtype : "datefield", 
-        name : "pi_date", 
-        bind : "{pi_date}", 
-        fieldLabel : "单据日期", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    },{
-        xtype : "numberfield", 
-        name : "pi_total", 
-        bind : "{pi_total}", 
-        fieldLabel : "单据金额", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_total",  
+        fieldLabel : "单据金额"
     }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
+        storeModel:'saas.model.stock.ProdIODetail',
         _detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -66,7 +66,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }],

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

@@ -91,33 +91,14 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             ["PARTIN", "部分入库"]
         ]
     }],
-    moreQueryFormItems: [{
-        xtype: 'textfield',
-        name: 'pu_buyername',
-        bind: '{pu_buyername}',
-        fieldLabel: '采购员',
-        allowBlank: true
-    }, {
-        xtype: 'textfield',
-        name: 'pu_total',
-        bind: '{pu_total}',
-        fieldLabel: '金额',
-        allowBlank: true
-    }, {
-        xtype: 'condatefield',
-        name: 'pu_delivery',
-        bind: '{pu_delivery}',
-        fieldLabel: '交货日期',
-        allowBlank: true,
-        columnWidth: 1
-    }],
+    moreQueryFormItems: [],
     queryGridConfig: {
         idField: 'pu_id',
         codeField: 'pu_code',
         addTitle: '其它出库单',
-        addXtype: 'stock-otheron-formpanel',
+        addXtype: 'stock-otherout-formpanel',
         defaultCondition:' pi_class = \'其它出库单\'',
-        baseVastUrl: 'http://localhost:8800/purchase/',
+        baseVastUrl: basePath+'storage/prodinout/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -8,7 +8,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'

frontend/saas-web/app/view/test/order/FormController.js

@@ -16,7 +16,7 @@ Ext.define('saas.view.test.order.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
@@ -77,7 +77,7 @@ Ext.define('saas.view.test.order.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
@@ -139,7 +139,7 @@ Ext.define('saas.view.test.order.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'

frontend/saas-web/app/view/test/order/FormPanel.js

@@ -15,11 +15,11 @@ Ext.define('saas.view.test.order.FormPanel', {
     _statusCodeField: 'pu_statuscode',
     _detnoColumn:  'pd_detno',
     _relationColumn: 'pd_puid',
-    _readUrl:'http://192.168.253.228:8800/purchase/read/',
-    _saveUrl:'http://192.168.253.228:8800/purchase/save',
-    _auditUrl:'http://192.168.253.228:8800/purchase/audit',
-    _deleteUrl:'http://192.168.253.228:8800/purchase/delete/',
-    _deleteDetailUrl:'http://192.168.253.228:8800/purchase/deleteItem/',
+    _readUrl:basePath + 'purchase/purchase/read/',
+    _saveUrl:basePath + 'purchase/purchase/save',
+    _auditUrl:basePath + 'purchase/purchase/audit',
+    _deleteUrl:basePath + 'purchase/purchase/delete/',
+    _deleteDetailUrl:basePath + 'purchase/purchase/deleteItem/',
     initId:0,
 
     toolBtns: [{
@@ -114,7 +114,7 @@ Ext.define('saas.view.test.order.FormPanel', {
         columnWidth : 0.25
     },{
         xtype : "remotecombo", 
-        storeUrl:"http://192.168.253.41:9480/api/document/product/getProdUnit",
+        storeUrl:basePath+'ducument/product/getProdUnit',
         name : "pu_text1", 
         bind : "{pu_text1}", 
         fieldLabel : "供应商类型", 
@@ -127,8 +127,8 @@ Ext.define('saas.view.test.order.FormPanel', {
             vendorkind:{
                 keyField:'id',
                 dataField:'vk_name',
-                reqUrl:'http://192.168.253.41:9480/api/document/vendorkind/save',
-                delUrl:'http://192.168.253.41:9480/api/document/vendorkind/delete'
+                reqUrl:basePath+'ducument/vendorkind/save',
+                delUrl:basePath+'ducument/vendorkind/delete'
             }
         },
         addHandler:function(b){

frontend/saas-web/app/view/test/query/QueryPanel.js

@@ -6,7 +6,7 @@ Ext.define('saas.view.test.query.QueryPanel', {
     viewModel: 'test-query-querypanel',
     
     viewName: 'test-query-formpanel',
-    _baseVastUrl:'http://192.168.253.58:8800/purchase/',
+    _baseVastUrl:basePath+'purchase/',
     _idField:'pu_id',
     _codeField:'pu_code',
     queryFormItems: [{
@@ -23,7 +23,7 @@ Ext.define('saas.view.test.query.QueryPanel', {
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25,
-        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+        dataUrl:basePath+'ducument/vendor/getVendorsByCondition',
         dbfinds:[{
             from:'ve_code',to:'pu_code'
         }],
@@ -157,7 +157,7 @@ Ext.define('saas.view.test.query.QueryPanel', {
         _codeField:'pu_code',
         _title:'采购单',
         _addXtype:'test-order-formpanel',
-        _baseVastUrl:'http://192.168.253.58:8800/purchase/',
+        _baseVastUrl:basePath+'purchase/',
         _baseColumn: [{
             text: '序号',
             width: 80,