Merge remote-tracking branch 'origin/dev' into dev

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -218,7 +218,7 @@
 
   <select id="selectHomePageList" resultMap="homePageList">
     select  *,
-    case WHEN pi_class='采购验收单' then pd_inqty when pi_class='采购验退单' then pd_outqty else 0 end qty
+    case WHEN pi_class='采购验收单' then ifnull(pd_inqty,0) when pi_class='采购验退单' then ifnull(pd_outqty,0) else 0 end qty
     from prodinout left join prodiodetail on pi_id = pd_piid left join vendor on pi_vendid=ve_id
     left join product on pd_prodid=pr_id
     <where>

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

@@ -204,7 +204,7 @@
 
   <select id="selectHomePageList" resultMap="homePageList">
     select  *,
-    case WHEN pi_class='出货单' then pd_outqty when pi_class='销售退货单' then pd_inqty else 0 end qty
+    case WHEN pi_class='出货单' then ifnull(pd_outqty,0) when pi_class='销售退货单' then ifnull(pd_inqty,0) else 0 end qty
     from prodinout left join prodiodetail on pi_id = pd_piid left join product on pr_id = pd_prodid
     left join customer on pi_custid=cu_id
     <where>

frontend/saas-web/Dockerfile.dev

@@ -1,6 +0,0 @@
-FROM hub.c.163.com/library/nginx
-MAINTAINER USOFTCHINA <yingp@usoftchina.com>
-RUN rm /etc/nginx/conf.d/default.conf
-ADD runtime/nginx/default.conf /etc/nginx/conf.d/
-COPY build/development/saas/ /usr/share/nginx/html/
-COPY set-token.html /usr/share/nginx/html/

frontend/saas-web/app.json

@@ -322,6 +322,7 @@
             "type": "yui"
         },
         "server": {
+            /** 暂时更改
             "accountCenter": "https://saas-test.usoftchina.com:5443",
             "accountEnterprise": "https://saas-test.usoftchina.com:5443/#/enterprise",
             "basePath": {
@@ -329,6 +330,14 @@
                 "http": "http://192.168.0.181:8575"
             },
             "urlPattern": "^\/api\/"
+            **/
+            "accountCenter":"http://192.168.0.181:8000",
+            "accountEnterprise":"http://192.168.0.181:8000/#/enterprise",
+            "basePath": {
+                "https": "https://saas-api-dev.usoftchina.com:5443",
+                "http": "http://192.168.0.181:8560"
+            },
+            "urlPattern": "^\/api\/"
         }
     },
 

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

@@ -365,13 +365,17 @@ Ext.define('saas.view.core.form.FormPanel', {
             name = item.name,
             ignore = item.ignore,
             defaultValue = item.defaultValue;
-            
-            if (xtype == 'detailGridField') {
-                item.listeners = item.listeners || {};
-                item.listeners.validChange = function() {
-                    me.isValid();
-                }
 
+            item.listeners = item.listeners || {};
+            item.listeners.validChange = function() {
+                me.isValid();
+            }
+            item.listeners.validitychange = function() {
+                me.isValid();
+            }
+
+
+            if (xtype == 'detailGridField') {
                 return;
             }
 

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

@@ -229,6 +229,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'ft_name',
                 allowBlank:false,
+                relativeField:'ord_type',
                 fieldLabel:'收支名称',
                 maxLength: 20
             },{
@@ -621,6 +622,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         var form=this.down('form');
         var combo = this._combo;
         var params = {};
+        var relativeField,relativeValue;//要赋值的字段和值
         var names = belong.columns.map(column => column.dataIndex);
 
         //账户资料特殊保存逻辑
@@ -645,7 +647,10 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                     }
 
                     params[name] = value;
-                    params._value = value;
+                    if(!relativeValue){
+                        relativeField = dataField.relativeField;
+                        relativeValue = value;
+                    }
                 }
             }
         });
@@ -665,9 +670,14 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 if(grid){
                     grid.store.load();
                 }
+                if(relativeField&&relativeValue&&form.ownerCt._parent){
+                    var grid = form.ownerCt._parent.down('grid');
+                    var rec = grid.getSelectionModel().getLastSelected();
+                    rec.set(relativeField,relativeValue);
+                }
                 if(combo){
                     combo.store.load(function() {
-                        typeof combo.setValue == 'function' && combo.setValue(params._value);
+                        typeof combo.setValue == 'function' && combo.setValue(relativeValue);
                     });
                 }
                 saas.util.BaseUtil.showSuccessToast('保存成功');
@@ -697,7 +707,6 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 var dataField = form.down('[name='+name+']');
                 if(dataField&&dataField.value){
                     params[name] = dataField.value;
-                    params._value = dataField.value;
                 }
             }
         });

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

@@ -189,7 +189,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         name : "ft_remark", 
         fieldLabel : "备注", 
         allowBlank : true, 
-        columnWidth : 0.75
+        columnWidth : 1
     },{
         xtype : "hidden", 
         name : "creatorId", 

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

@@ -118,7 +118,13 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '总金额',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '单据状态',
             align: 'center',
@@ -145,7 +151,13 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '未含税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 0
+            width: 0,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
@@ -200,27 +212,54 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '退货数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '销售单价',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 80
+            width: 80,
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '备注',
             dataIndex: 'pd_remark',

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

@@ -253,7 +253,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }