merge

frontend/saas-portal-web/config/env.js

@@ -27,4 +27,4 @@ if (process.env.NODE_ENV == 'production') {
             ssoUrl: 'http://192.168.253.12:32323'
         }
     }
-}
+}

frontend/saas-web/app.json

@@ -298,7 +298,7 @@
         "server": {
             "basePath": {
                 "https": "https://saas-api-dev.usoftchina.com:5443",
-                "http": "http://192.168.0.182:8560"
+                "http": "http://192.168.0.181:8560"
             },
             "urlPattern": "^\/api\/"
         }
@@ -311,7 +311,7 @@
         "server": {
             "basePath": {
                 "https": "https://saas-api-dev.usoftchina.com:5443",
-                "http": "http://192.168.0.182:8560"
+                "http": "http://192.168.0.181:8560"
             },
             "urlPattern": "^\/api\/"
         }
@@ -327,7 +327,7 @@
         "server": {
             "basePath": {
                 "https": "https://saas-api-dev.usoftchina.com:5443",
-                "http": "http://192.168.0.182:8560"
+                "http": "http://192.168.0.181:8560"
             },
             "urlPattern": "^\/api\/"
         }

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

@@ -54,13 +54,28 @@ Ext.define('saas.util.BaseUtil', {
          * @param title: 标题
          * 
          */
-        showToast: function (content, title) {
+        showSuccessToast: function (content, title) {
             Ext.toast({
+                cls:'x-toast-success',
                 html: content,
                 title: title,
                 closable: false,
                 align: 't',
-                slideDUration: 400,
+                autoCloseDelay:3000,
+                autoClose:true,
+                maxWidth: 400
+            });
+        },
+
+        showErrorToast: function (content, title) {
+            Ext.toast({
+                cls:'x-toast-error',
+                html: content,
+                title: title,
+                closable: false,
+                align: 't',
+                autoCloseDelay:3000,
+                autoClose:true,
                 maxWidth: 400
             });
         },

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

@@ -42,16 +42,16 @@ Ext.define('saas.util.Errors', {
                 if (error.code === -32096) {    // READONLY_SESSION
                     // The session is read-only (demo version), let's display a temporary message
                     // and return false since this exception should not be considered as an error.
-                    saas.util.BaseUtil.showToast(error.message);
+                    saas.util.BaseUtil.showErrorToast(error.message);
                     return false;
                 }
                 if (error.code === -32001 && form) {
                     form.setErrors(this.toForm(error));
                 } else {
-                    saas.util.BaseUtil.showToast(error.name + ' Error：' + error.message);
+                    saas.util.BaseUtil.showErrorToast(error.name + ' 错误信息：' + error.message);
                 }
             } else if (Ext.isString(error)) {
-                saas.util.BaseUtil.showToast('Error：' + error);
+                saas.util.BaseUtil.showErrorToast('错误信息：' + error);
             }
 
             return true;

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

@@ -35,10 +35,10 @@ Ext.define('saas.util.FormUtil', {
                 form.fireEvent('afterSetItems', form, items);
             })
             .then(function() {
-                form.inited || me.loadData(form);
+                me.loadData(form);
             })
             .catch(function(response) {
-                saas.util.BaseUtil.showToast('错误：' + response.message);
+                saas.util.BaseUtil.showErrorToast('加载数据错误：' + response.message);
                 console.error(response);
             });
 
@@ -199,7 +199,6 @@ Ext.define('saas.util.FormUtil', {
         loadData: function(form) {
             var me = this;
             form.setLoading(true);
-            form.inited = true;
             if(form.initId && form.initId!=0) {
                 var url = form._readUrl + form.initId;
                 saas.util.BaseUtil.request({url })
@@ -283,7 +282,7 @@ Ext.define('saas.util.FormUtil', {
                         form.initFormData(formData);
                     }
                 }).catch(function(res) {
-                    saas.util.BaseUtil.showToast(res.message);
+                    saas.util.BaseUtil.showErrorToast(res.message);
                     form.setLoading(false);
                 })
             }

frontend/saas-web/app/view/auth/LoginController.js

@@ -39,7 +39,7 @@ Ext.define('saas.view.auth.LoginController', {
             })
             .catch(function(error) {
                 view.isMasked() && view.unmask();
-                saas.util.BaseUtil.showToast(error.message);
+                saas.util.BaseUtil.showErrorToast(error.message);
             });
     },
 
@@ -61,7 +61,7 @@ Ext.define('saas.view.auth.LoginController', {
 				me.fireEvent('login', newSession);
             })
             .catch(function(error) {
-                saas.util.BaseUtil.showToast(error.message);
+                saas.util.BaseUtil.showErrorToast(error.message);
             })
             .then(function() {
                 view.isMasked() && view.unmask();

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

@@ -37,6 +37,18 @@ Ext.define('saas.view.core.base.GridPanel', {
                         type: 'json',
                         rootProperty: 'data.list',
                         totalProperty: 'data.total',
+                    },
+                    listeners: {
+                        exception: function(proxy, response, operation, eOpts) {
+                            if(operation.success) {
+                                if(response.timedout) {
+                                    saas.util.BaseUtil.showErrorToast('请求超时');
+                                }
+                            }else {
+                                console.error('exception: ', response.responseJson);
+                                saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson.message);
+                            }
+                        }
                     }
                 },
                 listeners: {
@@ -82,21 +94,9 @@ Ext.define('saas.view.core.base.GridPanel', {
                     }, {
                         text: '导入',
                         handler: me.onImport,
-                        menu: {
-                            cls:'x-query-menu',
-                            width: 80,
-                            items: [{
-                                text:'导出',
-                                handler:function(){
-                                    me.onExport(this)
-                                }
-                            }],
-                            listeners: {
-                                'mouseleave':function(enu){
-                                    this.hide();
-                                } 
-                            }
-                        }
+                    },{
+                        text:'导出',
+                        handler:me.onExport
                     },{
                         text: '禁用',
                         handler: function(){
@@ -132,13 +132,13 @@ Ext.define('saas.view.core.base.GridPanel', {
                                     }
                                 });
                             }else {
-                                saas.util.BaseUtil.showToast('请至少选择一条明细');
+                                saas.util.BaseUtil.showErrorToast('请至少选择一条明细');
                             }
                         }
-                    }, {
+                    }/* , {
                         text: '刷新',
                         handler: me.onLoad
-                    }]
+                    } */]
                 },{
                     xtype: 'pagingtoolbar',
                     dock: 'bottom',
@@ -160,7 +160,7 @@ Ext.define('saas.view.core.base.GridPanel', {
         var grid = this;
         var data = grid.getGridSelected(type);
         if(!data){
-            saas.util.BaseUtil.showToast('请勾选符合条件的行进行操作。');
+            saas.util.BaseUtil.showErrorToast('请勾选符合条件的行进行操作。');
             return false;
         }
         if(data&&data.length>0){
@@ -172,15 +172,15 @@ Ext.define('saas.view.core.base.GridPanel', {
                     async:false
                 })
                 .then(function() {
-                    saas.util.BaseUtil.showToast('操作成功');
+                    saas.util.BaseUtil.showSuccessToast('操作成功');
                     grid.store.load();
                 })
                 .catch(function(res) {
                     console.error(res);
-                    saas.util.BaseUtil.showToast('操作失败: ' + res.message);
+                    saas.util.BaseUtil.showErrorToast('操作失败: ' + res.message);
                 });
         }else{
-            saas.util.BaseUtil.showToast('请勾选至少一条明细。');
+            saas.util.BaseUtil.showErrorToast('请勾选至少一条明</br>细。');
         }
     },
 
@@ -215,13 +215,13 @@ Ext.define('saas.view.core.base.GridPanel', {
                             .then(function(localJson) {
                                 if(localJson.success){
                                     //解析参数
-                                    saas.util.BaseUtil.showToast('删除成功');
+                                    saas.util.BaseUtil.showSuccessToast('删除成功');
                                     view.ownerCt.store.load();
                                 }
                             })
                             .catch(function(res) {
                                 console.error(res);
-                                saas.util.BaseUtil.showToast('删除失败: ' + res.message);
+                                saas.util.BaseUtil.showErrorToast('删除失败: ' + res.message);
                             });
                         }
                     });

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

@@ -74,6 +74,8 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                         handler: me.onAddClick.bind(me)
                     }])
                 },{
+                    height:32,
+                    style:'padding: 0;',
                     xtype: 'pagingtoolbar',
                     dock: 'bottom',
                     displayInfo: true,
@@ -90,7 +92,7 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
             gridBodyBox = grid.body.dom.getBoundingClientRect(),
             gridBodyBoxHeight = gridBodyBox.height;
 
-            var pageSize = Math.floor(gridBodyBoxHeight / 32);
+            var pageSize = Math.floor(gridBodyBoxHeight / 33);
 
             store.setPageSize(pageSize);
         },

frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.scss

@@ -1,3 +1,54 @@
 .x-window-dbfind{
     border:none;
+    .x-window-header{
+        border: none;
+        background-color: #fff;
+    }
+    .x-title-text{
+        padding-left: 7px;
+        font-weight: 550;
+        color: #35baf6;
+    }
+    .x-tbar-page-number .x-form-text{
+        height: 16px !important;
+        min-height: 16px;
+        padding: 0px;
+    }
+    .x-tbar-page-number{
+        width: 40px !important;
+    }
+    .x-title-text::before{
+        margin-left: -10px;
+        content: ' ';
+        display: block;
+        border-style: solid;
+        background-color: #34baf6;
+        position: fixed;
+        width: 0px;
+        margin-top: 2px;
+        height: 10px;
+    }
+    .x-tool-tool-el{
+        color:#35baf6 !important;
+    }
+    .x-window-body{
+        padding-top: 0px !important;
+    }
+    .x-toolbar-default {
+        padding: 6px 0 12px 0px;
+    }
+    .x-grid-header-ct {
+        border: 1px solid #abdaff !important;
+    }
+    .x-grid-body {
+        border-width: 1px;
+        border-color: #abdaff;
+        border-right-width: 1px !important;
+        border-left-width: 1px !important;
+        border-top-width: 0px !important;
+    }
+    .x-grid-paging-toolbar{
+        border: 1px solid #abdaff !important;
+        border-top-width: 0px !important;
+    }
 }

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

@@ -5,8 +5,6 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     queryMode: 'local',
     displayField: 'dispaly',
     valueField: 'value',
-    triggerCls: 'x-form-search-trigger',
-    cls:'x-window-dbfind',
     minChars:1, // 设置用户输入字符多少时触发查询
     tpl: '',
     enableKeyEvents:true,
@@ -152,7 +150,8 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
             dbItem.onAddClick = me.onAddClick;
         }
 
-        var win = panel.add(Ext.create('Ext.window.Window', {   
+        var win = panel.add(Ext.create('Ext.window.Window', {  
+            cls:'x-window-dbfind', 
             trigger:f,
             belong:f.ownerCt,  
             modal:true,

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

@@ -39,7 +39,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
             gridBodyBox = grid.body.dom.getBoundingClientRect(),
             gridBodyBoxHeight = gridBodyBox.height;
 
-            var pageSize = Math.floor(gridBodyBoxHeight / 32);
+            var pageSize = Math.floor(gridBodyBoxHeight / 33);
 
             store.setPageSize(pageSize);
         }
@@ -164,6 +164,8 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                     xtype: 'pagingtoolbar',
                     dock: 'bottom',
                     displayInfo: true,
+                    height:32,
+                    style:'padding: 0;',
                     store: me.store,
                     items:[{
                         xtype:'checkbox',

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

@@ -143,6 +143,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
         var height = box.height;
         var width = box.width;
         var win = panel.add(Ext.create('Ext.window.Window', {   
+            cls:'x-window-dbfind', 
             trigger:f,
             belong:f.ownerCt,  
             modal:true,

frontend/saas-web/app/view/core/dbfind/types/WarehouseDbfindTrigger.js

@@ -107,13 +107,13 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
                             })
                             .then(function(localJson) {
                                 if(localJson.success){
-                                    saas.util.BaseUtil.showToast('操作成功');
+                                    saas.util.BaseUtil.showSuccessToast('操作成功');
                                     grid.store.load();
                                 }
                             })
                             .catch(function(res) {
                                 console.error(res);
-                                saas.util.BaseUtil.showToast('操作失败: ' + res.message);
+                                saas.util.BaseUtil.showErrorToast('操作失败: ' + res.message);
                             });
                         }
                     }]

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

@@ -36,12 +36,12 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
                             datas.push(o);
                         });
                     }else{
-                        saas.util.BaseUtil.showToast('下拉框读取数据为空！');
+                        saas.util.BaseUtil.showErrorToast('下拉框读取数据为空！');
                     }
                     me.datas = datas;
                 },
                 failure: function (response, opts) {
-                    saas.util.BaseUtil.showToast('上传失败: ' + response.responseText);
+                    saas.util.BaseUtil.showErrorToast('上传失败: ' + response.responseText);
                 }
             });
         }

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

@@ -95,12 +95,12 @@ Ext.define('saas.view.core.form.FormPanelController', {
                             var mainTab = Ext.getCmp('main-tab-panel');
                             mainTab.getActiveTab().close();
                             //解析参数
-                            saas.util.BaseUtil.showToast('删除成功');
+                            saas.util.BaseUtil.showSuccessToast('删除成功');
                         }
                     })
                     .catch(function(res) {
                         console.error(res);
-                        saas.util.BaseUtil.showToast('删除失败: ' + res.message);
+                        saas.util.BaseUtil.showErrorToast('删除失败: ' + res.message);
                     });
                 }
             });
@@ -113,7 +113,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
 
         var valid = form.isValid();
         if(!valid) {
-            saas.util.BaseUtil.showToast(form.invalidText);
+            saas.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
 
@@ -159,7 +159,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 var code = localJson.data.code;
                 form.initId = id;
                 saas.util.FormUtil.loadData(form);
-                saas.util.BaseUtil.showToast('保存成功');
+                saas.util.BaseUtil.showSuccessToast('保存成功');
 
                 var newId = form.xtype + '-' + id;
                 var newTitle = form._title + '(' + code + ')';
@@ -171,7 +171,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('保存失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
             form.fireEvent('aftersave', false, form, res);
         });
     },
@@ -197,7 +197,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var valid = form.isValid();
 
         if(!valid) {
-            saas.util.BaseUtil.showToast(form.invalidText);
+            saas.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
 
@@ -252,7 +252,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 }
                 saas.util.FormUtil.loadData(form);
                 form.setEditable(false);
-                saas.util.BaseUtil.showToast('审核成功' + (localJson.message ? ': ' + localJson.message : ''));
+                saas.util.BaseUtil.showSuccessToast('审核成功' + (localJson.message ? ': ' + localJson.message : ''));
                 form.fireEvent('afteraudit', true, form, localJson);
             }
         })
@@ -270,7 +270,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 saas.util.BaseUtil.refreshTabTitle(newId, newTitle);
                 saas.util.FormUtil.loadData(form);
             }
-            saas.util.BaseUtil.showToast('审核失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('审核失败: ' + res.message);
             form.fireEvent('afteraudit', false, form, res);
         });
     },
@@ -305,13 +305,13 @@ Ext.define('saas.view.core.form.FormPanelController', {
         .then(function(localJson) {
             if(localJson.success){
                 //解析参数
-                saas.util.BaseUtil.showToast('反审核成功');
+                saas.util.BaseUtil.showSuccessToast('反审核成功');
                 saas.util.FormUtil.loadData(form);
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('反审核失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('反审核失败: ' + res.message);
         });
     },
 

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

@@ -295,12 +295,12 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                         store.remove(selectedRecord);
                         me.fireEvent('validChange');
                         //解析参数
-                        saas.util.BaseUtil.showToast('删除成功');
+                        saas.util.BaseUtil.showSuccessToast('删除成功');
                     })
                     .catch(function() {
                         me.fireEvent('validChange');
                         //失败
-                        saas.util.BaseUtil.showToast('删除失败');
+                        saas.util.BaseUtil.showErrorToast('删除失败');
                     });
                 }else {
                     throw new Error();

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

@@ -81,13 +81,13 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                         exception: function(proxy, response, operation, eOpts) {
                             if(operation.success) {
                                 if(response.timedout) {
-                                    saas.util.BaseUtil.showToast('请求超时');
+                                    saas.util.BaseUtil.showErrorToast('请求超时');
                                 }
                             }else {
                                 if(response.timedout) {
-                                    saas.util.BaseUtil.showToast('请求超时');
+                                    saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
-                                    saas.util.BaseUtil.showToast('查询失败：' + response.responseJson.message);
+                                    saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson.message);
                                 }
                             }
                         }
