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

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -717,6 +717,6 @@
   </select>
 
   <update id="updateDelivery" parameterType="long">
-    update saledetail set sd_delivery = (select sa_delivery from sale where sa_id=#{id}) where sdsaid=#{id} and sa_delivery is null
+    update saledetail set sd_delivery = (select sa_delivery from sale where sa_id=#{id}) where sd_said=#{id} and sa_delivery is null
   </update>
 </mapper>

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

@@ -235,8 +235,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         detnoColumn: 'cc_detno',
         showCount: false,
         deleteDetailUrl:'/api/document/customer/deletecontact',
-        // height:145,
-        // emptyRows: 3,
+        // minHeight:145,
+        emptyRows: 3,
         columns : [
             {
                 text : "ID", 
@@ -301,7 +301,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         showCount: false,
         deleteDetailUrl:'/api/document/customer/deleteaddress',
         // height:145,
-        // emptyRows: 3,
+        emptyRows: 3,
         columns : [
             {
                 text : "ID", 

frontend/saas-web/app/view/main/MainController.js

@@ -131,7 +131,7 @@ Ext.define('saas.view.main.MainController', {
         Ext.Ajax.request({  
             url :'/api/commons/remind/apply/list',
             timeout: 8000,  
-            async:false,
+            async:true,
             headers:{
                 'Access-Control-Allow-Origin': '*',
                 'Authorization':  saas.util.State.get('session').token,

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

@@ -296,7 +296,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     },
                 }]
             }, {
-                xtype: "textfield",
+                xtype: "numberfield",
                 name: "pu_remark",
                 fieldLabel: "备注",
                 columnWidth: 1
@@ -312,10 +312,11 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 readOnly: true,
                 defaultValue: 'RMB'
             }, {
-                xtype: "textfield",
+                xtype: "numberfield",
                 name: "pu_total",
                 fieldLabel: "价税合计(元)",
                 readOnly: true,
+                thousandSeparator: ',',
                 columnWidth: 0.25,
             }, {
                 xtype: "hidden",

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

@@ -132,6 +132,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         },{
             text: '币别',
             dataIndex: 'pu_currency',
+            align: 'center',
             width: 65
         }, {
             text: '审核状态',
@@ -148,7 +149,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             dataIndex: 'pu_buyername',
             width: 80
         },{
-            text: '关联销售单',
+            text: '关联销售单号',
             dataIndex: 'pu_sacode',
             width: 150
         },{

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

@@ -333,18 +333,18 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         readOnly: true,
         defaultValue: 'RMB'
     }, {
-        xtype: "textfield",
+        xtype: "numberfield",
         name: "pi_nettotal",
         fieldLabel: "金额(元)",
-        allowBlank: true,
         readOnly: true,
+        thousandSeparator: ',',
         columnWidth: 0.25
     }, {
-        xtype: "textfield",
+        xtype: "numberfield",
         name: "pi_total",
         fieldLabel: "价税合计(元)",
-        allowBlank: true,
         readOnly: true,
+        thousandSeparator: ',',
         columnWidth: 0.25
     }, {
         xtype: "hidden",

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

@@ -330,18 +330,20 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         readOnly: true,
         defaultValue: 'RMB'
     }, {
-        xtype: "textfield",
+        xtype: "numberfield",
         name: "pi_nettotal",
         fieldLabel: "金额(元)",
         allowBlank: true,
         readOnly: true,
+        thousandSeparator: ',',
         columnWidth: 0.25
     }, {
-        xtype: "textfield",
+        xtype: "numberfield",
         name: "pi_total",
         fieldLabel: "价税合计(元)",
         allowBlank: true,
         readOnly: true,
+        thousandSeparator: ',',
         columnWidth: 0.25
     }, {
         xtype: "hidden",

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

@@ -327,14 +327,16 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 readOnly: true,
                 defaultValue: 'RMB'
             }, {
-                xtype: "textfield",
+                xtype: "numberfield",
                 name: "sa_nettotal",
                 fieldLabel: "金额(元)",
-                hidden: true
+                hidden: true,
+                thousandSeparator: ','
             },{
-                xtype: "textfield",
+                xtype: "numberfield",
                 name: "sa_total",
                 fieldLabel: "价税合计(元)",
+                thousandSeparator: ',',
                 readOnly: true
             }, {
                 xtype: "employeeDbfindTrigger",

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

@@ -357,14 +357,16 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         readOnly: true,
         defaultValue: 'RMB'
     },{
-        xtype: "textfield",
+        xtype: "numberfield",
         name: "pi_nettotal",
         fieldLabel: "金额(元)",
+        thousandSeparator: ',',
         readOnly: true
     },{
-        xtype : "textfield", 
+        xtype : "numberfield", 
         name : "pi_total", 
         fieldLabel : "价税合计(元)", 
+        thousandSeparator: ',',
         readOnly: true
     },{
         xtype: "employeeDbfindTrigger",

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

@@ -149,7 +149,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pi_prstatus',
             width: 80
         }, {
-            text: '关联出货单',
+            text: '关联出货号',
             dataIndex: 'pi_iocode',
             width: 150
         }, {

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

@@ -359,15 +359,17 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         readOnly: true,
         defaultValue: 'RMB'
     },{
-        xtype: "textfield",
+        xtype: "numberfield",
         name: "pi_nettotal",
         fieldLabel: "金额(元)",
-        readOnly: true
+        readOnly: true,
+        thousandSeparator: ','
     },{
-        xtype: "textfield",
+        xtype: "numberfield",
         name: "pi_total",
         fieldLabel: "价税合计(元)",
-        readOnly: true
+        readOnly: true,
+        thousandSeparator: ','
     },{
         xtype: "employeeDbfindTrigger",
         name: "pi_seller",

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

@@ -149,7 +149,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pi_prstatus',
             width: 80
         }, {
-            text: '关联销售单',
+            text: '关联销售单号',
             dataIndex: 'pi_sacode',
             width: 150
         }, {

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

@@ -76,13 +76,14 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         allowBlank : false, 
         columnWidth : 0.25,
         defaultValue: new Date()
-    },{
-        xtype : "textfield", 
-        name : "pi_costtotal", 
-        fieldLabel : "金额(元)", 
-        allowBlank : true,
+    }, {
+        xtype: "numberfield",
+        name: "pi_costtotal",
+        fieldLabel: "金额(元)",
+        allowBlank: true,
         readOnly: true,
-        columnWidth : 0.25
+        columnWidth: 0.25,
+        thousandSeparator: ','
     }, {
         name : "detailGridField", 
         xtype : "detailGridField",

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

@@ -62,12 +62,13 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         columnWidth: 0.25,
         defaultValue: new Date()
     }, {
-        xtype: "textfield",
+        xtype: "numberfield",
         name: "pi_costtotal",
         fieldLabel: "金额(元)",
         allowBlank: true,
         readOnly: true,
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        thousandSeparator: ','
     }, {
         name: "detailGridField",
         xtype: "detailGridField",