接口命名调整/放大镜配置调整

frontend/saas-web/app/model/document/bom.js

@@ -0,0 +1,23 @@
+Ext.define('saas.model.document.bom', {
+    extend: 'saas.model.Base',
+    fields: [
+        { name: 'id', type: 'int' },
+        { name: 'bd_id', type: 'int' },
+        { name: 'bd_bomid', type: 'int' },
+        { name: 'bd_detno', type: 'int' },
+        { name: 'bd_sonid', type: 'int' },
+        { name: 'bd_soncode', type: 'string' },
+        { name: 'bo_unit', type: 'string' },
+        { name: 'bd_baseqty', type: 'string' },
+        { name: 'bd_replace', type: 'string' },
+        { name: 'bd_remark', type: 'string' },
+        { name: 'companyid', type: 'int' },
+        { name: 'updaterId', type: 'int' },
+        { name: 'updatetime', type: 'date' },
+        { name: 'pd_text1', type: 'string' },
+        { name: 'pd_text2', type: 'string' },
+        { name: 'pd_text3', type: 'string' },
+        { name: 'pd_text4', type: 'string' },
+        { name: 'pd_text5', type: 'string' }
+    ]
+});

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

@@ -40,6 +40,8 @@ Ext.define('saas.util.FormUtil', {
                                 hideTrigger: true, // 隐藏trigger
                                 mouseWheelEnabled: false // 取消滚轮事件
                             });
+                            // 设置默认值为0
+                            formModel.set(item.name, 0);
                         }
 
                         //　设置必填

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