@@ -359,7 +359,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             }
         })
         .catch(function(res) {
-            saas.util.BaseUtil.showToast('导出失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('导出失败: ' + res.message);
         });
     },
     onCloseOrder:function(me){
@@ -378,7 +378,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 }
             });
         }else{
-            saas.util.BaseUtil.showToast('请勾选至少一条明细。');
+            saas.util.BaseUtil.showErrorToast('请勾选至少一条明细。');
         }
     },
     vastOperation :function(type){
@@ -394,18 +394,18 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             })
             .then(function(res) {
                 if(res.data){
-                    saas.util.BaseUtil.showToast(res.data);
+                    saas.util.BaseUtil.showSuccessToast(res.data);
                 }else{
-                    saas.util.BaseUtil.showToast('操作成功');
+                    saas.util.BaseUtil.showSuccessToast('操作成功');
                 }
                 me.getStore().loadPage(1);
             })
             .catch(function(res) {
                 console.error(res);
-                saas.util.BaseUtil.showToast('操作失败: ' + res.message);
+                saas.util.BaseUtil.showErrorToast('操作失败: ' + res.message);
             });
         }else{
-            saas.util.BaseUtil.showToast('请勾选至少一条明细。');
+            saas.util.BaseUtil.showErrorToast('请勾选至少一条明细。');
         }
     },
     /** */

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -199,11 +199,11 @@ Ext.define('saas.view.core.report.ReportPanel', {
                     exception: function(proxy, response, operation, eOpts) {
                         if(operation.success) {
                             if(response.timedout) {
-                                saas.util.BaseUtil.showToast('请求超时');
+                                saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
                             console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showToast('请求错误：' + response.responseJson);
+                            saas.util.BaseUtil.showErrorToast('请求错误：' + response.responseJson);
                         }
                     }
                 }

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

@@ -7,28 +7,46 @@ Ext.define('saas.view.document.bom.BasePanel', {
 
     deleteMoreMsg: '删除的BOM资料将不能恢复，请确认是否删除？',
     deleteOneMsg: '删除的BOM资料将不能恢复，请确认是否删除？',
-    searchField:[{ 
+    searchField:[{
         xtype : "textfield", 
         name : "bo_mothercode", 
-        emptyText : "产品编号", 
-        width:120
+        width:150, 
+        emptyText:'产品编号或名称',
+        getCondition: function(value) {
+           return  ' (bo_mothername like\'%' + value + '%\'' 
+                +' or bo_mothercode like \'%'+value+'%\' ) ';
+        }
     },{
-        xtype : "textfield", 
-        name : "bo_mothername", 
-        emptyText : "产品名称", 
-        width:120
-    },{
-        xtype : "textfield", 
-        name : "bo_status", 
-        emptyText : "产品状态",    
-        width:100
+        xtype: 'combobox',
+        name: 'bo_statuscode',
+        queryMode: 'local',
+        displayField: 'bo_status',
+        valueField: 'bo_statuscode',
+        emptyText :'状态',
+        editable:false,
+        width:90,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['bo_statuscode', 'bo_status'],
+        data: [
+            ["ALL", "全部"],
+            ["OPEN", "已开启"],
+            ["CLOSE", "已关闭"]
+        ]
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL'||value==null) {
+                return '1=1';
+            }else {
+                return 'bo_statuscode=\'' + value + '\'';
+            }
+        }
+    
     }],
 
     //字段属性
     _formXtype:'document-bom-formpanel',
     _title:'BOM资料',
     _deleteUrl:'/api/document/bom/delete/',
-    // _dataUrl:'/api/ducument/customer/list',
     _batchOpenUrl:'/api/document/bom/batchOpen',
     _batchCloseUrl:'/api/document/bom/batchClose',
     _batchDeleteUrl:'/api/document/bom/batchDelete',

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

@@ -86,12 +86,12 @@ Ext.define('saas.view.document.bom.FormController', {
                 form.initId = localJson.data.id;
                 saas.util.FormUtil.loadData(form);
                 //viewModel.set('base.editable', false);
-                saas.util.BaseUtil.showToast('启用成功');
+                saas.util.BaseUtil.showSuccessToast('启用成功');
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('启用失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('启用失败: ' + res.message);
         });
     },
     unAudit: function() {
@@ -109,11 +109,11 @@ Ext.define('saas.view.document.bom.FormController', {
                 form.initId = localJson.data.id;
                 saas.util.FormUtil.loadData(form);
                 // viewModel.set('base.editable', false);
-                saas.util.BaseUtil.showToast('关闭成功');
+                saas.util.BaseUtil.showSuccessToast('关闭成功');
             }
         })
         .catch(function(res) {
-            saas.util.BaseUtil.showToast('关闭失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('关闭失败: ' + res.message);
         });
     }
 });

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

@@ -102,7 +102,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                 allowBlank:false,
                 text : "物料编号", 
                 dataIndex : "bd_soncode", 
-                width : 160, 
+                width : 150, 
                 editor : {
                     displayField : "display", 
                     editable : true, 
@@ -127,7 +127,8 @@ Ext.define('saas.view.document.bom.FormPanel', {
                 hidden: true,
             }, {
                 text : "物料名称", 
-                dataIndex : "pr_detail",
+                dataIndex : "pr_detail", 
+                width : 200,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -137,7 +138,8 @@ Ext.define('saas.view.document.bom.FormPanel', {
                 }
             }, {
                 text : "物料规格", 
-                dataIndex : "pr_spec",
+                dataIndex : "pr_spec", 
+                width : 150,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -148,10 +150,12 @@ Ext.define('saas.view.document.bom.FormPanel', {
             }, {
                 text : "单位", 
                 dataIndex : "bd_unit", 
+                width : 80 
             },
             {
                 allowBlank:false,
                 text : "用量", 
+                width : 80, 
                 dataIndex : "bd_baseqty",
                 editor : {
                     xtype : "numberfield",
@@ -167,6 +171,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
             }, {
                 text : "替代料", 
                 dataIndex : "bd_replace", 
+                width : 250, 
                 editor : {
                     displayField : "display", 
                     editable : true, 

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

@@ -9,56 +9,21 @@ Ext.define('saas.view.document.customer.BasePanel', {
     deleteOneMsg: '删除的客户资料将不能恢复，请确认是否删除？',
 
     searchField:[{
-        xtype:'customerDbfindTrigger',
-        name : "cu_code", 
-        emptyText : "客户编号", 
-        width:140,
-    },{
         xtype : "textfield", 
         name : "cu_name", 
-        emptyText : "客户名称", 
-        width:140,
+        width:150, 
+        emptyText:'客户编号或名称',
+        getCondition: function(value) {
+           return  ' (cu_code like\'%' + value + '%\'' 
+                +' or cu_name like \'%'+value+'%\' ) ';
+        }
     },{
         xtype : "remotecombo", 
         storeUrl:'/api/document/customerkind/getCombo',
         name : "cu_type", 
-        emptyText : "客户类型", 
-        width:140,
+        emptyText : "类型", 
+        width:110,
         hiddenBtn:true
-    },{
-        xtype : "textfield", 
-        name : "cu_sellername", 
-        emptyText : "业务员", 
-        width:120,
-    },{
-        xtype : "textfield", 
-        name : "cu_promisedays", 
-        emptyText : "承付天数", 
-        width:120,
-        getCondition: function(value) {
-            if(value.indexOf("=")>=0||value.indexOf("<")>=0||value.indexOf(">")>=0){
-                return ' cu_promisedays ' + value;
-            }else if(value){
-                return ' cu_promisedays = ' + value;
-            }else{
-                return '1=1';
-            }
-        }
-    },{
-        xtype : "textfield", 
-        name : "cu_credit", 
-        emptyText : "额度", 
-        width:70,
-        dataIndex : "cu_credit",
-        getCondition: function(value) {
-            if(value.indexOf("=")>=0||value.indexOf("<")>=0||value.indexOf(">")>=0){
-                return ' cu_credit ' + value;
-            }else if(value){
-                return ' cu_credit = ' + value;
-            }else{
-                return '1=1';
-            }
-        }
     },{
         xtype: 'combobox',
         name: 'cu_statuscode',
@@ -67,7 +32,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
         valueField: 'cu_statuscode',
         emptyText :'状态',
         editable:false,
-        width:100,
+        width:90,
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['cu_statuscode', 'cu_status'],
         data: [
@@ -83,6 +48,11 @@ Ext.define('saas.view.document.customer.BasePanel', {
                 return 'cu_statuscode=\'' + value + '\'';
             }
         }
+    },{
+        xtype : "textfield", 
+        name : "cu_sellername", 
+        emptyText : "业务员", 
+        width:110
     }],
 
     //字段属性
@@ -106,73 +76,55 @@ Ext.define('saas.view.document.customer.BasePanel', {
             xtype : "numbercolumn", 
         },{
             text : "客户编号", 
-            width : 200.0, 
+            width : 150.0, 
             dataIndex : "cu_code"
         }, 
         {
             text : "客户名称", 
+            width : 250.0, 
             dataIndex : "cu_name"
-        }, 
-        {
-            text : "客户UU", 
-            dataIndex : "cu_uu"
-        }, 
-        {
+        }, {
+            text : "状态", 
+            dataIndex : "cu_status", 
+            width : 90.0
+        }, {
             text : "类型", 
-            dataIndex : "cu_type" 
-        }, 
-        {
-            text : "业务员编号", 
-            dataIndex : "cu_sellercode"
-        }, 
-        {
-            text : "业务员", 
-            dataIndex : "cu_sellername"
-        },{
+            dataIndex : "cu_type", 
+            width : 110.0
+        }, {
             text : "税率", 
             dataIndex : "cu_taxrate", 
-            xtype: 'numbercolumn'
-        }, {
-            text: '应收款余额',
-            dataIndex: 'cu_leftamount',
-            width: 120,
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn', 
+            width : 110.0, 
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
-            text : "承付天数", 
+            text : "结算天数", 
             xtype: 'numbercolumn',
             dataIndex : "cu_promisedays", 
             renderer : function(v) {
                 return Ext.util.Format.number(v, '0');
             }
-        }, 
-        {
-            text : "额度", 
+        }, {
+            text: '应收余额',
             xtype: 'numbercolumn',
-            dataIndex : "cu_credit", 
+            dataIndex: 'cu_leftamount',
+            width: 120,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text : "客户状态", 
-            dataIndex : "cu_status", 
-        }, 
-        {
-            text : "客户状态码", 
-            dataIndex : "cu_statuscode", 
-            hidden:true
-        }, 
-        {
-            text : "默认客户地址", 
-            dataIndex : "ca_address", 
-            hidden:true
-        }, 
-        {
-            text : "默认客户联系人", 
-            dataIndex : "cc_name", 
-            hidden:true
+            text : "业务员", 
+            dataIndex : "cu_sellername",
+            width: 110
+        }, {
+            text : "备注", 
+            dataIndex : "cu_text1",
+            width: 250
         }]
     },
 

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

@@ -28,7 +28,7 @@ Ext.define('saas.view.document.customer.FormController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                saas.util.BaseUtil.showToast('启用成功');
+                saas.util.BaseUtil.showSuccessToast('启用成功');
                 form.initId = localJson.data.id;
                 saas.util.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
@@ -36,7 +36,7 @@ Ext.define('saas.view.document.customer.FormController', {
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('启用失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('启用失败: ' + res.message);
         });
     },
     unAudit: function() {
@@ -54,11 +54,11 @@ Ext.define('saas.view.document.customer.FormController', {
                 form.initId = localJson.data.id;
                 saas.util.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
-                saas.util.BaseUtil.showToast('禁用成功');
+                saas.util.BaseUtil.showSuccessToast('禁用成功');
             }
         })
         .catch(function(res) {
-            saas.util.BaseUtil.showToast('禁用失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('禁用失败: ' + res.message);
         });
     }
 });

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

@@ -213,6 +213,11 @@ Ext.define('saas.view.document.customer.FormPanel', {
         allowBlank : true, 
         hidden:true,
         columnWidth : 0
+    },{
+        fieldLabel : "备注", 
+        xtype:'textfield',
+        name : "cu_text1",
+        columnWidth : 0.75
     }, {
         xtype : "detailGridField", 
         storeModel:'saas.model.document.customercontact',
@@ -239,8 +244,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "cc_name", 
-                xtype : "", 
-                items : null
+                width:110  
             },
             {
                 allowBlank:false,
@@ -250,8 +254,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "cc_tel", 
-                xtype : "", 
-                items : null
+                width:110 
             },
             {
                 allowBlank:true,
@@ -260,8 +263,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "cc_qq", 
-                xtype : "", 
-                items : null
+                width:110 
             },
             {
                 text : "邮箱", 
@@ -269,8 +271,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "cc_email", 
-                xtype : "", 
-                items : null
+                width:180 
             },
             {
                 editor : {
@@ -306,7 +307,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     }
                 }, 
                 text : "默认联系人", 
-                width : 200.0, 
+                width:110 ,
                 dataIndex : "cc_default", 
                 xtype : "",
                 renderer: function (v, m, r) {
@@ -344,8 +345,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "ca_address", 
-                xtype : "", 
-                items : null
+                width:110 
             },  
             {
                 allowBlank:true,
@@ -354,8 +354,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "ca_person", 
-                xtype : "", 
-                items : null   
+                width:110   
             },
             {
                 allowBlank:true,
@@ -365,8 +364,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     hideTrigger:true,
                 },
                 dataIndex : "ca_phone", 
-                xtype : "", 
-                items : null   
+                width:110  
             },
             {
                 editor : {
@@ -403,7 +401,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 }, 
                 text : "默认地址", 
                 dataIndex : "ca_default", 
-                xtype : "",
+                width:110,
                 renderer: function (v, m, r) {
                     if(v=='0'){
                         return '';

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

@@ -4,6 +4,7 @@
 Ext.define('KitchenSink.view.binding.ChildForm', {
     extend: 'Ext.window.Window',
     xtype: 'document-kind-childwin',
+    cls:'x-window-dbfind',
     layout: 'fit',
     modal: true,
     width: 500,
@@ -489,14 +490,14 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                         typeof combo.setValue == 'function' && combo.setValue(params._value);
                     });
                 }
-                saas.util.BaseUtil.showToast('保存成功');
+                saas.util.BaseUtil.showSuccessToast('保存成功');
                 form.ownerCt.close();
             }
         })
         .catch(function(res) {
             me.setLoading(false);
             console.error(res);
-            saas.util.BaseUtil.showToast('保存失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
         });
     },
     onCancel:function(){
@@ -529,7 +530,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         o = o.substring(0,o.length-1);
 
         if(o==""){
-            saas.util.BaseUtil.showToast('关联角色未选择，无法保存！')
+            saas.util.BaseUtil.showErrorToast('关联角色未选择，无法保存！')
         }
 
         var _params = {
@@ -550,7 +551,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         .then(function(localJson) {
             me.setLoading(false);
             if(localJson.success){
-                saas.util.BaseUtil.showToast('保存成功');
+                saas.util.BaseUtil.showSuccessToast('保存成功');
                 form.ownerCt._parent.store.load()
                 form.ownerCt.close();
             }
@@ -558,7 +559,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         .catch(function(res) {
             me.setLoading(false);
             console.error(res);
-            saas.util.BaseUtil.showToast('保存失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
         });
     }
 });

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

@@ -201,25 +201,22 @@ Ext.define('saas.view.document.kind.Kind', {
             columns: [{
                 text : "单据名称", 
                 width : 200.0, 
-                dataIndex : "mn_caller", 
-                xtype : "", 
+                dataIndex : "mn_caller" 
             }, 
             {
                 text : "单据前缀", 
                 dataIndex : "mn_leadcode", 
-                width : 120.0, 
-                xtype : "", 
+                width : 150.0
             }, 
             {
                 text : "单据规则", 
                 dataIndex : "mn_rule", 
-                width : 220.0, 
-                xtype : "", 
+                width : 250.0
             },{
                 text : "流水长度", 
                 dataIndex : "mn_number", 
-                width : 120.0, 
-                xtype : "", 
+                width : 90.0,
+                xtype: 'numbercolumn',
             }],
             keyField:'id',
             reqUrl:'/api/commons/number/save'
@@ -228,7 +225,7 @@ Ext.define('saas.view.document.kind.Kind', {
             columns: [ {
                 text : "编号", 
                 dataIndex : "code", 
-                width : 120.0, 
+                width : 150.0, 
                 xtype : "", 
             },{
                 text : "角色名称", 
@@ -239,8 +236,7 @@ Ext.define('saas.view.document.kind.Kind', {
             {
                 text : "角色描述", 
                 dataIndex : "description", 
-                width : 120.0, 
-                xtype : "", 
+                width : 250.0
             }
            ],
             keyField:'id',
@@ -252,30 +248,33 @@ Ext.define('saas.view.document.kind.Kind', {
                 dataIndex:'accountId',
             },{
                 dataIndex: 'roleNames',
+                width: 150
             },{
                 dataIndex: 'mobile',
+                width: 110
             },{
                 dataIndex: 'email',
+                width: 110
             }],
             reqUrl:'/api/account/account/bind/roles',
         },
         employee:{
             columns: [{
-                text: '人员编号',
+                text: '人员编号1',
                 dataIndex: 'em_code',
-                width: 200
+                width: 150
             },{
                 text: '人员名称',
                 dataIndex: 'em_name',
-                width: 200
+                width: 110
             },{
                 text: '联系电话',
                 dataIndex: 'em_mobile',
-                width: 200
+                width: 110
             },{  
                 text: '邮箱',
                 dataIndex: 'em_email',
-                width: 200
+                width: 180
             },{
                 text: '人员状态',
                 dataIndex: 'em_class',
@@ -304,13 +303,13 @@ Ext.define('saas.view.document.kind.Kind', {
                         })
                         .then(function(localJson) {
                             if(localJson.success){
-                                saas.util.BaseUtil.showToast('操作成功');
+                                saas.util.BaseUtil.showSuccessToast('操作成功');
                                 grid.store.load();
                             }
                         })
                         .catch(function(res) {
                             console.error(res);
-                            saas.util.BaseUtil.showToast('操作失败: ' + res.message);
+                            saas.util.BaseUtil.showErrorToast('操作失败: ' + res.message);
                         });
                     }
                 }]
@@ -323,7 +322,7 @@ Ext.define('saas.view.document.kind.Kind', {
             columns: [{
                 text: '编号',
                 dataIndex: 'wh_code',
-                width: 200
+                width: 150
             },{
                 text: '仓库名称',
                 dataIndex: 'wh_description',
@@ -331,7 +330,7 @@ Ext.define('saas.view.document.kind.Kind', {
             },{
                 text: '类型',
                 dataIndex: 'wh_type',
-                width: 200
+                width: 110
             },{  
                 text: '仓库状态码',
                 dataIndex: 'wh_status',
@@ -364,13 +363,13 @@ Ext.define('saas.view.document.kind.Kind', {
                         })
                         .then(function(localJson) {
                             if(localJson.success){
-                                saas.util.BaseUtil.showToast('操作成功');
+                                saas.util.BaseUtil.showSuccessToast('操作成功');
                                 grid.store.load();
                             }
                         })
                         .catch(function(res) {
                             console.error(res);
-                            saas.util.BaseUtil.showToast('操作失败: ' + res.message);
+                            saas.util.BaseUtil.showErrorToast('操作失败: ' + res.message);
                         });
                     }
                 }]

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

@@ -31,6 +31,7 @@ Ext.define('saas.view.document.kind.KindController', {
         grid.reconfigure(store, columns);
         if(store) store.reload();
         vm.set('title', button.typeText);
+        grid.ownerCt.ownerCt.setTitle(button.typeText+'查询');
     },
     onAdd:function(b){
         var dk = b.ownerCt.ownerCt;
@@ -84,13 +85,13 @@ Ext.define('saas.view.document.kind.KindController', {
                 })
                 .then(function(localJson) {
                     if(localJson.success){
-                        saas.util.BaseUtil.showToast('删除成功');
+                        saas.util.BaseUtil.showSuccessToast('删除成功');
                         grid.store.load();
                     }
                 })
                 .catch(function(res) {
                     console.error(res);
-                    saas.util.BaseUtil.showToast('删除失败: ' + res.message);
+                    saas.util.BaseUtil.showErrorToast('删除失败: ' + res.message);
                 });
             }
         });

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

@@ -9,38 +9,22 @@ Ext.define('saas.view.document.product.BasePanel', {
     deleteOneMsg: '删除的物料将不能恢复，请确认是否删除？',
 
     searchField:[{
-        xtype : "productDbfindTrigger", 
-        name : "pr_code", 
-        emptyText : "物料编号", 
-        width:120
-    },{ 
         xtype : "textfield", 
         name : "pr_detail", 
-        emptyText : "物料名称", 
-        width:120
-    },{
-        xtype : "textfield", 
-        name : "pr_spec", 
-        emptyText : "规格",    
-        width:100
-    },{
+        width:150, 
+        emptyText:'物料编号或名称',
+        getCondition: function(value) {
+           return  ' (pr_code like\'%' + value + '%\'' 
+                +' or pr_detail like \'%'+value+'%\' ) ';
+        }
+    }, {
         editable:false,
         hiddenBtn:true,
         xtype : "remotecombo", 
         storeUrl: '/api/document/producttype/getCombo',
         name : "pr_kind", 
-        emptyText : "物料类型",
-        width:120
-    },{
-        xtype : "textfield", 
-        name : "pr_brand", 
-        emptyText : "品牌", 
-        width:100
-    },{
-        xtype : "textfield", 
-        name : "pr_orispeccode", 
-        emptyText : "型号", 
-        width:100
+        emptyText : "类型",
+        width:110
     }, {
         xtype: 'combobox',
         name: 'pr_statuscode',
@@ -48,7 +32,7 @@ Ext.define('saas.view.document.product.BasePanel', {
         displayField: 'pr_status',
         valueField: 'pr_statuscode',
         emptyText :'状态',
-        width:100,
+        width:90,
         editable:false,
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['pr_statuscode', 'pr_status'],
@@ -65,6 +49,11 @@ Ext.define('saas.view.document.product.BasePanel', {
                 return 'pr_statuscode=\'' + value + '\'';
             }
         }
+    }, {
+        xtype : "textfield", 
+        name : "pr_brand", 
+        emptyText : "品牌", 
+        width:110
     }],
 
     //字段属性
@@ -87,25 +76,33 @@ Ext.define('saas.view.document.product.BasePanel', {
             xtype : "numbercolumn", 
         },{
             text : "物料编号", 
-            width : 200.0, 
-            dataIndex : "pr_code"
+            dataIndex : "pr_code", 
+            width : 150.0
         }, {
             text : "物料名称", 
             dataIndex : "pr_detail", 
-            width : 120.0
+            width : 200.0
         }, {
             text : "规格", 
-            dataIndex : "pr_spec"
+            dataIndex : "pr_spec", 
+            width : 150.0
         }, {
             text : "类型", 
-            dataIndex : "pr_kind"
+            dataIndex : "pr_kind", 
+            width : 110.0
         }, {
             text : "单位", 
-            dataIndex : "pr_unit"
+            dataIndex : "pr_unit", 
+            width : 80.0 
         }, {
-            text : "总库存数", 
+            text : "品牌", 
+            dataIndex : "pr_brand", 
+            width : 110.0 
+        }, {
+            text : "总库存", 
             dataIndex : "po_onhand",
             xtype: 'numbercolumn',
+            width : 110.0,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -116,6 +113,7 @@ Ext.define('saas.view.document.product.BasePanel', {
             text : "标准单价", 
             dataIndex : "pr_standardprice",
             xtype: 'numbercolumn',
+            width : 110.0,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
@@ -126,6 +124,7 @@ Ext.define('saas.view.document.product.BasePanel', {
             text : "最新采购单价", 
             dataIndex : "pr_purcprice",
             xtype: 'numbercolumn',
+            width : 110.0,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
@@ -134,9 +133,10 @@ Ext.define('saas.view.document.product.BasePanel', {
             }, 
             width : 200.0, 
         }, {
-            text : "最新出库单价", 
+            text : "最新出库价", 
             dataIndex : "pr_saleprice",
             xtype: 'numbercolumn',
+            width : 110.0,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
@@ -145,34 +145,13 @@ Ext.define('saas.view.document.product.BasePanel', {
             }, 
             width : 200.0, 
         }, {
-            text : "型号", 
-            dataIndex : "pr_orispeccode", 
-            width : 200.0, 
-        }, {
-            text : "品牌", 
-            dataIndex : "pr_brand", 
-            width : 150.0, 
-        }, {
-            text : "供应商", 
-            dataIndex : "pr_vendname", 
-            width : 150.0,
-        }, {
-            text : "最小包装", 
-            dataIndex : "pr_zxbzs",
-            xtype: 'numbercolumn',
-            renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
-            }
-        }, {
-            text : "L/T", 
-            dataIndex : "pr_leadtime",
-            xtype: 'numbercolumn',
-            renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
-            }
+            text : "备注", 
+            dataIndex : "pr_text1",
+            width :250.0
         }, {
             text : "状态", 
-            dataIndex : "pr_status"
+            dataIndex : "pr_status",
+            width : 90.0
         }]
     },
 

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

@@ -74,12 +74,12 @@ Ext.define('saas.view.document.product.FormController', {
                 form.initId = localJson.data.id;
                 saas.util.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
-                saas.util.BaseUtil.showToast('启用成功');
+                saas.util.BaseUtil.showSuccessToast('启用成功');
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('启用失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('启用失败: ' + res.message);
         });
     },
     unAudit: function() {
@@ -97,12 +97,12 @@ Ext.define('saas.view.document.product.FormController', {
                 form.initId = localJson.data.id;
                 saas.util.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
-                saas.util.BaseUtil.showToast('禁用成功');
+                saas.util.BaseUtil.showSuccessToast('禁用成功');
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('禁用失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('禁用失败: ' + res.message);
         });
     },
     amount_change:function() {

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

@@ -14,7 +14,6 @@ Ext.define('saas.view.document.product.FormPanel', {
     _statusField: 'pr_status',
     _statusCodeField: 'pr_statuscode',
     _readUrl:'/api/document/product/read/',
-    //_saveUrl:'/api/document/product/save',
     _saveUrl:'/api/document/product/save',
     _openUrl:'/api/document/product/open',
     _closeUrl:'/api/document/product/close',
@@ -203,6 +202,11 @@ Ext.define('saas.view.document.product.FormPanel', {
         name: 'pr_leadtime',
         minValue: 0,
         maxLength: 10
+    },{
+        xtype : "textfield", 
+        name : "pr_text1", 
+        fieldLabel : "备注",
+        columnWidth: 1
     }, {
         xtype: 'checkbox',
         fieldLabel: '期初设置',
@@ -234,9 +238,8 @@ Ext.define('saas.view.document.product.FormPanel', {
             dataIndex : "pd_whcode", 
             editor : {
                 xtype : "warehouseDbfindTrigger"
-            },
-            xtype : "", 
-            items : null
+            }, 
+            width : 150
         },
         {
             allowBlank:true,
@@ -244,7 +247,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             editable:false,
             text : "仓库名称", 
             dataIndex : "pd_whname", 
-            xtype : "", 
+            width : 200
         },{
             allowBlank:true,
             hidden:true,
@@ -257,7 +260,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             text : "期初数量", 
             dataIndex : "pd_num", 
             xtype: 'numbercolumn',
-            width : 120.0,
+            width : 110.0,
             allowBlank : false,
             editor : {
                 xtype : "numberfield",
@@ -286,7 +289,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             dataIndex : "pd_price", 
             allowBlank:false,
             xtype: 'numbercolumn',
-            width : 120.0,
+            width : 110.0,
             allowBlank : false,
             editor : {
                 xtype : "numberfield",
@@ -314,7 +317,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             text : "期初总价", 
             dataIndex : "pd_amount", 
             xtype: 'numbercolumn',
-            width : 120.0,
+            width : 110.0,
             allowBlank : true,
             renderer : function(v) {
                 var arr = (v + '.').split('.');

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

@@ -8,36 +8,21 @@ Ext.define('saas.view.document.vendor.BasePanel', {
     deleteOneMsg: '删除的供应商资料将不能恢复，请确认是否删除？',
 
     searchField:[{
-        xtype : "vendorDbfindTrigger", 
-        name : "ve_code", 
-        emptyText : "供应商编号", 
-        width:140,
-    },{
         xtype : "textfield", 
         name : "ve_name", 
-        emptyText : "供应商名称", 
-        width:140,
+        width:150, 
+        emptyText:'供应商编号或名称',
+        getCondition: function(value) {
+           return  ' (ve_code like\'%' + value + '%\'' 
+                +' or ve_name like \'%'+value+'%\' ) ';
+        }
     },{
         xtype : "remotecombo", 
         storeUrl:'/api/document/vendorkind/getCombo',
         name : "ve_type", 
-        emptyText : "供应商类型", 
-        width:140,
+        emptyText : "类别", 
+        width:110,
         hiddenBtn:true
-    },{
-        xtype : "textfield", 
-        name : "ve_promisedays", 
-        emptyText : "承付天数", 
-        width:120,
-        getCondition: function(value) {
-            if(value.indexOf("=")>=0||value.indexOf("<")>=0||value.indexOf(">")>=0){
-                return ' ve_promisedays '+value;
-            }else if(value){
-                return ' ve_promisedays = '+value;
-            }else{
-                return '1=1';
-            }
-        } 
     },{
         xtype: 'combobox',
         name: 've_statuscode',
@@ -45,7 +30,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         displayField: 've_status',
         valueField: 've_statuscode',
         emptyText :'状态',
-        width:100,
+        width:90,
         editable:false,
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['ve_statuscode', 've_status'],
@@ -67,7 +52,6 @@ Ext.define('saas.view.document.vendor.BasePanel', {
     //字段属性
     _formXtype:'document-vendor-formpanel',
     _title:'供应商资料',
-    // _dataUrl:'/api/ducument/vendor/list',
     _deleteUrl:'/api/document/vendor/delete/',
     _batchOpenUrl:'/api/document/vendor/batchOpen',
     _batchCloseUrl:'/api/document/vendor/batchClose',
@@ -85,65 +69,39 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             xtype : "numbercolumn", 
         },{
             text : "供应商编号", 
-            width : 200.0, 
-            dataIndex : "ve_code", 
-            xtype : "", 
-        }, 
-        {
+            width : 150.0, 
+            dataIndex : "ve_code" 
+        }, {
             text : "供应商名称", 
             dataIndex : "ve_name", 
-            width : 120.0, 
-            xtype : "", 
-        }, 
-        {
+            width : 250.0
+        }, {
+            text : "状态", 
+            dataIndex : "ve_status", 
+            width : 90.0
+        }, {
             text : "类型", 
             dataIndex : "ve_type", 
-            width : 120.0, 
-            xtype : "", 
-        }, 
-        {
-            text : "供应商状态码", 
-            dataIndex : "ve_statuscode", 
-            width : 0, 
-            xtype : ""
-        },               
-        {
+            width : 110.0 
+        }, {
             text : "税率", 
+            xtype: 'numbercolumn', 
             dataIndex : "ve_taxrate", 
-            width : 120.0, 
-            xtype : "",
-            align:'end'
+            width : 80.0, 
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
-            text : "承付天数", 
+            text : "结算天数", 
             xtype: 'numbercolumn',
             dataIndex : "ve_promisedays", 
-            width : 120.0, 
-            align:'end', 
+            width : 110.0, 
             renderer : function(v) {
                 return Ext.util.Format.number(v, '0');
             }
-        }, {
-            text : "纳税人识别号", 
-            dataIndex : "ve_nsrzh", 
-            width : 120.0, 
-            xtype : ""
-        }, {
-            text : "开户银行", 
-            dataIndex : "ve_bankcode", 
-            width : 120.0, 
-            xtype : ""
-        }, {
-            text : "银行账户", 
-            dataIndex : "ve_bankaccount", 
-            width : 120.0, 
-            xtype : ""
-        }, {
-            text : "状态", 
-            dataIndex : "ve_status", 
-            width : 120.0, 
-            xtype : ""
         },{
-            text: '应收款余额',
+            text: '应付余额',
+            xtype: 'numbercolumn',
             dataIndex : 've_leftamount',
             width : 120,
             renderer : function(v) {
@@ -151,7 +109,11 @@ Ext.define('saas.view.document.vendor.BasePanel', {
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
-            },
+            }
+        }, {
+            text : "备注", 
+            dataIndex : "ve_text1", 
+            width : 250.0
         }]
     },
 

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

@@ -30,12 +30,12 @@ Ext.define('saas.view.document.vendor.FormController', {
                 form.initId = localJson.data.id;
                 saas.util.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
-                saas.util.BaseUtil.showToast('启用成功');
+                saas.util.BaseUtil.showSuccessToast('启用成功');
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('启用失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('启用失败: ' + res.message);
         });
     },
     unAudit: function() {
@@ -53,12 +53,12 @@ Ext.define('saas.view.document.vendor.FormController', {
                 form.initId = localJson.data.id;
                 saas.util.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
-                saas.util.BaseUtil.showToast('禁用成功');
+                saas.util.BaseUtil.showSuccessToast('禁用成功');
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('禁用失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('禁用失败: ' + res.message);
         });
     }
 });

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

@@ -188,6 +188,11 @@ Ext.define('saas.view.document.vendor.FormPanel', {
             var format = '0.' + xr.join();
             return Ext.util.Format.number(v, format);
         },  
+    },{
+        fieldLabel : "备注", 
+        xtype:'textfield',
+        name : "ve_text1",
+        columnWidth : 1
     }, {
         xtype : "detailGridField", 
         storeModel:'saas.model.document.vendorcontact',
@@ -214,7 +219,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "vc_name", 
-                xtype : "", 
+                width:110
             },
             {
                 allowBlank:false,
@@ -224,7 +229,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "vc_tel", 
-                xtype : "", 
+                width:110 
             },
             {
                 allowBlank:true,
@@ -233,7 +238,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "vc_qq", 
-                xtype : "", 
+                width:110
             },
             {
                 text : "邮箱", 
@@ -241,7 +246,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "vc_email", 
-                xtype : "", 
+                width:180
             },
             {
                 editor : {

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

@@ -314,3 +314,53 @@ body > .x-mask {
     overflow: hidden;
     white-space: nowrap;
 }
+
+.x-toast-success{
+    border-color: #adeaa4 !important;
+    border-radius: 4px !important;
+    .x-window-body{
+        background: #f3ffef !important;
+        border-color: #f3ffef !important;
+    }
+    .x-autocontainer-innerCt{
+        color: #3ec12a;
+        padding: 4px 30px 4px 46px !important;
+    }
+    .x-autocontainer-innerCt::before{
+        margin-left: -19px;
+        margin-top: 1px;
+        content: ' ';
+        width: 16px;
+        position: absolute;
+        display: block;
+        height: 16px;
+        background: url(../../../../resources/images/default/toast_over.png) 0 0 no-repeat; 
+        background-size: 16px 16px;
+        background-position: center;
+    }
+}
+
+.x-toast-error{
+    border-color: #f39d70 !important;
+    border-radius: 4px !important;
+    .x-window-body{
+        background: #fdefcd !important;
+        border-color: #fdefcd !important;
+    }
+    .x-autocontainer-innerCt{
+        color: #ea800e;
+        padding: 4px 30px 4px 46px !important;
+    }
+    .x-autocontainer-innerCt::before{
+        margin-left: -19px;
+        margin-top: 1px;
+        content: ' ';
+        width: 16px;
+        position: absolute;
+        display: block;
+        height: 16px;
+        background: url(../../../../resources/images/default/toast_close.png) 0 0 no-repeat; 
+        background-size: 16px 16px;
+        background-position: center;
+    }
+}

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

@@ -51,7 +51,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 editor : {
                     xtype : "numberfield"
                 },
-                width : 120.0,
+                width : 110.0,
                 items : null,
                 hidden: true
             }, {
@@ -69,6 +69,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 xtype : "", 
                 items : null,
                 editor : {
+                    xtype : "bandinfoDbfindTrigger",
                     displayField : "display", 
                     editable : true, 
                     format : "", 
@@ -78,8 +79,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     positiveNum : false, 
                     queryMode : "local", 
                     store : null, 
-                    valueField : "value", 
-                    xtype : "bandinfoDbfindTrigger"
+                    valueField : "value"
                 }
             },{
                 text : "转出账户余额", 
@@ -115,11 +115,12 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
             },{
                 text : "转入账户余额", 
                 dataIndex : "bk_inthisamount", 
-                ignore:true
+                ignore:true,
+                width : 150.0
             }, {
                 text : "本次转出金额", 
                 xtype: 'numbercolumn',
-                dataIndex : "ftd_nowbalance", 
+                dataIndex : "ftd_nowbalance",
                 width : 150.0, 
                 editor : {
                     xtype : "numberfield",
@@ -140,7 +141,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 }
             }, {
                 text : "结算方式",
-                width : 150.0,
+                width : 110.0,
                 dataIndex : "ftd_paymethod",
                 editor : {
                     xtype:'combo',
@@ -164,14 +165,14 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
              {
                 text : "结算号",
                 dataIndex : "ftd_paycode",
-                width : 110,
+                width : 150,
                 editor:{
                     xtype: ''
                 }
             },{
                 text : "备注", 
                 dataIndex : "ftd_remark",
-                width : 120.0, 
+                width : 250.0, 
                 items : null,
                 editor : {
                     xtype : ""

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

@@ -8,18 +8,27 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     viewName: 'money-fundtransfer-querypanel',
     
     queryFormItems: [{
-        xtype : "textfield",
-        name : "ft_code",
-        fieldLabel : "单据编号",
+        xtype: 'textfield',
+        name:'ft_code',
+        fieldLabel: '单号',
+        emptyText:'请输入单号'
     },{
         xtype : "condatefield",
         name : "ft_date",
-        fieldLabel : "单据日期",
+        fieldLabel : "日期",
         columnWidth: 0.5
+    } ,{
+        xtype : "bandinfoDbfindTrigger",
+        name : "ftd_bankname",
+        fieldLabel : "转出账号",
+    },{
+        xtype : "bandinfoDbfindTrigger",
+        name : "ftd_inbankname",
+        fieldLabel : "转入账号",
     },{
         xtype: 'combobox',
         name: 'ft_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '单据状态',
         queryMode: 'local',
         displayField: 'ft_status',
         valueField: 'ft_statuscode',
@@ -41,20 +50,13 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             }
         }
     },{
-        xtype : "bandinfoDbfindTrigger",
-        name : "ftd_bankname",
-        fieldLabel : "转出账号",
-    },{
-        xtype : "bandinfoDbfindTrigger",
-        name : "ftd_inbankname",
-        fieldLabel : "转入账号",
-    },{
-        name : "ft_status",
+        name : "ftd_paymethod",
         fieldLabel : "结算方式",
         xtype:'combo',
         queryMode: 'local',
         displayField: 'display',
         valueField: 'value',
+        emptyText :'全部',
         store:Ext.create('Ext.data.Store', {
             fields: ['value', 'display'],
             data : [
@@ -66,16 +68,15 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
                 {value:"支付宝转账", display:"支付宝转账"},
                 {value:"微信转账", display:"微信转账"}
             ]
-        })
-    },{
-        xtype: 'textfield',
-        name: 'creatorName',
-        fieldLabel: '录入人'
-    },{
-        xtype : "textfield",
-        name : "ft_auditman",
-        fieldLabel : "审核人",
-    }],
+        }),
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'ftd_paymethod like \'%' + value + '\'%';
+            }
+        }
+    } ],
     moreQueryFormItems: [],
     queryGridConfig: {
         idField: 'id',
@@ -84,7 +85,6 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         addXtype: 'money-fundtransfer-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/money/fundtransfer/',
-        // baseVastUrl: 'http://192.168.253.35:8880/fundtransfer/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
@@ -92,37 +92,25 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         }, {
             text: '单据编号',
             dataIndex: 'ft_code',
-            width: 200
+            width: 150
         }, {
-            text: '单据日期',
+            text: '日期',
             dataIndex: 'ft_date',
             xtype: 'datecolumn',
-            width: 200
-        },{
-            text: '审核状态',
-            dataIndex: 'ft_status',
-            width: 120
-        }, {
-            text: '录入人',
-            dataIndex: 'ft_recorder',
-            width: 120
+            width: 110
         }, {
-            text: '审核人',
-            dataIndex: 'ft_auditman',
-            width: 120
-        },{
             text: '转出账户',
             dataIndex: 'ftd_bankname',
-            width: 120
-        }, {
+            width: 150
+        } , {
             text: '转入账户',
             dataIndex: 'ftd_inbankname',
-            width: 120
+            width: 150
         }, {
             text: '金额',
             xtype: 'numbercolumn',
             dataIndex: 'ftd_nowbalance',
-            width: 120,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -132,16 +120,28 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         }, {
             text: '结算方式',
             dataIndex: 'ftd_paymethod',
-            width: 120
+            width: 150
         }, {
             text: '结算号',
             dataIndex: 'ftd_paycode',
-            width: 120
+            width: 0
+        },{
+            text: '审核状态',
+            dataIndex: 'ft_status',
+            width: 90
+        }, {
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width: 110
+        }, {
+            text: '审核人',
+            dataIndex: 'ft_auditman',
+            width: 110
         }, {
             text: '备注',
             dataIndex: 'ft_remark',
             width: 250
-        }],
+        } ],
         relativeColumn: []
     }
 });

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

@@ -79,12 +79,12 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                     readOnly: true
                 },
                 // defaultValue: Ext.Date.format(new Date(), 'Ym'),
-                width : 120.0,
+                width : 110.0,
                 hidden: true,
                 items : null
             }, {
                 text : "收入类别", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "ord_type",
                 items : null,
                 hiddenBtn:false,//true 则会关闭新增按钮功能
@@ -113,7 +113,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 text : "金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "ord_nowbalance", 
-                width : 120.0, 
+                width : 110.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2
@@ -134,7 +134,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
             }, {
                 text : "备注", 
                 dataIndex : "ord_remark",
-                width : 220, 
+                width : 250, 
                 editor : {
                     xtype : "textarea"
                 }

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

@@ -50,7 +50,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
 
         var valid = form.isValid();
         if(!valid) {
-            saas.util.BaseUtil.showToast(form.invalidText);
+            saas.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
 

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

@@ -7,54 +7,50 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
 
     viewName: 'money-othreceipts-querypanel',
     
-    queryFormItems: [{
-        xtype: 'hidden',
-        name: 'or_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    }, {
-        xtype : 'hidden',
-        name : 'or_custid', 
-        fieldLabel : '客户ID'
-   }, {
+    queryFormItems: [ {
         xtype: 'textfield',
         name: 'or_code',
-        fieldLabel: '单据编号',
-    }, {
-        xtype: 'hidden',
-        name: 'or_custcode',
-        fieldLabel: '客户编号'
-    }, {
-        xtype: 'customerDbfindTrigger',
-        name: 'or_custname',
-        fieldLabel: '客户名称',
-    },{
-        xtype: 'textfield',
-        name: 'creatorName',
-        fieldLabel: '录入人'
-    },{
-        xtype: 'textfield',
-        name: 'or_auditman',
-        fieldLabel: '审核人'
+        fieldLabel: '单号/客户/账号',
+        emptyText:'请输入单号/客户/账号',
+        labelWidth: 100,
+        getCondition: function(value) {
+           return  ' (or_code like\'%' + value + '%\'' 
+                +' or or_custcode like \'%'+value+'%\''
+                +' or or_custname like \'%'+value+'%\''
+                +' or or_bankcode like \'%'+value+'%\''
+                +' or or_bankname like \'%'+value+'%\''
+                +') ';
+        }
     },  {
-        xtype: 'bandinfoDbfindTrigger',
-        name: 'or_bankname',
-        fieldLabel: '结算账户'
-    }, {
         xtype: 'condatefield',
         name: 'or_date',
-        fieldLabel: '单据日期',
+        fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
-    },{
+    } , {
+        name: 'ord_type',
+        fieldLabel: '收入类别',
+        xtype : "remotecombo",
+        columnWidth: 0.25,
+        emptyText :'全部',
+        storeUrl:'/api/document/fundinouttype/getCombo?condition=收入',
+        hiddenBtn:true,//true 则会关闭新增按钮功能
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'ord_type like \'%' + value + '%\'';
+            }
+        }
+    }, {
         xtype: 'combobox',
         name: 'or_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '状态',
         queryMode: 'local',
         displayField: 'or_status',
         valueField: 'or_statuscode',
         emptyText :'全部',
+        columnWidth: 0.25,
         editable:false,
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['or_statuscode', 'or_status'],
@@ -71,12 +67,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
                 return 'or_statuscode=\'' + value + '\'';
             }
         }
-    }, {
-        name: 'ord_type',
-        fieldLabel: '收入类别',
-        xtype : "remotecombo",
-        storeUrl:'/api/document/fundinouttype/getCombo?condition=收入',
-        hiddenBtn:true//true 则会关闭新增按钮功能
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
@@ -89,66 +79,50 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            hidden:true,
-            xtype: 'numbercolumn'
+            hidden:true
         }, {
             text: '单据编号',
             dataIndex: 'or_code',
-            width: 200
-        },{
-            text: '单据日期',
+            width: 150
+        }  ,{
+            text: '日期',
             dataIndex: 'or_date',
             xtype: 'datecolumn',
-            width: 200
+            width: 110
         }, {
-            text: '审核状态',
-            dataIndex: 'or_status',
-            width: 120
-        },  {
             text: '客户名称',
             dataIndex: 'or_custname',
-            width: 120
+            width: 250
         },  {
             text: '结算账户',
             dataIndex: 'or_bankname',
-            width: 120
-        },{
+            width: 150
+        }, {
             text: '收款金额',
             xtype: 'numbercolumn',
             dataIndex: 'or_amount',
-            width: 120,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
-        },{
+        }, {
+            text: '单据状态',
+            dataIndex: 'or_status',
+            width: 90
+        }, {
             text: '录入人',
-            dataIndex: 'or_recorder',
-            width: 120
+            dataIndex: 'creatorName',
+            width: 110
         },{
             text: '审核人',
             dataIndex: 'or_auditman',
-            width: 120
-        }, {
-            text: '收入类别',
-            dataIndex: 'ord_type',
-            width: 120
-        }, {
-            text: '明细金额',
-            xtype: 'numbercolumn',
-            dataIndex: 'ord_nowbalance',
-            width: 120,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            }
-        }, {
+            width: 110
+        },  {
             text: '备注',
-            dataIndex: 'ord_remark',
+            dataIndex: 'or_remark',
             width: 250
         }],
         relativeColumn: []

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

@@ -4,37 +4,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'customerDbfindTrigger[name=or_custname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'id',to:'or_custid',ignore:true
-                        },{
-                            from:'cu_code',to:'or_custcode'
-                        },{
-                            from:'cu_name',to:'or_custname'
-                        }],
-                    }) ;   
-
-                }
-          },
-            //放大镜赋值关系 以及 tpl模板
-            'bandinfoDbfindTrigger[name=or_bankname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'bk_bankcode',to:'or_bankcode'
-                        },{
-                            from:'bk_bankname',to:'or_bankname'
-                        },{
-                            from:'id',to:'or_bankid',ignore:true
-                        }],
-                    });
-
-                }
-            }
         });
-
     }
 });

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

@@ -79,12 +79,12 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                     readOnly:true
                 },
                 // defaultValue: Ext.Date.format(new Date(), 'Ym'),
-                width : 120.0, 
+                width : 110.0, 
                 hidden: true,
                 items : null
             }, {
                 text : "支出类别", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "osd_type",
                 items : null,
                 hiddenBtn:false,//true 则会关闭新增按钮功能
@@ -113,7 +113,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 text : "金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "osd_nowbalance", 
-                width : 120.0,
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2

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

@@ -53,7 +53,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
 
         var valid = form.isValid();
         if(!valid) {
-            saas.util.BaseUtil.showToast(form.invalidText);
+            saas.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
 

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

@@ -12,44 +12,51 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         name: 'os_id',
         fieldLabel: 'ID',
         allowBlank: true,
-        columnWidth: 0
-    }, {
-        xtype : 'hidden',
-        name : 'os_vendid', 
-        fieldLabel : '供应商ID'
-   }, {
-        xtype : 'textfield',
-        name : 'os_code',
-        fieldLabel : '单据编号',
-    }, {
-        xtype: 'hidden',
-        name: 'os_vendcode',
-        fieldLabel: '供应商编号',
-    }, {
-        xtype: 'vendorDbfindTrigger',
-        name: 'os_vendname',
-        fieldLabel: '供应商名称'
+        columnWidth: 0,
+        getCondition: function(value) {
+            return 'os_id=' + value;
+        }
     },{
         xtype: 'textfield',
-        name: 'creatorName',
-        fieldLabel: '录入人'
-    }, {
-        xtype: 'hidden',
-        name: 'os_auditman',
-        fieldLabel: '审核人',
-    }, {
-        xtype: 'bandinfoDbfindTrigger',
-        name: 'os_bankname',
-        fieldLabel: '结算账户',
+        name: 'os_code',
+        fieldLabel: '单号/客户/账号',
+        emptyText:'请输入单号/客户/账号',
+        labelWidth: 100,
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return  ' (os_code like\'%' + value + '%\'' 
+                +' or os_vendcode like \'%'+value+'%\''
+                +' or os_vendname like \'%'+value+'%\''
+                +' or os_bankcode like \'%'+value+'%\''
+                +' or os_bankname like \'%'+value+'%\''
+                +') ';
+            }
+        }
     },{
         xtype: 'condatefield',
         name: 'os_date',
         columnWidth: 0.5,
-        fieldLabel: '单据日期'
+        fieldLabel: '日期'
+    },{
+        name: 'ord_type',
+        fieldLabel: '支出类别',
+        xtype : "remotecombo",
+        emptyText :'全部',
+        storeUrl:'/api/document/fundinouttype/getCombo?condition=支出',
+        hiddenBtn:true,//true 则会关闭新增按钮功能
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'ord_type like \'%' + value + '%\'';
+            }
+        }
     },{
         xtype: 'combobox',
         name: 'os_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '状态',
         queryMode: 'local',
         displayField: 'os_status',
         valueField: 'os_statuscode',
@@ -70,12 +77,6 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                 return 'os_statuscode=\'' + value + '\'';
             }
         }
-    },{
-        name: 'ord_type',
-        fieldLabel: '支出类别',
-        xtype : "remotecombo",
-        storeUrl:'/api/document/fundinouttype/getCombo?condition=支出',
-        hiddenBtn:true//true 则会关闭新增按钮功能
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
@@ -85,7 +86,6 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         addXtype: 'money-othspendings-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/money/othspendings/',
-        // baseVastUrl: 'http://192.168.253.35:8880/othspendings/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
@@ -94,41 +94,28 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         }, {
             text: '单据编号',
             dataIndex: 'os_code',
-            width: 200
+            width: 150
         }, {
-            text: '单据日期',
+            text: '日期',
             dataIndex: 'os_date',
             xtype: 'datecolumn',
-            width: 200
+            width: 110
         },{
             text: '审核状态',
             dataIndex: 'os_status',
-            width: 120
+            width: 90
         }, {
             text: '供应商',
             dataIndex: 'os_vendname',
-            width: 120
+            width:250
         },{
             text: '结算账户',
             dataIndex: 'os_bankname',
-            width: 120
+            width: 150
         },{
             text: '付款金额',
             dataIndex: 'os_amount',
-            width: 120
-        },{
-            text: '录入人',
-            dataIndex: 'os_recorder',
-            width: 120
-        }, {
-            text: '支出类别',
-            dataIndex: 'osd_type',
-            width: 200
-        }, {
-            text: '金额',
-            dataIndex: 'osd_nowbalance',
-            xtype: 'numbercolumn',
-            width: 120,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -136,24 +123,21 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text: '备注',
-            dataIndex: 'osd_remark',
-            width: 120
+            text: '单据状态',
+            dataIndex: 'os_status',
+            width: 90
         },{
-            text: '金额',
-            xtype: 'numbercolumn',
-            dataIndex: 'os_amount',
-            hidden:true,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            },
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width: 110
+        }, {
+            text: '审核人',
+            dataIndex: 'os_auditman',
+            width: 110
         }, {
             text: '备注',
             dataIndex: 'os_remark',
-            hidden:true
+            width: 250
         }],
         relativeColumn: []
     }

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

@@ -4,40 +4,6 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=os_vendname]':{
-                beforerender: function (f) {
-                    Ext.apply(f, {
-                        dbfinds: [{
-                            from: 'id',
-                            to: 'os_vendid'
-                        }, {
-                            from: 've_code',
-                            to: 'os_vendcode'
-                        }, {
-                            from: 've_name',
-                            to: 'os_vendname'
-                        }],
-                    });
-
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=os_bankname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'bk_bankcode',to:'os_bankcode'
-                        },{
-                            from:'bk_bankname',to:'os_bankname'
-                        },{
-                            from:'id',to:'os_bankid',ignore:true
-                        }],
-                    }); 
-
-                }
-            }
         });
