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

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/BankinformationMapper.java

@@ -29,4 +29,6 @@ public interface BankinformationMapper extends CommonBaseMapper<Bankinformation>
 
     void check(Map<String, Object> map);
 
+    Double selectamount(Long id);
+
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -47,6 +47,7 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         bankinformation.setCompanyId(BaseContextHolder.getCompanyId());
         bankinformation.setBk_income(new Double(0));
         bankinformation.setBk_spending(new Double(0));
+        int bid = Math.toIntExact(bankinformation.getId());
 
         String bktion = bankinformationMapper.selectBankcode(bankinformation.getBk_bankcode());
         //先判断ID,再判断编号
@@ -58,6 +59,24 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
             bankinformationMapper.insertSelective(bankinformation);
         }else {
+            //判断是否能修改期初金额
+            Double beginamount = bankinformationMapper.selectamount(bankinformation.getId());
+            Double fbeginamount = bankinformation.getBk_beginamount();
+            if (!(fbeginamount.equals(beginamount))){
+                DocBaseDTO docBaseDTO = getBaseDTOById(bid);
+                Map<String, Object> map = new HashMap<String, Object>();
+                map.put("v_id",bid);
+                map.put("v_code", docBaseDTO.getCode());
+                map.put("v_type","bank");
+                map.put("v_companyid",BaseContextHolder.getCompanyId());
+                map.put("v_res","");
+                bankinformationMapper.check(map);
+                Object result =  map.get("v_res");
+                if(!StringUtils.isEmpty(result)){
+                    throw new BizException(BizExceptionCode.USING_EXISTS.getCode(),result.toString());
+                }
+            }
+
             Long id = bankinformationMapper.selectBankId(bankinformation.getBk_bankcode());
             if (bktion != null){
                 if (id.equals(bankinformation.getId())){

applications/document/document-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -344,6 +344,10 @@
         select bk_id from bankinformation where bk_bankcode = #{bk_bankcode,jdbcType=VARCHAR}
    </select>
 
+  <select id="selectamount" parameterType="java.lang.Long" resultType="java.lang.Double">
+        select bk_beginamount from bankinformation where bk_id = #{bk_id,jdbcType=INTEGER}
+   </select>
+
   <select id="check" parameterMap="checkParamMap" statementType="CALLABLE">
         CALL SP_LIMITBASE(?, ?, ?, ?,?)
     </select>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleList.java

@@ -106,6 +106,8 @@ public class SaleList implements Serializable {
     private String sd_text4;
 
     private String sd_text5;
+    //已转数
+    private Double sd_yqty;
 
     //private ProductDTO productDTO;级联属性会导致分页查询出现BUG，设置数与查询数量不一致
     private Long pr_id;

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

@@ -42,6 +42,7 @@
         <result column="sd_nettotal" property="sd_nettotal" jdbcType="DOUBLE" />
         <result column="sd_delivery" property="sd_delivery" jdbcType="TIMESTAMP" />
         <result column="sd_sendqty" property="sd_sendqty" jdbcType="DOUBLE" />
+        <result column="sd_yqty" property="sd_yqty" jdbcType="DOUBLE" />
         <result column="sd_pdqty" property="sd_pdqty" jdbcType="DOUBLE" />
         <result column="sd_remark" property="sd_remark" jdbcType="VARCHAR" />
         <result column="sd_text1" property="sd_text1" jdbcType="VARCHAR" />

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

@@ -6,6 +6,7 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
     alias: 'widget.datamulticombo',
     editable : false,
     matchFieldWidth: true,
+    autoScroll:true,
     value: [],
     cachedConfig: {
         menuAlign: 'tl-bl?',

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

@@ -47,7 +47,7 @@ Ext.define('saas.view.core.form.FormPanel', {
     initComponent: function () {
         var me = this,
         auditTexts = me.auditTexts;
-
+        me._deleteMsg = '删除的'+me._title+'将不能恢复，请确认是否删除？';
         me.initViewModel();
         saas.util.FormUtil.setItems(me);
 

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

@@ -37,7 +37,7 @@ Ext.define('saas.view.core.form.RemoteCombo', {
             picker;
         var count = this.store.getCount();
         var pickerCfg = Ext.apply({
-                height: count>5?248-(me.hiddenBtn?50:0):(33*count+me.hiddenBtn?0:50),
+                height: count>5?248-(me.hiddenBtn?50:0):(33*count+(me.hiddenBtn?0:50)),
                 hiddenBtn:me.hiddenBtn,
                 xtype: 'boundlistadd',
                 id: me.id + '-picker',

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

@@ -367,8 +367,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     onDelete: function (btns) {
         var grid = btns.up('grid');
         var data = grid.getGridSelected();
+        var deleteMsg =grid.addTitle?"删除的"+grid.addTitle+"将不能恢复，请确认是否删除？":"是否删除所选单据？";
         if(data&&data.length>0){
-            saas.util.BaseUtil.warnMsg("是否删除所选单据？",function(btn){
+            saas.util.BaseUtil.warnMsg(deleteMsg,function(btn){
                 if(btn == 'yes'){
                     grid.vastOperation("batchDelete");
                 }

frontend/saas-web/app/view/document/bom/BasePanel.js

@@ -5,6 +5,8 @@ Ext.define('saas.view.document.bom.BasePanel', {
     controller: 'document-bom-basepanel',
     viewModel: 'document-bom-basepanel',
 
+    deleteMoreMsg: '删除的BOM资料将不能恢复，请确认是否删除？',
+    deleteOneMsg: '删除的BOM资料将不能恢复，请确认是否删除？',
     searchField:[{ 
         xtype : "textfield", 
         name : "bo_mothercode", 

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

@@ -19,7 +19,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
     _closeUrl:'/api/document/bom/close',
     _deleteUrl:'/api/document/bom/delete/',
     initId:0,
-
+    _deleteMsg: '删除的BOM资料将不能恢复，请确认是否删除？',
     codeInHeader: false,
 
     defaultButtons:[{

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

@@ -224,6 +224,15 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'hidden',
                 name:'accountId',
                 hidden:true,
+            },{
+                xtype:'textfield',
+                fieldLabel: '真实姓名',
+                name: 'realname',
+                readOnly:true,
+                editable:false,
+                allowBlank:true,
+                maxLength: 30,
+                beforeLabelTextTpl: "",
             },{
                 xtype:'datamulticombo',
                 dataUrl:'/api/account/role/list',

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

@@ -78,6 +78,7 @@ Ext.define('saas.view.document.kind.Kind', {
                 dataIndex: 'ck_name',
                 flex: 1
             }],
+            
             keyField:'id',
             reqUrl:'/api/document/customerkind/save',
             delUrl:'/api/document/customerkind/delete'

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

@@ -74,20 +74,25 @@ Ext.define('saas.view.document.kind.KindController', {
         var dataKind=dk.getViewModel().getData()['dataKind'].value,
         rec = grid.getStore().getAt(row);
         var keyV=rec.get(dk.etc[dataKind].keyField);
-        //删除接口
-        saas.util.BaseUtil.request({
-            url: dk.etc[dataKind].delUrl+'/'+keyV,
-            method: 'POST'
-        })
-        .then(function(localJson) {
-            if(localJson.success){
-                saas.util.BaseUtil.showToast('删除成功');
-                grid.store.load();
+        var deleteMsg = '删除的'+dk.getViewModel().getData()['title']+'将不能恢复，请确认是否删除？';
+        saas.util.BaseUtil.deleteWarn(deleteMsg,function(btn){
+            if(btn == 'yes'){
+                //删除接口
+                saas.util.BaseUtil.request({
+                    url: dk.etc[dataKind].delUrl+'/'+keyV,
+                    method: 'POST'
+                })
+                .then(function(localJson) {
+                    if(localJson.success){
+                        saas.util.BaseUtil.showToast('删除成功');
+                        grid.store.load();
+                    }
+                })
+                .catch(function(res) {
+                    console.error(res);
+                    saas.util.BaseUtil.showToast('删除失败: ' + res.message);
+                });
             }
-        })
-        .catch(function(res) {
-            console.error(res);
-            saas.util.BaseUtil.showToast('删除失败: ' + res.message);
         });
     },
     createDialog: function(dataKind,record,dk) {

frontend/saas-web/app/view/document/vendor/BasePanel.js

@@ -4,6 +4,9 @@ Ext.define('saas.view.document.vendor.BasePanel', {
     controller: 'document-vendor-basepanel',
     viewModel: 'document-vendor-basepanel',
 
+    deleteMoreMsg: '删除的供应商资料将不能恢复，请确认是否删除？',
+    deleteOneMsg: '删除的供应商资料将不能恢复，请确认是否删除？',
+
     searchField:[{
         xtype : "vendorDbfindTrigger", 
         name : "ve_code", 

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

@@ -76,13 +76,15 @@ Ext.define('saas.view.main.Main', {
                         cls:'x-main-menu sa-nav-menu',
                         items: [{
                             text: '新手导航',
-                            iconCls:'x-fa fa-comment-o sa-navicon',
+                            //fa-comment-o sa-userGuite
+                            iconCls:'x-fa sa-navicon fa-comment-o',
                             handler:function(){
                                saas.util.BaseUtil.openTab('sys-guide-formpanel','新手导航', 'sys-guide-formpanel-nav');
                             }
                         },{
                             text: '用户手册',
-                            iconCls:'x-fa fa-address-book-o sa-navicon',
+                            //fa-address-book-o sa-userBook
+                            iconCls:'x-fa sa-navicon  fa-address-book-o',
                             handler:function(){
                                 window.open('http://www.usoftchina.com','_blank');
                             }
@@ -94,7 +96,7 @@ Ext.define('saas.view.main.Main', {
                             }
                         },{
                             text: '客服热线',
-                            iconCls:'x-fa fa-comment-o sa-navicon',
+                            iconCls:'x-fa fa-phone-o sa-navicon',
                             menu:{
                                 cls:'sa-nav-menu',
                                 items:[{

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

@@ -207,9 +207,15 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             dataIndex: 'pd_whname',
             width: 120
         },{
-            text: '单位成本',
+            text: '单价',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },            
             width: 120
         },{
             text: '税率',

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

@@ -215,9 +215,15 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pd_whname',
             width: 120
         },{
-            text: '单位成本',
+            text: '单价',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },            
             width: 120
         },{
             text: '税率',

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

@@ -208,7 +208,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             },
         }, {
             text: '已转数',
-            dataIndex: 'sd_ytqy',
+            dataIndex: 'sd_yqty',
             xtype: 'numbercolumn',
             width: 120,
             renderer : function(v) {

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

@@ -215,7 +215,9 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            },
         },{
             text: '金额',
             dataIndex: 'pd_total',

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

@@ -196,7 +196,10 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            },
         },{
             text: '金额',
             dataIndex: 'pd_total',

frontend/saas-web/app/view/sys/config/FormPanel.js

@@ -172,6 +172,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     var fileEl = field.fileInputEl.dom;
                     var fd = new FormData();
                     fd.append('file', fileEl.files[0]);
+                    fd.append('folderId', 0);
                     form.setLoading(true);
                     Ext.Ajax.request({
                         url: '/api/file/upload',//这里是填写需要跨域访问的URL
@@ -297,6 +298,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     var myForm = field.ownerCt;
                     var fileEl = field.fileInputEl.dom;
                     var fd = new FormData();
+                    fd.append('folderId', 0);
                     fd.append('file', fileEl.files[0]);
                     form.setLoading(true);
                     Ext.Ajax.request({

frontend/saas-web/app/view/sys/feedback/FormPanel.js

@@ -47,7 +47,7 @@ Ext.define('saas.view.sys.feedback.FormPanel', {
             name : "fb_wechat", 
             fieldLabel : "微信"
         }, {
-            xtype : "htmleditor", 
+            xtype : "textfield", 
             name : "fb_msg", 
             fieldLabel : "反馈内容",
             columnWidth: 1

frontend/saas-web/app/view/sys/manager/FormPanel.scss

@@ -56,12 +56,13 @@
         border:none !important;
     }
     .x-keyboard-mode .x-grid-item-focused .x-grid-cell-inner:before{
-        border:0px solid #ffffff !important;
+        border:none !important;
     }
     .x-keyboard-mode .x-grid-item-focused{
         border:0px solid #ffffff !important;
     }
     .x-grid-cell-inner .x-grid-cell-inner-action-col::before{
-        border:0px solid #ffffff !important;
+        content: '';
+        border:none !important;
     }
 }

frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -12,8 +12,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         text:'保存',
         name:'savepower',
         margin:'0 10 0 2',
-        cls:'x-formpanel-btn-orange',
-        style:'background:#da8282;border-color:#cccccc'
+        style:'background:#34baf6;border-color:#cccccc'
     }],
     features : [Ext.create('Ext.grid.feature.Grouping',{
         collapseTip:null,