Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -57,10 +57,6 @@ Ext.define('saas.view.core.form.FormPanelController', {
             return false;
         }
 
-        if(form.getForm().wasDirty==false){
-            showToast('未修改数据，请修改后保存');
-            return false;
-        }
         //form里面数据
         var formData = form.getFormData();
         

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

@@ -64,10 +64,6 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: 'numberfield',
         name: 'pb_pdamount',
         fieldLabel: '付款金额'
-    }, {
-        xtype: 'numberfield',
-        name: 'pb_pdamount',
-        fieldLabel: '付款金额'
     }, {
         xtype: "numberfield",
         name: "pb_pbdamount",
@@ -94,20 +90,28 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             dataIndex: 'id',
             hidden: true
         }, {
-            text: '期间',
-            dataIndex: 'pb_ym'
-        }, {
-            text: '结算账户ID',
-            dataIndex: 'pb_bankid'
-        }, {
-            text: '结算账户编号',
-            dataIndex: 'paybalancedet'
-        }, {
+            // text: '期间',
+            // dataIndex: 'pb_ym'
+            // editor: {
+            //     xtype: 'hidden',
+            //     // xtype: 'textfield,
+            //     // xtype: 'datefield''
+            // }
+        // }, {
+        //     text: '结算账户ID',
+        //     dataIndex: 'pb_bankid'
+        // }, {
+        //     text: '结算账户编号',
+        //     dataIndex: 'paybalancedet'
+        // }, {
             text: '结算账户',
             dataIndex: 'pb_bankname'
         }, {
             text: "付款金额",
             dataIndex: "pb_amount",
+            editor:{
+                xtype: 'numberfield'
+            }
         }, {
             text: "结算方式",
             dataIndex: "pb_paymethod"
@@ -116,7 +120,10 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             dataIndex: "pb_paycode"
         }, {
             text: "备注",
-            dataIndex: "pb_remark"
+            dataIndex: "pb_remark",
+            editor:{
+                xtype: 'textfield'
+            }
         }]
     }, {
         xtype: "detailGridField",
@@ -128,17 +135,17 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             dataIndex: 'id',
             hidden: true
         }, {
-            text: '期间',
-            dataIndex: 'pbd_ym'
-        }, {
-            text: '来源ID',
-            dataIndex: 'pbd_slid'
-        }, {
+        //     text: '期间',
+        //     dataIndex: 'pbd_ym'
+        // }, {
+        //     text: '来源ID',
+        //     dataIndex: 'pbd_slid'
+        // }, {
             text: '源单编号',
             dataIndex: 'pbd_slcode'
-        }, {
-            text: "单据类型",
-            dataIndex: "pbd_slkind",
+        // }, {
+        //     text: "单据类型",
+        //     dataIndex: "pbd_slkind",
         }, {
             text: "单据日期",
             dataIndex: "pbd_sldate",
@@ -146,43 +153,58 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             defaultValue: new Date()
         }, {
             text: "单据金额",
-            dataIndex: "pbd_amount"
+            dataIndex: "pbd_amount",
+            editor:{
+                xtype: 'numberfield'
+            }
+        }, {
+            text: "已核销金额",
+            dataIndex: "pb_remark",
+            editor:{
+                xtype: 'numberfield'
+            }
+        }, {
+            text: "未核销金额",
+            dataIndex: "pb_remark",
+            editor:{
+                xtype: 'numberfield'
+            }
         }, {
-        //     text: "已核销金额",
-        //     dataIndex: "pb_remark"
-        // }, {
-        //     text: "未核销金额",
-        //     dataIndex: "pb_remark"
-        // }, {
             text: "本次核销金额",
-            dataIndex: "pbd_nowbalance"
+            dataIndex: "pbd_nowbalance",
+            editor:{
+                xtype: 'numberfield'
+            }
         }, {
             text: '备注',
-            dataIndex: 'pbd_remark'
+            dataIndex: 'pbd_remark',
+            editor:{
+                xtype: 'textfield'
+            }
         }]
     }, {
-        xtype: 'textareafield',
+        xtype: 'hidden',
         name: 'pb_remark',
         columnWidth: 1,
         fieldLabel: '备注'
     }, {
-        xtype: 'numberfield',
+        xtype: 'hidden',
         name: 'pb_recorderid',
         fieldLabel: '创建人ID'
     }, {
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pb_recorder',
         fieldLabel: '创建人'
     }, {
-        xtype: "datefield",
+        xtype: "hidden",
         name: "pb_recorddate",
         fieldLabel: "创建时间"
     }, {
-        xtype: "datefield",
+        xtype: "hidden",
         name: "updatedate",
         fieldLabel: "更新时间"
     }, {
-        xtype: "textfield",
+        xtype: "hidden",
         readOnly: true,
         editable: false,
         name: "pb_status",
@@ -194,23 +216,23 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         name: "pb_statuscode",
         fieldLabel: "单据状态码"
     }, {
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pb_text1',
         fieldLabel: '自定义字段1'
     }, {
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pb_text2',
         fieldLabel: '自定义字段2'
     }, {
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pb_text3',
         fieldLabel: '自定义字段3'
     }, {
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pb_text4',
         fieldLabel: '自定义字段4'
     }, {
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pb_text5',
         fieldLabel: '自定义字段5'
     }]

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

@@ -25,7 +25,8 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             text: 'id',
             dataIndex: 'id',
             width: 100,
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            hidden:true
         }, {
             text: '单据编号',
             dataIndex: 'pb_code',
@@ -49,27 +50,33 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         }, {
             text: '收款人',
             dataIndex: 'pb_manname',
-            width: 120
+            width: 120,
+            hidden:true
         }, {
             text: '付款金额',
             dataIndex: 'pb_pdamount',
-            width: 120
+            width: 120,
+            hidden:true
         }, {
             text: '本次核销金额',
             dataIndex: 'pb_pbdamount',
             width: 120,
+            hidden:true
         }, {
             text: '本次预付款',
             dataIndex: 'pb_preamount',
             width: 120,
+            hidden:true
         }, {
             text: '整单折扣',
             dataIndex: 'pb_discounts',
             width: 120,
+            hidden:true
         }, {
             text: '已核销金额',
             dataIndex: 'pb_havebalance',
             width: 120,
+            hidden:true
         }],
         relativeColumn: []
     }