-
     }
 });

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

@@ -100,11 +100,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             dataIndex: 'pd_ym',
             hidden:true,
             defaultValue: Ext.Date.format(new Date(), 'Ym'),
-            // editor: {
-            //     xtype: 'hidden',
-                // xtype: 'textfield,
-                // xtype: 'datefield''
-            // }
+            width : 110.0
         }, {
             text: '结算账户ID',
             dataIndex: 'pd_bankid',
@@ -112,6 +108,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: '资金账户',
             dataIndex: 'pd_bankname',
+            width : 200.0,
             allowBlank : false,
             editor:{
                 xtype:'bandinfoDbfindTrigger'
@@ -124,6 +121,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             text: "付款金额",
             xtype: 'numbercolumn',
             dataIndex: "pd_amount",
+            width : 110.0,
             editor : {
                 xtype : "numberfield",
                 decimalPrecision: 2
@@ -144,6 +142,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "结算方式",
             dataIndex: "pd_paymethod",
+            width :200.0,
             editor : {
                 xtype:'combo',
                 queryMode: 'local',
@@ -165,6 +164,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "结算号",
             dataIndex: "pd_paycode",
+            width : 150.0,
             editor:{
                 xtype:'textfield'
             }
@@ -197,7 +197,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             hidden: true
         }, {
             text: '来源单号',
-            dataIndex: 'pbd_slcode',
+            dataIndex: 'pbd_slcode', 
+            width : 150,
             editor:{
                 displayField : "display",
                 editable : true,
@@ -217,19 +218,18 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
 
         }, {
             text: "业务类型",
-            dataIndex: "pbd_slkind"
+            dataIndex: "pbd_slkind", 
+            width : 110
         }, {
             text: "单据日期",
             dataIndex: "pbd_sldate",
-            xtype: 'datecolumn'
+            xtype: 'datecolumn', 
+            width : 110
         }, {
             text: "单据金额",
             xtype: 'numbercolumn',
-            dataIndex: "pbd_amount",
-            // editor : {
-            //     xtype : "numberfield",
-            //     decimalPrecision: 2
-            // },
+            dataIndex: "pbd_amount", 
+            width : 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -246,12 +246,9 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "已核销金额",
             xtype: 'numbercolumn',
-            dataIndex: "sl_yamount",
+            dataIndex: "sl_yamount", 
+            width : 110,
             ignore:true,
-            // editor : {
-            //     xtype : "numberfield",
-            //     decimalPrecision: 2
-            // },
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -269,11 +266,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             text: "未核销金额",
             xtype: 'numbercolumn',
             dataIndex: "sl_namount",
-            ignore:true,
-            // editor : {
-            //     xtype : "numberfield",
-            //     decimalPrecision: 2
-            // },
+            ignore:true, 
+            width : 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -291,7 +285,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             text: "本次核销金额",
             xtype: 'numbercolumn',
             dataIndex: "pbd_nowbalance",
-            width: 150,
+            width: 120,
             editor : {
                 xtype : "numberfield",
                 decimalPrecision: 2

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

@@ -177,13 +177,13 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                saas.util.BaseUtil.showToast('转单成功');
+                saas.util.BaseUtil.showSuccessToast('转单成功');
               
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('转单失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('转单失败: ' + res.message);
         });
      },
 
@@ -196,7 +196,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
 
         var valid = form.isValid();
         if(!valid) {
-            saas.util.BaseUtil.showToast(form.invalidText);
+            saas.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
 

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

@@ -8,17 +8,27 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
     viewName: 'money-paybalance-querypanel',
     
     queryFormItems: [{
+        xtype: 'hidden',
+        name: 'pb_id',
+        fieldLabel: 'ID',
+        allowBlank: true,
+        getCondition: function(value) {
+            return 'pb_id=' + value;
+        }
+    }, {
         xtype: 'textfield',
         name: 'pb_code',
-        fieldLabel: '单据编号',
-    },{
-        xtype: 'vendorDbfindTrigger',
-        name: 'pb_vendname',
-        fieldLabel: '供应商名称',
-    },{
-        xtype: 'textfield',
-        name: 'pb_manname',
-        fieldLabel: '付款人',
+        fieldLabel: '单号/供应商',
+        emptyText :'请输入单号或供应商',
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return  ' (pb_code like\'%' + value + '%\' '
+                +' or pb_vendcode like \'%'+value+'%\' '
+                +' or pb_vendname like \'%'+value+'%\') ';
+            }
+        }
     },{
         xtype: 'bandinfoDbfindTrigger',
         name: 'pd_bankname',
@@ -26,13 +36,13 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
     },{
         xtype: 'condatefield',
         name: 'pb_date',
-        fieldLabel: '单据日期',
+        fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
     },{
         xtype: 'combobox',
         name: 'pb_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '状态',
         queryMode: 'local',
         displayField: 'name',
         valueField: 'value',
@@ -62,43 +72,26 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         addXtype: 'money-paybalance-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/money/paybalance/',
-        // baseVastUrl: 'http://192.168.253.35:8880/paybalance/',
-        baseColumn: [{
+        baseColumn: [
+        {
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            width: 0,
             xtype: 'numbercolumn',
             hidden:true
         }, {
-            text: '单据编号',
+            text: '付款单号',
             dataIndex: 'pb_code',
-            width: 200
+            width: 150
         }, {
-            text: '单据日期',
+            text: '日期',
             dataIndex: 'pb_date',
             xtype: 'datecolumn',
-            width: 160
-        }, {
-            text: '审核状态',
-            dataIndex: 'pb_status',
-            width: 120
+            width: 110
         }, {
-            text: '供应商编号',
-            dataIndex: 'pb_vendcode',
-            width: 200,
-            hidden:true
-        }, {
-            text: '供应商',
+            text: '供应商名称',
             dataIndex: 'pb_vendname',
-            width: 120,
-        }, {
-            text: '付款人',
-            dataIndex: 'pb_manname',
-            width: 120,
-        }, {
-            text: '资金账户',
-            dataIndex: 'pd_bankname',
-            width: 120,
+            width: 250,
         },{
             text: '付款金额',
             xtype: 'numbercolumn',
@@ -111,100 +104,21 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             },
         }, {
-            text: '结算方式',
-            dataIndex: 'pd_paymethod',
-            width: 120,
-        },{
-            text: '结算号',
-            dataIndex: 'pd_paycode',
-            width: 120
-        },  {
-            text: '备注',
-            dataIndex: 'pd_remark',
-            width: 120,
-        },{
-            text: '付款总额',
-            dataIndex: 'pb_pdamount',
-            width: 120,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            }
-        },{
-            text: '源单编号',
-            dataIndex: 'pbd_slcode',
-            width: 0
-        },{
-            text: '业务类别',
-            dataIndex: 'pbd_slkind',
-            width: 0
-        },{
-            text: '单据日期',
-            dataIndex: 'pbd_sldate',
-            width: 0,
-            xtype:'datecolumn'
-        },{
-            text: '单据金额',
-            dataIndex: 'pbd_amount',
-            width: 0,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            },
-        },{
-            text: '本次核销金额',
-            dataIndex: 'pbd_nowbalance',
-            width: 0,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            }
-        },{
-            text: '本次核销金额',
-            xtype: 'numbercolumn',
-            dataIndex: 'pb_pbdamount',
-            width: 0,
-            hidden:true,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            },
+            text: '单据状态',
+            dataIndex: 'pb_status',
+            width: 90
         }, {
-            text: '本次预付款',
-            dataIndex: 'pb_preamount',
-            width: 0,
-            hidden:true,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            }
+            text: '付款人',
+            dataIndex: 'pb_manname',
+            width: 110
         }, {
-            text: '整单折扣',
-            dataIndex: 'pb_discounts',
-            width: 0,
-            hidden:true
+            text: '单据状态',
+            dataIndex: 'pb_status',
+            width: 90
         }, {
-            text: '已核销金额',
-            xtype: 'numbercolumn',
-            dataIndex: 'pb_havebalance',
-            width: 0,
-            hidden:true,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            },
+            text: '备注',
+            dataIndex: 'pb_remark',
+            width: 250
         }],
         relativeColumn: []
     },

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

