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

applications/money/money-server/src/main/resources/mapper/BanksubledgerMapper.xml

@@ -107,7 +107,7 @@
         from banksubledger
         where bl_id = #{bl_id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from banksubledger
     where bl_id = #{code,jdbcType=VARCHAR} and bl_kind = #{kind, jdbcType=VARCHAR}
   </delete>

applications/money/money-server/src/main/resources/mapper/SubledgerMapper.xml

@@ -31,7 +31,7 @@
     from subledger
     where sl_id = #{sl_id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from subledger
     where sl_code = #{code,jdbcType=VARCHAR} and sl_kind = #{kind, jdbcType=VARCHAR}
   </delete>

frontend/saas-web/app.json

@@ -20,7 +20,8 @@
         "font-awesome",
         "ux",
         "modern-locale",
-        "charts"
+        "charts",
+        "font-saas"
     ],
     "locale":"zh_CN",
 

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -126,7 +126,10 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 },
                 items: ['->', {
                     text: '新增',
-                    handler: 'onAddClick'
+                    handler: 'onAddClick',
+                    bind: {
+                        hidden: '{!addEnable}'
+                    }
                 }, {
                     text: '审核',
                     xtype: 'button',
@@ -144,6 +147,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 this.hide();
                             } 
                         }
+                    },
+                    bind: {
+                        hidden: '{!auditEnable}'
                     }
                 }, {
                     text: '打印',
@@ -162,6 +168,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 this.hide();
                             } 
                         }
+                    },
+                    bind: {
+                        hidden: '{!printEnable}'
                     }
                 }, {
                     text: '导入',
@@ -180,6 +189,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 this.hide();
                             } 
                         }
+                    },
+                    bind: {
+                        hidden: '{!importEnable}'
                     }
                 },{
                     text: '关闭',
@@ -198,10 +210,16 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 this.hide();
                             } 
                         }
+                    },
+                    bind: {
+                        hidden: '{!closeEnable}'
                     }
                 }, {
                     text: '删除',
-                    handler: me.onDelete
+                    handler: me.onDelete,
+                    bind: {
+                        hidden: '{!deleteEnable}'
+                    }
                 }]
             }, {
                 xtype: 'pagingtoolbar',

frontend/saas-web/app/view/core/query/QueryPanelModel.js

@@ -4,5 +4,11 @@ Ext.define('saas.view.core.query.QueryPanelModel', {
 
     data: {
         form: {}, // 查询字段记录
+        addEnable: true, // 显示新增按钮
+        auditEnable: true, // 显示审核按钮
+        printEnable: true, // 显示打印按钮
+        importEnable: true, // 显示导入按钮
+        closeEnable: true, // 显示关闭按钮
+        deleteEnable: true // 显示删除按钮
     }
 });

frontend/saas-web/app/view/home/Home.scss

@@ -89,4 +89,45 @@ $unaudit-purc-container-color: dynamic(#e91e63);
     content: "";
     top: 0;
     left: 0
+}
+
+.x-responsivecolumn {
+    padding: 0;
+}
+
+.big-100 {
+    @include responsivecolumn-item(100%);
+}
+
+.big-60 {
+    @include responsivecolumn-item(60%);
+}
+
+.big-50 {
+    @include responsivecolumn-item(50%);
+}
+
+.big-40 {
+    @include responsivecolumn-item(40%);
+}
+
+.big-33 {
+    @include responsivecolumn-item(33.33%);
+}
+
+.big-20 {
+    @include responsivecolumn-item(20%);
+}
+
+//--------------------------------------------------------
+// And classes for small-size responsive items
+
+ .x-responsivecolumn-small {
+     > .small-100 {
+         @include responsivecolumn-item(100%);
+     }
+
+     > .small-50 {
+         @include responsivecolumn-item(50%);
+     }
 }

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

@@ -165,7 +165,6 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 dataIndex : "ftd_remark",
                 width : 120.0, 
                 items : null,
-                flex : 1.0,
                 editor : {
                     xtype : ""
                 }

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

@@ -72,8 +72,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         }, {
             text: '备注',
             dataIndex: 'ft_remark',
-            width: 250,
-            flex: 1
+            width: 250
         }],
         relativeColumn: []
     }

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

@@ -86,7 +86,6 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             text: '备注',
             dataIndex: 'os_remark',
             width: 250,
-            flex: 1
         }],
         relativeColumn: []
     }

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

@@ -176,6 +176,12 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         detnoColumn: 'pbd_detno',
         allowEmpty: true,
         deleteDetailUrl: '/api/money/paybalance/deleteDetail2/',