@@ -24,11 +24,12 @@ Ext.define('saas.view.core.form.FormPanelController', {
     delete: function(){
         var me = this;
         var form = this.getView();
-        var id = form.getForm().findField(form._idField);
-        var code = form.getForm().findField(form._codeField);
+        var viewModel = me.getViewModel();
+        var id = viewModel.get(form._idField);
+        var code = viewModel.get(form._codeField);
         if(id&&id.value!=0){
             me.BaseUtil.request({
-                url: form._deleteUrl+id.value,
+                url: form._deleteUrl+id,
                 method: 'POST',
             })
             .then(function(localJson) {
@@ -183,6 +184,10 @@ Ext.define('saas.view.core.form.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
+                // 未保存直接审核会返回id
+                if(localJson.data) {
+                    form.initId = localJson.data.id;
+                }
                 form.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
                 showToast('审核成功');
@@ -194,17 +199,34 @@ Ext.define('saas.view.core.form.FormPanelController', {
         });
     },
     unAudit: function() {
-        var me = this,
-        viewModel = me.getViewModel();
-
-        viewModel.set('base.editable', true);
-        console.log('反审核');
+        var me = this;
+        var form = this.getView();
+        var viewModel = me.getViewModel();
+        var id = viewModel.get(form._idField);
+        var code = viewModel.get(form._codeField);
+        if(id&&id.value!=0){
+            me.BaseUtil.request({
+                url: form._unAuditUrl+id,
+                method: 'POST',
+            })
+            .then(function(localJson) {
+                if(localJson.success){
+                    //解析参数
+                    showToast('反审核成功');
+                    form.FormUtil.loadData(form);
+                }
+            })
+            .catch(function(res) {
+                console.error(res);
+                showToast('反审核失败: ' + res.message);
+            });
+        }
     },
     codeEditorBlur: function() {
         var me = this,
         viewModel = me.getViewModel();
 
-        // viewModel.set('base.codeEditable', false);
+        viewModel.set('base.codeEditable', false);
     },
     codeEditorClick: function() {
         var me = this,

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

@@ -188,7 +188,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
         var id = selectedRecord.data.id;
         if(id&&id!=0&&(typeof id) == 'number'){
             Ext.Ajax.request({
-                url: me._deleteDetailUrl+id,
+                url: me.deleteDetailUrl+id,
                 params: '',
                 method: 'POST',
                 headers: {

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

@@ -261,12 +261,12 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             })
             .then(function() {
                 showToast('操作成功');
+                me.getStore().loadPage(1);
             })
             .catch(function(res) {
                 console.error(res);
                 showToast('操作失败: ' + res.message);
             });
-            me.getStore().loadPage(1);
         }else{
             showToast('请勾选至少一条明细。');
         }

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

@@ -73,7 +73,7 @@ Ext.define('saas.view.core.query.QueryPanel', {
                             value: '{form.' + bind + '}'
                         });
                     }else {
-                        bind = bind.replace(/[{|}]/g, '');
+                        bind = name;
                         item.bind = '{form.' + bind + '}';
                     }
                 }else {

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

@@ -5,11 +5,59 @@ Ext.define('saas.view.document.bom.BasePanel', {
     controller: 'document-bom-basepanel',
     viewModel: 'document-bom-basepanel',
 
+    searchField:[{
+        xtype : "textfield", 
+        name: 'bo_mothername',
+        fieldLabel: '产品名称'
+    }],
+
     //字段属性
+    _formXtype:'document-bom-formpanel',
     _title:'BOM资料',
-    _dataUrl:basePath + 'document/vendor/getVendorsByCondition',
-    _saveUrl:basePath + 'document/vendor/save',
-    _deleteUrl:basePath + 'document/vendor/delete',
+    _batchOpenUrl:basePath+'ducument/bom/batchOpen',
+    _batchCloseUrl:basePath+'ducument/bom/batchClose',
+    _batchDeleteUrl:basePath+'ducument/bom/batchDelete',
+
+    gridConfig: {
+        idField: 'id',
+        codeField: 'cu_code',
+        dataUrl: basePath+'ducument/customer/list',
+        columns : [{
+            text : "客户id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn", 
+        },{
+            text : "客户编号", 
+            width : 200.0, 
+            dataIndex : "cu_code", 
+        }, 
+        {
+            text : "客户名称", 
+            dataIndex : "cu_name", 
+            width : 120.0, 
+        }, 
+        {
+            text : "客户状态", 
+            dataIndex : "cu_status", 
+            width : 120.0, 
+        }, 
+        {
+            text : "客户UU", 
+            dataIndex : "cu_uu", 
+            width : 120.0, 
+        }, 
+        {
+            text : "默认客户地址", 
+            dataIndex : "ca_address", 
+            width : 120.0, 
+        }, 
+        {
+            text : "默认客户联系人", 
+            dataIndex : "cc_name", 
+            flex : 1.0, 
+        }]
+    },
 
 
 

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

@@ -0,0 +1,65 @@
+Ext.define('saas.view.document.bom.FormController', {
+    extend: 'saas.view.core.form.FormPanelController',
+    alias: 'controller.document-bom-formpanel',
+    
+    init: function (form) {
+        var me = this;
+        this.control({});
+    },
+
+    auditBtnClick: function() {
+        var me = this,
+        form = me.getView(),
+        statusCodeField = form._statusCodeField,
+        viewModel = me.getViewModel(),
+        status = viewModel.data[statusCodeField];
+        status == 'OPEN' ? me.unAudit() : me.audit();
+    },
+
+    audit: function(){
+        var me = this,
+        form = this.getView(),
+        viewModel = me.getViewModel();
+        
+        me.BaseUtil.request({
+            url: form._openUrl+'/'+viewModel.data.id,
+            params: '',
+            method: 'POST',
+        })
+        .then(function(localJson) {
+            if(localJson.success){
+                showToast('启用成功');
+                form.initId = localJson.data.id;
+                form.FormUtil.loadData(form);
+                viewModel.set('base.editable', false);
+            }
+        })
+        .catch(function(res) {
+            console.error(res);
+            showToast('启用失败: ' + res.message);
+        });
+    },
+    unAudit: function() {
+        var me = this,
+        form = this.getView(),
+        viewModel = me.getViewModel();
+        
+        me.BaseUtil.request({
+            url: form._closeUrl+'/'+viewModel.data.id,
+            params: '',
+            method: 'POST',
+        })
+        .then(function(localJson) {
+            if(localJson.success){
+                showToast('禁用成功');
+                form.initId = localJson.data.id;
+                form.FormUtil.loadData(form);
+                viewModel.set('base.editable', false);
+            }
+        })
+        .catch(function(res) {
+            console.log(res);
+            showToast('禁用失败: ' + res.message);
+        });
+    }
+});

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

@@ -0,0 +1,6 @@
+Ext.define('saas.view.document.customer.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.document-customer-formpanel',
+
+    
+});

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

@@ -0,0 +1,270 @@
+Ext.define('saas.view.document.customer.FormPanel', {
+    extend: 'saas.view.core.form.FormPanel',
+    xtype: 'document-customer-formpanel',
+
+    controller: 'document-customer-formpanel',
+    viewModel: 'document-customer-formpanel',
+    
+    caller:'Customer',
+
+    //字段属性
+    _title:'客户资料',
+    _idField: 'id',
+    _codeField: 'cu_code',
+    _statusField: 'cu_status',
+    _statusCodeField: 'cu_statuscode',
+    _readUrl:basePath+'ducument/customer/read/',
+    _saveUrl:basePath+'ducument/customer/save',
+    _openUrl:basePath+'ducument/customer/open',
+    _closeUrl:basePath+'ducument/customer/close',
+    _deleteUrl:basePath+'ducument/customer/delete/',
+    initId:0,
+
+    defaultItems: [{
+        xtype: 'hidden',
+        name: 'id',
+        fieldLabel: 'id',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'cu_name',
+        fieldLabel: '客户名称',
+        allowBlank: false,
+        columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'cu_code',
+        fieldLabel: '客户编号',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'cu_status',
+        fieldLabel: '状态',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
+        xtype: 'hidden',
+        name: 'cu_statuscode',
+        fieldLabel: '状态码',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/customerkind/getCombo',
+        name : "cu_type", 
+        fieldLabel : "客户类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            customerkind:{
+                keyField:'id',
+                dataField:'ck_name',
+                reqUrl:basePath+'ducument/customerkind/save',
+                delUrl:basePath+'ducument/customerkind/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增客户类型'
+                },
+                dataKind:'customerkind',
+                belong:this.ownerCmp.etc['customerkind'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }
+    },{
+        format : "Y-m-d",
+        xtype : "datefield", 
+        name : "createTime", 
+        fieldLabel : "创建时间", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "cu_begindate", 
+        fieldLabel : "期初日期", 
+        allowBlank : true, 
+        columnWidth : 0.25  
+    },{ 
+        xtype : "numberfield", 
+        hideTrigger:true,
+        name : "cu_beginaramount", 
+        fieldLabel : "期初应收", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{ 
+        xtype : "numberfield", 
+        hideTrigger:true,
+        name : "cu_beginprerecamount", 
+        fieldLabel : "期初预收", 
+        allowBlank : true, 
+        columnWidth : 0.25    
+    },{ 
+        xtype : "numberfield", 
+        hideTrigger:true,
+        name : "cu_promisedays", 
+        fieldLabel : "承付天数", 
+        allowBlank : true, 
+        columnWidth : 0.25      
+    },{
+        xtype : "numberfield", 
+        name : "cu_taxrate", 
+        fieldLabel : "税率", 
+        allowBlank : true, 
+        columnWidth : 0.25   
+    },{
+        xtype : "numberfield", 
+        name : "cu_ta", 
+        fieldLabel : "应收款余额", 
+        allowBlank : true, 
+        readOnly:true,
+        editable:false,
+        columnWidth : 0.25     
+    },{
+        xtype:'textfield',
+        name : "cu_uu", 
+        fieldLabel : "客户UU", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{  
+        format : "Y-m-d",
+        xtype : "datefield", 
+        name : "updateTime", 
+        fieldLabel : "更新时间", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    }, {
+        xtype : "detailGridField", 
+        detnoColumn:  'cc_detno',
+        storeModel:'saas.model.document.bom',
+        deleteDetailUrl:basePath+'ducument/bom/deletecontact/',
+        columns : [
+            {
+                text : "ID", 
+                dataIndex : "id", 
+                width : 0, 
+                xtype : "numbercolumn"
+            },
+            {
+                text : "关联ID", 
+                dataIndex : "cc_cuid", 
+                width : 0, 
+                xtype : "numbercolumn"
+            },
+            {
+                text : "联系人", 
+                editor : {
+                    xtype : "textfield"
+                },
+                dataIndex : "cc_name", 
+                width : 120.0, 
+                xtype : "", 
+                items : null
+            },
+            {
+                text : "电话", 
+                editor : {
+                    xtype : "textfield"
+                },
+                dataIndex : "cc_tel", 
+                width : 120.0, 
+                xtype : "", 
+                items : null
+            },
+            {
+                text : "微信/QQ", 
+                editor : {
+                    xtype : "textfield"
+                },
+                dataIndex : "cc_qq", 
+                width : 120.0, 
+                xtype : "", 
+                items : null
+            },
+            {
+                text : "邮箱", 
+                editor : {
+                    xtype : "textfield"
+                },
+                dataIndex : "cc_email", 
+                width : 120.0, 
+                xtype : "", 
+                items : null
+            },
+            {
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    valueField : "value", 
+                    xtype : "combo",
+                    store:{
+                        fields: ['display', 'value'],
+                        data : [
+                            {"display":"是", "value":'1'},
+                            {"display":"否", "value":'0'}
+                        ]
+                    }
+                }, 
+                text : "是否默认联系人", 
+                width : 200.0, 
+                dataIndex : "cc_default", 
+                xtype : "",
+                renderer: function (v, m, r) {
+                    if(v=='0'){
+                        return '';
+                    }else if(v=='1'){
+                        return '是';
+                    }
+                    return v;
+                }
+            }]
+    }],
+
+    /**
+     * 一些初始化viewModel的方法
+     */
+    initViewModel: function() {
+        var me = this,
+        codeField = me._codeField,
+        statusField = me._statusField,
+        statusCodeField = me._statusCodeField,
+        viewModel = me.getViewModel();
+        
+        viewModel.set(codeField, '');
+        viewModel.set('createTime', new Date());
+        viewModel.set('updateTime', new Date());
+
+        if(statusCodeField) {
+            var o = {};
+            o['auditBtnText'] = {
+                bind: '{' + statusCodeField + '}',
+                get: function(value) {
+                    viewModel.set(statusField, value == 'OPEN' ? '启用' : '禁用');
+                    return value == 'OPEN' ? '禁用' : '启用'
+                }
+            };
+            viewModel.setFormulas(o);
+            viewModel.set(statusCodeField, "OPEN");
+        }else {
+            viewModel.set('auditBtnText', "禁用");
+        }
+    }
+});

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

@@ -149,7 +149,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'cc_detno',
         storeModel:'saas.model.document.customercontact',
-        _deleteDetailUrl:basePath+'ducument/customer/deletecontact/',
+        deleteDetailUrl:basePath+'ducument/customer/deletecontact/',
         columns : [
             {
                 text : "ID", 
@@ -240,7 +240,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'ca_detno',
         storeModel:'saas.model.document.customeraddress',
-        _deleteDetailUrl:basePath+'ducument/customer/deleteaddress/',
+        deleteDetailUrl:basePath+'ducument/customer/deleteaddress/',
         columns : [
             {
                 text : "ID", 

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

@@ -9,7 +9,9 @@ Ext.define('saas.view.document.product.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pr_vendcode'
@@ -67,6 +69,8 @@ Ext.define('saas.view.document.product.FormController', {
                     Ext.apply(f,{
                         //数据接口
                         dataUrl:basePath + 'document/product/getWareHouseByCondition',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'wh_code',to:'pr_whcode'

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

@@ -149,7 +149,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'vc_detno',
         storeModel:'saas.model.document.vendorcontact',
-        _deleteDetailUrl:basePath+'ducument/vendor/deleteContact/',
+        deleteDetailUrl:basePath+'ducument/vendor/deleteContact/',
         columns : [
             {
                 text : "ID", 

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

@@ -54,7 +54,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othreceipts',
         detnoColumn:  'ord_detno',
-        _deleteDetailUrl:basePath+'money/deleteItem/',
+        deleteDetailUrl:basePath+'money/deleteDetail/',
         columnWidth : 1,
         columns : [
             {

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

@@ -9,6 +9,8 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         dbfinds:[{
                             from:'id',to:'or_custid'
                         },{

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

@@ -9,6 +9,8 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         dbfinds:[{
                             from:'id',to:'or_custid'
                         },{

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

@@ -53,7 +53,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othspendings',
         detnoColumn:  'osd_detno',
-        _deleteDetailUrl:basePath+'money/othreceipts/deleteItem/',
+        deleteDetailUrl:basePath+'money/othreceipts/deleteDetail/',
         columnWidth : 1,
         columns : [
             {

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

@@ -5,78 +5,89 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=os_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/list',
-                        dbfinds:[{
-                            from:'id',to:'os_vendid'
-                        },{
-                            from:'ve_code',to:'os_vendcode'
-                        },{
-                            from:'ve_name',to:'os_vendname'
+            'dbfindtrigger[name=os_vendname]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: basePath + 'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'os_vendid'
+                        }, {
+                            from: 've_code',
+                            to: 'os_vendcode'
+                        }, {
+                            from: 've_name',
+                            to: 'os_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
+                        dbtpls: [{
+                            field: 've_code',
+                            width: 100
+                        }, {
+                            field: 've_name',
+                            width: 100
                         }],
-                        dbColumns:[{
+                        dbColumns: [{
                             "text": "供应商ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 100,
                             "xtype": "numbercolumn"
-                        },{
-                            conditionCode:'ve_code',
+                        }, {
+                            conditionCode: 've_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
                             "width": 100
                         }, {
-                            conditionCode:'ve_name',
+                            conditionCode: 've_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
                             "width": 100
                         }, {
-                            conditionCode:'cu_type',
+                            conditionCode: 'cu_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
                             "items": null
                         }]
-                    }) ;   
+                    });
 
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=os_bankname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        conditionCode:'os_bankcode',
-                        dataUrl:basePath+'document/bankinformation/list',
-                        dbfinds:[{
-                            from:'bk_bankcode',to:'os_bankcode'
-                        },{
-                            from:'bk_bankname',to:'os_bankname'
-                        },{
-                            from:'bk_id',to:'os_bankid'
-                    }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
+            'dbfindtrigger[name=os_bankname]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: basePath + 'document/bankinformation/list',
+                        dbfinds: [{
+                            from: 'bk_bankcode',
+                            to: 'os_bankcode'
+                        }, {
+                            from: 'bk_bankname',
+                            to: 'os_bankname'
+                        }, {
+                            from: 'bk_id',
+                            to: 'os_bankid'
+                        }],
+                        dbtpls: [{
+                            field: 'bk_bankcode',
+                            width: 100
+                        }, {
+                            field: 'bk_bankname',
+                            width: 100
                         }],
-                        dbColumns:[{
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
                             "items": null
-                        },{
+                        }, {
                             "text": "账户编号",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
@@ -97,7 +108,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             "xtype": "",
                             "items": null
                         }]
-                    }) ;   
+                    });
 
                 }
             }

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

@@ -9,6 +9,8 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'id',to:'os_vendid'
                         },{

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

@@ -19,14 +19,12 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _saveUrl: basePath + 'money/paybalance/save/',
     _auditUrl: basePath + 'money/paybalance/audit/',
     _deleteUrl: basePath + 'money/paybalance/delete/',
-    _deleteDetailUrl: basePath + 'money/paybalance/deleteItem/',
 
     // _readUrl: 'http://192.168.253.129:8940/money/paybalance/read/',
     // _saveUrl: 'http://192.168.253.129:8940/money/paybalance/save/',
     // _auditUrl: 'http://192.168.253.129:8940/money/paybalance/audit/',
     // _unAuditUrl: 'http://192.168.253.129:8940/money/paybalance/unAudit/',
     // _deleteUrl: 'http://192.168.253.129:8940/money/paybalance/delete/',
-    // _deleteDetailUrl: 'http://192.168.253.129:8940/money/paybalance/deleteItem/',
     
     initId: 0,
 
@@ -90,6 +88,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.PayBalance1',
         detnoColumn: 'pb_detno',
+        deleteDetailUrl: basePath + 'money/paybalance/deleteDetail1/',
         columns: [{
             text: 'ID',
             dataIndex: 'id',
@@ -123,6 +122,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.PayBalance2',
         detnoColumn: 'pbd_detno',
+        deleteDetailUrl: basePath + 'money/paybalance/deleteDetail2/',
         columns: [{
             text: 'ID',
             dataIndex: 'id',

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

@@ -10,6 +10,9 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                     Ext.apply(f,{
                         //数据接口
                         dataUrl: basePath + 'document/customer/list',
+                        dataUrl:basePath+'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'

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

@@ -10,6 +10,8 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath + 'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -62,6 +64,8 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath + 'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -21,7 +21,6 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     _auditUrl: basePath + 'money/recbalance/audit/',
     _unAuditUrl: basePath + 'money/recbalance/unAudit/',
     _deleteUrl: basePath + 'money/recbalance/delete/',
-    _deleteDetailUrl: basePath + 'money/recbalance/deleteItem/',
     initId: 0,
 
     defaultItems: [{
@@ -82,7 +81,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.RecBalance1',
         detnoColumn: 'rd_detno',
-        _deleteDetailUrl: basePath + 'money/recbalance/audit/',
+        deleteDetailUrl: basePath + 'money/recbalance/deleteDetail1/',
         columns: [{
             text: 'ID',
             dataIndex: 'id',
@@ -143,7 +142,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.RecBalance2',
         detnoColumn: 'rbd_detno',
-        _deleteDetailUrl: basePath + 'money/recbalance/unAudit/',
+        deleteDetailUrl: basePath + 'money/recbalance/deleteDetail2/',
         columns: [{
             text: 'ID',
             dataIndex: 'id',

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

@@ -10,6 +10,8 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                     Ext.apply(f,{
                         //数据接口
                         dataUrl: basePath + 'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'
@@ -65,6 +67,8 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                     Ext.apply(f,{
                         //数据接口
                         dataUrl: basePath + 'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'

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

@@ -10,6 +10,8 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl: basePath + 'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -62,6 +64,8 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl: basePath + 'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -17,10 +17,10 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
      _relationColumn: 'pd_puid',
 
      _readUrl:basePath+'purchase/purchase/read/',
-     _saveUrl:basePath+'purchase/purchase/save',
-     _auditUrl:basePath+'purchase/purchase/audit',
+     _saveUrl:basePath+'purchase/purchase/save/',
+     _auditUrl:basePath+'purchase/purchase/audit/',
+     _unAuditUrl: basePath + 'purchase/purchase/unAudit/',
      _deleteUrl:basePath+'purchase/purchase/delete/',
-     _deleteDetailUrl:basePath+'purchase/purchase/deleteItem/',
      _turnInUrl:basePath+'purchase/prodinout/turnProdin/',
      initId:0,
  
@@ -55,43 +55,31 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         xtype : "hidden", 
         name : "pu_buyerid", 
         bind : "{pu_buyerid}", 
-        fieldLabel : "采购员ID", 
-        allowBlank : true, 
-        columnWidth : 0.0
+        fieldLabel : "采购员ID"
     }, {
         xtype : "textfield", 
         name : "pu_buyercode", 
-        bind : "{pu_buyercode}", 
         fieldLabel : "采购员编号", 
-        allowBlank : true, 
         hidden:true,
         columnWidth : 0
     }, {
-        xtype : "dbfindtrigger", 
+        xtype : "textfield", 
         name : "pu_buyername", 
-        bind : "{pu_buyername}", 
-        fieldLabel : "采购员名称", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "采购员名称"
     }, {
         xtype : "textfield", 
         name : "pu_shipaddresscode", 
-        bind : "{pu_shipaddresscode}", 
-        fieldLabel : "交货地址", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "交货地址"
     }, {
         xtype : "textfield", 
         name : "pu_total", 
-        bind : "{pu_total}", 
-        fieldLabel : "单据金额", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "单据金额"
     }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
         storeModel:'saas.model.purchase.ProdIODetail',
         detnoColumn:  'pd_detno',
+        deleteDetailUrl:basePath+'purchase/purchase/deleteDetail/',
         columns : [
             {
                 text : "id", 

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

@@ -4,12 +4,14 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //主表单选放大镜模板
+            // 主表-供应商名称
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
                         dataUrl:basePath+'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
@@ -65,17 +67,29 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
 
                 }
             },
-            //从表单选放大镜赋值关系 以及 tpl模板
+            // 主表-采购员名称
+            'dbfindtrigger[name=pu_buyername]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                    }) ;   
+
+                }
+            },
+            // 从表-物料编号
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
                         dataUrl: basePath + 'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
-                        },{
+                        }, {
                             from:'pr_unit',to:'pd_unit'
+                        }, {
+                            from: 'pr_detail', to: 'pr_detail'
                         }],
                         //联想查询条件
                         dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",

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

@@ -10,7 +10,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     queryFormItems: [{
         xtype: 'hidden',
         name: 'pu_id',
-        bind: '{pu_id}',
         fieldLabel: 'ID',
         allowBlank: true,
         getCondition: function(value) {
@@ -19,35 +18,29 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pu_code',
-        bind: '{pu_code}',
         fieldLabel: '单据编号'
     }, {
         xtype: 'condatefield',
         name: 'pu_date',
-        bind: '{pu_date}',
         fieldLabel: '采购日期',
         columnWidth: 0.5,
         operation: 'between'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pu_vendcode',
-        bind: '{pu_vendcode}',
         fieldLabel: '供应商编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pu_vendname',
-        bind: '{pu_vendname}',
         fieldLabel: '供应商名称'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
         showDetail: true
     }, {
         xtype: 'textfield',
         name: 'pr_detail',
-        bind: '{pr_detail}',
         fieldLabel: '物料名称',
         showDetail: true
     }, {
@@ -76,7 +69,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     }, {
         xtype: 'multicombo',
         name: 'pu_acceptstatuscode',
-        bind: '{pu_acceptstatuscode}',
         fieldLabel: '入库状态',
         datas: [
             ["TURNIN", "已入库"],

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

@@ -5,11 +5,13 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendname]':{
+            // 供应商编号
+            'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -56,12 +58,14 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
 
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
+            // 放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -19,7 +19,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _readUrl:basePath+'purchase/prodinout/read/',
     _saveUrl:basePath+'purchase/prodinout/save',
     _auditUrl:basePath+'purchase/prodinout/audit',
-    _deleteDetailUrl:basePath+'purchase/prodinout/deleteItem/',
+    _unAuditUrl: basePath + 'purchase/prodinout/unAudit',
     _baseVastUrl:basePath+'purchase/prodinout/',
     _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
 
@@ -113,8 +113,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.document.ProductDTO',
-        _deleteDetailUrl:'http://localhost:8800/prodinout/deleteItem/',
-        // _deleteUrl:basePath+'purchase/prodinout/delete/',
+        // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
+        deleteDetailUrl:basePath+'purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -16,8 +16,10 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
 
-                        // dataUrl:basePath+'document/vendor/getVendorsByCondition',
-                        dataUrl:'http://localhost:9480/vendor/list',
+                        dataUrl:basePath+'document/vendor/list',
+                        // dataUrl:'http://localhost:9480/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_id',to:'pi_vendid'
                         },{
@@ -70,8 +72,10 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/list',
-                        dataUrl:'http://localhost:9480/product/list',
+                        dataUrl:basePath+'document/product/list',
+                        // dataUrl:'http://localhost:9480/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
                         },{
@@ -132,8 +136,10 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/warehouse/list',
-                        dataUrl:'http://localhost:9480/warehouse/list',
+                        dataUrl:basePath+'document/warehouse/list',
+                        // dataUrl:'http://localhost:9480/warehouse/list',
+                        addXtype: 'other-storeinformation',
+                        addTitle: '仓库资料',
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          
                         },{

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

@@ -10,6 +10,8 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -62,6 +64,8 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

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

@@ -15,21 +15,20 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     _statusField: 'pi_status',
     _statusCodeField: 'pi_statuscode',
     
-    // _relationColumn: 'pd_piid',
-    // _readUrl:basePath+'purchase/prodinout/read/',
-    // _saveUrl:basePath+'purchase/prodinout/save',
-    // _auditUrl:basePath+'purchase/prodinout/audit',
-    // _deleteDetailUrl:basePath+'purchase/prodinout/deleteItem/',
-    // _baseVastUrl:basePath+'purchase/prodinout/',
-    // _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
-
     _relationColumn: 'pd_piid',
-    _readUrl:'http://localhost:8800/prodinout/read/',
-    _saveUrl:'http://localhost:8800/prodinout/save',
-    _auditUrl:'http://localhost:8800/prodinout/audit',
-    _deleteUrl:'http://localhost:8800/prodinout/delete/',
-    _baseVastUrl:'http://localhost:8800/prodinout/',
-    _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
+    _readUrl:basePath+'purchase/prodinout/read/',
+    _saveUrl:basePath+'purchase/prodinout/save/',
+    _auditUrl:basePath+'purchase/prodinout/audit/',
+    _baseVastUrl:basePath+'purchase/prodinout/',
+    _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
+
+    // _relationColumn: 'pd_piid',
+    // _readUrl:'http://localhost:8800/prodinout/read/',
+    // _saveUrl:'http://localhost:8800/prodinout/save/',
+    // _auditUrl:'http://localhost:8800/prodinout/audit/',
+    // _deleteUrl:'http://localhost:8800/prodinout/delete/',
+    // _baseVastUrl:'http://localhost:8800/prodinout/',
+    // _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
 
 
 
@@ -109,9 +108,9 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.document.ProductDTO',
-        _deleteDetailUrl:'http://localhost:8800/prodinout/deleteItem/',
-        // _deleteUrl:basePath+'purchase/prodinout/delete/',
-        _detnoColumn:  'pd_pdno',
+        // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
+        deleteUrl:basePath+'purchase/prodinout/deleteDetail/',
+        detnoColumn:  'pd_pdno',
         columns : [
             {
                 text : "id", 

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

@@ -15,9 +15,10 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-
-                        // dataUrl:basePath+'document/vendor/getVendorsByCondition',
-                        dataUrl:'http://localhost:9480/vendor/list',
+                        dataUrl:basePath+'document/vendor/list',
+                        // dataUrl:'http://localhost:9480/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_id',to:'pi_vendid'
                         },{
@@ -70,8 +71,10 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/list',
-                        dataUrl:'http://localhost:9480/product/list',
+                        dataUrl:basePath+'document/product/list',
+                        // dataUrl:'http://localhost:9480/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
                         },{
@@ -132,8 +135,10 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/warehouse/list',
-                        dataUrl:'http://localhost:9480/warehouse/list',
+                        dataUrl:basePath+'document/warehouse/list',
+                        // dataUrl:'http://localhost:9480/warehouse/list',
+                        addXtype: 'other-storeinformation',
+                        addTitle: '仓库资料',
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          
                         },{

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

@@ -10,6 +10,8 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -62,6 +64,8 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

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

@@ -19,6 +19,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
      _readUrl:basePath+'sale/sale/read/',
      _saveUrl:basePath+'sale/sale/save',
      _auditUrl:basePath+'sale/sale/audit',
+     _unAuditUrl: basePath + 'sale/sale/unAudit/',
      _deleteUrl:basePath+'sale/sale/delete/',
      _turnOutUrl:basePath+'sale/sale/turnProdOut/', 
      initId:0,
@@ -56,7 +57,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn: 'sd_detno',
         storeModel:'saas.model.sale.Saledetail',
-        _deleteDetailUrl:basePath+'sale/deleteItem/',
+        deleteDetailUrl:basePath+'sale/sale/deleteDetail/',
         columns : [
            {
                 text : "id", 

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

@@ -9,6 +9,8 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         dbfinds:[{
                             from:'id',to:'sa_custid'
                         },{
@@ -61,8 +63,9 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'dbfindtrigger[name=sd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[
                         {
                             from:'pr_code',to:'sd_prodcode'

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

@@ -9,6 +9,8 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         dbfinds:[{
                             from:'cu_id',to:'sa_custid'
                         },{
@@ -61,8 +63,9 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'sd_prodcode',
                             from:'pr_detail',to:'pr_detail'

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

@@ -19,6 +19,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     _readUrl:basePath+'sale/prodinout/read/',
     _saveUrl:basePath+'sale/prodinout/save',
     _auditUrl:basePath+'sale/prodinout/audit',
+    _unAuditUrl: basePath + 'sale/prodinout/unAudit',
     _deleteUrl:basePath+'sale/prodinout/delete/',
     _turnInUrl:basePath+'sale/prodinout/turnProdIn/',
     initId:0,
@@ -52,7 +53,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'pd_pdno',
         storeModel:'saas.model.sale.ProdIODetail',
-        _deleteDetailUrl:basePath+'prodinout/deleteItem/',
+        deleteDetailUrl:basePath+'prodinout/deleteDetail/',
         columns : [
             {
                 text : "id", 
@@ -67,8 +68,6 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "物料编号", 
                 width : 200.0, 
                 dataIndex : "pd_prodcode", 
-                xtype : "", 
-                items : null,
                 editor : {
                     displayField : "display", 
                     editable : true, 
@@ -107,7 +106,6 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 format:'0',
-                items : null,
                 summaryType: 'sum'
             },            {
                 text : "已转数", 
@@ -115,14 +113,12 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 format:'0',
-                items : null,
                 summaryType: 'sum'
             }, 
             {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
                 width : 120.0, 
-                items : null,
                 editor : {
                     displayField : "display", 
                     editable : true, 
@@ -145,7 +141,6 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     xtype : "numberfield"
                 },
                 xtype : "numbercolumn", 
-                items : null
             }, 
            {
                 text : "含税金额", 

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

@@ -9,6 +9,8 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         dbfinds:[
                         {
                             from:'id',to:'pi_custid'
@@ -62,8 +64,9 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[
                         {
                             from:'id',to:'pd_prodid'
@@ -122,8 +125,9 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'wh_code',
                         dataUrl:basePath+'document/warehouse/list',
+                        addXtype: 'other-storeinformation',
+                        addTitle: '仓库资料',
                         dbfinds:[{
                             from:'id',to:'pd_whid',
                         }, { 

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

@@ -10,60 +10,35 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
     queryFormItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
+        fieldLabel: 'ID'
     }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
-        bind: '{pi_inoutno}',
-        fieldLabel: '单据编号',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '单据编号'
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
-        bind: '{pi_date}',
         fieldLabel: '单据日期',
-        allowBlank: true,
         columnWidth: 0.5
     }, {
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pi_custcode',
-        bind: '{pi_custcode}',
-        fieldLabel: '客户编号',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
+        fieldLabel: '客户编号'
     }, {
         xtype: 'textfield',
         name: 'pi_custname',
-        bind: '{pi_custname}',
-        fieldLabel: '客户名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '客户名称'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
-        fieldLabel: '物料编号',
-        fieldMode: 'DETAIL',
-        queryType:'VAG',
-        hidden:true,
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '物料编号'
     }, {
-        xtype: 'dbfindtrigger',
-        name: 'pr_detail#pd_prodcode',
-        bind: '{pr_detail}',
-        fieldLabel: '物料名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        xtype: 'textfield',
+        name: 'pr_detail',
+        fieldLabel: '物料名称'
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        bind: '{pi_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
         columnWidth: 0.25,
@@ -73,7 +48,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         store: Ext.create('Ext.data.ArrayStore', {
             fields: ['pi_statuscode', 'pi_status'],
             data: [
-                ["$ALL", "全部"],
+                ["ALL", "全部"],
                 ["AUDITED", "已审核"],
                 ["UNAUDITED", "未审核"]
             ]

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

@@ -4,11 +4,13 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
+            // 客户名称
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         dbfinds:[
                         {
                             from:'id',to:'pi_custid'
@@ -60,11 +62,14 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
 
                 }
             },
+
+            // 物料编号
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }, {

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

@@ -62,7 +62,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'pd_pdno',
         storeModel:'saas.model.sale.ProdIODetail',
-        _deleteDetailUrl:basePath+'sale/prodinout/deleteItem/',
+        deleteDetailUrl:basePath+'sale/prodinout/deleteDetail/',
         columns : [
             {
                 text : "id", 

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

@@ -10,6 +10,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         dbfinds:[
                         {
                             from:'id',to:'pi_custid'
@@ -65,6 +67,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[
                         {
                             from:'id',to:'pd_prodid'
@@ -125,6 +129,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                     Ext.apply(f,{
                         conditionCode:'wh_code',
                         dataUrl:basePath+'document/warehouse/list',
+                        addXtype: 'other-storeinformation',
+                        addTitle: '仓库资料',
                         dbfinds:[{
                             from:'id',to:'pd_whid',
                         }, { 

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

@@ -10,6 +10,8 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/customer/list',
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         dbfinds:[
                         {
                             from:'id',to:'pi_custid'
@@ -66,6 +68,8 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }, {

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

@@ -54,7 +54,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField", 
         storeModel:'saas.model.document.ProductDTO',
-        _detnoColumn:  'pd_pdno',
+        detnoColumn:  'pd_pdno',
         columns : [
             {
                 text : "id", 

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

@@ -17,6 +17,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:basePath+'document/vendor/list',
                         // dataUrl:'http://localhost:9480/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_id',to:'pi_vendid'
                         },{
@@ -71,6 +73,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:basePath+'document/product/list',
                         // dataUrl:'http://localhost:9480/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
                         },{
@@ -132,6 +136,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                 Ext.apply(f,{
                     dataUrl:basePath+'document/warehouse/list',
                     // dataUrl:'http://localhost:9480/warehouse/list',
+                    addXtype: 'other-storeinformation',
+                        addTitle: '仓库资料',
                     dbfinds:[{
                         from:'id',to:'pd_whid'                          
                     },{
@@ -175,6 +181,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
              Ext.apply(f,{
                  dataUrl:basePath+'document/warehouse/list',
                 //  dataUrl:'http://localhost:9480/warehouse/list',
+                addXtype: 'other-storeinformation',
+                        addTitle: '仓库资料',
                  dbfinds:[{
                      from:'id',to:'pd_inwhid'                          
                  },{

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

@@ -9,6 +9,8 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath + 'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -59,8 +61,9 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
                         dataUrl:basePath + 'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'

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

@@ -20,7 +20,6 @@ Ext.define('saas.view.stock.make.FormPanel', {
      _saveUrl:basePath+'purchase/purchase/save',
      _auditUrl:basePath+'purchase/purchase/audit',
      _deleteUrl:basePath+'purchase/purchase/delete/',
-     _deleteDetailUrl:basePath+'purchase/purchase/deleteItem/',
      _turnInUrl:basePath+'purchase/prodinout/turnProdin/',
      initId:0,
  
@@ -92,6 +91,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.document.Product',
         detnoColumn:  'pd_detno',
+        deleteDetailUrl:basePath+'purchase/purchase/deleteDetail/',
         columns : [
             {
                 text : "id", 

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

@@ -10,6 +10,8 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                     Ext.apply(f,{
                         //数据接口
                         dataUrl:basePath+'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
@@ -71,6 +73,8 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                     Ext.apply(f,{
                         //数据接口
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'

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

@@ -10,6 +10,8 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath+'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -62,6 +64,8 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     _saveUrl:basePath+'storage/prodinout/save',
     _auditUrl:basePath+'storage/prodinout/audit',
     _deleteUrl:basePath+'storage/prodinout/delete/',
-    _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
+    
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:9000/prodinout/read/',
@@ -54,7 +54,8 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField", 
         storeModel:'saas.model.document.ProductDTO',
-        _detnoColumn:  'pd_pdno',
+        detnoColumn:  'pd_pdno',
+        deleteDetailUrl:basePath+'storage/prodinout/deleteDetail/',
         columns : [
             {
                 text : "id", 

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

@@ -17,6 +17,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                 Ext.apply(f,{
                     dataUrl:basePath+'document/vendor/list',
                     // dataUrl:'http://localhost:9480/vendor/list',
+                    addXtype: 'document-vendor-formpanel',
+                    addTitle: '供应商资料',
                     dbfinds:[{
                         from:'ve_id',to:'pi_vendid'
                     },{
@@ -71,6 +73,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:basePath+'document/product/list',
                         // dataUrl:'http://localhost:9480/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
                         },{
@@ -132,6 +136,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                 Ext.apply(f,{
                     dataUrl:basePath+'document/warehouse/list',
                     // dataUrl:'http://localhost:9480/warehouse/list',
+                    addXtype: 'other-storeinformation',
+                    addTitle: '仓库资料',
                     dbfinds:[{
                         from:'id',to:'pd_whid'                          
                     },{

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

@@ -9,6 +9,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath + 'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -61,6 +63,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath + 'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     _saveUrl:basePath+'storage/prodinout/save',
     _auditUrl:basePath+'storage/prodinout/audit',
     _deleteUrl:basePath+'storage/prodinout/delete/',
-    _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
+    
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:9000/prodinout/read/',
@@ -55,7 +55,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField", 
         storeModel:'saas.model.document.ProductDTO',
-        _detnoColumn:  'pd_pdno',
+        detnoColumn:  'pd_pdno',
+        deleteDetailUrl:basePath+'storage/prodinout/deleteDetail/',
         columns : [
             {
                 text : "id", 

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

@@ -5,212 +5,235 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
         var me = this;
         this.control({
             /**放大镜新增demo*/
-            "field[name=combo]":{
-                beforerender:function(f){
-                    f.addHandler=me.addCombo;
+            "field[name=combo]": {
+                beforerender: function (f) {
+                    f.addHandler = me.addCombo;
                 }
             },
-        //放大镜赋值关系 以及 tpl模板
-        'dbfindtrigger[name=pu_vendcode]':{
-            beforerender:function(f){
-                Ext.apply(f,{
-                    dataUrl:basePath+'document/vendor/list',
-                    // dataUrl:'http://localhost:9480/vendor/list',
-                    dbfinds:[{
-                        from:'ve_id',to:'pi_vendid'
-                    },{
-                        from:'ve_code',to:'pu_vendcode'
-                    },{
-                        from:'ve_name',to:'pu_vendname'
-                    }],
-                    dbtpls:[{
-                        field:'ve_code',width:100
-                    },{
-                        field:'ve_name',width:100
-                    }],
-                    dbColumns:[{
-                        conditionCode:'ve_id',
-                        "text": "供应商ID",
-                        "flex": 0,
-                        "dataIndex": "ve_id",
-                        "width": 0,
-                        "xtype": "",
-                        "items": null
-                    },{
-                        conditionCode:'ve_code',
-                        "text": "供应商编号",
-                        "flex": 1,
-                        "dataIndex": "ve_code",
-                        "width": 100,
-                        "xtype": "",
-                        "items": null
-                    }, {
-                        conditionCode:'ve_name',
-                        "text": "供应商名称",
-                        "flex": 1,
-                        "dataIndex": "ve_name",
-                        "xtype": "",
-                        "items": null
-                    }, {
-                        conditionCode:'ve_type',
-                        "text": "供应商类型",
-                        "flex": 0,
-                        "dataIndex": "ve_type",
-                        "width": 200,
-                        "xtype": "",
-                        "items": null
-                    }]
-                }) ;   
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=pu_vendcode]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: basePath + 'document/vendor/list',
+                        // dataUrl:'http://localhost:9480/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        dbfinds: [{
+                            from: 've_id',
+                            to: 'pi_vendid'
+                        }, {
+                            from: 've_code',
+                            to: 'pu_vendcode'
+                        }, {
+                            from: 've_name',
+                            to: 'pu_vendname'
+                        }],
+                        dbtpls: [{
+                            field: 've_code',
+                            width: 100
+                        }, {
+                            field: 've_name',
+                            width: 100
+                        }],
+                        dbColumns: [{
+                            conditionCode: 've_id',
+                            "text": "供应商ID",
+                            "flex": 0,
+                            "dataIndex": "ve_id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode: 've_code',
+                            "text": "供应商编号",
+                            "flex": 1,
+                            "dataIndex": "ve_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode: 've_name',
+                            "text": "供应商名称",
+                            "flex": 1,
+                            "dataIndex": "ve_name",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode: 've_type',
+                            "text": "供应商类型",
+                            "flex": 0,
+                            "dataIndex": "ve_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    });
 
-            }
-        },
-           //放大镜赋值关系 以及 tpl模板
-           'dbfindtrigger[name=pd_prodcode]':{
-            beforerender:function(f){
-                Ext.apply(f,{
-                    dataUrl:basePath+'document/product/list',
-                    // dataUrl:'http://localhost:9480/product/list',
-                    dbfinds:[{
-                        from:'id',to:'pd_prodid'                          
-                    },{
-                        from:'pr_code',to:'pd_prodcode'                          
-                    },{
-                        from:'pr_detail',to:'pr_detail'
-                    },{
-                        from:'pr_unit',to:'pd_unit'
-                    }],
-                    dbtpls:[{
-                        field:'pr_code',width:100
-                    },{
-                        field:'pr_detail',width:100
-                    },{
-                        field:'pr_unit',width:100
-                    }],
-                    dbColumns:[{
-                        "text": "物料ID",
-                        "flex": 0,
-                        "dataIndex": "pr_id",
-                        "width": 0,
-                        "xtype": "",
-                        "items": null
-                    },{
-                        "text": "物料编号",
-                        "flex": 1,
-                        "dataIndex": "pr_code",
-                        "width": 100,
-                        "xtype": "",
-                        "items": null
-                    }, {
-                        "text": "物料名称",
-                        "flex": 1,
-                        "dataIndex": "pr_detail",
-                        "xtype": "",
-                        "items": null
-                    }, {
-                        "text": "物料规格",
-                        "flex": 0,
-                        "dataIndex": "pr_spec",
-                        "width": 200,
-                        "xtype": "",
-                        "items": null
-                    }, {
-                        "text": "物料单位",
-                        "flex": 0,
-                        "dataIndex": "pr_unit",
-                        "width": 200,
-                        "xtype": "",
-                        "items": null
-                    }]
-                }) ;   
+                }
+            },
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=pd_prodcode]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: basePath + 'document/product/list',
+                        // dataUrl:'http://localhost:9480/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'pd_prodid'
+                        }, {
+                            from: 'pr_code',
+                            to: 'pd_prodcode'
+                        }, {
+                            from: 'pr_detail',
+                            to: 'pr_detail'
+                        }, {
+                            from: 'pr_unit',
+                            to: 'pd_unit'
+                        }],
+                        dbtpls: [{
+                            field: 'pr_code',
+                            width: 100
+                        }, {
+                            field: 'pr_detail',
+                            width: 100
+                        }, {
+                            field: 'pr_unit',
+                            width: 100
+                        }],
+                        dbColumns: [{
+                            "text": "物料ID",
+                            "flex": 0,
+                            "dataIndex": "pr_id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "物料编号",
+                            "flex": 1,
+                            "dataIndex": "pr_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "物料名称",
+                            "flex": 1,
+                            "dataIndex": "pr_detail",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "物料规格",
+                            "flex": 0,
+                            "dataIndex": "pr_spec",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "物料单位",
+                            "flex": 0,
+                            "dataIndex": "pr_unit",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    });
 
-            }
-        },           //放大镜赋值关系 以及 tpl模板
-        'dbfindtrigger[name=pd_whname]':{
-         beforerender:function(f){
-             Ext.apply(f,{
-                 dataUrl:basePath+'document/warehouse/list',
-                //  dataUrl:'http://localhost:9480/warehouse/list',
-                 dbfinds:[{
-                     from:'id',to:'pd_whid'                          
-                 },{
-                     from:'wh_code',to:'pd_whcode'                          
-                 },{
-                     from:'wh_description',to:'pd_whname'
-                 }],
-                 dbtpls:[{
-                     field:'pd_whcode',width:100
-                 },{
-                     field:'pd_whname',width:100
-                 }],
-                 dbColumns:[{
-                     "text": "仓库ID",
-                     "flex": 0,
-                     "dataIndex": "id",
-                     "width": 0,
-                     "xtype": "",
-                     "items": null
-                 },{
-                     "text": "仓库编号",
-                     "flex": 1,
-                     "dataIndex": "wh_code",
-                     "width": 100,
-                     "xtype": "",
-                     "items": null
-                 }, {
-                     "text": "仓库名称",
-                     "flex": 1,
-                     "dataIndex": "wh_description",
-                     "xtype": "",
-                     "items": null
-                 }, ]
-             }) ;   
+                }
+            }, //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=pd_whname]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: basePath + 'document/warehouse/list',
+                        //  dataUrl:'http://localhost:9480/warehouse/list',
+                        addXtype: 'other-storeinformation',
+                        addTitle: '仓库资料',
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'pd_whid'
+                        }, {
+                            from: 'wh_code',
+                            to: 'pd_whcode'
+                        }, {
+                            from: 'wh_description',
+                            to: 'pd_whname'
+                        }],
+                        dbtpls: [{
+                            field: 'pd_whcode',
+                            width: 100
+                        }, {
+                            field: 'pd_whname',
+                            width: 100
+                        }],
+                        dbColumns: [{
+                            "text": "仓库ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "仓库编号",
+                            "flex": 1,
+                            "dataIndex": "wh_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "仓库名称",
+                            "flex": 1,
+                            "dataIndex": "wh_description",
+                            "xtype": "",
+                            "items": null
+                        }, ]
+                    });
 
-         }
-     } 
+                }
+            }
         });
 
     },
-    addCombo:function(){
-        var combo=this.ownerCmp;
-        Ext.create('Ext.window.Window',{
-            layout:'vbox',
+    addCombo: function () {
+        var combo = this.ownerCmp;
+        Ext.create('Ext.window.Window', {
+            layout: 'vbox',
             bodyPadding: 15,
-            width:500,
-            items:[{
-                fieldLabel:'实际值',
-                xtype:'textfield'
-            },{
-                fieldLabel:'显示值',
-                xtype:'textfield'
+            width: 500,
+            items: [{
+                fieldLabel: '实际值',
+                xtype: 'textfield'
+            }, {
+                fieldLabel: '显示值',
+                xtype: 'textfield'
             }],
-            buttons:[{
-                text:'确认',
-                handler:function(b){
+            buttons: [{
+                text: '确认',
+                handler: function (b) {
                     combo.setValue('ok');
                     b.up('window').close();
                 }
             }],
-            renderTo:this.ownerCmp.ownerCt.getEl()
+            renderTo: this.ownerCmp.ownerCt.getEl()
         }).show();
 
     },
 
-    turnIn: function() {
+    turnIn: function () {
         var me = this,
-        form = me.getView(),
-        id = form.getForm().findField(form._idField);
+            form = me.getView(),
+            id = form.getForm().findField(form._idField);
         form.BaseUtil.request({
-            url: form._turnInUrl+id.value,
-            method: 'GET',
-        })
-        .then(function(localJson) {
-            if(localJson.success){
-                showToast('转单成功');
-              
-            }
-        })
-        .catch(function(res) {
-            showToast('转单失败: ' + res.message);
-        });
-     }
+                url: form._turnInUrl + id.value,
+                method: 'GET',
+            })
+            .then(function (localJson) {
+                if (localJson.success) {
+                    showToast('转单成功');
+
+                }
+            })
+            .catch(function (res) {
+                showToast('转单失败: ' + res.message);
+            });
+    }
 });

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

@@ -9,6 +9,8 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:basePath + 'document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -61,6 +63,8 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath + 'document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'