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/service/impl/ProductServiceImpl.java

@@ -123,16 +123,18 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             if (productDetailList.size() > 0){
                 //找到原始单据,反过账并删除
                 String inoutCode = getMapper().selectProdIOCode(product.getPr_code(), BaseContextHolder.getCompanyId(), "库存初始化");
-                post(inoutCode, "反过账");
-                getMapper().deleteProdIODetailByCode(inoutCode, BaseContextHolder.getCompanyId());
-                getMapper().deleteProdIOByCode(inoutCode, BaseContextHolder.getCompanyId());
-
+                if (!StringUtils.isEmpty(inoutCode)) {
+                    post(inoutCode, "反过账");
+                    getMapper().deleteProdIODetailByCode(inoutCode, BaseContextHolder.getCompanyId());
+                    getMapper().deleteProdIOByCode(inoutCode, BaseContextHolder.getCompanyId());
+                }
                 //此种情况不可能发生明细行数量,只会发生明细行数据修改/新增明细行
                 //a.更新明细行数据
                 List<ProductDetail> insertItems = new ArrayList<ProductDetail>();
                 List<ProductDetail> updateItems = new ArrayList<ProductDetail>();
                 for(ProductDetail productDetail : productDetailList){
                     if (productDetail.getId() == 0){
+                        productDetail.setPd_prodid(product.getId());
                         productDetail.setUpdaterId(userId);
                         productDetail.setUpdateTime(new Date());
                         insertItems.add(productDetail);
@@ -373,8 +375,8 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         validEnableDel(id);
 
         String code = getMapper().getCodeById(id);
-        getMapper().deleteByPrimaryKey(id);
         productDetailMapper.deleteByProdId(id);
+        getMapper().deleteByPrimaryKey(id);
         DocBaseDTO docBaseDTO = generateMsgObj(id, code);
         //记录LOG
         messageLogService.delete(docBaseDTO);

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -242,6 +242,7 @@ Ext.define('saas.view.core.base.GridPanel', {
         if(columns[columns.length - 1].flex != 1) {
             columns.push({
                 flex: 1,
+                dataIndex:'virtual',
                 allowBlank: true
             });
         }

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -162,7 +162,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
 
     judge:function(f){
-        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1){
+        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1||f.ownerCt.ownerCt.xtype.trim().toUpperCase().indexOf('BASEPANEL')>-1){
             f.belong = 'form';
             return f.ownerCt.ownerCt
         }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORM')>-1){

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

@@ -125,7 +125,11 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
         datas = me.datas,
         menu = me.menu;
         if(!Ext.isArray(items)) {
-            items = [items]
+            if(items.indexOf(',')>0){
+                items = items.split(',')
+            }else{
+                items = [items]
+            }
         }
         items.map(function(item, index) {
             if(Ext.isString(item)) {

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

@@ -97,7 +97,6 @@ Ext.define('saas.view.document.customer.BasePanel', {
         codeField: 'cu_code',
         statusCodeField:'cu_statuscode',
         dataUrl: '/api/document/customer/list',
-        //dataUrl: 'http://192.168.253.31:8560/api/document/customer/list',
         columns : [
         {
             text : "客户id", 

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

@@ -473,21 +473,17 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         saas.util.BaseUtil.request({
             url: belong.reqUrl,
             params: _params,
-            method: 'POST'
+            method: 'POST',
+            headers:{
+                'Access-Control-Allow-Origin': '*',
+                "Content-Type":'application/x-www-form-urlencoded'
+            }
         })
         .then(function(localJson) {
             me.setLoading(false);
             if(localJson.success){
                 saas.util.BaseUtil.showToast('保存成功');
-                var grid = form.ownerCt._parent.lookup('document-kind-Grid');
-                if(grid){
-                    grid.store.load();
-                }
-                if(combo){
-                    combo.store.load(function() {
-                        typeof combo.setValue == 'function' && combo.setValue(params._value);
-                    });
-                }
+                form.ownerCt._parent.store.load()
                 form.ownerCt.close();
             }
         })

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

@@ -256,7 +256,7 @@ Ext.define('saas.view.document.kind.Kind', {
             },{
                 dataIndex: 'email',
             }],
-            reqUrl:'http://192.168.253.31:8560/api/account/account/bind/roles',
+            reqUrl:'/api/account/account/bind/roles',
         },
         warehouse:{
             columns: [{

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

@@ -75,7 +75,6 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         codeField: 've_code',
         statusCodeField:'ve_statuscode',
         dataUrl: '/api/document/vendor/list',
-        //dataUrl: 'http://192.168.253.31:8560/api/document/vendor/list',
         columns : [{
             text : "供应商id", 
             width : 0, 

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

@@ -139,15 +139,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     return Ext.util.Format.number(v, format);
                 }
             }, {
-                text : "结算方式号", 
-                dataIndex : "ftd_paycode", 
-                width : 110,
-                editor:{
-                    xtype: ''  
-                }
-            }, {
-                text : "结算方式", 
-                width : 150.0, 
+                text : "结算方式",
+                width : 150.0,
                 dataIndex : "ftd_paymethod",
                 editor : {
                     xtype:'combo',
@@ -167,7 +160,15 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                         ]
                     })
                 }
-            }, {
+            },
+             {
+                text : "结算号",
+                dataIndex : "ftd_paycode",
+                width : 110,
+                editor:{
+                    xtype: ''
+                }
+            },{
                 text : "备注", 
                 dataIndex : "ftd_remark",
                 width : 120.0, 

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

@@ -25,14 +25,22 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         fieldLabel : "单据日期",
         columnWidth: 0.5
     },{
-        xtype: 'multicombo',
+        xtype: 'combobox',
         name: 'ft_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'ft_status',
+        valueField: 'ft_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['ft_statuscode', 'ft_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -47,15 +47,23 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         fieldLabel: '单据日期',
         columnWidth: 0.5,
         operation: 'between'
-    }, {
-        xtype: 'multicombo',
+    },{
+        xtype: 'combobox',
         name: 'or_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'or_status',
+        valueField: 'or_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['or_statuscode', 'or_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -47,14 +47,22 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         columnWidth: 0.5,
         fieldLabel: '单据日期'
     },{
-        xtype: 'multicombo',
+        xtype: 'combobox',
         name: 'os_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'os_status',
+        valueField: 'os_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['os_statuscode', 'os_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

frontend/saas-web/app/view/sys/account/DataList.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.sys.account.DataList', {
     autoScroll: true,
     frame:true,
     layout:'fit',
-    dataUrl:'http://192.168.253.31:8560/api/account/account/accountRole/list',                 
+    dataUrl:'/api/account/account/accountRole/list',                 
 
     tbar: [{
         width: 150,

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

@@ -7,8 +7,8 @@ Ext.define('saas.view.sys.config.FormPanel', {
     
     //字段属性
     _idField: 'id',
-    _readUrl:'http://192.168.253.31:8560/api/account/company/read/current',
-    _saveUrl:'http://192.168.253.31:8560/api/account/company/save',
+    _readUrl:'/api/account/company/read/current',
+    _saveUrl:'/api/account/company/save',
 
     //基础属性
     frame:true,
@@ -170,7 +170,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     fd.append('file', fileEl.files[0]);
                     form.setLoading(true);
                     Ext.Ajax.request({
-                        url: 'http://192.168.253.31:8560/api/file/upload',//这里是填写需要跨域访问的URL
+                        url: '/api/file/upload',//这里是填写需要跨域访问的URL
                         cors: true,
                         useDefaultXhrHeader: false,
                         method: 'post',
@@ -192,8 +192,9 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 field.setRawValue(name);
                                 //读取图片
                                 if(data.id){
+                                    var serverOptions = Ext.manifest.server;
                                     var img = myForm.down('[name=SignetPhoto]');
-                                    img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+data.fullPath;
+                                    img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+data.fullPath;
                                     var showSignetPhoto = form.down('[name=showSignetPhoto]');
                                     showSignetPhoto.show();
                                 }
@@ -295,7 +296,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     fd.append('file', fileEl.files[0]);
                     form.setLoading(true);
                     Ext.Ajax.request({
-                        url: 'http://192.168.253.31:8560/api/file/upload',//这里是填写需要跨域访问的URL
+                        url: '/api/file/upload',//这里是填写需要跨域访问的URL
                         cors: true,
                         useDefaultXhrHeader: false,
                         method: 'post',
@@ -316,8 +317,9 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 myForm.down('[name=logoUrl]').setValue(data.fullPath);
                                 //读取图片
                                 if(data.id){
+                                    var serverOptions = Ext.manifest.server;
                                     var img = myForm.down('[name=LogoPhoto]');
-                                    img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+data.fullPath;
+                                    img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+data.fullPath;
                                     var showLogoPhoto = form.down('[name=showLogoPhoto]');
                                     showLogoPhoto.show();
                                 }
@@ -401,14 +403,12 @@ Ext.define('saas.view.sys.config.FormPanel', {
     },
 
     load:function(form){
+        var serverOptions = Ext.manifest.server;
         //打印章
         var signet = form.down('[name=signet]').value;
         if(signet&&signet!=''){
             var img = form.down('[name=SignetPhoto]');
-            img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+signet;
-            // var name = data.name + "  (" + Ext.util.Format.fileSize(data.size) + ")";
-            // myForm.down('[name=signet]').setValue(data.fullPath);
-            // field.setRawValue(name);
+            img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+signet;
             var showSignetPhoto = form.down('[name=showSignetPhoto]');
             showSignetPhoto.show();
         }
@@ -416,7 +416,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
         var logoUrl = form.down('[name=logoUrl]').value;
         if(logoUrl&&logoUrl!=''){
             var img = form.down('[name=LogoPhoto]');
-            img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+logoUrl;
+            img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+logoUrl;
             var showLogoPhoto = form.down('[name=showLogoPhoto]');
             showLogoPhoto.show();
         }
@@ -465,10 +465,9 @@ Ext.define('saas.view.sys.config.FormPanel', {
     },
 
     downLoad:function(path){
+        var serverOptions = Ext.manifest.server;
+        window.location.href = serverOptions.basePath + '/api/file/download?path='+path;
         //ajax 响应下载必须要创建一个form实例
-
-        window.location.href = 'http://192.168.253.31:8560/api/file/download?path='+path;
-
         // if (!Ext.fly('ext-attach-download')) {  
 		// 	var frm = document.createElement('form');  
 		// 	frm.id = 'ext-attach-download';  

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

@@ -51,7 +51,17 @@
     .x-panel-body-default-framed{
         padding:0 !important;
     }
+    .x-grid-item-focused{
+        outline: none !important;
+        border:none !important;
+    }
     .x-keyboard-mode .x-grid-item-focused .x-grid-cell-inner:before{
-        border:1px solid #ffffff;
+        border:0px solid #ffffff !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;
     }
 }

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.sys.power.FormPanel', {
     frame:true,
     layout: 'border',
     autoScroll: true,
-    saveUrl:'http://192.168.253.31:8560/api/account/role/save/bind/resource',
+    saveUrl:'/api/account/role/save/bind/resource',
 
     items: [{
         region:'west',

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

@@ -24,7 +24,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         groupHeaderTpl: '{name}'+'模块'
 	})],
     initId:0,
-    dataUrl:'http://192.168.253.31:8560/api/account/role/power/resource',
+    dataUrl:'/api/account/role/power/resource',
     selModel: {
         showHeaderCheckbox:false,
         checkOnly:true,