+        tbar: ['->', {
+            xtype:'dbfindtrigger',
+            columnWidth: 1,
+            fieldLabel:'选择源单',
+            name: 'choseSource'
+        }],
         columns: [{
             text: 'ID',
             dataIndex: 'id',

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

@@ -171,6 +171,12 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         storeModel: 'saas.model.money.RecBalance2',
         detnoColumn: 'rbd_detno',
         deleteDetailUrl: '/api/money/recbalance/deleteDetail2/',
+        tbar: ['->', {
+            xtype:'dbfindtrigger',
+            columnWidth: 1,
+            fieldLabel:'选择源单',
+            name: 'choseSource'
+        }],
         columns: [{
             text: 'ID',
             dataIndex: 'id',

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

@@ -70,7 +70,6 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             dataIndex: 'rb_rdamount',
             xtype: 'numbercolumn',
             width: 120,
-            flex: 1,
             hidden: true
         }]
     }

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

@@ -1,5 +1,7 @@
 Ext.define('saas.view.purchase.purchase.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.purchase-purchase-querypanel'
-
+    alias: 'viewmodel.purchase-purchase-querypanel',
+    data: {
+        closeEnable:false
+    }
 });

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

@@ -110,6 +110,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             from:'pr_whcode',to:'pd_whcode'
                         },{
                             from:'pr_whname',to:'pd_whname'
+                        },{
+                            from:'pr_purcprice',to:'pd_orderprice'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100

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

@@ -1,5 +1,7 @@
 Ext.define('saas.view.purchase.purchaseIn.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.purchase-purchasein-querypanel'
-
+    alias: 'viewmodel.purchase-purchasein-querypanel',
+    data: {
+        closeEnable:false
+    }
 });

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

@@ -109,6 +109,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             from:'pr_whcode',to:'pd_whcode'
                         },{
                             from:'pr_whname',to:'pd_whname'
+                        },,{
+                            from:'pr_purcprice',to:'pd_orderprice'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100

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

@@ -208,7 +208,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 120,
-            flex: 1
         }]
     }
 });

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

@@ -1,5 +1,8 @@
 Ext.define('saas.view.purchase.purchaseOut.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.purchase-purchaseout-querypanel'
+    alias: 'viewmodel.purchase-purchaseout-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

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

@@ -115,7 +115,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 allowBlank:false, 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8,
+                    decimalPrecision: 3,
                     minValue:0
                 },
                 renderer : function(v) {

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

@@ -118,8 +118,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
-            width: 250,
-            flex:1
+            width: 250
         }],
         relativeColumn: [{
             text: 'id',
@@ -184,8 +183,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         }, {
             text: '备注',
             dataIndex: 'pd_remark',
-            width: 250,
-            flex:1
+            width: 250
         }]
     }
 });

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

@@ -185,8 +185,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         }, {
             text: '备注',
             dataIndex: 'pd_remark',
-            width: 250,
-            flex:1
+            width: 250
         }]
     }
 });

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -149,7 +149,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
             width: 120,
-            flex: 1
         }],
         relativeColumn: [{
             text: 'id',
@@ -211,7 +210,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 120,
-            flex: 1
         }]
     }
 });

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelModel.js

@@ -1,5 +1,8 @@
 Ext.define('saas.view.stock.appropriationInOut.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.stock-appropriationinout-querypanel'
+    alias: 'viewmodel.stock-appropriationinout-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

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

@@ -287,8 +287,8 @@ Ext.define('saas.view.stock.make.FormPanel', {
     },{
         xtype : "datefield", 
         name : "createTime", 
-        fieldLabel : "录入日期", 
-        allowBlank : true, 
+        fieldLabel : "录入日期",
+        readOnly:true,
         columnWidth : 0.25
     },{
         xtype : "textfield", 

frontend/saas-web/app/view/stock/make/QueryPanel.js

@@ -43,7 +43,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
@@ -70,23 +70,19 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             dataIndex: 'ma_qty',
             xtype: 'numbercolumn',
             width: 120,
-            flex: 1
         },{
             text: '单位',
             dataIndex: 'ma_produnit',
             width: 120,
-            flex: 1
         },{
             text: '单位成本',
             dataIndex: 'ma_total',
             xtype: 'numbercolumn',
             width: 120,
-            flex: 1
         },{
             text: '状态',
             dataIndex: 'ma_status',
             width: 120,
-            flex: 1
         }],
         relativeColumn: []
     }

frontend/saas-web/app/view/stock/make/QueryPanelModel.js