@@ -5,30 +5,6 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pb_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'ve_name',to:'pb_vendname'
-                        }],
-                    }) ;   
-
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
-                        }, {
-                            from:'pr_detail',to:'pr_detail'
-                        }],
-                    }) ;   
-
-                }
-            },
             'dbfindtrigger[name=pd_bankname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
@@ -43,7 +19,6 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                             to: 'pd_bankname'
                         }],
                     });
-
                 }
             }
         });

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

@@ -93,14 +93,11 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: '期间',
             dataIndex: 'rd_ym',
             defaultValue: Ext.Date.format(new Date(), 'Ym'),
-            // editor: {
-            //     xtype: 'numberfield'
-            // },
+            width : 110,
             hidden: true
         }, {
             text: '资金账户ID',
             dataIndex: 'rd_bankid',
-            width : 100.0, 
             editor: {
                 xtype: 'numberfield'
             },
@@ -108,7 +105,6 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: '资金账户编号',
             dataIndex: 'rd_bankcode',
-            width : 100.0, 
             editor: {
                 xtype: 'textfield'
             },
@@ -125,6 +121,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "收款金额",
             xtype: 'numbercolumn',
             dataIndex: "rd_amount",
+            width : 110.0,
             editor : {
                 xtype : "numberfield",
                 decimalPrecision: 2
@@ -145,6 +142,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: "结算方式",
             dataIndex: "rd_paymethod",
+            width : 150.0,
             editor : {
                 xtype:'combo',
                 queryMode: 'local',
@@ -224,15 +222,18 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             }
         }, {
             text: "业务类型",
-            dataIndex: "rbd_slkind"
+            dataIndex: "rbd_slkind",
+            width:110
         }, {
             text: "单据日期",
             dataIndex: "rbd_sldate",
-            xtype: 'datecolumn'
+            xtype: 'datecolumn',
+            width:110
         }, {
             text: "单据金额",
             xtype: 'numbercolumn',
             dataIndex: "rbd_amount",
+            width:110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -250,6 +251,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "已核销金额",
             xtype: 'numbercolumn',
             dataIndex: "sl_yamount",
+            width:110,
             ignore:true,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
@@ -268,6 +270,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "未核销金额",
             xtype: 'numbercolumn',
             dataIndex: "sl_namount",
+            width:110,
             ignore:true,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
@@ -286,7 +289,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "本次核销金额",
             xtype: 'numbercolumn',
             dataIndex: "rbd_nowbalance",
-            width:200,
+            width:120,
             editor : {
                 xtype : "numberfield",
                 decimalPrecision: 2

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

@@ -168,13 +168,13 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                saas.util.BaseUtil.showToast('转单成功');
+                saas.util.BaseUtil.showSuccessToast('转单成功');
               
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('转单失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('转单失败: ' + res.message);
         });
      },
     onSave: function() {
@@ -186,7 +186,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
 
         var valid = form.isValid();
         if(!valid) {
-            saas.util.BaseUtil.showToast(form.invalidText);
+            saas.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
 

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

@@ -8,39 +8,33 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
     viewName: 'money-recbalance-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'rb_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        getCondition: function(value) {
-            return 'rb_id=' + value;
-        }
-    }, {
         xtype: 'textfield',
         name: 'rb_code',
-        fieldLabel: '单据编号',
-    }, {
-        xtype: 'customerDbfindTrigger',
-        name: 'rb_custname',
-        fieldLabel: '客户名',
-    }, {
-        xtype: 'textfield',
-        name: 'rb_manname',
-        fieldLabel: '收款人',
+        fieldLabel: '单号/客户',
+        emptyText :'请输入单号或者客户',
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return  ' (rd_code like\'%' + value + '%\' '
+                +' or rb_custcode like \'%'+value+'%\' '
+                +' or rb_custname like \'%'+value+'%\') ';
+            }
+        }
     },{
-        xtype: 'textfield',
+        xtype: 'bandinfoDbfindTrigger',
         name: 'rd_bankname',
         fieldLabel: '资金账户',
-    },  {
+    },{
         xtype: 'condatefield',
         name: 'rb_date',
-        fieldLabel: '单据日期',
+        fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
     },{
         xtype: 'combobox',
         name: 'rb_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '状态',
         queryMode: 'local',
         displayField: 'name',
         valueField: 'value',
@@ -70,7 +64,6 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         addXtype: 'money-recbalance-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/money/recbalance/',
-        // baseVastUrl: 'http://192.168.253.35:8880/recbalance/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
@@ -78,35 +71,20 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             xtype: 'numbercolumn',
             hidden: true
         }, {
-            text: '单据编号',
+            text: '付款单号',
             dataIndex: 'rb_code',
-            width: 200
-        }, {
-            text: '审核状态',
-            dataIndex: 'rb_status',
-            width: 120
+            width: 150
         }, {
-            text: '单据日期',
+            text: '日期',
             dataIndex: 'rb_date',
             xtype: 'datecolumn',
-            width: 200
-        }, {
-            text: '客户编号',
-            dataIndex: 'rb_custcode',
-            hidden: true
+            width: 110
         }, {
             text: '客户名称',
             dataIndex: 'rb_custname',
-        }, {
-            text: '收款人',
-            dataIndex: 'rb_manname',
-            width: 120,
-        }, {
-            text: '资金账户',
-            dataIndex: 'rd_bankname',
-            width: 120,
+            width: 250,
         },{
-            text: '收款金额',
+            text: '付款金额',
             xtype: 'numbercolumn',
             dataIndex: 'rd_amount',
             width: 120,
@@ -115,57 +93,21 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
-            },
+            }
+        }, {
+            text: '单据状态',
+            dataIndex: 'rb_status',
+            width: 90
+        }, {
+            text: '收款人',
+            dataIndex: 'rb_manname',
+            width: 110
         }, {
-            text: '结算方式',
-            dataIndex: 'rd_paymethod',
-            width: 120,
-        },{
-            text: '结算号',
-            dataIndex: 'rd_paycode',
-            width: 120,
-        },{
             text: '备注',
-            dataIndex: 'rd_remark',
-            width: 120,
-        },{
-            text: '收款总额',
-            dataIndex: 'rb_rdamount',
-            xtype: 'numbercolumn',
-            width: 120,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            },
-        },{
-            text: '源单编号',
-            dataIndex: 'rbd_slcode',
-            hidden:true
-        },{
-            text: '业务类别',
-            dataIndex: 'rbd_slkind',
-            hidden:true
-        },{
-            text: '单据日期',
-            dataIndex: 'rbd_sldate',
-            xtype: 'datecolumn',
-            hidden:true
-        },{
-            text: '单据金额',
-            dataIndex: 'rbd_amount',
-            xtype: 'numbercolumn',
-            hidden:true
-        },{
-            text: '本次核销金额',
-            dataIndex: 'rbd_nowbalance',
-            xtype: 'numbercolumn',
-            hidden:true
-        },
-        ]
+            dataIndex: 'rb_remark',
+            width: 250
+        }]
     },
