代码提交

frontend/saas-web/app/Application.scss

@@ -99,13 +99,14 @@ body.launching {
 // toolbar button
 .x-btn-default-toolbar-small {
   color: #fff;
-  background-color: #35BAF6;
+  background-color: #F8FCFF;
   border-color: #35BAF6;
+  border-radius: 2px;
   min-width: 86px;
   transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 
   .x-btn-inner-default-toolbar-small {
-    color: #FFFFFF;
+    color: #34BAF6 ;
   }
 }
 
@@ -131,6 +132,16 @@ body.launching {
   opacity: 0.72;
 }
 
+.x-btn-over{
+  .x-btn-wrap{
+    .x-btn-button{
+      .x-btn-inner{
+        color:#fff !important;
+      }
+    }
+  }
+}
+
 .x-keyboard-mode .x-btn-focus.x-btn-default-toolbar-small {
   background: #34BAF6;
   opacity: 0.72;
@@ -141,7 +152,7 @@ body.launching {
 }
 
 .x-btn-wrap-default-toolbar-small.x-btn-arrow-right:after {
-  color: #FFFFFF;
+  color: #79d3dc;
 }
 
 .x-btn.x-btn-disabled.x-btn-default-toolbar-small {
@@ -178,15 +189,15 @@ body.launching {
 .x-formpanel-btn-white {
     border: 1px solid #c1c1c1 !important;
     //border-radius: 2px;
-    box-shadow: 0 1px 1px rgba(0,0,0,.15);
+    //box-shadow: 0 1px 1px rgba(0,0,0,.15);
     /*background: #fff;
     background: -moz-linear-gradient(top,#fff,#f4f4f4);
     background: -webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f4f4f4));
     background: -o-linear-gradient(top,#fff,#f4f4f4);
     background: -ms-linear-gradient(top,#fff 0,#f4f4f4 100%);
     background: linear-gradient(top,#fff,#f4f4f4); */
-    border-color: #fff;
-    background: linear-gradient(to bottom,#fff,#f4f4f4 100%) !important;
+    // border-color: #fff;
+    // background: linear-gradient(to bottom,#fff,#f4f4f4 100%) !important;
     .x-btn-inner-default-toolbar-small{
       color: #555;
   }

frontend/saas-web/app/util/FormUtil.js

@@ -200,7 +200,7 @@ Ext.define('saas.util.FormUtil', {
             var me = this;
             form.setLoading(true);
             if(form.initId && form.initId!=0) {
-                var url = form._readUrl + form.initId;
+                var url = form._readUrl + '/' + form.initId;
                 saas.util.BaseUtil.request({url })
                 .then(function(res) {
                     form.setLoading(false);

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

@@ -252,7 +252,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                     .then(function(yes) {
                         if(yes == 'yes') {
                             saas.util.BaseUtil.request({
-                                url: form._deleteUrl+id,
+                                url: form._deleteUrl+'/'+id,
                                 method: 'POST',
                             })
                             .then(function(localJson) {

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

@@ -87,7 +87,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
             saas.util.BaseUtil.deleteWarn(form._deleteMsg,function(btn){
                 if(btn == 'yes'){
                     saas.util.BaseUtil.request({
-                        url: form._deleteUrl+id,
+                        url: form._deleteUrl+'/'+id,
                         method: 'POST',
                     })
                     .then(function(localJson) {
@@ -299,7 +299,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var code = viewModel.get(form._codeField);
 
         saas.util.BaseUtil.request({
-            url: form._unAuditUrl+id,
+            url: form._unAuditUrl + '/' + id,
             method: 'POST',
         })
         .then(function(localJson) {

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

@@ -18,8 +18,8 @@ Ext.define('saas.view.core.form.RemoteCombo', {
     setStore:function(v){
        var me=this;
        var store=Ext.create('Ext.data.Store',{
+           autoLoad:true,
            fields:['display','value'],
-           autoLoad: true,
            proxy: {
                type: 'ajax',
                url: me.storeUrl,
@@ -30,12 +30,16 @@ Ext.define('saas.view.core.form.RemoteCombo', {
            }
        });
        me.store=store;
-
     },
     createPicker: function() {
+        debugger
         var me = this,
             picker;
         var count = this.store.getCount();
+        if(count==0){
+            this.store.filters.removeAll();
+            count = this.store.getCount();
+        }
         var pickerCfg = Ext.apply({
                 height: count>5?248-(me.hiddenBtn?50:0):(33*count+(me.hiddenBtn?0:50)),
                 hiddenBtn:me.hiddenBtn,

frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -289,7 +289,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
             .then(function(yes) {
                 if(yes == 'yes') {
                     saas.util.BaseUtil.request({
-                        url: me.deleteDetailUrl+id,
+                        url: me.deleteDetailUrl + '/' + id,
                         params: '',
                         method: 'POST',
                     })

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

@@ -23,7 +23,7 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
 	},
 
     dockedItems: [{
-        width:110,
+        width:140,
         height: 40,
         xtype: 'toolbar',
         dock: 'right',
@@ -36,11 +36,12 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
                 width:50,
                 style:'min-width: 0px;min-height: 0px;',
                 xtype: 'button',
+                name:'query',
                 text: '查询',
                 handler: 'onQuery',
             },{
                 height:24,
-                style:'min-width: 0px;min-height: 0px;border-color: #fff;background-color: #fff; height: 24px;width: 24px;margin-top: -4px;',
+                style:'margin-left: 2px;min-width: 0px;min-height: 0px;border-color: #fff;background-color: #fff; height: 24px;width: 36px;margin-top: -4px;',
                 xtype: 'button',
                 iconCls:'x-fa fa-caret-square-o-down',
                 handler: 'showMore',
@@ -66,7 +67,7 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
                 hidden:true,
                 height:24,
                 tooltip:'隐藏',
-                style:'min-width: 0px;min-height: 0px;border-color: #fff;background-color: #fff; height: 24px;width: 24px;margin-top: -4px;',
+                style:'margin-left: 2px;min-width: 0px;min-height: 0px;border-color: #fff;background-color: #fff; height: 24px;width: 36px;margin-top: -4px;',
                 xtype: 'button',
                 iconCls:'x-fa fa-caret-square-o-up',
                 handler: 'hideMore'

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

@@ -39,6 +39,8 @@ Ext.define('saas.view.core.query.QueryPanelController', {
             queryForm.animate({dynamic: true, duration: 500, to: {height: (24+42*columnWidthCount)+'px'}})
             queryForm.dockedItems.items[0].down('[name=showMore]').hide();
             queryForm.dockedItems.items[0].down('[name=hideMore]').show();
+            var b = queryForm.dockedItems.items[0].down('[name=query]');
+            b.removeFocusCls();
         }
     },
     hideMore:function (){
@@ -49,6 +51,8 @@ Ext.define('saas.view.core.query.QueryPanelController', {
         queryForm.animate({dynamic: true, duration: 500, to: {height: '56px'}})
         queryForm.dockedItems.items[0].down('[name=hideMore]').hide();
         queryForm.dockedItems.items[0].down('[name=showMore]').show();
+        var b = queryForm.dockedItems.items[0].down('[name=query]');
+        b.removeFocusCls();
     },
     onMoreQuery: function() {
         var me = this,

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

@@ -46,7 +46,7 @@ Ext.define('saas.view.document.bom.BasePanel', {
     //字段属性
     _formXtype:'document-bom-formpanel',
     _title:'BOM资料',
-    _deleteUrl:'/api/document/bom/delete/',
+    _deleteUrl:'/api/document/bom/delete',
     _batchOpenUrl:'/api/document/bom/batchOpen',
     _batchCloseUrl:'/api/document/bom/batchClose',
     _batchDeleteUrl:'/api/document/bom/batchDelete',

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

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.bom.FormPanel', {
     _codeField: 'codefied',
     _statusField: 'bo_status',
     _statusCodeField: 'bo_statuscode',
-    _readUrl:'/api/document/bom/read/',
+    _readUrl:'/api/document/bom/read',
     _saveUrl:'/api/document/bom/save',
     _openUrl:'/api/document/bom/open',
     _closeUrl:'/api/document/bom/close',
-    _deleteUrl:'/api/document/bom/delete/',
+    _deleteUrl:'/api/document/bom/delete',
     initId:0,
     _deleteMsg: '删除的BOM资料将不能恢复，请确认是否删除？',
     codeInHeader: false,
@@ -84,7 +84,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
         detnoColumn: 'bd_detno',
         showCount: false,
         storeModel:'saas.model.document.bomdetail',
-        deleteDetailUrl:'/api/document/bom/deleteDetail/',
+        deleteDetailUrl:'/api/document/bom/deleteDetail',
         columns : [
             {
                 text : "ID", 

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

@@ -59,7 +59,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
     caller:'Customer',
     _formXtype:'document-customer-formpanel',
     _title:'客户资料',
-    _deleteUrl:'/api/document/customer/delete/',
+    _deleteUrl:'/api/document/customer/delete',
     _batchOpenUrl:'/api/document/customer/batchOpen',
     _batchCloseUrl:'/api/document/customer/batchClose',
     _batchDeleteUrl:'/api/document/customer/batchDelete',

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

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.customer.FormPanel', {
     _codeField: 'cu_code',
     _statusField: 'cu_status',
     _statusCodeField: 'cu_statuscode',
-    _readUrl:'/api/document/customer/read/',
+    _readUrl:'/api/document/customer/read',
     _saveUrl:'/api/document/customer/save',
     _openUrl:'/api/document/customer/open',
     _closeUrl:'/api/document/customer/close',
-    _deleteUrl:'/api/document/customer/delete/',
+    _deleteUrl:'/api/document/customer/delete',
     initId:0,
 
     codeInHeader: false,
@@ -225,7 +225,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         storeModel:'saas.model.document.customercontact',
         detnoColumn: 'cc_detno',
         showCount: false,
-        deleteDetailUrl:'/api/document/customer/deletecontact/',
+        deleteDetailUrl:'/api/document/customer/deletecontact',
         columns : [
             {
                 text : "ID", 
@@ -326,7 +326,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         storeModel:'saas.model.document.customeraddress',
         detnoColumn: 'ca_detno',
         showCount: false,
-        deleteDetailUrl:'/api/document/customer/deleteaddress/',
+        deleteDetailUrl:'/api/document/customer/deleteaddress',
         columns : [
             {
                 text : "ID", 

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

@@ -278,31 +278,24 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 listeners:{
                     blur:function(f,a,b,c){
                         if(f.value&&f.value!=''&&f.isValid()){
-                            // var url = 'https://sso.ubtob.com' + '/api/user/checkMobile?mobile='+f.value;
-                            // saas.util.BaseUtil.request({url })
-                            // .then(function(res) {
-                            //     if(res.success) {
-                            //     }
-                            // })
-                            // .catch(function(response) {
-                            // });
-                            // Ext.Ajax.request({
-                            //     url: Ext.manifest.server.accountPath + '/api/user/checkMobile',
-                            //     params: {
-                            //         mobile: f.value
-                            //     },
-                            //     method: 'GET',
-                            //     headers:{
-                            //         'Access-Control-Allow-Origin': '*',
-                            //         "Content-Type": 'application/json;charset=UTF-8'
-                            //     },
-                            //     success: function (response) {
-                            //         debugger
-                            //     },
-                            //     failure: function (response) {
-                            //         debugger
-                            //     }
-                            // });
+                            Ext.Ajax.request({
+                                url: 'http://192.168.253.31:8560/api/account/account/checkMobile?mobile='+f.value,
+                                method: 'GET',
+                                headers:{
+                                    'Access-Control-Allow-Origin': '*',
+                                    "Content-Type": 'application/json;charset=UTF-8'
+                                },
+                                success: function (response) {
+                                    if(localJson.success){
+                                        saas.util.BaseUtil.showSuccessToast('保存成功');
+                                        form.ownerCt._parent.store.load()
+                                        form.ownerCt.close();
+                                    }
+                                },
+                                failure: function (response) {
+                                    debugger
+                                }
+                            });
                         }
                     }
                 }
@@ -517,6 +510,11 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             me.accountinformation();
             return;
         }
+        //账户资料新增特殊保存逻辑
+        if(me.dataKind=='accountadd'){
+            me.accountadd();
+            return;
+        }
 
         Ext.Array.each(names,function(name) {
             if(name){
@@ -618,5 +616,53 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             console.error(res);
             saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
         });
+    },
+    accountadd:function(){
+        var me = this;
+        var belong = this.belong;
+        me.setLoading(true);
+        var form=this.down('form');
+        var combo = this._combo;
+        var params = {};
+        var names = belong.columns.map(column => column.dataIndex);
+
+        Ext.Array.each(names,function(name) {
+            if(name){
+                var dataField = form.down('[name='+name+']');
+                if(dataField&&dataField.value){
+                    params[name] = dataField.value;
+                    params._value = dataField.value;
+                }
+            }
+        });
+        params['username'] = params['mobile'];
+        params['type'] = 1;
+        //保存接口
+        saas.util.BaseUtil.request({
+            url: belong.reqUrl,
+            params: JSON.stringify(params),
+            method: 'POST'
+        })
+        .then(function(localJson) {
+            me.setLoading(false);
+            if(localJson.success){
+                var grid = form.ownerCt._parent ? form.ownerCt._parent.lookup('document-kind-Grid') : null;
+                if(grid){
+                    grid.store.load();
+                }
+                if(combo){
+                    combo.store.load(function() {
+                        typeof combo.setValue == 'function' && combo.setValue(params._value);
+                    });
+                }
+                saas.util.BaseUtil.showSuccessToast('保存成功');
+                form.ownerCt.close();
+            }
+        })
+        .catch(function(res) {
+            me.setLoading(false);
+            console.error(res);
+            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
+        });
     }
 });

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

@@ -60,7 +60,7 @@ Ext.define('saas.view.document.product.BasePanel', {
     caller:'Product',
     _formXtype:'document-product-formpanel',
     _title:'物料资料',
-    _deleteUrl:'/api/document/product/delete/',
+    _deleteUrl:'/api/document/product/delete',
     _batchOpenUrl:'/api/document/product/batchOpen',
     _batchCloseUrl:'/api/document/product/batchClose',
     _batchDeleteUrl:'/api/document/product/batchDelete',

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

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.product.FormPanel', {
     _codeField: 'pr_code',
     _statusField: 'pr_status',
     _statusCodeField: 'pr_statuscode',
-    _readUrl:'/api/document/product/read/',
+    _readUrl:'/api/document/product/read',
     _saveUrl:'/api/document/product/save',
     _openUrl:'/api/document/product/open',
     _closeUrl:'/api/document/product/close',
-    _deleteUrl:'/api/document/product/delete/',
+    _deleteUrl:'/api/document/product/delete',
     initId:0,
 
     codeInHeader: false,
@@ -219,7 +219,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         showCount: false,
         allowEmpty:true,
         hidden: true,
-        deleteDetailUrl:'/api/document/product/deleteDetail/',
+        deleteDetailUrl:'/api/document/product/deleteDetail',
         columns : [{
             text : "ID", 
             dataIndex : "id", 

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

@@ -53,7 +53,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
     caller:'Vendor',
     _formXtype:'document-vendor-formpanel',
     _title:'供应商资料',
-    _deleteUrl:'/api/document/vendor/delete/',
+    _deleteUrl:'/api/document/vendor/delete',
     _batchOpenUrl:'/api/document/vendor/batchOpen',
     _batchCloseUrl:'/api/document/vendor/batchClose',
     _batchDeleteUrl:'/api/document/vendor/batchDelete',

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

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.vendor.FormPanel', {
     _codeField: 've_code',
     _statusField: 've_status',
     _statusCodeField: 've_statuscode',
-    _readUrl:'/api/document/vendor/read/',
+    _readUrl:'/api/document/vendor/read',
     _saveUrl:'/api/document/vendor/save',
     _openUrl:'/api/document/vendor/open',
     _closeUrl:'/api/document/vendor/close',
-    _deleteUrl:'/api/document/vendor/delete/',
+    _deleteUrl:'/api/document/vendor/delete',
     initId:0,
 
     codeInHeader: false,
@@ -198,7 +198,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         storeModel:'saas.model.document.vendorcontact',
         detnoColumn: 'vc_detno',
         showCount: false,
-        deleteDetailUrl:'/api/document/vendor/deleteContact/',
+        deleteDetailUrl:'/api/document/vendor/deleteContact',
         columns : [
             {
                 text : "ID", 

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

@@ -15,11 +15,11 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
      _statusField: 'ft_status',
      _statusCodeField: 'ft_statuscode',
      _relationColumn: 'ftd_ftid',
-     _readUrl:'/api/money/fundtransfer/read/',
+     _readUrl:'/api/money/fundtransfer/read',
      _saveUrl:'/api/money/fundtransfer/save',
-     _auditUrl:'/api/money/fundtransfer/audit/',
-     _unAuditUrl: '/api/money/fundtransfer/unAudit/',
-     _deleteUrl:'/api/money/fundtransfer/delete/',
+     _auditUrl:'/api/money/fundtransfer/audit',
+     _unAuditUrl: '/api/money/fundtransfer/unAudit',
+     _deleteUrl:'/api/money/fundtransfer/delete',
      initId:0,
 
     defaultItems: [{
@@ -37,7 +37,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.FundTransfer',
         detnoColumn:  'ftd_detno',
-        deleteDetailUrl:'/api/money/fundtransfer/deleteItem/',
+        deleteDetailUrl:'/api/money/fundtransfer/deleteItem',
         columnWidth : 1,
         columns : [
             {

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

@@ -11,7 +11,6 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         xtype: 'textfield',
         name:'ft_code',
         emptyText:'请输入单号',
-        style:{paddingLeft: '95px'},
     },{
         xtype : "condatefield",
         name : "ft_date",

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

@@ -15,11 +15,11 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _statusField: 'or_status',
      _statusCodeField: 'or_statuscode',
      _relationColumn: 'ord_orid',
-     _readUrl:'/api/money/othreceipts/read/',
-     _saveUrl:'/api/money/othreceipts/save/',
-     _auditUrl:'/api/money/othreceipts/audit/',
-     _unAuditUrl: '/api/money/othreceipts/unAudit/',
-     _deleteUrl:'/api/money/othreceipts/delete/',  
+     _readUrl:'/api/money/othreceipts/read',
+     _saveUrl:'/api/money/othreceipts/save',
+     _auditUrl:'/api/money/othreceipts/audit',
+     _unAuditUrl: '/api/money/othreceipts/unAudit',
+     _deleteUrl:'/api/money/othreceipts/delete',  
      initId:0,
 
     defaultItems: [{
@@ -63,7 +63,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othreceipts',
         detnoColumn:  'ord_detno',
-        deleteDetailUrl:'/api/money/othreceipts/deleteDetail/',
+        deleteDetailUrl:'/api/money/othreceipts/deleteDetail',
         columnWidth : 1,
         columns : [
             {

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

@@ -11,7 +11,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         xtype: 'textfield',
         name: 'or_code',
         emptyText:'请输入单号或客户或账号',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
            return  ' (or_code like\'%' + value + '%\'' 
                 +' or or_custcode like \'%'+value+'%\''

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

@@ -15,11 +15,11 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      _statusField: 'os_status',
      _statusCodeField: 'os_statuscode',
      _relationColumn: 'osd_osid',
-     _readUrl:'/api/money/othspendings/read/',
-     _saveUrl:'/api/money/othspendings/save/',
-     _auditUrl:'/api/money/othspendings/audit/',
-     _unAuditUrl: '/api/money/othspendings/unAudit/',
-     _deleteUrl:'/api/money/othspendings/delete/', 
+     _readUrl:'/api/money/othspendings/read',
+     _saveUrl:'/api/money/othspendings/save',
+     _auditUrl:'/api/money/othspendings/audit',
+     _unAuditUrl: '/api/money/othspendings/unAudit',
+     _deleteUrl:'/api/money/othspendings/delete', 
      initId:0,
 
     defaultItems: [{
@@ -63,7 +63,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othspendings',
         detnoColumn:  'osd_detno',
-        deleteDetailUrl:'/api/money/othspendings/deleteDetail/',
+        deleteDetailUrl:'/api/money/othspendings/deleteDetail',
         columnWidth : 1,
         columns : [
             {

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

@@ -20,7 +20,6 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         xtype: 'textfield',
         name: 'os_code',
         emptyText:'请输入单号或客户或账号',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -15,11 +15,11 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _statusField: 'pb_status',
     _statusCodeField: 'pb_statuscode',
     
-    _readUrl: '/api/money/paybalance/read/',
-    _saveUrl: '/api/money/paybalance/save/',
-    _auditUrl: '/api/money/paybalance/audit/',
-    _unAuditUrl: '/api/money/paybalance/unAudit/',
-    _deleteUrl: '/api/money/paybalance/delete/',
+    _readUrl: '/api/money/paybalance/read',
+    _saveUrl: '/api/money/paybalance/save',
+    _auditUrl: '/api/money/paybalance/audit',
+    _unAuditUrl: '/api/money/paybalance/unAudit',
+    _deleteUrl: '/api/money/paybalance/delete',
     initId: 0,
 
     toolBtns: [],
@@ -89,7 +89,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.PayBalance1',
         detnoColumn: 'pd_detno',
-        deleteDetailUrl: '/api/money/paybalance/deleteDetail1/',
+        deleteDetailUrl: '/api/money/paybalance/deleteDetail1',
         columns: [
         {
             text: 'ID',
@@ -181,7 +181,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         storeModel: 'saas.model.money.PayBalance2',
         detnoColumn: 'pbd_detno',
         allowEmpty: true,
-        deleteDetailUrl: '/api/money/paybalance/deleteDetail2/',
+        deleteDetailUrl: '/api/money/paybalance/deleteDetail2',
         columns: [
         {
             text: 'ID',

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

@@ -19,7 +19,6 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         xtype: 'textfield',
         name: 'pb_code',
         emptyText :'请输入单号或供应商',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -16,11 +16,11 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     _statusField: 'rb_status',
     _statusCodeField: 'rb_statuscode',
     
-    _readUrl: '/api/money/recbalance/read/',
-    _saveUrl: '/api/money/recbalance/save/',
-    _auditUrl: '/api/money/recbalance/audit/',
-    _unAuditUrl: '/api/money/recbalance/unAudit/',
-    _deleteUrl: '/api/money/recbalance/delete/',
+    _readUrl: '/api/money/recbalance/read',
+    _saveUrl: '/api/money/recbalance/save',
+    _auditUrl: '/api/money/recbalance/audit',
+    _unAuditUrl: '/api/money/recbalance/unAudit',
+    _deleteUrl: '/api/money/recbalance/delete',
     initId: 0,
 
     defaultItems: [{
@@ -84,7 +84,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.RecBalance1',
         detnoColumn: 'rd_detno',
-        deleteDetailUrl: '/api/money/recbalance/deleteDetail1/',
+        deleteDetailUrl: '/api/money/recbalance/deleteDetail1',
         columns: [{
             text: 'ID',
             dataIndex: 'id',
@@ -180,7 +180,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         storeModel: 'saas.model.money.RecBalance2',
         detnoColumn: 'rbd_detno',
         allowEmpty: true,
-        deleteDetailUrl: '/api/money/recbalance/deleteDetail2/',
+        deleteDetailUrl: '/api/money/recbalance/deleteDetail2',
         columns: [{
             text: 'ID',
             dataIndex: 'id',

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

@@ -11,7 +11,6 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         xtype: 'textfield',
         name: 'rb_code',
         emptyText :'请输入单号或客户',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -17,11 +17,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
     _statusField: 'vc_status',
     _statusCodeField: 'vc_statuscode',
 
-    _readUrl: '/api/money/verification/read/',
-    _saveUrl: '/api/money/verification/save/',
-    _auditUrl: '/api/money/verification/audit/',
-    _unAuditUrl: '/api/money/verification/unAudit/',
-    _deleteUrl: '/api/money/verification/delete/',
+    _readUrl: '/api/money/verification/read',
+    _saveUrl: '/api/money/verification/save',
+    _auditUrl: '/api/money/verification/audit',
+    _unAuditUrl: '/api/money/verification/unAudit',
+    _deleteUrl: '/api/money/verification/delete',
 
     defatulType: 'receipts_offset_receivable',
 
@@ -64,7 +64,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
             xtype: "detailGridField",
             storeModel: 'saas.model.money.Verification1',
             detnoColumn: 'vd_detno',
-            deleteDetailUrl: '/api/money/verification/deleteDetail1/',
+            deleteDetailUrl: '/api/money/verification/deleteDetail1',
             columnWidth: 1,
             columns: [{
                 text: 'ID',
@@ -185,7 +185,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
             xtype: "detailGridField",
             storeModel: 'saas.model.money.Verification1',
             detnoColumn: 'vcd_detno',
-            deleteDetailUrl: '/api/money/verification/deleteDetail2/',
+            deleteDetailUrl: '/api/money/verification/deleteDetail2',
             columnWidth: 1,
             columns: [{
                 text: 'ID',

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

@@ -16,12 +16,12 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
      _statusCodeField: 'pu_statuscode',
      _relationColumn: 'pd_puid',
 
-     _readUrl:'/api/purchase/purchase/read/',
+     _readUrl:'/api/purchase/purchase/read',
      _saveUrl:'/api/purchase/purchase/save',
      _auditUrl:'/api/purchase/purchase/audit',
-     _unAuditUrl: '/api/purchase/purchase/unAudit/',
-     _deleteUrl:'/api/purchase/purchase/delete/',
-     _turnInUrl:'/api/purchase/purchase/turnProdin/',
+     _unAuditUrl: '/api/purchase/purchase/unAudit',
+     _deleteUrl:'/api/purchase/purchase/delete',
+     _turnInUrl:'/api/purchase/purchase/turnProdin',
      initId:0,
  
      toolBtns: [{
@@ -89,7 +89,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.purchase.Purchasedetail',
         detnoColumn:  'pd_detno',
-        deleteDetailUrl:'/api/purchase/purchase/deleteDetail/',
+        deleteDetailUrl:'/api/purchase/purchase/deleteDetail',
         allowEmpty: false,
         columns : [
             {

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

@@ -21,7 +21,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         fieldLabel: ' ',
         labelSeparator:' ',
         emptyText:'请输入单号或供应商',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             return  ' (pu_code like\'%' + value + '%\' or pu_vendcode like \'%'+value+'%\' or pu_vendname like \'%'+value+'%\') ';
         }

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

@@ -16,12 +16,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:'/api/purchase/prodinout/read/',
+    _readUrl:'/api/purchase/prodinout/read',
     _saveUrl:'/api/purchase/prodinout/save',
     _auditUrl:'/api/purchase/prodinout/audit',
-    _unAuditUrl:'/api/purchase/prodinout/unAudit/',
-    _deleteUrl:'/api/purchase/prodinout/delete/',
-    _turnOutUrl:'/api/purchase/prodinout/turnProdOut/',
+    _unAuditUrl:'/api/purchase/prodinout/unAudit',
+    _deleteUrl:'/api/purchase/prodinout/delete',
+    _turnOutUrl:'/api/purchase/prodinout/turnProdOut',
     initId:0,
 
     toolBtns: [{
@@ -91,7 +91,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        deleteDetailUrl:'/api/purchase/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/purchase/prodinout/deleteDetail',
         detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -16,7 +16,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
         }

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

@@ -16,11 +16,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:'/api/purchase/prodinout/read/',
+    _readUrl:'/api/purchase/prodinout/read',
     _saveUrl:'/api/purchase/prodinout/save',
     _auditUrl:'/api/purchase/prodinout/audit',
-    _unAuditUrl:'/api/purchase/prodinout/unAudit/',
-    _deleteUrl:'/api/purchase/prodinout/delete/',
+    _unAuditUrl:'/api/purchase/prodinout/unAudit',
+    _deleteUrl:'/api/purchase/prodinout/delete',
     initId:0,
     toolBtns: [],
     defaultItems: [{
@@ -89,7 +89,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        deleteDetailUrl:'/api/purchase/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/purchase/prodinout/deleteDetail',
         detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -19,7 +19,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
         }

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

@@ -16,13 +16,13 @@ Ext.define('saas.view.sale.sale.FormPanel', {
      _statusCodeField: 'sa_statuscode',
      
      _relationColumn: 'sd_puid',
-     _readUrl:'/api/sale/sale/read/',
-     _saveUrl:'/api/sale/sale/save/',
-     _auditUrl:'/api/sale/sale/audit/',
-     _unAuditUrl: '/api/sale/sale/unAudit/',
-     _deleteUrl:'/api/sale/sale/delete/',
-     _turnOutUrl:'/api/sale/sale/turnProdOut/',
-     _turnPurchase:'/api/sale/sale/saleTurnPurchase/',
+     _readUrl:'/api/sale/sale/read',
+     _saveUrl:'/api/sale/sale/save',
+     _auditUrl:'/api/sale/sale/audit',
+     _unAuditUrl: '/api/sale/sale/unAudit',
+     _deleteUrl:'/api/sale/sale/delete',
+     _turnOutUrl:'/api/sale/sale/turnProdOut',
+     _turnPurchase:'/api/sale/sale/saleTurnPurchase',
      initId:0,
  
      toolBtns: [{
@@ -92,7 +92,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn: 'sd_detno',
         storeModel:'saas.model.sale.Saledetail',
-        deleteDetailUrl:'/api/sale/sale/deleteDetail/',
+        deleteDetailUrl:'/api/sale/sale/deleteDetail',
         columns : [
            {
                 text : "id", 

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

@@ -19,7 +19,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         xtype: 'textfield',
         name: 'sa_code',
         emptyText:'请输入单号或客户',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
            return  ' (sa_code like\'%' + value + '%\' or sa_custcode like \'%'+value+'%\' or sa_custname like \'%'+value+'%\') ';
         }

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

@@ -16,12 +16,12 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:'/api/sale/prodinout/read/',
-    _saveUrl:'/api/sale/prodinout/save/',
-    _auditUrl:'/api/sale/prodinout/audit/',
-    _unAuditUrl:'/api/sale/prodinout/unAudit/',
-    _deleteUrl:'/api/sale/prodinout/delete/',
-    _turnInUrl:'/api/sale/prodinout/turnProdIn/',
+    _readUrl:'/api/sale/prodinout/read',
+    _saveUrl:'/api/sale/prodinout/save',
+    _auditUrl:'/api/sale/prodinout/audit',
+    _unAuditUrl:'/api/sale/prodinout/unAudit',
+    _deleteUrl:'/api/sale/prodinout/delete',
+    _turnInUrl:'/api/sale/prodinout/turnProdIn',
     initId:0,
 
     defaultItems: [{
@@ -66,7 +66,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'pd_pdno',
         storeModel:'saas.model.sale.ProdIODetail',
-        deleteDetailUrl:'/api/sale/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/sale/prodinout/deleteDetail',
         columns : [
             {
                 text : "id", 

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

@@ -15,7 +15,6 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户或关联单号',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' or pi_sacode like \'%'+value+'%\') ';
         }

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

@@ -16,12 +16,12 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:'/api/sale/prodinout/read/',
-    _saveUrl:'/api/sale/prodinout/save/',
-    _auditUrl:'/api/sale/prodinout/audit/',
-    _unAuditUrl:'/api/sale/prodinout/unAudit/',
-    _deleteUrl:'/api/sale/prodinout/delete/',
-    _turnInUrl:'/api/sale/prodinout/turnProdIn/',
+    _readUrl:'/api/sale/prodinout/read',
+    _saveUrl:'/api/sale/prodinout/save',
+    _auditUrl:'/api/sale/prodinout/audit',
+    _unAuditUrl:'/api/sale/prodinout/unAudit',
+    _deleteUrl:'/api/sale/prodinout/delete',
+    _turnInUrl:'/api/sale/prodinout/turnProdIn',
     initId:0,
 
     toolBtns: [{
@@ -75,7 +75,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'pd_pdno',
         storeModel:'saas.model.sale.ProdIODetail',
-        deleteDetailUrl:'/api/sale/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/sale/prodinout/deleteDetail',
         columns : [
             {
                 text : "id", 

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

@@ -16,7 +16,6 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户或关联单号',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' or pi_iocode like \'%'+value+'%\') ';
         }

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

@@ -16,11 +16,11 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:'/api/storage/prodinout/read/',
+    _readUrl:'/api/storage/prodinout/read',
     _saveUrl:'/api/storage/prodinout/save',
     _auditUrl:'/api/storage/prodinout/audit',
-    _unAuditUrl: '/api/storage/prodinout/unAudit/',
-    _deleteUrl:'/api/storage/prodinout/delete/',
+    _unAuditUrl: '/api/storage/prodinout/unAudit',
+    _deleteUrl:'/api/storage/prodinout/delete',
     initId:0,
 
     toolBtns: [],
@@ -76,7 +76,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        deleteDetailUrl:'/api/storage/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/storage/prodinout/deleteDetail',
         detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -18,7 +18,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         name: 'pi_inoutno',
         emptyText:'请输入单号或物料',
         showDetail: true,
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -16,12 +16,12 @@ Ext.define('saas.view.stock.make.FormPanel', {
      _statusCodeField: 'ma_statuscode',
      _relationColumn: 'mm_maid',
 
-     _readUrl:'/api/storage/make/read/',
+     _readUrl:'/api/storage/make/read',
      _saveUrl:'/api/storage/make/save',
      _auditUrl:'/api/storage/make/audit',
-     _unAuditUrl: '/api/storage/make/unAudit/',
-     _deleteUrl:'/api/storage/make/delete/',
-     _getBomUrl:'/api/document/bom/read/',
+     _unAuditUrl: '/api/storage/make/unAudit',
+     _deleteUrl:'/api/storage/make/delete',
+     _getBomUrl:'/api/document/bom/read',
      initId:0,
  
      toolBtns: [],
@@ -127,7 +127,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.stock.Makematerial',
         detnoColumn:  'mm_detno',
-        deleteDetailUrl:'/api/storage/make/deleteDetail/',
+        deleteDetailUrl:'/api/storage/make/deleteDetail',
         columns : [
             {
                 text : "id", 

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

@@ -19,7 +19,6 @@ Ext.define('saas.view.stock.make.QueryPanel', {
         xtype: 'textfield',
         name: 'ma_code',
         emptyText :'请输入单据编号',
-        style:{paddingLeft: '95px'}
     },{
         xtype: 'textfield',
         name: 'ma_prodcode',

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

@@ -17,11 +17,11 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:'/api/storage/prodinout/read/',
+    _readUrl:'/api/storage/prodinout/read',
     _saveUrl:'/api/storage/prodinout/save',
     _auditUrl:'/api/storage/prodinout/audit',
-    _unAuditUrl: '/api/storage/prodinout/unAudit/',
-    _deleteUrl:'/api/storage/prodinout/delete/',
+    _unAuditUrl: '/api/storage/prodinout/unAudit',
+    _deleteUrl:'/api/storage/prodinout/delete',
     initId:0,
 
     toolBtns: [],
@@ -93,7 +93,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        deleteDetailUrl:'/api/storage/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/storage/prodinout/deleteDetail',
         detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -17,7 +17,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -16,11 +16,11 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     _statusCodeField: 'pi_statuscode',
 
     _relationColumn: 'pd_piid',
-    _readUrl: '/api/storage/prodinout/read/',
+    _readUrl: '/api/storage/prodinout/read',
     _saveUrl: '/api/storage/prodinout/save',
     _auditUrl: '/api/storage/prodinout/audit',
-    _unAuditUrl: '/api/storage/prodinout/unAudit/',
-    _deleteUrl: '/api/storage/prodinout/delete/',
+    _unAuditUrl: '/api/storage/prodinout/unAudit',
+    _deleteUrl: '/api/storage/prodinout/delete',
     initId: 0,
 
     toolBtns: [],
@@ -78,7 +78,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         name: "detailGridField",
         xtype: "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        deleteDetailUrl: '/api/storage/prodinout/deleteDetail/',
+        deleteDetailUrl: '/api/storage/prodinout/deleteDetail',
         detnoColumn: 'pd_pdno',
         columns: [{
                 text: "id",

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

@@ -17,7 +17,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户',
-        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';