其他出入库单

frontend/saas-web/app/view/storage/prodInOutOtherIn/FormPanel.js

@@ -6,13 +6,13 @@ Ext.define('saas.view.storage.prodInOutOtherIn.FormPanel', {
     viewModel: 'storage-prodInOutOtherIn-formmodel',
     
      //字段属性
-     _title:'采购单',
+     _title:'其它入库单',
      _idField: 'id',
-     _codeField: 'pu_code',
-     _statusField: 'pu_status',
-     _statusCodeField: 'pu_statuscode',
-     _detnoColumn:  'pd_detno',
-     _relationColumn: 'pd_puid',
+     _codeField: 'pi_inoutno',
+     _statusField: 'pi_status',
+     _statusCodeField: 'pi_statuscode',
+     _detnoColumn:  'pd_pdno',
+     _relationColumn: 'pd_piid',
      _readUrl:'http://localhost:8800/purchase/read/',
      _saveUrl:'http://localhost:8800/purchase/save',
      _auditUrl:'http://localhost:8800/purchase/audit',
@@ -23,7 +23,7 @@ Ext.define('saas.view.storage.prodInOutOtherIn.FormPanel', {
  
      toolBtns: [{
          xtype: 'button',
-         text: '转验收单按钮',
+         text: '转其他出库',
          handler: 'turnIn'
      }],
 
@@ -34,75 +34,39 @@ Ext.define('saas.view.storage.prodInOutOtherIn.FormPanel', {
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
-    }, {
-        xtype : "textfield", 
-        name : "pu_code", 
-        bind : "{pu_code}", 
-        fieldLabel : "采购单号", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    }, {
+    },{
         xtype : "hidden", 
-        name : "pu_vendid", 
-        bind : "{pu_vendid}", 
+        name : "pi_vendid", 
+        bind : "{pi_vendid}", 
         fieldLabel : "供应商ID", 
         allowBlank : true, 
         columnWidth : 0.0
     }, {
         xtype : "textfield", 
-        name : "pu_vendcode", 
-        bind : "{pu_vendcode}", 
+        name : "pi_vendcode", 
+        bind : "{pi_vendcode}", 
         fieldLabel : "供应商编号", 
         hidden:true,
         allowBlank : true, 
         columnWidth : 0, 
     }, {
         xtype : "dbfindtrigger", 
-        name : "pu_vendname", 
-        bind : "{pu_vendname}", 
+        name : "pi_vendname", 
+        bind : "{pi_vendname}", 
         fieldLabel : "供应商名称", 
         allowBlank : true, 
         columnWidth : 0.25
-    },{
-        xtype : "datefield", 
-        name : "pu_date", 
-        bind : "{pu_date}", 
-        fieldLabel : "采购日期", 
-        allowBlank : false, 
-        columnWidth : 0.25
-    }, {
-        xtype : "hidden", 
-        name : "pu_buyerid", 
-        bind : "{pu_buyerid}", 
-        fieldLabel : "采购员ID", 
-        allowBlank : true, 
-        columnWidth : 0.0
-    }, {
-        xtype : "textfield", 
-        name : "pu_buyercode", 
-        bind : "{pu_buyercode}", 
-        fieldLabel : "采购员编号", 
-        allowBlank : true, 
-        hidden:true,
-        columnWidth : 0
-    }, {
-        xtype : "dbfindtrigger", 
-        name : "pu_buyername", 
-        bind : "{pu_buyername}", 
-        fieldLabel : "采购员名称", 
-        allowBlank : true, 
-        columnWidth : 0.25
     }, {
-        xtype : "textfield", 
-        name : "pu_shipaddresscode", 
-        bind : "{pu_shipaddresscode}", 
-        fieldLabel : "交货地址", 
+        xtype : "datefield", 
+        name : "pi_date", 
+        bind : "{pi_date}", 
+        fieldLabel : "单据日期", 
         allowBlank : true, 
         columnWidth : 0.25
-    }, {
-        xtype : "textfield", 
-        name : "pu_total", 
-        bind : "{pu_total}", 
+    },{
+        xtype : "numberfield", 
+        name : "pi_total", 
+        bind : "{pi_total}", 
         fieldLabel : "单据金额", 
         allowBlank : true, 
         columnWidth : 0.25
@@ -112,7 +76,7 @@ Ext.define('saas.view.storage.prodInOutOtherIn.FormPanel', {
         columns : [
             {
                 text : "序号", 
-                dataIndex : "pd_detno", 
+                dataIndex : "pd_pdno", 
                 width : 100, 
                 xtype : "numbercolumn",
                 align : 'center',
@@ -124,7 +88,13 @@ Ext.define('saas.view.storage.prodInOutOtherIn.FormPanel', {
             }, {
                 text : "id", 
                 dataIndex : "id", 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                hidden:true
+            },{
+                text : "pd_piid", 
+                dataIndex : "id", 
+                xtype : "numbercolumn",
+                hidden:true
             },
             {
                 text : "物料编号", 
@@ -156,6 +126,11 @@ Ext.define('saas.view.storage.prodInOutOtherIn.FormPanel', {
                 dataIndex : "pr_spec",
                 ignore:true
             },
+            {
+                text : "单位", 
+                dataIndex : "pr_unit",
+                ignore:true
+            },
             {
                 text : "数量", 
                 dataIndex : "pd_qty", 
@@ -202,32 +177,26 @@ Ext.define('saas.view.storage.prodInOutOtherIn.FormPanel', {
                 xtype : "numbercolumn", 
                 items : null
             },
-            {
-                text : "含税金额", 
-                dataIndex : "pd_total", 
-                width : 120.0, 
-                xtype : "numbercolumn"
-            }, 
             {
                 text : "未税金额", 
                 dataIndex : "pd_taxtotal", 
                 xtype : "numbercolumn"
-            },{
-                text : "需求日期", 
-                dataIndex : "pd_delivery", 
-                flex : 1.0, 
-                xtype:'datecolumn',
-                format : "Y-m-d H:i:s", 
-                editor : {
-                    xtype : "datefield",
-                    editable : true, 
-                    format : "Y-m-d H:i:s", 
-                    hideTrigger : false
-                }
             },
             {
-                text : "关联销售单号", 
-                dataIndex : "pd_salecode", 
+                text : "销售单明细id", 
+                dataIndex : "pd_sdid", 
+                width : 120.0,
+                flex : 1.0,
+                hidden:true
+
+            },{
+                text : "销售单单号", 
+                dataIndex : "pd_sdid", 
+                width : 120.0,
+                flex : 1.0
+            },{
+                text : "销售序号", 
+                dataIndex : "pd_sdid", 
                 width : 120.0,
                 flex : 1.0
             }
@@ -252,7 +221,7 @@ Ext.define('saas.view.storage.prodInOutOtherIn.FormPanel', {
         readOnly : true, 
         editable : false, 
         name : "pu_status", 
-        bind : "{pu_status}", 
+        bind : "{pi_status}", 
         fieldLabel : "单据状态", 
         allowBlank : true, 
         columnWidth : 0.25
@@ -260,8 +229,8 @@ Ext.define('saas.view.storage.prodInOutOtherIn.FormPanel', {
         xtype : "hidden", 
         readOnly : true, 
         editable : false, 
-        name : "pu_statuscode", 
-        bind : "{pu_statuscode}", 
+        name : "pi_statuscode", 
+        bind : "{pi_statuscode}", 
         fieldLabel : "单据状态码", 
         allowBlank : true, 
         columnWidth : 0.0