-
     // override
     getQueryMode: function() {
         return 'MAIN';

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

@@ -5,23 +5,22 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            'dbfindtrigger[name=rb_custname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //赋值
-                        dbfinds:[{
-                            from: 'id', to: 'rb_custid',ignore:true
+            'dbfindtrigger[name=rd_bankname]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'rd_bankid',ignore:true
                         }, {
-                            from:'cu_code', to:'rb_custcode'
+                            from: 'bk_bankcode',
+                            to: 'rd_bankcode'
                         },{
-                            from:'cu_name', to:'rb_custname'
-                        },{
-                            from:'cu_leftamount', to:'cu_leftamount'
-                        }]
-                    }) ;
-
+                            from: 'bk_bankname',
+                            to: 'rd_bankname'
+                        }],
+                    });
                 }
-            },
+            }
         });
 
     }

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

@@ -105,7 +105,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             },
             {
                 text : "物料编号", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null,
@@ -116,6 +116,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             },
             {
                 text : "名称", 
+                width : 200.0, 
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -131,7 +132,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             },
             {
                 text : "规格", 
-                dataIndex : "pr_spec",
+                dataIndex : "pr_spec", 
+                width : 150.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -144,7 +146,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 text : "数量", 
                 dataIndex : "pd_qty", 
                 xtype: 'numbercolumn',
-                width : 120.0,
+                width : 110.0,
                 allowBlank : false,
                 editor : {
                     xtype : "numberfield",
@@ -169,7 +171,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 text : "单价", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_price", 
-                width : 120.0,
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -211,7 +213,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 text : "税率", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
-                width : 120.0,
+                width : 80.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 0,
@@ -225,7 +227,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 text : "需求日期", 
                 dataIndex : "pd_delivery", 
                 xtype:'datecolumn',
-                width : 120.0, 
+                width : 110.0, 
                 editor : {
                     xtype : "datefield",
                     editable : false, 
@@ -236,7 +238,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 text : "含税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
-                width : 120.0, 
+                width : 110.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,
@@ -260,7 +262,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 text : "未税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_taxtotal", 
-                width : 120.0,
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,
@@ -284,7 +286,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 text : "最小包装数", 
                 xtype: 'numbercolumn',
                 dataIndex : "pr_zxbzs",
-                align: 'end',
+                width : 110.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -296,7 +298,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             {
                 text : "关联销售单号", 
                 dataIndex : "pd_salecode", 
-                width : 120.0
+                width : 150.0
             },{
                 text : "备注", 
                 dataIndex : "pd_remark",

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

@@ -75,12 +75,12 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 saas.util.BaseUtil.openTab('purchase-purchasein-formpanel',name+"("+codeValue+")",codeValue+intValue, {
                     initId: intValue
                 });
-                saas.util.BaseUtil.showToast('转单成功');    
+                saas.util.BaseUtil.showSuccessToast('转单成功');    
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('转单失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('转单失败: ' + res.message);
         });
      }
 });

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

@@ -18,33 +18,27 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pu_code',
-        fieldLabel: '单据编号'
-    }, {
-        xtype: 'condatefield',
-        name: 'pu_date',
-        fieldLabel: '单据日期',
-        columnWidth: 0.5,
-        operation: 'between'
-    }, {
-        xtype: 'textfield',
-        name: 'pu_vendcode',
-        fieldLabel: '供应商编号',
-        hidden:true
-    }, {
-        xtype: 'vendorDbfindTrigger',
-        name: 'pu_vendname',
-        fieldLabel: '供应商名称',
-        emptyText:'输入供应商编号或名称'
+        fieldLabel: '单号/供应商',
+        emptyText:'请输入单号或供应商',
+        getCondition: function(value) {
+            return  ' (pu_code like\'%' + value + '%\' or pu_vendcode like \'%'+value+'%\' or pu_vendname like \'%'+value+'%\') ';
+        }
     }, {
         xtype: 'textfield',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         showDetail: true,
         hidden:true
+    }, {
+        xtype: 'condatefield',
+        name: 'pu_date',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        fieldLabel: '物料名称',
+        fieldLabel: '物料',
         showDetail: true,
         emptyText:'输入物料编号或名称',
     }, {
@@ -75,6 +69,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         xtype: 'multicombo',
         name: 'pu_acceptstatuscode',
         fieldLabel: '业务状态',
+        emptyText :'全部',
         datas: [
             ["TURNIN", "已入库"],
             ["UNTURNIN", "未入库"],
@@ -93,114 +88,80 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         {
             text: 'id',
             dataIndex: 'pu_id',
-            width: 100,
+            width: 0,
             xtype: 'numbercolumn',
             hidden:true
         }, {
             text: '采购单号',
             dataIndex: 'pu_code',
-            width: 200
-        },{
-            text: '供应商编号',
-            dataIndex: 'pu_vendcode',
-            width: 120
+            width: 150
         },{
             text: '供应商名称',
             dataIndex: 'pu_vendname',
-            width: 120
+            width:250
+        }, {
+            text: '总金额',
+            dataIndex: 'pu_total',
+            xtype: 'numbercolumn',
+            width: 110
         }, {
             text: '审核状态',
             dataIndex: 'pu_status',
-            width: 120
+            width: 90
         },{
             text: '业务状态',
             dataIndex: 'pu_acceptstatus',
-            width: 120
+            width: 90
         },{
             text: '单据日期',
             dataIndex: 'pu_date',
             xtype: 'datecolumn',
-            width: 200
-        }, {
-            text: '总额',
-            dataIndex: 'pu_total',
-            xtype: 'numbercolumn',
-            width: 120
+            width: 110
         },{
             text: '制单人',
             dataIndex: 'creatorName',
-            width: 120
+            width: 110
         },{
             text: '审核人',
             dataIndex: 'pu_auditman',
-            width: 120
+            width: 110
         },{
             text: '关联销售单',
             dataIndex: 'pu_salecode',
-            width: 120
-        }, {
-            text: '录入人ID',
-            dataIndex: 'creatorId',
-            hidden:true
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            hidden:true
-        }, {
-            text: '录入日期',
-            dataIndex: 'createTime',
-            xtype: 'datecolumn',
-            hidden:true
-        }, {
-            text: '更新人ID',
-            dataIndex: 'updaterId',
-            hidden:true
-        }, {
-            text: '更新人',
-            dataIndex: 'updater',
-            hidden:true
-        }, {
-            text: '更新日期',
-            dataIndex: 'updateTime',
-            xtype: 'datecolumn',
-            hidden:true
+            width: 150
         }],
         relativeColumn: [
         {
             text: 'id',
             dataIndex: 'pu_id',
-            width: 100,
+            width: 0,
             hidden: true
         }, {
             text: '采购单号',
             dataIndex: 'pu_code',
-            width: 200
-        },{
-            text: '供应商编号',
-            dataIndex: 'pu_vendcode',
-            width: 120
+            width: 150
         },{
             text: '供应商名称',
             dataIndex: 'pu_vendname',
-            width: 120
+            width: 150
         }, {
             text: '审核状态',
             dataIndex: 'pu_status',
-            width: 120
+            width: 90
         },{
             text: '业务状态',
             dataIndex: 'pu_acceptstatus',
-            width: 120
+            width: 90
         }, {
             text: '单据日期',
             dataIndex: 'pu_date',
             xtype: 'datecolumn',
-            width: 200
+            width: 110
         }, {
             text: '序号',
             dataIndex: 'pd_detno',
             xtype: 'numbercolumn',
-            width: 120, 
+            width: 80, 
             renderer : function(v) {
                 return Ext.util.Format.number(v, '0');
             }
@@ -211,20 +172,20 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         },{
             text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 180
+            width: 200
         }, {
             text: '物料规格',
             dataIndex: 'pr_spec',
-            width: 180
+            width: 150
         }, {
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 100
+            width: 80
         },{
             text: '采购数量',
             dataIndex: 'pd_qty',
             xtype: 'numbercolumn',
-            width: 100,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -232,16 +193,15 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             },
         }, {
-            // text: '交货日期',
             text: '需求日期',
             dataIndex: 'pd_delivery',
             xtype: 'datecolumn',
-            width: 200
+            width: 110
         },{
             text: '单价',
             dataIndex: 'pd_price',
             xtype: 'numbercolumn',
-            width: 100,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
@@ -252,7 +212,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype: 'numbercolumn',
-            width: 100,
+            width: 80,
             renderer : function(v) {
                 return Ext.util.Format.number(v, '0');
             },
@@ -260,7 +220,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '金额',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
-            width: 100,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

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

@@ -5,19 +5,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            // 供应商编号
-            'dbfindtrigger[name=pu_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
-                        },{
-                            from:'ve_name',to:'pu_vendname'
-                        }],
-                    }) ;   
-
-                }
-            },
             // 放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){

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

@@ -107,7 +107,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             },
             {
                 text : "物料编号", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null,
@@ -132,6 +132,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             },
             {
                 text : "名称", 
+                width : 200.0, 
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -143,7 +144,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             },
             {
                 text : "规格", 
-                dataIndex : "pr_spec",
+                dataIndex : "pr_spec", 
+                width : 150.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -156,7 +158,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 text : "数量", 
                 dataIndex : "pd_inqty", 
                 xtype: 'numbercolumn',
-                width : 120.0,
+                width : 110.0,
                 allowBlank : false,
                 editor : {
                     xtype : "numberfield",
@@ -181,7 +183,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 dataIndex : "pd_yqty",
                 xtype: 'numbercolumn',
                 hidden:true, 
-                width : 120.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 3,
@@ -214,7 +215,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
-                width : 120.0, 
+                width : 150.0, 
                 allowBlank : false,
                 editor : {
                     displayField : "display", 
@@ -232,7 +233,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             },
             {
                 text : "单价",
-                xtype: 'numbercolumn',
+                xtype: 'numbercolumn', 
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -250,7 +252,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 xtype: 'numbercolumn',
                 text : "税率", 
                 dataIndex : "pd_taxrate", 
-                width : 120.0,
+                width : 80.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 0,
@@ -264,7 +266,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 text : "含税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
-                width : 120.0, 
+                width : 110.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,
@@ -288,6 +290,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 text : "未税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
+                width : 110.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,
@@ -310,18 +313,17 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             {
                 text : "采购单明细id", 
                 dataIndex : "pd_orderid", 
-                width : 120.0,
                 hidden:true
             },
             {
                 text : "采购单号", 
                 dataIndex : "pd_ordercode", 
-                width : 120.0
+                width : 150.0
             },{
                 text : "采购序号",
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
-                width : 120.0,
+                width : 80.0,
                 format: '0',
                 renderer: function(v) {
                     return v ? v : null;
@@ -393,7 +395,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         data = grid.getTrueData();
         Ext.Array.each(data,function(item){
             if(item.pd_orderprice==0){
-                saas.util.BaseUtil.showToast(item.pd_pdno+'行'+item.pd_prodcode+'物料单价为0');
+                saas.util.BaseUtil.showErrorToast(item.pd_pdno+'行'+item.pd_prodcode+'物料单价为0');
             }
         });
         return true;

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

@@ -110,13 +110,13 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                 saas.util.BaseUtil.openTab('purchase-purchaseout-formpanel',name+"("+codeValue+")",codeValue+intValue, {
                     initId: intValue
                 });
-                saas.util.BaseUtil.showToast('转单成功');
+                saas.util.BaseUtil.showSuccessToast('转单成功');
               
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('转单失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('转单失败: ' + res.message);
         });
      }
 });

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

@@ -11,34 +11,15 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         xtype: 'hidden',
         name: 'id',
         fieldLabel: 'ID',
-        allowBlank: true,
         columnWidth: 0
-    }, {
+    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单据编号',
-        allowBlank: true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'condatefield',
-        name: 'pi_date',
-        fieldLabel: '单据日期',
-        allowBlank: true,
-        columnWidth: 0.5
-    }, {
-        xtype: 'textfield',
-        name: 'pi_vendcode',
-        fieldLabel: '供应商编号',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'vendorDbfindTrigger',
-        name: 'pi_vendname',
-        fieldLabel: '供应商名称',
-        emptyText:'输入供应商编号或名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '单号/供应商',
+        emptyText:'请输入单号或供应商',
+        getCondition: function(value) {
+            return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
+        }
     }, {
         xtype: 'textfield',
         name: 'pd_prodcode',
@@ -48,13 +29,23 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        fieldLabel: '物料名称',
+        fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
+    }, {
+        xtype: 'textfield',
+        name: 'pi_pucode',
+        fieldLabel: '关联单号'
+    }, {
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '单据状态',
         allowBlank: true,
         emptyText :'全部',
         editable:false,
@@ -84,73 +75,59 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         addXtype:'purchase-purchasein-formpanel',
         defaultCondition:' pi_class = \'采购验收单\'',
         baseVastUrl:'/api/purchase/prodinout/',
-        // baseVastUrl:"http://localhost:8800/prodinout/",
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '验收单号',
             dataIndex: 'pi_inoutno',
-            width: 200
+            width: 150
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 120
+            width: 0
         },{
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
-        },{
-            text: '审核状态',
-            dataIndex: 'pi_status',
-            width: 120
-        },{
-            text: '供应商编号',
-            dataIndex: 'pi_vendcode',
-            width: 120
+            width: 110
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
-            width: 120
+            width: 150
+        },{
+            text: '关联采购单号',
+            dataIndex: 'pi_pucode',
+            width: 150
         },{
-            text: '制单人',
+            text: '总金额',
+            dataIndex: 'pi_total',
+            width: 110
+        },{
+            text: '单据状态',
+            dataIndex: 'pi_status',
+            width: 90
+        },{
+            text: '付款状态',
+            dataIndex: 'pi_prstatus',
+            width: 90
+        },{
+            text: '录入人',
             dataIndex: 'creatorName',
-            width: 120
+            width: 110
         },{
             text: '审核人',
             dataIndex: 'pi_auditman',
-            width: 120
+            width: 110
         },{
             text: '备注',
             dataIndex: 'pi_remark',
-            width: 200
-        },{
-            text: '录入人ID',
-            dataIndex: 'creatorId',
-            hidden:true
-        }, {
-            text: '录入日期',
-            dataIndex: 'createTime',
-            xtype: 'datecolumn',
-            hidden:true
-        }, {
-            text: '更新人ID',
-            dataIndex: 'updaterId',
-            hidden:true
-        }, {
-            text: '更新人',
-            dataIndex: 'updaterName',
-            hidden:true
-        }, {
-            text: '更新日期',
-            dataIndex: 'updateTime',
-            xtype: 'datecolumn',
-            hidden:true
+            width: 250
         }],
-        relativeColumn: [{
+        relativeColumn: [
+        {
             text: 'id',
             dataIndex: 'pu_id',
             xtype: 'numbercolumn',
@@ -158,44 +135,57 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
-            width: 200
+            width: 150
         }, {
             text: '单据类型',
             dataIndex: 'pd_piclass',
-            width: 200
+            width: 0
         },{
-            text: '审核状态',
-            dataIndex: 'pi_status',
-            width: 120
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            xtype:'datecolumn',
+            width: 110
         },{
             text: '供应商编号',
             dataIndex: 'pi_vendcode',
-            width: 120
+            width: 0
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
-            width: 120
+            width: 150
+        },{
+            text: '审核状态',
+            dataIndex: 'pi_status',
+            width: 90
+        },{
+            text: '序号',
+            dataIndex: 'pd_pdno',
+            width: 80
+        },{
+            text: '相关单号',
+            dataIndex: 'pd_ordercode',
+            width: 150
         },{
             text: '物料编号',
             dataIndex: 'pd_prodcode',
-            width: 120
+            width: 150
         },{
             text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 120
+            width: 200
         },{
             text: '物料规格',
             dataIndex: 'pr_spec',
-            width: 120
+            width: 150
         },{
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 120
+            width: 80
         },{
             text: '数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
-            width: 120,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -205,7 +195,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         },{
             text: '仓库',
             dataIndex: 'pd_whname',
-            width: 120
+            width: 150
         },{
             text: '单价',
             dataIndex: 'pd_orderprice',
@@ -216,12 +206,12 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             },            
-            width: 120
+            width: 110
         },{
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120,
+            width: 80,
             renderer : function(v) {
                 return Ext.util.Format.number(v, '0');
             },
@@ -229,17 +219,13 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
-            width: 120,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             },
-        },{
-            text: '相关单号',
-            dataIndex: 'pd_ordercode',
-            width: 120
         }]
     }
 });

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

@@ -5,19 +5,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pi_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'ve_code',to:'pi_vendcode'
-                        },{
-                            from:'ve_name',to:'pi_vendname'
-                        }],
-                    }) ;   
-
-                }
-            },
             //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){

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

@@ -89,7 +89,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
         deleteDetailUrl:'/api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
