多选放大镜，销售出货-》出货单，界面必填完善

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

@@ -26,7 +26,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
  
      toolBtns: [{
          xtype: 'button',
-         text: '转销售出货单',
+         text: '转出货单',
          handler: 'turnOut'
      }],
 
@@ -46,7 +46,9 @@ Ext.define('saas.view.sale.sale.FormPanel', {
     }, {
         xtype : "dbfindtrigger", 
         name : "sa_custname", 
-        fieldLabel : "客户名称"
+        fieldLabel : "客户名称",
+        allowBlank : false
+
     }, {
         xtype : "textfield", 
         name : "sa_toplace", 
@@ -74,6 +76,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 dataIndex : "sd_prodcode", 
                 xtype : "", 
                 items : null,
+                allowBlank:false,
                 editor : {
                     displayField : "display", 
                     editable : true, 
@@ -113,6 +116,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 xtype : "numbercolumn", 
                 format:'0,000.00',
                 items : null,
+                allowBlank:false,
                 summaryType: 'sum'
             },  {
                 text : "已转数", 
@@ -156,11 +160,11 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 text : "交货日期", 
                 dataIndex : "sd_delivery", 
                 xtype:'datecolumn',
-                format : "Y-m-d H:i:s", 
+                format : "Y-m-d", 
                 editor : {
                     xtype : "datefield",
                     editable : true, 
-                    format : "Y-m-d H:i:s", 
+                    format : "Y-m-d", 
                     hideTrigger : false
                 }
             },{

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

@@ -209,7 +209,8 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 openTab('sale-saleout-formpanel',name+"("+codeValue+")",codeValue+intValue, {
                     initId: intValue
                 });
-                showToast('转单成功');    
+                showToast('转单成功');  
+                form.FormUtil.loadData(form);
             }
         })
         .catch(function(res) {

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

@@ -12,6 +12,10 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         name: 'sa_id',
         fieldLabel: 'ID',
         columnWidth: 0
+    }, {
+        xtype: 'textfield',
+        name: 'sa_code',
+        fieldLabel: '销售编号'
     }, {
         xtype: 'hidden',
         name: 'sa_custcode',
@@ -116,7 +120,12 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '收货地址',
             dataIndex: 'sa_toplace',
-            width: 120
+            width: 200
+        }, {
+            text: '备注',
+            dataIndex: 'sa_remark',
+            width: 250,
+            flex:1
         }
     ],
         relativeColumn: [ {

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

@@ -34,7 +34,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : false, 
-        defaultValue:'销售退货单'
+        defaultValue:'销售退货单',
+        allowBlank:false
     },{
         xtype : "hidden", 
         name : "pi_custid",  
@@ -46,7 +47,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     }, {
         xtype : "dbfindtrigger", 
         name : "pi_custname", 
-        fieldLabel : "客户名称"
+        fieldLabel : "客户名称",
+        allowBlank:false,
     }, {
         xtype : "textfield", 
         name : "pi_address", 
@@ -72,6 +74,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "物料编号", 
                 width : 200.0, 
                 dataIndex : "pd_prodcode", 
+                allowBlank:false,
                 editor : {
                     displayField : "display", 
                     editable : true, 
@@ -104,6 +107,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             }, {
                 text : "数量", 
                 dataIndex : "pd_inqty", 
+                allowBlank:false,
                 editor : {
                     xtype : "numberfield"
                 },
@@ -111,9 +115,18 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 xtype : "numbercolumn", 
                 format:'0',
                 summaryType: 'sum'
+            }, {
+                text : "仓库ID", 
+                dataIndex : "pd_whid", 
+                width : 0
+            }, {
+                text : "仓库", 
+                dataIndex : "pd_whcode", 
+                width :0
             }, {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
+                allowBlank:false,
                 width : 120.0, 
                 editor : {
                     displayField : "display", 

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     caller:'SaleOut',
     
     //字段属性
-    _title:'销售出货单',
+    _title:'出货单',
     _idField: 'id',
     _codeField: 'pi_inoutno',
     _statusField: 'pi_status',
@@ -43,7 +43,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : false, 
-        defaultValue:'销售出货单'
+        defaultValue:'出货单'
     }, {
         xtype : "hidden", 
         name : "pi_custid", 
@@ -55,7 +55,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     }, {
         xtype : "dbfindtrigger", 
         name : "pi_custname", 
-        fieldLabel : "客户名称"
+        fieldLabel : "客户名称",
+        allowBlank:false,
     }, {
         xtype : "textfield", 
         name : "pi_address", 
@@ -83,6 +84,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null,
+                allowBlank:false,
                 editor : {
                     displayField : "display", 
                     editable : true, 
@@ -122,7 +124,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 xtype : "numbercolumn", 
                 format:'0,000.00',
                 items : null,
-                summaryType: 'sum'
+                summaryType: 'sum',
+                allowBlank:false,
             }, {
                 text : "仓库ID", 
                 dataIndex : "pd_whid", 
@@ -136,6 +139,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 dataIndex : "pd_whname", 
                 width : 120.0, 
                 items : null,
+                allowBlank:false,
                 editor : {
                     displayField : "display", 
                     editable : true, 

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

@@ -254,7 +254,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
         id = form.getForm().findField(form._idField);
         form.BaseUtil.request({
             url: form._turnInUrl+id.value,
-            method: 'GET',
+            method: 'POST',
         })
         .then(function(localJson) {
             if(localJson.success){
@@ -264,7 +264,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                 openTab('sale-salein-formpanel',name+"("+codeValue+")",codeValue+intValue, {
                     initId: intValue
                 });
-                showToast('转单成功');    
+                showToast('转单成功');  
+                form.FormUtil.loadData(form);  
             }
         })
         .catch(function(res) {

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

@@ -67,9 +67,9 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     queryGridConfig: {
         idField:'id',
         codeField:'pi_inoutno',
-        addTitle:'销售出货单',
+        addTitle:'出货单',
         addXtype:'sale-saleout-formpanel',
-        defaultCondition:' pi_class = \'销售出货单\'',
+        defaultCondition:' pi_class = \'出货单\'',
         baseVastUrl: '/api/sale/prodinout/',
         baseColumn: [{
             text: 'id',