merge

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

@@ -5,59 +5,11 @@ 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资料',
-    _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, 
-        }]
-    },
+    _dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+    _saveUrl:basePath + 'document/vendor/save',
+    _deleteUrl:basePath + 'document/vendor/delete',
 
 
 

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

@@ -0,0 +1,10 @@
+Ext.define('saas.view.document.bom.BasePanelController', {
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-bom-basepanel',
+    
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.bom.BasePanelModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-bom-basepanel'
+});

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

@@ -1,270 +0,0 @@
-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/BasePanel.js

@@ -0,0 +1,92 @@
+Ext.define('saas.view.document.customer.BasePanel', {
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-customer-basepanel',
+
+    controller: 'document-customer-basepanel',
+    viewModel: 'document-customer-basepanel',
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/customerkind/getCombo',
+        name : "cu_type", 
+        emptyText : "请选择客户类型", 
+        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.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();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'document-customer-formpanel',
+    _title:'客户资料',
+    // _dataUrl:basePath+'ducument/customer/list',
+    _batchOpenUrl:basePath+'ducument/customer/batchOpen',
+    _batchCloseUrl:basePath+'ducument/customer/batchClose',
+    _batchDeleteUrl:basePath+'ducument/customer/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/customer/BasePanelController.js

@@ -0,0 +1,10 @@
+Ext.define('saas.view.document.customer.BasePanelController', {
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-customer-basepanel',
+
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.customer.BasePanelModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-customer-basepanel'
+});

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

@@ -1,6 +1,6 @@
-Ext.define('saas.view.document.bom.FormController', {
+Ext.define('saas.view.document.customer.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.document-bom-formpanel',
+    alias: 'controller.document-customer-formpanel',
     
     init: function (form) {
         var me = this;

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

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.customer.panel.FormPanel', {
+Ext.define('saas.view.document.customer.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'customer-panel-formpanel',
+    xtype: 'document-customer-formpanel',
 
-    controller: 'customer-panel-formpanel',
-    viewModel: 'customer-panel-formpanel',
+    controller: 'document-customer-formpanel',
+    viewModel: 'document-customer-formpanel',
     
     caller:'Customer',
 
@@ -149,7 +149,7 @@ Ext.define('saas.view.document.customer.panel.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.panel.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'ca_detno',
         storeModel:'saas.model.document.customeraddress',
-        deleteDetailUrl:basePath+'ducument/customer/deleteaddress/',
+        _deleteDetailUrl:basePath+'ducument/customer/deleteaddress/',
         columns : [
             {
                 text : "ID", 
@@ -336,9 +336,9 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
         statusCodeField = me._statusCodeField,
         viewModel = me.getViewModel();
         
-        viewModel.set(codeField, '');
-        viewModel.set('createTime', new Date());
-        viewModel.set('updateTime', new Date());
+        viewModel.set('form.' + codeField, '--------------');
+        viewModel.set('form.createTime', new Date());
+        viewModel.set('form.updateTime', new Date());
 
         if(statusCodeField) {
             var o = {};

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

@@ -1,112 +0,0 @@
-Ext.define('saas.view.document.customer.list.FormPanel', {
-    extend: 'saas.view.core.baseform.FormPanel',
-    xtype: 'customer-list-formpanel',
-    controller: 'customer-list-formpanel',
-    viewModel: 'customer-list-formpanel',
-
-    fieldDefaults: {
-        margin: '0 5 5 0',
-        labelAlign: 'right',
-        labelWidth: 90,
-        blankText: '该字段不能为空'
-    },
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl:basePath+'ducument/customerkind/getCombo',
-        name : "cu_type", 
-        emptyText : "请选择客户类型", 
-        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.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();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'customer-panel-formpanel',
-    _title:'客户资料',
-    _dataUrl:basePath+'ducument/customer/list',
-    _batchOpenUrl:basePath+'ducument/customer/batchOpen',
-    _batchCloseUrl:basePath+'ducument/customer/batchClose',
-    _batchDeleteUrl:basePath+'ducument/customer/batchDelete',
-
-    initComponent: function () {
-        var me = this;
-        Ext.apply(me, {
-            items: [{
-                idField: 'id',
-                codeField: 'cu_code',
-                name : "baseGrid", 
-                xtype : "core-baseform-gridpanel", 
-                layout:'fit',
-                dataUrl:me._dataUrl,
-                columns : [{
-                    text : "客户id", 
-                    width : 0, 
-                    dataIndex : "id", 
-                    xtype : "numbercolumn", 
-                },{
-                    text : "客户编号", 
-                    width : 200.0, 
-                    dataIndex : "cu_code", 
-                    xtype : "", 
-                }, 
-                {
-                    text : "客户名称", 
-                    dataIndex : "cu_name", 
-                    width : 120.0, 
-                    xtype : "", 
-                }, 
-                {
-                    text : "客户状态", 
-                    dataIndex : "cu_status", 
-                    width : 120.0, 
-                    xtype : ""
-                }, 
-                {
-                    text : "客户UU", 
-                    dataIndex : "cu_uu", 
-                    width : 120.0, 
-                    xtype : "",
-                }, 
-                {
-                    text : "默认客户地址", 
-                    dataIndex : "ca_address", 
-                    width : 120.0, 
-                    xtype : "",
-                }, 
-                {
-                    text : "默认客户联系人", 
-                    dataIndex : "cc_name", 
-                    flex : 1.0, 
-                    xtype : "",
-                }]
-            }]
-        });
-        me.callParent(arguments);
-    }
-});

frontend/saas-web/app/view/document/customer/list/FormPanelController.js

@@ -1,11 +0,0 @@
-Ext.define('saas.view.document.customer.list.FormPanelController', {
-    extend: 'saas.view.core.baseform.FormPanelController',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    alias: 'controller.customer-list-formpanel',
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/customer/list/FormPanelModel.js

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

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

@@ -1,64 +0,0 @@
-Ext.define('saas.view.document.customer.panel.FormController', {
-    extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.customer-panel-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/customer/panel/FormModel.js

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

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

@@ -110,9 +110,6 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         },
         storeinformation:{
             items:[{
-                xtype:'hidden',
-                name:'id'
-            },{
                 xtype:'textfield',
                 fieldLabel: '仓库编号',
                 name: 'wh_code'
@@ -124,13 +121,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 readOnly:true,
                 xtype:'textfield',
                 fieldLabel: '仓库状态',
-                name: 'wh_status',
-                value:'已开启'
-            },{
-                xtype:'hidden',
-                fieldLabel: '仓库状态码',
-                name: 'wh_statuscode',
-                value:'OPEN'
+                name: 'wh_status'
             }]
         }
     },

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

@@ -6,9 +6,6 @@ Ext.define('saas.view.document.kind.Kind', {
     xtype: 'document-kind',
     autoScroll: true,
     layout:'fit',
-    //工具类
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
     controller:'document-kind',
     viewModel: {
         type: 'document-kind'
@@ -153,52 +150,10 @@ Ext.define('saas.view.document.kind.Kind', {
                 text: '仓库名称',
                 dataIndex: 'wh_description',
                 width: 200
-            },{
-                text: '仓库状态码',
-                dataIndex: 'wh_status',
-                width: 0
             },{
                 text: '仓库状态',
-                dataIndex: 'wh_statuscode',
-                width:90,
-                xtype: 'actioncolumn',
-                align : 'center',
-                items: [{
-                    icon:basePath + 'resource/images/16/lock_bg.png',
-                    tooltip: '锁定',
-                    iconCls:'',
-                    getClass: function(v, meta, rec) {
-                        if(rec.get('wh_statuscode')=='OPEN'){
-                            this.items[0].tooltip = '不启用';
-                            return 'x-grid-checkcolumn-checked';
-                        }else{
-                            this.items[0].tooltip = '启用';
-                            return 'x-grid-checkcolumn';
-                        }
-                    },
-                    handler: function(view, rowIndex, colIndex) {
-                        var rec = view.getStore().getAt(rowIndex);
-                        var type=rec.get('wh_statuscode')=='OPEN'?true:false;
-                        //  禁用/启用
-                        var form = this.ownerCt.ownerCt.ownerCt;
-                        var grid = this.ownerCt.ownerCt;
-                        form.BaseUtil.request({
-                            url: (!type?form._openUrl:form._closeUrl)+'/'+rec.get('id'),
-                            params: '',
-                            method: 'POST',
-                        })
-                        .then(function(localJson) {
-                            if(localJson.success){
-                                showToast('操作成功');
-                                grid.store.load();
-                            }
-                        })
-                        .catch(function(res) {
-                            console.error(res);
-                            showToast('操作失败: ' + res.message);
-                        });
-                    }
-                }]
+                dataIndex: 'wh_status',
+                width: 100
             }],
             keyField:'id',
             reqUrl: basePath + 'document/warehouse/save',

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

@@ -40,8 +40,7 @@ Ext.define('saas.view.document.kind.KindController', {
         me.createDialog(dataKind);
     },
     onRefresh:function(){
-        var me = this;
-        me.view.items.items[0].store.load();
+
     },
     insertActionColumn:function(columns){
         var me=this;

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

@@ -133,8 +133,7 @@ Ext.define('saas.view.document.kind.KindModel', {
                 {name: 'id', type: 'int'},
                 {name: 'wh_code',  type: 'string'},
                 {name: 'wh_description',  type: 'string'},
-                {name: 'wh_statuscode',  type: 'string'},
-                {name: 'wh_status',  type: 'string'}
+                {name: 'wh_statuscode',  type: 'string'}
             ],
             proxy: {
                 type: 'ajax',

frontend/saas-web/app/view/document/other/StoreInformation.js

@@ -4,8 +4,6 @@ Ext.define('saas.view.document.other.StoreInformation', {
     autoScroll: true,
     layout:'fit',
     defaultType:'storeinformation',
-    _openUrl:basePath + 'document/warehouse/open',
-    _closeUrl:basePath + 'document/warehouse/close',
     tbar: ['->',{
         xtype:'button',
         text:'新增',

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

@@ -0,0 +1,86 @@
+Ext.define('saas.view.document.product.BasePanel', {
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-product-basepanel',
+
+    controller: 'document-product-basepanel',
+    viewModel: 'document-product-basepanel',
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl: basePath + 'document/producttype/getCombo',
+        name : "pr_type", 
+        emptyText : "请选择物料类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            producttype:{
+                keyField:'id',
+                dataField:'pr_name',
+                reqUrl:basePath + 'document/producttype/save',
+                delUrl:basePath + 'document/producttype/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增物料类型'
+                },
+                dataKind:'producttype',
+                belong:this.ownerCmp.etc['producttype'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'document-product-formpanel',
+    _title:'物料资料',
+    // _dataUrl:'http://192.168.253.31:9480/product/list',
+    _batchOpenUrl:'http://192.168.253.31:9480/product/batchOpen',
+    _batchCloseUrl:'http://192.168.253.31:9480/product/batchClose',
+    _batchDeleteUrl:'http://192.168.253.31:9480/product/batchDelete',
+
+    gridConfig: {
+        idField: 'id',
+        codeField: 'pr_code',
+        dataUrl: 'http://192.168.253.31:9480/product/list',
+        columns : [{
+            text : "id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn", 
+        },{
+            text : "物料编号", 
+            width : 200.0, 
+            dataIndex : "pr_code", 
+            xtype : "", 
+        }, 
+        {
+            text : "物料名称", 
+            dataIndex : "pr_detail", 
+            width : 120.0, 
+            xtype : "", 
+        }, 
+        {
+            text : "状态", 
+            dataIndex : "pr_status", 
+            width : 120.0, 
+            xtype : ""
+        }, 
+        {
+            text : "物料种类", 
+            dataIndex : "pr_type", 
+            width : 120.0, 
+            xtype : "",
+        }]
+    },
+
+});

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

@@ -0,0 +1,10 @@
+Ext.define('saas.view.document.product.BasePanelController', {
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-product-basepanel',
+
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.product.BasePanelModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-product-basepanel'
+});

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

@@ -1,6 +1,6 @@
-Ext.define('saas.view.document.product.panel.FormController', {
+Ext.define('saas.view.document.product.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.product-panel-formpanel',
+    alias: 'controller.document-product-formpanel',
     init: function (form) {
         var me = this;
         this.control({
@@ -9,9 +9,7 @@ Ext.define('saas.view.document.product.panel.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath + 'document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
+                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pr_vendcode'
@@ -69,8 +67,6 @@ Ext.define('saas.view.document.product.panel.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/product/FormModel.js

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

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

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.product.panel.FormPanel', {
+Ext.define('saas.view.document.product.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'product-panel-formpanel',
+    xtype: 'document-product-formpanel',
 
-    controller: 'product-panel-formpanel',
-    viewModel: 'product-panel-formpanel',
+    controller: 'document-product-formpanel',
+    viewModel: 'document-product-formpanel',
     
     caller:'Product',
 
@@ -212,9 +212,9 @@ Ext.define('saas.view.document.product.panel.FormPanel', {
         statusCodeField = me._statusCodeField,
         viewModel = me.getViewModel();
         
-        viewModel.set(codeField, '');
-        viewModel.set('createTime', new Date());
-        viewModel.set('updateTime', new Date());
+        viewModel.set('form.' + codeField, '--------------');
+        viewModel.set('form.createTime', new Date());
+        viewModel.set('form.updateTime', new Date());
 
         if(statusCodeField) {
             var o = {};

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

@@ -1,109 +0,0 @@
-Ext.define('saas.view.document.product.list.FormPanel', {
-    extend: 'saas.view.core.baseform.FormPanel',
-    xtype: 'product-list-formpanel',
-    controller: 'product-list-formpanel',
-    viewModel: 'product-list-formpanel',
-
-    //工具类
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-
-    //基础属性
-    layout: 'fit',
-    autoScroll: true,
-    border: 1,
-
-    fieldDefaults: {
-        margin: '0 5 5 0',
-        labelAlign: 'right',
-        labelWidth: 90,
-        blankText: '该字段不能为空'
-    },
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl: basePath + 'document/producttype/getCombo',
-        name : "pr_type", 
-        emptyText : "请选择物料类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            producttype:{
-                keyField:'id',
-                dataField:'pr_name',
-                reqUrl:basePath + 'document/producttype/save',
-                delUrl:basePath + 'document/producttype/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增物料类型'
-                },
-                dataKind:'producttype',
-                belong:this.ownerCmp.etc['producttype'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'product-panel-formpanel',
-    _title:'物料资料',
-    _dataUrl:basePath + 'document/product/list',
-    _batchOpenUrl:basePath + 'document/product/batchOpen',
-    _batchCloseUrl:basePath + 'document/product/batchClose',
-    _batchDeleteUrl:basePath + 'document/product/batchDelete',
-
-    initComponent: function () {
-        var me = this;
-        Ext.apply(me, {
-            items: [{
-                idField: 'id',
-                codeField: 'pr_code',
-                name : "baseGrid", 
-                xtype : "core-baseform-gridpanel", 
-                layout:'fit',
-                dataUrl:me._dataUrl,
-                columns : [{
-                    text : "id", 
-                    width : 0, 
-                    dataIndex : "id", 
-                    xtype : "numbercolumn", 
-                },{
-                    text : "物料编号", 
-                    width : 200.0, 
-                    dataIndex : "pr_code", 
-                    xtype : "", 
-                }, 
-                {
-                    text : "物料名称", 
-                    dataIndex : "pr_detail", 
-                    width : 120.0, 
-                    xtype : "", 
-                }, 
-                {
-                    text : "状态", 
-                    dataIndex : "pr_status", 
-                    width : 120.0, 
-                    xtype : ""
-                }, 
-                {
-                    text : "物料种类", 
-                    dataIndex : "pr_type", 
-                    width : 120.0, 
-                    xtype : "",
-                }]
-            }]
-        });
-        me.callParent(arguments);
-    }
-});

frontend/saas-web/app/view/document/product/list/FormPanelController.js

@@ -1,11 +0,0 @@
-Ext.define('saas.view.document.product.list.FormPanelController', {
-    extend: 'saas.view.core.baseform.FormPanelController',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    alias: 'controller.product-list-formpanel',
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/product/list/FormPanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.product.list.FormPanelModel', {
-    extend: 'saas.view.core.baseform.FormPanelModel',
-    alias: 'viewmodel.product-list-formpanel'
-});

frontend/saas-web/app/view/document/product/panel/FormModel.js

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

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

@@ -0,0 +1,91 @@
+Ext.define('saas.view.document.vendor.BasePanel', {
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-vendor-basepanel',
+    controller: 'document-vendor-basepanel',
+    viewModel: 'document-vendor-basepanel',
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/vendorkind/getCombo',
+        name : "ve_type", 
+        emptyText : "请选择供应商类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            vendorkind:{
+                keyField:'id',
+                dataField:'vk_name',
+                reqUrl:basePath+'ducument/vendorkind/save',
+                delUrl:basePath+'ducument/vendorkind/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增供应商类型'
+                },
+                dataKind:'vendorkind',
+                belong:this.ownerCmp.etc['vendorkind'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'document-vendor-formpanel',
+    _title:'供应商资料',
+    // _dataUrl:basePath+'ducument/vendor/list',
+    _deleteUrl:basePath+'ducument/vendor/delete/',
+    _batchOpenUrl:basePath+'ducument/vendor/batchOpen',
+    _batchCloseUrl:basePath+'ducument/vendor/batchClose',
+    _batchDeleteUrl:basePath+'ducument/vendor/batchDelete',
+
+    gridConfig: {
+        idField: 'id',
+        codeField: 've_code',
+        dataUrl: basePath+'ducument/vendor/list',
+        columns : [{
+            text : "供应商id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn", 
+        },{
+            text : "供应商编号", 
+            width : 200.0, 
+            dataIndex : "ve_code", 
+            xtype : "", 
+        }, 
+        {
+            text : "供应商名称", 
+            dataIndex : "ve_name", 
+            width : 120.0, 
+            xtype : "", 
+        }, 
+        {
+            text : "供应商状态", 
+            dataIndex : "ve_status", 
+            width : 120.0, 
+            xtype : ""
+        }, 
+        {
+            text : "供应商UU", 
+            dataIndex : "ve_uu", 
+            width : 120.0, 
+            xtype : "",
+        }, 
+        {
+            text : "默认供应商联系人", 
+            dataIndex : "vc_name", 
+            flex : 1.0, 
+            xtype : "",
+        }]
+    },
+});

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

@@ -0,0 +1,10 @@
+Ext.define('saas.view.document.vendor.BasePanelController', {
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-vendor-basepanel',
+
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.vendor.BasePanelModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-vendor-basepanel'
+});

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

@@ -1,6 +1,6 @@
-Ext.define('saas.view.document.vendor.panel.FormController', {
+Ext.define('saas.view.document.vendor.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.vendor-panel-formpanel',
+    alias: 'controller.document-vendor-formpanel',
     init: function (form) {
         var me = this;
         this.control({});

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

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

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

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.vendor.panel.FormPanel', {
+Ext.define('saas.view.document.vendor.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'vendor-panel-formpanel',
+    xtype: 'document-vendor-formpanel',
 
-    controller: 'vendor-panel-formpanel',
-    viewModel: 'vendor-panel-formpanel',
+    controller: 'document-vendor-formpanel',
+    viewModel: 'document-vendor-formpanel',
     
     caller:'Vendor',
 
@@ -52,7 +52,7 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
         columnWidth: 0.25
     },{
         xtype : "remotecombo", 
-        storeUrl:basePath + 'document/vendorkind/getCombo',
+        storeUrl:basePath+'ducument/vendorkind/getCombo',
         name : "ve_type", 
         fieldLabel : "供应商类型", 
         allowBlank : true, 
@@ -64,8 +64,8 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
             vendorkind:{
                 keyField:'id',
                 dataField:'vk_name',
-                reqUrl:basePath + 'document/vendorkind/save',
-                delUrl:basePath + 'document/vendorkind/delete'
+                reqUrl:basePath+'ducument/vendorkind/save',
+                delUrl:basePath+'ducument/vendorkind/delete'
             }
         },
         addHandler:function(b){
@@ -149,7 +149,7 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'vc_detno',
         storeModel:'saas.model.document.vendorcontact',
-        deleteDetailUrl:basePath+'ducument/vendor/deleteContact/',
+        _deleteDetailUrl:basePath+'ducument/vendor/deleteContact/',
         columns : [
             {
                 text : "ID", 
@@ -245,9 +245,9 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
         statusCodeField = me._statusCodeField,
         viewModel = me.getViewModel();
         
-        viewModel.set(codeField, '');
-        viewModel.set('createTime', new Date());
-        viewModel.set('updateTime', new Date());
+        viewModel.set('form.' + codeField, '--------------');
+        viewModel.set('form.createTime', new Date());
+        viewModel.set('form.updateTime', new Date());
 
         if(statusCodeField) {
             var o = {};

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

@@ -1,116 +0,0 @@
-Ext.define('saas.view.document.vendor.list.FormPanel', {
-    extend: 'saas.view.core.baseform.FormPanel',
-    xtype: 'vendor-list-formpanel',
-    controller: 'vendor-list-formpanel',
-    viewModel: 'vendor-list-formpanel',
-
-    //工具类
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-
-    //基础属性
-    layout: 'fit',
-    autoScroll: true,
-    border: 1,
-
-    fieldDefaults: {
-        margin: '0 5 5 0',
-        labelAlign: 'right',
-        labelWidth: 90,
-        blankText: '该字段不能为空'
-    },
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl:basePath+'ducument/vendorkind/getCombo',
-        name : "ve_type", 
-        emptyText : "请选择供应商类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            vendorkind:{
-                keyField:'id',
-                dataField:'vk_name',
-                reqUrl:basePath+'ducument/vendorkind/save',
-                delUrl:basePath+'ducument/vendorkind/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增供应商类型'
-                },
-                dataKind:'vendorkind',
-                belong:this.ownerCmp.etc['vendorkind'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'vendor-panel-formpanel',
-    _title:'供应商资料',
-    _dataUrl:basePath+'ducument/vendor/list',
-    _deleteUrl:basePath+'ducument/vendor/delete/',
-    _batchOpenUrl:basePath+'ducument/vendor/batchOpen',
-    _batchCloseUrl:basePath+'ducument/vendor/batchClose',
-    _batchDeleteUrl:basePath+'ducument/vendor/batchDelete',
-
-    initComponent: function () {
-        var me = this;
-        Ext.apply(me, {
-            items: [{
-                idField: 'id',
-                codeField: 've_code',
-                name : "baseGrid", 
-                xtype : "core-baseform-gridpanel", 
-                layout:'fit',
-                dataUrl:me._dataUrl,
-                columns : [{
-                    text : "供应商id", 
-                    width : 0, 
-                    dataIndex : "id", 
-                    xtype : "numbercolumn", 
-                },{
-                    text : "供应商编号", 
-                    width : 200.0, 
-                    dataIndex : "ve_code", 
-                    xtype : "", 
-                }, 
-                {
-                    text : "供应商名称", 
-                    dataIndex : "ve_name", 
-                    width : 120.0, 
-                    xtype : "", 
-                }, 
-                {
-                    text : "供应商状态", 
-                    dataIndex : "ve_status", 
-                    width : 120.0, 
-                    xtype : ""
-                }, 
-                {
-                    text : "供应商UU", 
-                    dataIndex : "ve_uu", 
-                    width : 120.0, 
-                    xtype : "",
-                }, 
-                {
-                    text : "默认供应商联系人", 
-                    dataIndex : "vc_name", 
-                    flex : 1.0, 
-                    xtype : "",
-                }]
-            }]
-        });
-        me.callParent(arguments);
-    }
-});

frontend/saas-web/app/view/document/vendor/list/FormPanelController.js

@@ -1,11 +0,0 @@
-Ext.define('saas.view.document.vendor.list.FormPanelController', {
-    extend: 'saas.view.core.baseform.FormPanelController',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    alias: 'controller.vendor-list-formpanel',
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/vendor/list/FormPanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.vendor.list.FormPanelModel', {
-    extend: 'saas.view.core.baseform.FormPanelModel',
-    alias: 'viewmodel.vendor-list-formpanel'
-});

frontend/saas-web/app/view/document/vendor/panel/FormModel.js

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