@@ -106,7 +105,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "物料编号", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null,
@@ -131,7 +130,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "名称", 
-                dataIndex : "pr_detail",
+                dataIndex : "pr_detail", 
+                width : 200.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -142,7 +142,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "规格", 
-                dataIndex : "pr_spec",
+                dataIndex : "pr_spec", 
+                width : 150.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -153,7 +154,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "数量", 
-                dataIndex : "pd_outqty",
+                dataIndex : "pd_outqty", 
+                width : 110.0,
                 xtype: 'numbercolumn',
                 allowBlank : false,
                 editor : {
@@ -199,7 +201,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
-                width : 120.0, 
+                width : 150.0, 
                 allowBlank : false,
                 editor : {
                     displayField : "display", 
@@ -217,7 +219,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "单价",
-                xtype: 'numbercolumn',
+                xtype: 'numbercolumn', 
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -235,7 +238,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 text : "税率", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
-                width : 120.0,
+                width : 80.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 0,
@@ -250,7 +253,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 text : "含税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
-                width : 120.0, 
+                width : 110.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,
@@ -274,6 +277,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 text : "未税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
+                width : 110.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,
@@ -296,20 +300,19 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             {
                 text : "采购单明细id", 
                 dataIndex : "pd_orderid", 
-                width : 120.0,
                 hidden:true
             },
             {
                 text : "采购单号", 
                 dataIndex : "pd_ordercode", 
-                width : 120.0
+                width : 150.0
             },{
                 text : "采购序号", 
                 dataIndex : "pd_orderdetno", 
-                xtype : "numbercolumn",
-                format: '0000',
+                xtype : "numbercolumn", 
+                width : 80.0,
                 renderer: function(v) {
-                    return v ? v : null;
+                    return Ext.util.Format.number(v, '0');
                 }
             },{
                 text : "备注", 

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

@@ -11,41 +11,18 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'hidden',
         name: 'id',
         fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    }, {    
-        xtype: 'textfield',
-        name: 'pi_inoutno',
-        fieldLabel: '单据编号',
-        allowBlank: true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'condatefield',
-        name: 'pi_date',
-        fieldLabel: '单据日期',
-        allowBlank: true,
-        columnWidth: 0.5
-    }, {
-        xtype: 'textfield',
-        name: 'pi_vendcode',
-        fieldLabel: '供应商编号',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
+        columnWidth: 0,
+        getCondition: function(value) {
+            return 'pi_id=' + value;
+        }
     },{
         xtype: 'textfield',
-        name: 'pi_vendcode',
-        fieldLabel: '供应商编号',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'vendorDbfindTrigger',
-        name: 'pi_vendname',
-        fieldLabel: '供应商名称',
-        emptyText:'输入供应商编号或名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        name: 'pi_inoutno',
+        fieldLabel: '单号/供应商',
+        emptyText:'请输入单号或供应商',
+        getCondition: function(value) {
+            return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
+        }
     }, {
         xtype: 'textfield',
         name: 'pd_prodcode',
@@ -55,17 +32,26 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        fieldLabel: '物料名称',
+        fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
+    }, {
+        xtype: 'textfield',
+        name: 'pi_pucode',
+        fieldLabel: '关联单号'
+    }, {
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '单据状态',
         allowBlank: true,
         emptyText :'全部',
         editable:false,
-        columnWidth: 0.25,
         queryMode: 'local',
         displayField: 'pi_status',
         valueField: 'pi_statuscode',
@@ -92,163 +78,161 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         addXtype:'purchase-purchaseout-formpanel',
         defaultCondition:' pi_class = \'采购验退单\'',
         baseVastUrl:'/api/purchase/prodinout/',
-        // baseVastUrl:"http://localhost:8800/prodinout/",
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '验退单号',
             dataIndex: 'pi_inoutno',
-            width: 200
+            width: 150
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 120
+            width: 0
         },{
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
-        },{
-            text: '审核状态',
-            dataIndex: 'pi_status',
-            width: 120
+            width: 110
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
-            width: 120
+            width: 150
         },{
-            text: '制单人',
-            dataIndex: 'pi_recordman',
-            width: 120
-        },{
-            text: '审核人',
-            dataIndex: 'pi_auditman',
-            width: 120
+            text: '关联验收单号',
+            dataIndex: 'pi_iocode',
+            width: 150
         },{
-            text: '备注',
-            dataIndex: 'pi_remark',
-            width: 200
-        }, {
-            text: '录入人ID',
-            dataIndex: 'creatorId',
-            width: 0
-        }, {
-            text: '录入人',
-            dataIndex: 'creatorName',
-            width: 0
-        }, {
-            text: '录入日期',
-            dataIndex: 'createTime',
-            xtype: 'datecolumn',
-            width: 0
-        }, {
-            text: '更新人ID',
-            dataIndex: 'updaterId',
-            width: 0
-        }, {
-            text: '更新人',
-            dataIndex: 'updaterName',
-            width: 0
-        }, {
-            text: '更新日期',
-            dataIndex: 'updateTime',
-            xtype: 'datecolumn',
-            width: 0
-        }],
-        relativeColumn: [{
-            text: 'id',
-            dataIndex: 'pu_id',
-            xtype: 'numbercolumn',
-            hidden:true
-        }, {
-            text: '单据编号',
-            dataIndex: 'pi_inoutno',
-            width: 200
-        }, {
-            text: '单据类型',
-            dataIndex: 'pd_piclass',
-            width: 200
+            text: '总金额',
+            dataIndex: 'pi_total',
+            width: 110
         },{
             text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
-            text: '供应商编号',
-            dataIndex: 'pi_vendcode',
-            width: 120
-        },{
-            text: '供应商名称',
-            dataIndex: 'pi_vendname',
-            width: 120
-        },{
-            text: '物料编号',
-            dataIndex: 'pd_prodcode',
-            width: 120
-        },{
-            text: '物料名称',
-            dataIndex: 'pr_detail',
-            width: 120
-        },{
-            text: '物料规格',
-            dataIndex: 'pr_spec',
-            width: 120
-        },{
-            text: '单位',
-            dataIndex: 'pr_unit',
-            width: 120
-        },{
-            text: '数量',
-            dataIndex: 'pd_inqty',
-            xtype:'numbercolumn',
-            width: 120,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            },
-        },{
-            text: '仓库',
-            dataIndex: 'pd_whname',
-            width: 120
+            text: '单据状态',
+            dataIndex: 'pi_status',
+            width: 90
         },{
-            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: '付款状态',
+            dataIndex: 'pi_prstatus',
+            width: 90
         },{
-            text: '税率',
-            dataIndex: 'pd_taxrate',
-            xtype:'numbercolumn',
-            width: 120,
-            renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
-            },
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width: 110
         },{
-            text: '金额',
-            dataIndex: 'pd_total',
-            xtype:'numbercolumn',
-            width: 120,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            },
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 110
         },{
-            text: '相关单号',
-            dataIndex: 'pd_ordercode',
-            xtype:'numbercolumn',
-            width: 120
-        }]
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 250
+        }],
+        relativeColumn: [
+            {
+                text: 'id',
+                dataIndex: 'pu_id',
+                xtype: 'numbercolumn',
+                hidden:true
+            }, {
+                text: '单据编号',
+                dataIndex: 'pi_inoutno',
+                width: 150
+            }, {
+                text: '单据类型',
+                dataIndex: 'pd_piclass',
+                width: 0
+            },{
+                text: '单据日期',
+                dataIndex: 'pi_date',
+                xtype:'datecolumn',
+                width: 110
+            },{
+                text: '供应商编号',
+                dataIndex: 'pi_vendcode',
+                width: 0
+            },{
+                text: '供应商名称',
+                dataIndex: 'pi_vendname',
+                width: 150
+            },{
+                text: '审核状态',
+                dataIndex: 'pi_status',
+                width: 90
+            },{
+                text: '序号',
+                dataIndex: 'pd_pdno',
+                width: 80
+            },{
+                text: '相关单号',
+                dataIndex: 'pd_ordercode',
+                width: 150
+            },{
+                text: '物料编号',
+                dataIndex: 'pd_prodcode',
+                width: 150
+            },{
+                text: '物料名称',
+                dataIndex: 'pr_detail',
+                width: 200
+            },{
+                text: '物料规格',
+                dataIndex: 'pr_spec',
+                width: 150
+            },{
+                text: '单位',
+                dataIndex: 'pr_unit',
+                width: 80
+            },{
+                text: '数量',
+                dataIndex: 'pd_outqty',
+                xtype:'numbercolumn',
+                width: 110,
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                },
+            },{
+                text: '仓库',
+                dataIndex: 'pd_whname',
+                width: 150
+            },{
+                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: 110
+            },{
+                text: '税率',
+                dataIndex: 'pd_taxrate',
+                xtype:'numbercolumn',
+                width: 80,
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
+                },
+            },{
+                text: '金额',
+                dataIndex: 'pd_total',
+                xtype:'numbercolumn',
+                width: 110,
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                },
+            }]
     }
 });

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

@@ -5,19 +5,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pi_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'ve_code',to:'pi_vendcode'
-                        },{
-                            from:'ve_name',to:'pi_vendname'
-                        }],
-                    }) ;   
-
-                }
-            },
             //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){

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

@@ -105,7 +105,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 width : 0
             }, {
                 text : "物料编号", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "sd_prodcode", 
                 xtype : "", 
                 items : null,
@@ -129,9 +129,9 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 hidden: true,
             }, {
                 text : "名称", 
-                dataIndex : "pr_detail",
+                dataIndex : "pr_detail", 
+                width : 200.0,
                 ignore:true,
-                width : 150.0, 
                 renderer: function (v, m, r) {
                     if(!v){
                         return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
@@ -151,7 +151,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 }
             }, {
                 text : "数量", 
-                dataIndex : "sd_qty",
+                dataIndex : "sd_qty", 
+                width : 110.0,
                 xtype: 'numbercolumn',
                 allowBlank:false, 
                 editor : {
@@ -200,7 +201,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 text : "单价", 
                 xtype: 'numbercolumn',
                 dataIndex : "sd_price", 
-                width : 120.0,
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -217,7 +218,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 text : "税率", 
                 xtype: 'numbercolumn',
                 dataIndex : "sd_taxrate", 
-                width : 120.0, 
+                width : 80.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 0,
@@ -230,6 +231,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             },{
                 text : "交货日期", 
                 dataIndex : "sd_delivery", 
+                width : 110.0, 
                 xtype:'datecolumn',
                 editor : {
                     xtype : "datefield",
@@ -241,7 +243,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 text : "含税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "sd_total", 
-                width : 120.0,
+                width : 110.0,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -259,7 +261,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             {
                 text : "未税金额", 
                 xtype: 'numbercolumn',
-                dataIndex : "sd_nettotal",
+                dataIndex : "sd_nettotal", 
+                width : 110.0,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -276,7 +279,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             },{
                 text : "关联采购订单", 
                 dataIndex : "sd_pucode",
-                width : 120.0, 
+                width : 150.0, 
                 items : null,
                 ignore:true
             },{

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

@@ -74,13 +74,13 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 saas.util.BaseUtil.openTab('sale-saleout-formpanel',name+"("+codeValue+")",codeValue+intValue, {
                     initId: intValue
                 });
-                saas.util.BaseUtil.showToast('转单成功');  
+                saas.util.BaseUtil.showSuccessToast('转单成功');  
                 saas.util.FormUtil.loadData(form);
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('转单失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('转单失败: ' + res.message);
         });
      },
     turnPurchase : function(){
@@ -99,13 +99,13 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                     saas.util.BaseUtil.openTab('purchase-purchase-formpanel',name+"("+codeValue+")",codeValue+intValue, {
                         initId: intValue
                     });
-                    saas.util.BaseUtil.showToast('转单成功');
+                    saas.util.BaseUtil.showSuccessToast('转单成功');
                     saas.util.FormUtil.loadData(form);
                 }
             })
             .catch(function(res) {
                 console.error(res);
-                saas.util.BaseUtil.showToast('转单失败: ' + res.message);
+                saas.util.BaseUtil.showErrorToast('转单失败: ' + res.message);
             });
     }
 });

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

@@ -11,24 +11,18 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         xtype: 'hidden',
         name: 'sa_id',
         fieldLabel: 'ID',
-        columnWidth: 0
-    }, {
+        columnWidth: 0,
+        getCondition: function(value) {
+            return 'sa_id=' + value;
+        }
+    },{
         xtype: 'textfield',
         name: 'sa_code',
-        fieldLabel: '销售编号'
-    }, {
-        xtype: 'condatefield',
-        name: 'sa_date',
-        fieldLabel: '单据日期',
-        columnWidth: 0.5
-    }, {
-        xtype: 'hidden',
-        name: 'sa_custcode',
-        fieldLabel: '客户编号'
-    }, {
-        xtype: 'customerDbfindTrigger',
-        name: 'sa_custname',
-        fieldLabel: '客户名称'
+        fieldLabel: '单号/客户',
+        emptyText:'请输入单号或客户',
+        getCondition: function(value) {
+           return  ' (sa_code like\'%' + value + '%\' or sa_custcode like \'%'+value+'%\' or sa_custname like \'%'+value+'%\') ';
+        }
     }, {
         xtype: 'hidden',
         name: 'sd_prodcode',
@@ -37,8 +31,13 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        fieldLabel: '物料名称',
+        fieldLabel: '物料',
         showDetail: true
+    }, {
+        xtype: 'condatefield',
+        name: 'sa_date',
+        fieldLabel: '日期',
+        columnWidth: 0.5
     }, {
         xtype: 'combobox',
         name: 'sa_statuscode',
@@ -92,31 +91,24 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '销售单号',
             dataIndex: 'sa_code',
-            width: 180
+            width: 150
+        }, {
+            text: '单据日期',
+            dataIndex: 'sa_date',
+            xtype: 'datecolumn',
+            width: 110
         }, {
             text: '客户编号',
             dataIndex: 'sa_custcode',
-            width: 150
+            width: 0
         }, {
             text: '客户名称',
             dataIndex: 'sa_custname',
-            width: 180
-        }, {
-            text: '审核状态',
-            dataIndex: 'sa_status',
-            width: 120
-        }, {
-            text: '业务状态',
-            dataIndex: 'sa_sendstatus',
-            width: 120
-        }, {
-            text: '单据日期',
-            dataIndex: 'sa_date',
-            xtype: 'datecolumn',
-            width: 200
+            width: 250
         }, {
-            text: '金额',
+            text: '总金额',
             dataIndex: 'sa_total',
+            width: 110,
             xtype: 'numbercolumn',
             renderer : function(v) {
                 var arr = (v + '.').split('.');
@@ -125,17 +117,29 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text: '制单人',
+            text: '审核状态',
+            dataIndex: 'sa_status',
+            width: 90
+        }, {
+            text: '业务状态',
+            dataIndex: 'sa_sendstatus',
+            width: 90
+        }, {
+            text: '业务员',
+            dataIndex: 'sa_seller',
+            width: 110
+        }, {
+            text: '录入人',
             dataIndex: 'creatorName',
-            width: 120
+            width: 0
         }, {
             text: '审核人',
             dataIndex: 'sa_auditman',
-            width: 120
+            width: 110
         }, {
             text: '收货地址',
             dataIndex: 'sa_toplace',
-            width: 380
+            width: 0
         }, {
             text: '备注',
             dataIndex: 'sa_remark',

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

@@ -4,22 +4,6 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=sa_custname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        defaultCondition:"cu_statuscode='OPEN'",
-                        dbfinds:[{
-                            from:'cu_id',to:'sa_custid',ignore:true
-                        },{
-                            from:'cu_code',to:'sa_custcode'
-                        },{
-                            from:'cu_name',to:'sa_custname'
-                        }],
-                    }) ;   
-
-                }
-            },
             //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){

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

@@ -79,7 +79,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 width :0
             }, {
                 text : "物料编号", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "pd_prodcode", 
                 allowBlank:false,
                 editor : {
@@ -103,7 +103,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "名称", 
                 dataIndex : "pr_detail",
                 ignore:true,
-                width : 150.0, 
+                width : 200.0, 
                 renderer: function (v, m, r) {
                     if(!v){
                         return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
@@ -126,7 +126,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
                 allowBlank:false,
-                width : 120.0,
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 3,
@@ -157,7 +157,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
                 allowBlank:false,
-                width : 120.0, 
+                width : 150.0, 
                 editor : {
                     displayField : "display", 
                     editable : true, 
@@ -176,7 +176,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "单价", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_sendprice", 
-                width : 120.0, 
+                width : 110.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -193,7 +193,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "含税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
-                width : 120.0, 
+                width : 110.0, 
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -211,7 +211,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "税率", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
-                width : 120.0, 
+                width : 80.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 0,
@@ -226,6 +226,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "未税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
+                width : 110.0, 
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -243,18 +244,17 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             {
                 text : "销售订单明细id", 
                 dataIndex : "pd_sdid", 
-                width : 120.0,
                 hidden:true
             },
             {
                 text : "销售单号", 
                 dataIndex : "pd_ordercode", 
-                width : 120.0
+                width : 150.0
             },{
                 text : "销售序号", 
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
-                width: 100,
+                width: 80,
                 format: '0',
                 renderer: function(v) {
                     return v ? v : null;

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

@@ -11,37 +11,34 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         xtype: 'hidden',
         name: 'id',
         fieldLabel: 'ID'
-    }, {
+    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单据编号'
-    }, {
-        xtype: 'condatefield',
-        name: 'pi_date',
-        fieldLabel: '单据日期',
-        columnWidth: 0.5
+        fieldLabel: '单号/客户',
+        emptyText:'请输入单号或客户或关联单号',
+        getCondition: function(value) {
+            return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' or pi_sacode like \'%'+value+'%\') ';
+        }
     }, {
         xtype: 'hidden',
-        name: 'pi_custcode',
-        fieldLabel: '客户编号'
-    }, {
-        xtype: 'textfield',
-        name: 'pi_custname',
-        fieldLabel: '客户名称'
-    }, {
-        xtype: 'productDbfindTrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         showDetail: true
     }, {
-        xtype: 'textfield',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        fieldLabel: '物料名称',
+        fieldLabel: '物料',
         showDetail: true
+    }, {
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '日期',
+        allowBlank: true,
+        columnWidth: 0.5
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '单据状态',
         queryMode: 'local',
         emptyText :'全部',
         editable:false,
@@ -77,115 +74,123 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '退货单号',
             dataIndex: 'pi_inoutno',
-            width: 200
-        }, {
-            text: '审核状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
-            text: '单据类型',
-            dataIndex: 'pi_class',
-            width: 120
+            width: 150
         }, {
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
+            width: 110
         },{
-            text: '销售单号',
-            dataIndex: 'pd_ordercode',
-            width: 200
-        }, {
-            text: '客户编号',
-            dataIndex: 'pi_custcode',
-            width: 200
-        }, {
             text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 200
+            width: 250
         },{
-            text: '含税金额',
+            text: '关联出货单号',
+            dataIndex: 'pi_iocode',
+            width: 150
+        },{
+            text: '总金额',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
-            width: 120,
-            align:'right'
+            width: 110
+        }, {
+            text: '单据状态',
+            dataIndex: 'pi_status',
+            width: 90
         },{
-            text: '未税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 120,
-            align:'right'
+            text: '收款状态',
+            dataIndex: 'pi_prstatus',
+            width: 90
+        },{
+            text: '业务员',
+            dataIndex: 'sa_seller',
+            width: 90
+        },{
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 110
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
-            width: 250
+            width: 250,
+            flex:1
+        },{
+            text: '未含税金额',
+            dataIndex: 'pi_nettotal',
+            xtype:'numbercolumn',
+            width: 0
+        },{
+            text: '单据类型',
+            dataIndex: 'pi_class',
+            width: 0
         }],
         relativeColumn: [{
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'id',
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
-            dataIndex: 'pd_inoutno',
-            width: 200
-        }, {
-            text: '审核状态',
-            dataIndex: 'pi_status',
-            width: 120
+            text: '出货单号',
+            dataIndex: 'pi_inoutno',
+            width: 150
         }, {
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
+            width: 110
         },{
             text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 120
-        },{
-            text: '销售单号',
+            width: 250
+        }, {
+            text: '单据状态',
+            dataIndex: 'pi_status',
+            width: 90
+        }, {
+            text: '明细序号',
+            dataIndex: 'pd_detno',
+            xtype: 'numbercolumn',
+            width: 80
+        }, {
+            text: '关联销售单号',
             dataIndex: 'pd_ordercode',
-            width: 120
-        },{
-            text: '销售序号',
+            width: 150
+        }, {
+            text: '订单序号',
             dataIndex: 'pd_orderdetno',
             xtype:'numbercolumn',
-            width: 120
-        },{
+            width: 80
+        }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
-            width: 120
-        },{
-            text: '验收数量',
+            width: 150
+        }, {
+            text: '退货数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
-            width: 120
-        },{
+            width: 110
+        }, {
             text: '销售单价',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 120,
-            align:'right'
-        },{
+            width: 110
+        }, {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
-            width: 120,
-            align:'right'
-        },{
+            width: 110
+        }, {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120,
-            align:'right'
-        },{
+            width: 80
+        }, {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 120,
-            align:'right'
+            width: 110
         }, {
             text: '备注',
             dataIndex: 'pd_remark',

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

@@ -88,7 +88,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 width : 0
             }, {
                 text : "物料编号", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null,
@@ -114,7 +114,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 text : "名称", 
                 dataIndex : "pr_detail",
                 ignore:true,
-                width : 150.0, 
+                width : 200.0, 
                 renderer: function (v, m, r) {
                     if(!v){
                         return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null;
@@ -136,7 +136,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 text : "出货数量", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_outqty", 
-                width : 120.0, 
+                width : 110.0, 
                 allowBlank:false,
                 editor : {
                     xtype : "numberfield",
@@ -167,7 +167,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }, {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
-                width : 120.0, 
+                width : 150.0, 
                 items : null,
                 allowBlank:false,
                 editor : {
@@ -188,7 +188,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 text : "单价", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_sendprice", 
-                width : 120.0,
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -205,7 +205,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 text : "含税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
-                width : 120.0, 
+                width : 110.0, 
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -223,7 +223,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 text : "税率", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
-                width : 120.0, 
+                width : 80.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 0,
@@ -238,6 +238,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 text : "未税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
+                width : 110.0, 
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length)).fill('0');
@@ -255,12 +256,12 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             {
                 text : "销售单号", 
                 dataIndex : "pd_ordercode", 
-                width : 200.0
+                width : 150.0
             },{
                 text : "销售序号", 
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
-                width : 120.0,
+                width : 80.0,
                 format: '0',
                 renderer: function(v) {
                     return v ? v : null;

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

@@ -71,13 +71,13 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                 saas.util.BaseUtil.openTab('sale-salein-formpanel',name+"("+codeValue+")",codeValue+intValue, {
                     initId: intValue
                 });
-                saas.util.BaseUtil.showToast('转单成功');  
+                saas.util.BaseUtil.showSuccessToast('转单成功');  
                 saas.util.FormUtil.loadData(form);  
             }
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('转单失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('转单失败: ' + res.message);
         });
      }
 });

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

@@ -12,38 +12,34 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         name: 'pi_id',
         fieldLabel: 'ID',
         columnWidth: 0
-    }, {
+    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单据编号'
-    }, {
-        xtype: 'condatefield',
-        name: 'pi_recorddate',
-        fieldLabel: '单据日期',
-        allowBlank: true,
-        columnWidth: 0.5
+        fieldLabel: '单号/客户',
+        emptyText:'请输入单号或客户或关联单号',
+        getCondition: function(value) {
+            return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' or pi_iocode like \'%'+value+'%\') ';
+        }
     }, {
         xtype: 'hidden',
-        name: 'pi_custcode',
-        fieldLabel: '客户编号'
-    }, {
-        xtype: 'customerDbfindTrigger',
-        name: 'pi_custname',
-        fieldLabel: '客户名称'
-    }, {
-        xtype: 'productDbfindTrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         showDetail: true
     }, {
-        xtype: 'textfield',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        fieldLabel: '物料名称',
+        fieldLabel: '物料',
         showDetail: true
+    }, {
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '日期',
+        allowBlank: true,
+        columnWidth: 0.5
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '单据状态',
         queryMode: 'local',
         emptyText :'全部',
         editable:false,
@@ -79,44 +75,57 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '出货单号',
             dataIndex: 'pi_inoutno',
-            width: 200
-        }, {
-            text: '审核状态',
-            dataIndex: 'pi_status',
-            width: 120
-        },{
-            text: '单据类型',
-            dataIndex: 'pi_class',
-            width: 120
+            width: 150
         }, {
             text: '单据日期',
-            dataIndex: 'pi_recorddate',
+            dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
-        },{
-            text: '销售单号',
-            dataIndex: 'pi_sacode',
-            width: 200
+            width: 110
         },{
             text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 120
+            width: 250
+        },{
+            text: '关联销售单号',
+            dataIndex: 'pi_sacode',
+            width: 150
         },{
-            text: '含税金额',
+            text: '总金额',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
-            width: 120
+            width: 110
+        }, {
+            text: '单据状态',
+            dataIndex: 'pi_status',
+            width: 90
         },{
-            text: '未含税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 120
+            text: '收款状态',
+            dataIndex: 'pi_prstatus',
+            width: 90
+        },{
+            text: '业务员',
+            dataIndex: 'sa_seller',
+            width: 90
+        },{
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 110
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
             width: 250,
+            flex:1
+        },{
+            text: '未含税金额',
+            dataIndex: 'pi_nettotal',
+            xtype:'numbercolumn',
+            width: 0
+        },{
+            text: '单据类型',
+            dataIndex: 'pi_class',
+            width: 0
         }],
         relativeColumn: [{
             text: 'id',
@@ -124,65 +133,65 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '出货单号',
             dataIndex: 'pi_inoutno',
-            width: 200
-        }, {
-            text: '审核状态',
-            dataIndex: 'pi_status',
-            width: 120
+            width: 150
         }, {
             text: '单据日期',
-            dataIndex: 'pi_recorddate',
+            dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
-        } ,{
+            width: 110
+        },{
             text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 120
+            width: 250
+        }, {
+            text: '单据状态',
+            dataIndex: 'pi_status',
+            width: 90
         }, {
             text: '明细序号',
             dataIndex: 'pd_detno',
             xtype: 'numbercolumn',
-            width: 120
+            width: 80
         }, {
-            text: '销售单号',
+            text: '关联销售单号',
             dataIndex: 'pd_ordercode',
-            width: 120
+            width: 150
         }, {
             text: '订单序号',
             dataIndex: 'pd_orderdetno',
             xtype:'numbercolumn',
-            width: 120
+            width: 80
         }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
-            width: 120
+            width: 150
         }, {
             text: '出货数量',
             dataIndex: 'pd_outqty',
             xtype:'numbercolumn',
-            width: 120
+            width: 110
         }, {
             text: '销售单价',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 120
+            width: 110
         }, {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
-            width: 120
+            width: 110
         }, {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120
+            width: 80
         }, {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 120
+            width: 110
         }, {
             text: '备注',
             dataIndex: 'pd_remark',

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

@@ -5,26 +5,8 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pi_custname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[
-                        {
-                            from:'id',to:'pi_custid',ignore:true
-                        },{
-                            from:'cu_code',to:'pi_custcode'
-                        },{
-                            from:'cu_name',to:'pi_custname'
-                        },{
-                            from:'ca_address',to:'ca_address'
-                        }],
-                    }) ;   
-
-                }
-            },
             // 物料编号