@@ -1,5 +1,8 @@
 Ext.define('saas.view.stock.make.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.stock-make-querypanel'
+    alias: 'viewmodel.stock-make-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

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

@@ -181,6 +181,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             from:'pr_whcode',to:'pd_whcode'
                         },{
                             from:'pr_whname',to:'pd_whname'
+                        },,{
+                            from:'pr_purcprice',to:'pd_orderprice'
                         }],
                         dbtpls: [{
                             field: 'pr_code',

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

@@ -208,7 +208,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 120,
-            flex: 1
         }]
     }
 });

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

@@ -1,5 +1,8 @@
 Ext.define('saas.view.stock.otherIn.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.stock-otherin-querypanel'
+    alias: 'viewmodel.stock-otherin-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

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

@@ -172,6 +172,8 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             from:'pr_whcode',to:'pd_whcode'
                         },{
                             from:'pr_whname',to:'pd_whname'
+                        },,{
+                            from:'pr_purcprice',to:'pd_orderprice'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100

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

@@ -208,7 +208,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 120,
-            flex: 1
         }]
     }
 });

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

@@ -1,5 +1,8 @@
 Ext.define('saas.view.stock.otherOut.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.stock-otherout-querypanel'
+    alias: 'viewmodel.stock-otherout-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

frontend/saas-web/packages/font-saas/Readme.md

@@ -0,0 +1 @@
+# font-saas

frontend/saas-web/packages/font-saas/build.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="font-ios" default=".help">
+    <!--
+    The build-impl.xml file imported here contains the guts of the build process. It is
+    a great idea to read that file to understand how the process works, but it is best to
+    limit your changes to this file.
+    -->
+    <import file="${basedir}/.sencha/package/build-impl.xml"/>
+
+    <!--
+    The following targets can be provided to inject logic before and/or after key steps
+    of the build process:
+
+        The "init-local" target is used to initialize properties that may be personalized
+        for the local machine.
+
+            <target name="-before-init-local"/>
+            <target name="-after-init-local"/>
+
+        The "clean" target is used to clean build output from the build.dir.
+
+            <target name="-before-clean"/>
+            <target name="-after-clean"/>
+
+        The general "init" target is used to initialize all other properties, including
+        those provided by Sencha Cmd.
+
+            <target name="-before-init"/>
+            <target name="-after-init"/>
+        
+        The "build" target performs the call to Sencha Cmd to build the application.
+
+            <target name="-before-build"/>
+            <target name="-after-build"/>
+    -->
+
+</project>

frontend/saas-web/packages/font-saas/index.js

@@ -0,0 +1,2 @@
+// This file was intentionally left blank.
+// This file is used by require.resolve to property locate this module.

frontend/saas-web/packages/font-saas/package.json

@@ -0,0 +1,32 @@
+{
+    "name": "@extjs/ext-font-saas",
+    "ext-react-name": "@extjs/ext-react-font-saas",
+    "ext-name": "@extjs/ext-font-saas",
+    "SenchaExtName": "@sencha/ext-font-saas",
+    "SenchaExtReactName": "@sencha/ext-react-font-saas",
+    "version": "6.6.0.258",
+    "sencha": {
+        "name": "font-saas",
+        "namespace": "Ext",
+        "type": "code",
+        "creator": "Sencha",
+        "summary": "saas iconfont",
+        "detailedDescription": "Saas iconfont from http://www.iconfont.cn/",
+        "version": "6.6.0.258",
+        "compatVersion": "6.2.0",
+        "format": "1",
+        "output": "${framework.dir}/build/packages/${package.name}",
+        "local": true,
+        "sass" : {
+            "namespace": "Ext",
+            "etc": "${package.dir}/sass/etc/all.scss",
+            "var": "${package.dir}/sass/var",
+            "src": [
+                "${package.dir}/sass/src",
+                "${package.dir}/sass/src/all.scss"
+            ]
+        },
+        "classpath": "${package.dir}/src",
+        "overrides": "${package.dir}/overrides"
+    }
+}

frontend/saas-web/packages/font-saas/sass/etc/icons.scss

@@ -0,0 +1,14 @@
+
+.sa-purchase:before { content: "\e613"; }
+
+.sa-document:before { content: "\e654"; }
+
+.sa-edit:before { content: "\e6ec"; }
+
+.sa-sale:before { content: "\e638"; }
+
+.sa-warehouse:before { content: "\e63c"; }
+
+.sa-setting:before { content: "\e64b"; }
+
+.sa-money:before { content: "\e6fa"; }

frontend/saas-web/resources/json/navigation.json

@@ -256,7 +256,7 @@
     }]
 },{
     "text": "设置",
-    "iconCls": "x-fa fa-cog",
+    "iconCls": "x-sa sa-setting",
     "items": [{
         "text": "系统设置",
         "items": [{