-            'dbfindtrigger[name=pd_prodcode]':{
+            'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{

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

@@ -92,7 +92,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             },
             {
                 text : "物料编号", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null,
@@ -117,7 +117,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             },
             {
                 text : "名称", 
-                dataIndex : "pr_detail",
+                dataIndex : "pr_detail", 
+                width : 200.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -128,7 +129,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             },
             {
                 text : "规格", 
-                dataIndex : "pr_spec",
+                dataIndex : "pr_spec", 
+                width : 150.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -141,7 +143,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                 text : "数量", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_outqty", 
-                width : 120.0,
+                width : 110.0,
                 allowBlank:false,
                 editor : {
                     xtype : "numberfield",
@@ -175,7 +177,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             {
                 text : "拨出仓库", 
                 dataIndex : "pd_whname", 
-                width : 120.0, 
+                width : 150.0, 
                 items : null,
                 allowBlank:false,
                 editor : {
@@ -205,7 +207,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             {
                 text : "拨入仓库", 
                 dataIndex : "pd_inwhname", 
-                width : 120.0, 
+                width : 150.0, 
                 allowBlank:false,
                 items : null,
                 editor : {

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

@@ -13,58 +13,28 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
-    }, {
+    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单据编号',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '单号/物料',
+        showDetail: true,
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return  ' (pi_inoutno like\'%' + value + '%\' or pd_prodcode like \'%'+value+'%\' ) ';
+            }
+        }
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
-        fieldLabel: '单据日期',
+        fieldLabel: '日期',
         allowBlank: true,
         columnWidth: 0.5
-    }, {
-        xtype: 'hidden',
-        name: 'pi_vendcode',
-        fieldLabel: '供应商编号',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'vendorDbfindTrigger',
-        name: 'pi_vendname',
-        fieldLabel: '供应商名称',
-        allowBlank: true,
-        columnWidth: 0.25
-    },{
-        xtype: 'textfield',
-        name: 'pi_custcode',
-        fieldLabel: '客户编号',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'customerDbfindTrigger',
-        name: 'pi_custname',
-        fieldLabel: '客户名称',
-        allowBlank: true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'hidden',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        showDetail: true
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料名称',
-        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '状态',
         allowBlank: true,
         editable:false,
         columnWidth: 0.25,
@@ -88,6 +58,19 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 return 'pi_statuscode=\'' + value + '\'';
             }
         }
+    },{
+        xtype: 'textfield',
+        name: 'pd_whcode',
+        fieldLabel: '仓库',
+        emptyText :'请输入仓库名或仓库编号',
+        showDetail: true,
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return  ' (pd_whcode like\'%' + value + '%\' or pd_whname like \'%'+value+'%\' or pd_inwhcode like\'%' + value + '%\' or pd_inwhname like \'%'+value+'%\') ';
+            }
+        }
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
@@ -103,113 +86,85 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '调拨单号',
             dataIndex: 'pi_inoutno',
-            width: 200
+            width: 150
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 120
+            width: 0
         },{
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
+            width: 110
         },{
-            text: '审核状态',
+            text: '状态',
             dataIndex: 'pi_status',
-            width: 120
+            width: 90
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
-            width: 120
+            width: 0
         },{
             text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 120
+            width: 0
         },{
-            text: '制单人',
+            text: '录入人',
             dataIndex: 'creatorName',
-            width: 120
+            width: 110
         },{
             text: '审核人',
             dataIndex: 'pi_auditman',
-            width: 120
+            width: 110
         },{
             text: '备注',
             dataIndex: 'pi_remark',
-            width: 200
+            width: 250
         }],
         relativeColumn: [{
             text: 'id',
-            dataIndex: 'pu_id',
-            xtype: 'numbercolumn',
-            hidden:true
+            dataIndex: 'id',
+            hidden:true,
+            xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '调拨单号',
             dataIndex: 'pi_inoutno',
-            width: 200
-        }, {
+            width: 150
+        },{
             text: '单据类型',
-            dataIndex: 'pd_piclass',
-            width: 200
+            dataIndex: 'pi_class',
+            width: 0
         },{
-            text: '审核状态',
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            xtype:'datecolumn',
+            width: 110
+        },{
+            text: '状态',
             dataIndex: 'pi_status',
-            width: 120
+            width: 90
         },{
-            text: '客户编号',
-            dataIndex: 'pi_custcode',
-            width: 120
+            text: '供应商名称',
+            dataIndex: 'pi_vendname',
+            width: 0
         },{
             text: '客户名称',
             dataIndex: 'pi_custname',
-            width: 120
-        },{
-            text: '物料编号',
-            dataIndex: 'pd_prodcode',
-            width: 120
-        },{
-            text: '物料名称',
-            dataIndex: 'pr_detail',
-            width: 120
-        },{
-            text: '物料规格',
-            dataIndex: 'pr_spec',
-            width: 120
-        },{
-            text: '单位',
-            dataIndex: 'pr_unit',
-            width: 120
-        },{
-            text: '数量',
-            dataIndex: 'pd_inqty',
-            xtype:'numbercolumn',
-            width: 120
-        },{
-            text: '仓库',
-            dataIndex: 'pd_whname',
-            width: 120
-        },{
-            text: '单位成本',
-            dataIndex: 'pd_orderprice',
-            xtype:'numbercolumn',
-            width: 120
-        },{
-            text: '税率',
-            dataIndex: 'pd_taxrate',
-            xtype:'numbercolumn',
-            width: 120
-        },{
-            text: '金额',
-            dataIndex: 'pd_total',
-            xtype:'numbercolumn',
-            width: 120
-        },{
-            text: '相关单号',
-            dataIndex: 'pd_ordercode',
-            xtype:'numbercolumn',
-            width: 120
+            width: 0
+        },{
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width: 110
+        },{
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 110
+        },{
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 250
         }]
     }
 });

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

@@ -5,48 +5,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pi_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'ve_code',to:'pi_vendcode'
-                        },{
-                            from:'ve_name',to:'pi_vendname'
-                        }],
-                    }) ;   
-
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pr_detail]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'pr_detail',to:'pr_detail',
-                        },{
-                            from:'pr_code',to:'pd_prodcode',
-                        }, {
-                            from:'pr_detail',to:'pr_detail'
-                        }],
-                    }) ;   
-
-                }
-            },
-            'dbfindtrigger[name=pi_custname]': {
-                beforerender: function (f) {
-                    Ext.apply(f, {
-                        dbfinds: [{
-                            from: 'id',to: 'pi_custid',ignore:true
-                        }, {
-                            from: 'cu_code',to: 'pi_custcode'
-                        }, {
-                            from: 'cu_name',to: 'pi_custname'
-                        }],
-                    });
-
-                }
-            },                
         });
 
     }

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

@@ -143,7 +143,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             },
             {
                 text : "物料编号", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "mm_prodcode", 
                 allowBlank : false,
                 xtype : "", 
@@ -169,7 +169,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             {
                 text : "名称", 
                 dataIndex : "pr_detail",
-                width : 100.0,
+                width : 200.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -181,7 +181,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             {
                 text : "规格", 
                 dataIndex : "pr_spec",
-                width : 100.0,
+                width : 150.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -193,7 +193,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             {
                 text : "单位", 
                 dataIndex : "pr_unit",
-                width : 100.0,
+                width : 80.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -206,7 +206,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 text : "需求数量", 
                 xtype: 'numbercolumn',
                 dataIndex : "mm_qty", 
-                width : 120.0,
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 3,
@@ -230,7 +230,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 text : "单位用量", 
                 xtype: 'numbercolumn',
                 dataIndex : "mm_oneuseqty", 
-                width : 120.0,
+                width : 110.0,
                 hidden:true,
                 editor : {
                     xtype : "numberfield",
@@ -266,7 +266,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             {
                 text : "仓库",
                 dataIndex : "mm_whname",
-                width : 120.0,
+                width : 150.0,
                 items : null,
                 allowBlank : false,
                 editor : {
@@ -286,7 +286,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 text : "成本单价", 
                 dataIndex : "mm_price", 
                 xtype: 'numbercolumn',
-                width : 120.0,
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -305,7 +305,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 text : "成本金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "mm_amount", 
-                width : 120.0, 
+                width : 110.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,

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

@@ -125,7 +125,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('获取BOM资料失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('获取BOM资料失败: ' + res.message);
         });
      }
 });

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

@@ -20,6 +20,24 @@ Ext.define('saas.view.stock.make.QueryPanel', {
         name: 'ma_code',
         fieldLabel: '单据编号'
     },{
+        xtype: 'textfield',
+        name: 'ma_prodcode',
+        fieldLabel: '产品',
+        emptyText :'请输入产品名称或编号',
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return  ' (ma_prodcode like\'%' + value + '%\' or ma_proddetail like \'%'+value+'%\') ';
+            }
+        }
+    }, {
+        xtype: 'condatefield',
+        name: 'createTime',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
+    }, {
         xtype: 'combobox',
         name: 'ma_type',
         fieldLabel: '类型',
@@ -45,10 +63,30 @@ Ext.define('saas.view.stock.make.QueryPanel', {
                 return 'ma_type=\'' + value + '\'';
             }
         }
-    },{
-        xtype: 'bomDbfindTrigger',
-        name: 'ma_prodcode',
-        fieldLabel: '产品编号'
+    }, {
+        xtype: 'combobox',
+        name: 'ma_statuscode',
+        fieldLabel: '单据状态',
+        queryMode: 'local',
+        displayField: 'ma_status',
+        valueField: 'ma_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['ma_statuscode', 'ma_status'],
+        data: [
+            ["ALL", "全部"],
+            ["AUDITED", "已审核"],
+            ["UNAUDITED", "未审核"]
+        ]
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'ma_statuscode=\'' + value + '\'';
+            }
+        }
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
@@ -64,43 +102,43 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '制造单号',
             dataIndex: 'ma_code',
-            width: 200
+            width: 150
         }, {
             text: '类型',
             dataIndex: 'ma_type',
-            width: 120
+            width: 110
         }, {
             text: '产品编号',
             dataIndex: 'ma_prodcode',
-            width: 200
+            width: 150
         }, {
             text: '产品名称',
             dataIndex: 'ma_proddetail',
-            width: 120
+            width: 200
         }, {
             text: '版本号',
             dataIndex: 'ma_version',
-            width: 120
+            width: 80
         }, {
             text: '数量',
             dataIndex: 'ma_qty',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 110,
         },{
             text: '单位',
             dataIndex: 'ma_produnit',
-            width: 120,
+            width: 80,
+        },{
+            text: '单据状态',
+            dataIndex: 'ma_status',
+            width: 90,
         },{
             text: '单位成本',
             dataIndex: 'ma_total',
             xtype: 'numbercolumn',
-            width: 120,
-        },{
-            text: '状态',
-            dataIndex: 'ma_status',
-            width: 120,
+            width: 0,
         }],
         relativeColumn: []
     }

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

@@ -5,52 +5,6 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
-                        },{
-                            from:'ve_name',to:'pu_vendname'
-                        }],
-                    }) ;   
-
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',
-                        }, {
-                            from:'pr_detail',to:'pr_detail'
-                        }],
-                    }) ;   
-
-                }
-            },
-            'dbfindtrigger[name=ma_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //放大镜赋值设置
-                        dbfinds:[{
-                            from:'bo_motherid',to:'ma_prodid'
-                        },{
-                            from:'bo_mothercode',to:'ma_prodcode'
-                        },{
-                            from:'bo_mothername',to:'ma_proddetail'
-                        },{
-                            from:'pr_spec',to:'ma_prodspec'
-                        },{
-                            from:'bo_version',to:'ma_version'
-                        }],
-                    }) ;   
-
-                }
-            },
-
         });
 
     }

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

@@ -93,7 +93,6 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        // deleteDetailUrl:'http://localhost:9000/prodinout/deleteDetail/',
         deleteDetailUrl:'/api/storage/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
@@ -110,7 +109,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "物料编号", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null,
@@ -135,7 +134,8 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "名称", 
-                dataIndex : "pr_detail",
+                dataIndex : "pr_detail", 
+                width : 200.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -146,7 +146,8 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "规格", 
-                dataIndex : "pr_spec",
+                dataIndex : "pr_spec", 
+                width : 150.0,
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -159,7 +160,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 text : "数量", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
-                width : 120.0,
+                width : 110.0,
                 allowBlank : false,
                 editor : {
                     xtype : "numberfield",
@@ -193,7 +194,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
-                width : 120.0, 
+                width : 150.0, 
                 allowBlank : false,
                 editor : {
                     displayField : "display", 
@@ -213,7 +214,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 text : "单价", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_orderprice",
-                width : 120.0,
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -230,7 +231,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 text : "含税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
-                width : 120.0,
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,
@@ -252,7 +253,8 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             }, {
                 text : "税率", 
                 xtype: 'numbercolumn',
-                dataIndex : "pd_taxrate",
+                dataIndex : "pd_taxrate", 
+                width : 80.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 0,
@@ -264,6 +266,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 text : "未税金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
+                width : 110.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,

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

@@ -10,75 +10,46 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
     queryFormItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
-    }, {
-        xtype: 'textfield',
-        name: 'pi_inoutno',
-        bind: '{pi_inoutno}',
-        fieldLabel: '单据编号',
-        allowBlank: true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'condatefield',
-        name: 'pi_date',
-        bind: '{pi_date}',
-        fieldLabel: '单据日期',
-        allowBlank: true,
-        columnWidth: 0.5
-    },{
-        xtype: 'textfield',
-        name: 'pi_vendcode',
-        fieldLabel: '供应商编号',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'vendorDbfindTrigger',
-        name: 'pi_vendname',
-        fieldLabel: '供应商名称',
-        emptyText:'输入供应商编号或名称',
-        allowBlank: true,
-        columnWidth: 0.25
     },{
         xtype: 'textfield',
-        name: 'pi_custcode',
-        fieldLabel: '客户编号',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'customerDbfindTrigger',
-        name: 'pi_custname',
-        fieldLabel: '客户名称',
-        emptyText:'输入客户编号或名称',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
+        name: 'pi_inoutno',
+        fieldLabel: '单号/供应商',
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
+            }
+        }
     }, {
         xtype: 'textfield',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
-        hidden: true,
+        hidden:true,
         showDetail: true
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        fieldLabel: '物料名称',
+        fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
+    }, {
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '状态',
         allowBlank: true,
-        editable:false,
-        columnWidth: 0.25,
-        queryMode: 'local',
         emptyText :'全部',
         editable:false,
+        queryMode: 'local',
         displayField: 'pi_status',
         valueField: 'pi_statuscode',
         store: Ext.create('Ext.data.ArrayStore', {
@@ -104,136 +75,139 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         addXtype:'stock-otherin-formpanel',
         defaultCondition:' pi_class = \'其它入库单\'',
         baseVastUrl:'/api/storage/prodinout/',
-        // baseVastUrl:"http://localhost:9000/prodinout/",
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '其它入库单号',
             dataIndex: 'pi_inoutno',
-            width: 200
+            width: 150
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 120
+            width: 0
         },{
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
-        },{
-            text: '审核状态',
-            dataIndex: 'pi_status',
-            width: 120
+            width: 110
         },{
-            text: '供应商名称',
+            text: '供应商',
             dataIndex: 'pi_vendname',
-            width: 120
+            width: 250
+        },{
+            text: '状态',
+            dataIndex: 'pi_status',
+            width: 90
         },{
-            text: '制单人',
+            text: '录入人',
             dataIndex: 'creatorName',
-            width: 120
+            width: 110
         },{
             text: '审核人',
             dataIndex: 'pi_auditman',
-            width: 120
+            width: 110
         },{
             text: '备注',
             dataIndex: 'pi_remark',
-            width: 200
+            width: 250
         }],
-        relativeColumn: [{
+        relativeColumn: [
+        {
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'pi_id',
             xtype: 'numbercolumn',
             hidden:true
-        }, {
-            text: '单据编号',
+        },{
+            text: '其它入库单号',
             dataIndex: 'pi_inoutno',
-            width: 200
-        }, {
+            width: 150
+        },{
             text: '单据类型',
-            dataIndex: 'pd_piclass',
-            width: 200
+            dataIndex: 'pi_class',
+            width: 0
         },{
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
+            width: 110
+        },{
+            text: '供应商',
+            dataIndex: 'pi_vendname',
+            width: 250
         },{
-            text: '审核状态',
+            text: '状态',
             dataIndex: 'pi_status',
-            width: 120
+            width: 90
         },{
-            text: '客户编号',
-            dataIndex: 'pi_custcode',
-            hidden:true,
-            width: 120
+            text: '序号',
+            dataIndex: 'pd_pdno',
+            width: 80
         },{
-            text: '供应商名称',
-            dataIndex: 'pi_vendname',
-            width: 120
+            text: '相关单号',
+            dataIndex: 'pd_ordercode',
+            width: 150
         },{
             text: '物料编号',
             dataIndex: 'pd_prodcode',
-            width: 120
+            width: 150
         },{
             text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 120
+            width: 200
         },{
             text: '物料规格',
             dataIndex: 'pr_spec',
-            width: 120
+            width: 150
         },{
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 120
+            width: 80
         },{
             text: '数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
-            width: 120
+            width: 10
         },{
             text: '仓库',
             dataIndex: 'pd_whname',
-            width: 120
+            width: 150
         },{
             text: '单价',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
+            width: 110,
             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: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120,            renderer : function(v) {
+            width: 80,            
+            renderer : function(v) {
                 return Ext.util.Format.number(v, '0');
             },
         },{
             text: '金额',
             dataIndex: 'pd_total',
-            xtype:'numbercolumn',
+            xtype:'numbercolumn',            
+            width: 110,
             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: '相关单号',
-            dataIndex: 'pd_ordercode',
-            xtype:'numbercolumn',
-            width: 120
+            text: '备注',
+            dataIndex: 'pd_remark',
+            width:250
         }]
     }
 });

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

@@ -5,49 +5,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pi_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'ve_code',to:'pi_vendcode'
-                        },{
-                            from:'ve_name',to:'pi_vendname'
-                        }],
-                    }) ;   
-
-                }
-            },
-            // 物料名称
-            'dbfindtrigger[name=pr_detail]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'pr_detail',to:'pr_detail',
-                        },{
-                            from:'pr_code',to:'pd_prodcode',
-                        }, {
-                            from:'pr_detail',to:'pr_detail'
-                        }],
-                    }) ;   
-
-                }
-            },
-            'dbfindtrigger[name=pi_custname]': {
-                beforerender: function (f) {
-                    Ext.apply(f, {
-                        dbfinds: [{
-                            from: 'id',to: 'pi_custid',ignore:true
-                        }, {
-                            from: 'cu_code',to: 'pi_custcode'
-                        }, {
-                            from: 'cu_name',to: 'pi_custname'
-                        }],
-                    });
-
-                }
-            },            
         });
-
     }
 });

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

@@ -78,7 +78,6 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         name: "detailGridField",
         xtype: "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        // _deleteDetailUrl:'http://localhost:9000/prodinout/deleteDetail/',
         deleteDetailUrl: '/api/storage/prodinout/deleteDetail/',
         detnoColumn: 'pd_pdno',
         columns: [{
@@ -94,7 +93,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "物料编号",
-                width: 200.0,
+                width: 150.0,
                 dataIndex: "pd_prodcode",
                 xtype: "",
                 items: null,
@@ -119,7 +118,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "名称",
-                dataIndex: "pr_detail",
+                dataIndex: "pr_detail", 
+                width : 200.0,
                 ignore: true,
                 renderer: function (v, m, r) {
                     return r.data["productDTO"] ? r.data["productDTO"][m.column.dataIndex] : v;
@@ -127,7 +127,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "规格",
-                dataIndex: "pr_spec",
+                dataIndex: "pr_spec", 
+                width : 150.0,
                 ignore: true,
                 renderer: function (v, m, r) {
                     return r.data["productDTO"] ? r.data["productDTO"][m.column.dataIndex] : v;
@@ -138,7 +139,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 xtype: 'numbercolumn',
                 dataIndex: "pd_outqty",
                 allowBlank : false,
-                width: 120.0,
+                width: 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -171,7 +172,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             {
                 text: "仓库",
                 dataIndex: "pd_whname",
-                width: 120.0,
+                width: 150.0,
                 allowBlank : false,
                 editor: {
                     displayField: "display",
@@ -190,7 +191,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             {
                 text: "单价",
                 xtype: 'numbercolumn',
-                dataIndex: "pd_orderprice",
+                dataIndex: "pd_orderprice", 
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -207,7 +209,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 text: "含税金额",
                 xtype: 'numbercolumn',
                 dataIndex: "pd_total",
-                width: 120.0,
+                width: 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,
@@ -229,7 +231,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             }, {
                 text: "税率",
                 xtype: 'numbercolumn',
-                dataIndex: "pd_taxrate",
+                dataIndex: "pd_taxrate", 
+                width : 80.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 0,
@@ -240,7 +243,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             {
                 text: "未税金额",
                 xtype: 'numbercolumn',
-                dataIndex: "pd_nettotal",
+                dataIndex: "pd_nettotal", 
+                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2,

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

@@ -16,51 +16,40 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单据编号',
-        allowBlank: true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'condatefield',
-        name: 'pi_date',
-        fieldLabel: '单据日期',
-        allowBlank: true,
-        columnWidth: 0.5
-    }, {
-        xtype: 'textfield',
-        name: 'pi_custcode',
-        fieldLabel: '客户编号',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'customerDbfindTrigger',
-        name: 'pi_custname',
-        fieldLabel: '客户名称',
-        emptyText:'输入客户编号或名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '单号/供应商',
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\') ';
+            }
+        }
     }, {
         xtype: 'textfield',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
-        hidden: true,
+        hidden:true,
         showDetail: true
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        fieldLabel: '物料名称',
+        fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
+    }, {
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '状态',
         allowBlank: true,
-        editable:false,
-        columnWidth: 0.25,
-        queryMode: 'local',
         emptyText :'全部',
         editable:false,
+        queryMode: 'local',
         displayField: 'pi_status',
         valueField: 'pi_statuscode',
         store: Ext.create('Ext.data.ArrayStore', {
@@ -86,136 +75,139 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         addXtype:'stock-otherout-formpanel',
         defaultCondition:' pi_class = \'其它出库单\'',
         baseVastUrl:'/api/storage/prodinout/',
-        // baseVastUrl:"http://localhost:9000/prodinout/",
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '其它入库单号',
             dataIndex: 'pi_inoutno',
-            width: 200
+            width: 150
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 120
+            width: 0
         },{
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
-        },{
-            text: '审核状态',
-            dataIndex: 'pi_status',
-            width: 120
+            width: 110
         },{
-            text: '客户名称',
+            text: '客户',
             dataIndex: 'pi_custname',
-            width: 120
+            width: 250
         },{
-            text: '制单人',
+            text: '状态',
+            dataIndex: 'pi_status',
+            width: 90
+        },{
+            text: '录入人',
             dataIndex: 'creatorName',
-            width: 120
+            width: 110
         },{
             text: '审核人',
             dataIndex: 'pi_auditman',
-            width: 120
+            width: 110
         },{
             text: '备注',
             dataIndex: 'pi_remark',
-            width: 200
+            width: 250
         }],
-        relativeColumn: [{
+        relativeColumn: [
+        {
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'pi_id',
             xtype: 'numbercolumn',
             hidden:true
-        }, {
-            text: '单据编号',
+        },{
+            text: '其它入库单号',
             dataIndex: 'pi_inoutno',
-            width: 200
-        }, {
+            width: 150
+        },{
             text: '单据类型',
-            dataIndex: 'pd_piclass',
-            width: 200
+            dataIndex: 'pi_class',
+            width: 0
         },{
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
-            width: 200
+            width: 110
         },{
-            text: '审核状态',
+            text: '供应商',
+            dataIndex: 'pi_vendname',
+            width: 250
+        },{
+            text: '状态',
             dataIndex: 'pi_status',
-            width: 120
+            width: 90
         },{
-            text: '客户编号',
-            dataIndex: 'pi_custcode',
-            width: 120
+            text: '序号',
+            dataIndex: 'pd_pdno',
+            width: 80
         },{
-            text: '客户名称',
-            dataIndex: 'pi_custname',
-            width: 120
+            text: '相关单号',
+            dataIndex: 'pd_ordercode',
+            width: 150
         },{
             text: '物料编号',
             dataIndex: 'pd_prodcode',
-            width: 120
+            width: 150
         },{
             text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 120
+            width: 200
         },{
             text: '物料规格',
             dataIndex: 'pr_spec',
-            width: 120
+            width: 150
         },{
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 120
+            width: 80
         },{
             text: '数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
-            width: 120
+            width: 10
         },{
             text: '仓库',
             dataIndex: 'pd_whname',
-            width: 120
+            width: 150
         },{
             text: '单价',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
+            width: 110,
             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: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120,
+            width: 80,            
             renderer : function(v) {
                 return Ext.util.Format.number(v, '0');
             },
         },{
             text: '金额',
             dataIndex: 'pd_total',
-            xtype:'numbercolumn',
+            xtype:'numbercolumn',            
+            width: 110,
             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: '相关单号',
-            dataIndex: 'pd_ordercode',
-            xtype:'numbercolumn',
-            width: 120
+            text: '备注',
+            dataIndex: 'pd_remark',
+            width:250
         }]
     }
 });

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

@@ -5,49 +5,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            // 供应商名称
-            'dbfindtrigger[name=pi_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'ve_code',to:'pi_vendname'
-                        },{
-                            from:'ve_name',to:'pi_vendname'
-                        }],
-                    }) ;   
-
-                }
-            },
-            // 物料名称
-            'dbfindtrigger[name=pr_detail]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[{
-                            from:'pr_detail',to:'pr_detail',
-                        },{
-                            from:'pr_code',to:'pd_prodcode',
-                        }, {
-                            from:'pr_detail',to:'pr_detail'
-                        }],
-                    }) ;   
-
-                }
-            },
-            'dbfindtrigger[name=pi_custname]': {
-                beforerender: function (f) {
-                    Ext.apply(f, {
-                        dbfinds: [{
-                            from: 'id',to: 'pi_custid',ignore:true
-                        }, {
-                            from: 'cu_code',to: 'pi_custcode'
-                        }, {
-                            from: 'cu_name',to: 'pi_custname'
-                        }],
-                    });
-
-                }
-            },             
         });
-
     }
 });

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

@@ -73,7 +73,7 @@ Ext.define('saas.view.sys.account.DataList', {
     },{
         text : '联系邮箱', 
         dataIndex : 'email', 
-        width : 220.0, 
+        width : 180.0, 
         xtype : '', 
     },{
         text : '关联角色id', 
@@ -146,7 +146,7 @@ Ext.define('saas.view.sys.account.DataList', {
         var grid = this;
         var data = grid.getGridSelected(type);
         if(!data){
-            saas.util.BaseUtil.showToast('请勾选符合条件的行进行操作。');
+            saas.util.BaseUtil.showErrorToast('请勾选符合条件的行进行操作。');
             return false;
         }
         if(data&&data.length>0){
@@ -158,14 +158,14 @@ Ext.define('saas.view.sys.account.DataList', {
                     async:false
                 })
                 .then(function() {
-                    saas.util.BaseUtil.showToast('操作成功');
+                    saas.util.BaseUtil.showSuccessToast('操作成功');
                     grid.store.load();
                 })
                 .catch(function(response) {
-                    saas.util.BaseUtil.showToast('操作失败');
+                    saas.util.BaseUtil.showErrorToast('操作失败');
                 });
         }else{
-            saas.util.BaseUtil.showToast('请勾选至少一条明细。');
+            saas.util.BaseUtil.showErrorToast('请勾选至少一条明细。');
         }
     },
 

frontend/saas-web/app/view/sys/baseconfig/FormPanelController.js

@@ -22,12 +22,12 @@ Ext.define('saas.view.sys.baseconfig.FormPanelController', {
 
         var valid = form.isValid();
         if(!valid) {
-            saas.util.BaseUtil.showToast('表单校验有误，请检查');
+            saas.util.BaseUtil.showErrorToast('表单校验有误，请检查');
             return false;
         }
 
         if(form.getForm().wasDirty==false){
-            saas.util.BaseUtil.showToast('未修改数据，请修改后保存');
+            saas.util.BaseUtil.showErrorToast('未修改数据，请修改后保存');
             return false;
         }
         viewModel = me.getViewModel();
@@ -48,7 +48,7 @@ Ext.define('saas.view.sys.baseconfig.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                saas.util.BaseUtil.showToast('保存成功');
+                saas.util.BaseUtil.showSuccessToast('保存成功');
                 viewModel = form.getViewModel();
                 var url = form._readUrl;
                 saas.util.BaseUtil.request({url })
@@ -71,7 +71,7 @@ Ext.define('saas.view.sys.baseconfig.FormPanelController', {
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('保存失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
         });
     }
 });

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

@@ -188,7 +188,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                         },
                         success: function (response, opts) {
                             form.setLoading(false);
-                            saas.util.BaseUtil.showToast('上传成功');
+                            saas.util.BaseUtil.showSuccessToast('上传成功');
                             var res = Ext.decode(response.responseText);
                             if(res.success){
                                 var data = res.data;
@@ -204,13 +204,13 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                     showSignetPhoto.show();
                                 }
                             }else{
-                                saas.util.BaseUtil.showToast('上传失败: ' + res.message);
+                                saas.util.BaseUtil.showErrorToast('上传失败: ' + res.message);
                             }
                         },
                         failure: function (response, opts) {
                             form.setLoading(false);
                             var res = Ext.decode(response.responseText);
-                            saas.util.BaseUtil.showToast('上传失败: ' + res.message);
+                            saas.util.BaseUtil.showErrorToast('上传失败: ' + res.message);
                         }
                     });
                 }
@@ -315,7 +315,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                         },
                         success: function (response, opts) {
                             form.setLoading(false);
-                            saas.util.BaseUtil.showToast('上传成功');
+                            saas.util.BaseUtil.showSuccessToast('上传成功');
                             var res = Ext.decode(response.responseText);
                             if(res.success){
                                 var data = res.data;
@@ -330,13 +330,13 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                     showLogoPhoto.show();
                                 }
                             }else{
-                                saas.util.BaseUtil.showToast('上传失败: ' + res.message);
+                                saas.util.BaseUtil.showErrorToast('上传失败: ' + res.message);
                             }
                         },
                         failure: function (response, opts) {
                             form.setLoading(false);
                             var res = Ext.decode(response.responseText);
-                            saas.util.BaseUtil.showToast('上传失败: ' + res.message);
+                            saas.util.BaseUtil.showErrorToast('上传失败: ' + res.message);
                         }
                     });
                 }

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

@@ -19,12 +19,12 @@ Ext.define('saas.view.sys.config.FormPanelController', {
 
         var valid = form.isValid();
         if(!valid) {
-            saas.util.BaseUtil.showToast('表单校验有误，请检查');
+            saas.util.BaseUtil.showErrorToast('表单校验有误，请检查');
             return false;
         }
 
         if(form.getForm().wasDirty==false){
-            saas.util.BaseUtil.showToast('未修改数据，请修改后保存');
+            saas.util.BaseUtil.showErrorToast('未修改数据，请修改后保存');
             return false;
         }
         
@@ -39,7 +39,7 @@ Ext.define('saas.view.sys.config.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                saas.util.BaseUtil.showToast('保存成功');
+                saas.util.BaseUtil.showSuccessToast('保存成功');
                 viewModel = form.getViewModel();
                 var url = form._readUrl;
                 saas.util.BaseUtil.request({url })
@@ -56,7 +56,7 @@ Ext.define('saas.view.sys.config.FormPanelController', {
         })
         .catch(function(res) {
             console.error(res);
-            saas.util.BaseUtil.showToast('保存失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
         });
     }
 

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

@@ -7,7 +7,7 @@ Ext.define('saas.view.sys.feedback.FormPanelController', {
         });
     },
     onSubmit:function(){
-        saas.util.BaseUtil.showToast('提交成功！');
+        saas.util.BaseUtil.showSuccessToast('提交成功！');
         Ext.destroy(Ext.getCmp("feedbackWin"));
     },
     onClose:function(){

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

@@ -26,13 +26,13 @@ Ext.define('saas.view.sys.finish.DataList', {
                 })
                 .then(function(localJson) {
                     if(localJson.success){
-                        saas.util.BaseUtil.showToast('结账成功');
+                        saas.util.BaseUtil.showSuccessToast('结账成功');
                         grid.store.loadPage(1);
                     }
                 })
                 .catch(function(res) {
                     console.error(res);
-                    saas.util.BaseUtil.showToast('结账失败: ' + res.message);
+                    saas.util.BaseUtil.showErrorToast('结账失败: ' + res.message);
                 });
             }
         }
@@ -49,13 +49,13 @@ Ext.define('saas.view.sys.finish.DataList', {
                 })
                 .then(function(localJson) {
                     if(localJson.success){
-                        saas.util.BaseUtil.showToast('反结账成功');
+                        saas.util.BaseUtil.showSuccessToast('反结账成功');
                         grid.store.loadPage(1);
                     }
                 })
                 .catch(function(res) {
                     console.error(res);
-                    saas.util.BaseUtil.showToast('反结账失败: ' + res.message);
+                    saas.util.BaseUtil.showErrorToast('反结账失败: ' + res.message);
                 });
             }
         }

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

@@ -165,7 +165,7 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
         var grid = this;
         var data = grid.getGridSelected(type);
         if(!data){
-            saas.util.BaseUtil.showToast('请勾选符合条件的行进行操作。');
+            saas.util.BaseUtil.showErrorToast('请勾选符合条件的行进行操作。');
             return false;
         }
         if(data&&data.length>0){
@@ -177,14 +177,14 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
                     async:false
                 })
                 .then(function() {
-                    saas.util.BaseUtil.showToast('操作成功');
+                    saas.util.BaseUtil.showSuccessToast('操作成功');
                     grid.store.load();
                 })
                 .catch(function(response) {
-                    saas.util.BaseUtil.showToast('操作失败');
+                    saas.util.BaseUtil.showErrorToast('操作失败');
                 });
         }else{
-            saas.util.BaseUtil.showToast('请勾选至少一条明细。');
+            saas.util.BaseUtil.showErrorToast('请勾选至少一条明细。');
         }
     },
 
@@ -228,12 +228,12 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
                     .then(function(localJson) {
                         if(localJson.success){
                             //解析参数
-                            saas.util.BaseUtil.showToast('删除成功');
+                            saas.util.BaseUtil.showSuccessToast('删除成功');
                             view.ownerCt.store.load();
                         }
                     })
                     .catch(function() {
-                        saas.util.BaseUtil.showToast('删除失败');
+                        saas.util.BaseUtil.showErrorToast('删除失败');
                     });
                 }
             }

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

@@ -51,16 +51,16 @@ Ext.define('saas.view.sys.power.FormPanelController', {
             })
             .then(function(localJson) {
                 if(localJson.success){
-                    saas.util.BaseUtil.showToast('保存成功');
+                    saas.util.BaseUtil.showSuccessToast('保存成功');
                     viewModel.data.powergrid.load();
                 }
             })
             .catch(function(res) {
                 console.error(res);
-                saas.util.BaseUtil.showToast('保存失败: ' + res.message);
+                saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
             });
         }else{
-            saas.util.BaseUtil.showToast('没有修改数据，请修改后保存');
+            saas.util.BaseUtil.showErrorToast('没有修改数据，请修改后保存');
         }
     },
 
@@ -94,6 +94,13 @@ Ext.define('saas.view.sys.power.FormPanelController', {
                 checked:data['audit']
             })
         }
+        if((typeof modified.update) == 'boolean'){
+            powerSetList.push({
+                groupId:groupId,
+                classify:'update',
+                checked:data['update']
+            })
+        }
         if((typeof modified.unAudit) == 'boolean'){
             powerSetList.push({
                 groupId:groupId,

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

@@ -114,6 +114,38 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         doUpdateHeaderState: function(e) {
             return true;
         }
+    },{
+        header: '启用/关闭',
+        dataIndex: 'update',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        menuDisabled:true,
+        flex: 1.5,
+        stopSelection: false,
+        onTitleElClick:function(a,b,c,d){
+            var me = this;
+            var records = me.ownerCt.ownerCt.store.data.items;
+            var first = 'null',isAllCheck = true;
+            Ext.Array.each(records,function(rec){
+                var data = rec.get('update');
+                if(data!=null&&(typeof data)=='boolean'){
+                    if(first=='null'){
+                        first = data;
+                    }else{
+                        if(first!=data){
+                            isAllCheck = false
+                        }
+                    }
+                    rec.set('update',!data)
+                }
+            });
+            if(isAllCheck){
+                me.setHeaderStatus(!first)
+            }
+        },
+        doUpdateHeaderState: function(e) {
+            return true;
+        }
     }, {
         header: '删除',
         dataIndex: 'delete',
@@ -329,6 +361,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
                 {name: 'moduleName',type:'string'},
                 {name: 'add'},
                 {name: 'delete'},
+                {name: 'update'},
                 {name: 'audit'},
                 {name: 'unAudit'},
                 {name: 'fileExport'},
@@ -387,6 +420,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         data.query = record.get('query')==null?null:bool;
         data.delete = record.get('delete')==null?null:bool;
         data.audit = record.get('audit')==null?null:bool;
+        data.update = record.get('update')==null?null:bool;
         data.unAudit= record.get('unAudit')==null?null:bool;
         data.fileExport= record.get('fileExport')==null?null:bool;
         data.fileImport= record.get('fileImport')==null?null:bool;

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

@@ -8,7 +8,7 @@ Ext.define('saas.view.sys.power.OtherField', {
     layout: 'column',
     defaults:{
        xtype:'checkbox',
-       columnWidth:0.5
+       columnWidth:1
     },
     initComponent:function(){
         var me=this;

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

@@ -176,7 +176,7 @@ Ext.define('saas.view.sys.power.TreePanel', {
                 .then(function(localJson) {
                     me.setLoading(false);
                     if(localJson.success){
-                        saas.util.BaseUtil.showToast('保存成功');
+                        saas.util.BaseUtil.showSuccessToast('保存成功');
                         me._parent.setTree();
                         form.ownerCt.close();
                     }
@@ -184,7 +184,7 @@ Ext.define('saas.view.sys.power.TreePanel', {
                 .catch(function(res) {
                     me.setLoading(false);
                     console.error(res);
-                    saas.util.BaseUtil.showToast('保存失败: ' + res.message);
+                    saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
                 });
             }
         });
@@ -204,14 +204,14 @@ Ext.define('saas.view.sys.power.TreePanel', {
         .then(function(localJson) {
             me.setLoading(false);
             if(localJson.success){
-                saas.util.BaseUtil.showToast('删除成功');
+                saas.util.BaseUtil.showSuccessToast('删除成功');
                 me.setTree();
             }
         })
         .catch(function(res) {
             me.setLoading(false);
             console.error(res);
-            saas.util.BaseUtil.showToast('删除失败: ' + res.message);
+            saas.util.BaseUtil.showErrorToast('删除失败: ' + res.message);
         });
     }
 });

frontend/saas-web/app/view/viewport/ViewportController.js

@@ -148,7 +148,7 @@ Ext.define('saas.view.viewport.ViewportController', {
 
         view.mask();
         session.logout().catch(function(error) {
-            saas.util.BaseUtil.showToast(error.message);
+            saas.util.BaseUtil.showErrorToast(error.message);
         }).then(function() {
             me.originalRoute = Ext.History.getToken();
             me.terminateSession();
@@ -170,7 +170,7 @@ Ext.define('saas.view.viewport.ViewportController', {
                     me.initiateSession(newSession);
                 })
                 .catch(function(error) {
-                    saas.util.BaseUtil.showToast(error.message);
+                    saas.util.BaseUtil.showErrorToast(error.message);
                 })
                 .then(function() {
                     view.isMasked() && view.unmask();