代码提交

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

@@ -4,6 +4,8 @@
 Ext.define('saas.view.core.form.RemoteCombo', {
     extend: 'Ext.form.field.ComboBox',
     alias: 'widget.remotecombo',
+    displayField: 'display',
+    valueField: 'value',
     queryMode: 'local',//只在组件加载的时候请求一次
     initComponent: function() {
         var me = this;
@@ -34,6 +36,7 @@ Ext.define('saas.view.core.form.RemoteCombo', {
         var me = this,
             picker,
             pickerCfg = Ext.apply({
+                hiddenBtn:me.hiddenBtn,
                 xtype: 'boundlistadd',
                 id: me.id + '-picker',
                 pickerField: me,

frontend/saas-web/app/view/core/view/BoundListAdd.js

@@ -255,6 +255,7 @@ Ext.define('saas.view.core.view.BoundListAdd', {
             id: me.id + '-toolbar',
             border: true,
             ownerCt: me,
+            hidden:me.hiddenBtn,
             items:[{
                 text:'新增',
                 handler:me.addHandler,

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

@@ -150,13 +150,13 @@ Ext.define('saas.view.document.bom.FormPanel', {
                 bind: '{' + statusCodeField + '}',
                 get: function(value) {
                     viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
-                    return value == 'OPEN' ? '已关闭' : '已开启'
+                    return value == 'OPEN' ? '禁用' : '启用'
                 }
             };
             viewModel.setFormulas(o);
             viewModel.set(statusCodeField, "OPEN");
         }else {
-            viewModel.set('auditBtnText', "已关闭");
+            viewModel.set('auditBtnText', "禁用");
         }
     }
 });

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

@@ -6,6 +6,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
     viewModel: 'document-customer-basepanel',
 
     searchField:[{
+        hiddenBtn:true,
         xtype : "remotecombo", 
         storeUrl:'/api/document/customerkind/getCombo',
         name : "cu_type", 

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

@@ -348,13 +348,13 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 bind: '{' + statusCodeField + '}',
                 get: function(value) {
                     viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
-                    return value == 'OPEN' ? '已关闭' : '已开启'
+                    return value == 'OPEN' ? '禁用' : '启用'
                 }
             };
             viewModel.setFormulas(o);
             viewModel.set(statusCodeField, "OPEN");
         }else {
-            viewModel.set('auditBtnText', "已关闭");
+            viewModel.set('auditBtnText', "禁用");
         }
     }
 });

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

@@ -96,6 +96,17 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 allowBlank:false,
                 fieldLabel:'类型'
             }]
+        },  
+        productunit:{
+            items:[{
+                xtype:'hidden',
+                name:'id'
+            },{
+                xtype:'textfield',
+                name:'pu_name',
+                allowBlank:false,
+                fieldLabel:'计量单位'
+            }]
         },
         inoutkind:{
             items:[{
@@ -178,6 +189,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
     onSave:function(){
         var belong = this.belong;
         var form=this.down('form');
+        var combo = this._combo;
         var params = {};
         var names = belong.columns.map(column => column.dataIndex);
         Ext.Array.each(names,function(name) {
@@ -203,6 +215,9 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 if(grid){
                     grid.store.load();
                 }
+                if(combo){
+                    combo.store.load();
+                }
                 form.ownerCt.close();
             }
         })

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

@@ -10,6 +10,9 @@ Ext.define('saas.view.document.kind.Kind', {
     viewModel: {
         type: 'document-kind'
     },
+    //工具类
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
     defaultType:'',
     requires: [
         'Ext.button.Segmented'
@@ -92,7 +95,7 @@ Ext.define('saas.view.document.kind.Kind', {
             keyField:'id',
             reqUrl:'/api/document/producttype/save',
             delUrl:'/api/document/producttype/delete'
-        },
+        }, 
         productbrand:{
             columns: [{
                 text: '物料品牌',
@@ -103,6 +106,16 @@ Ext.define('saas.view.document.kind.Kind', {
             reqUrl:'/api/document/productbrand/save',
             delUrl:'/api/document/productbrand/delete'
         },
+        productunit:{
+            columns: [{
+                text: '计量单位',
+                dataIndex: 'pu_name',
+                flex: 1
+            }],
+            keyField:'id',
+            reqUrl:'/api/document/productunit/save',
+            delUrl:'/api/document/productunit/delete'
+        },
         bankinformation:{
             columns: [{
                 text: '账户编号',

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

@@ -164,7 +164,26 @@ Ext.define('saas.view.document.kind.KindModel', {
                 },
                 reader: {
                     type: 'json',
-                    rootProperty: 'data.list'
+                    rootProperty: 'data'
+                }
+            },
+            pageSize: null,
+            autoLoad: false
+        },
+        productunit: {
+            fields:[
+                {name: 'id', type: 'int'},
+                {name: 'pu_name',  type: 'string'}
+            ],
+            proxy: {
+                type: 'ajax',
+                url: '/api/document/productunit/list',
+                actionMethods: {
+                    read: 'GET'
+                },
+                reader: {
+                    type: 'json',
+                    rootProperty: 'data'
                 }
             },
             pageSize: null,

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

@@ -0,0 +1,25 @@
+/**
+ * Created by zhouy on 2018/10/18.
+ */
+Ext.define('saas.view.document.other.ProductUnit', {
+    extend: 'saas.view.document.kind.Kind',
+    xtype: 'other-productunit',
+    autoScroll: true,
+    layout:'fit',
+    defaultType:'productunit',
+    tbar: ['->',{
+        xtype:'button',
+        text:'新增',
+        listeners: {
+            click: 'onAdd'
+        }
+    },{
+        xtype:'button',
+        text:'刷新',
+        listeners: {
+            click: 'onRefresh'
+        }
+    }]
+})
+
+

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

@@ -6,6 +6,7 @@ Ext.define('saas.view.document.product.BasePanel', {
     viewModel: 'document-product-basepanel',
 
     searchField:[{
+        hiddenBtn:true,
         xtype : "remotecombo", 
         storeUrl: '/api/document/producttype/getCombo',
         name : "pr_type", 

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

@@ -222,13 +222,13 @@ Ext.define('saas.view.document.product.FormPanel', {
                 bind: '{' + statusCodeField + '}',
                 get: function(value) {
                     viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
-                    return value == 'OPEN' ? '已关闭' : '已开启'
+                    return value == 'OPEN' ? '禁用' : '启用'
                 }
             };
             viewModel.setFormulas(o);
             viewModel.set(statusCodeField, "OPEN");
         }else {
-            viewModel.set('auditBtnText', "已关闭");
+            viewModel.set('auditBtnText', "禁用");
         }
     }
 });

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

@@ -9,11 +9,8 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         storeUrl:'/api/document/vendorkind/getCombo',
         name : "ve_type", 
         emptyText : "请选择供应商类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
         columnWidth : 0.25,
+        hiddenBtn:true,
         etc:{
             vendorkind:{
                 keyField:'id',
@@ -24,6 +21,8 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         },
         addHandler:function(b){
             var form = this.ownerCmp.ownerCt.ownerCt;
+            var document = Ext.create('document-kind',{});
+            debugger
             this.dialog = form.getController().getView().add({
                 xtype: 'document-kind-childwin',
                 bind: {

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

@@ -51,24 +51,15 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         allowBlank: true,
         columnWidth: 0.25
     },{
+        editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/vendorkind/getCombo',
         name : "ve_type", 
         fieldLabel : "供应商类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
+        allowBlank : false, 
         columnWidth : 0.25,
-        etc:{
-            vendorkind:{
-                keyField:'id',
-                dataField:'vk_name',
-                reqUrl:'/api/document/vendorkind/save',
-                delUrl:'/api/document/vendorkind/delete'
-            }
-        },
         addHandler:function(b){
+            var document = Ext.create('saas.view.document.kind.Kind',{});
             var form = this.ownerCmp.ownerCt;
             this.dialog = form.getController().getView().add({
                 xtype: 'document-kind-childwin',
@@ -76,8 +67,9 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                     title: '新增供应商类型'
                 },
                 dataKind:'vendorkind',
-                belong:this.ownerCmp.etc['vendorkind'],
+                belong:document.etc['vendorkind'],
                 _parent:form,
+                _combo:this.ownerCmp,
                 record:null,
                 session: true
             });
@@ -255,13 +247,13 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 bind: '{' + statusCodeField + '}',
                 get: function(value) {
                     viewModel.set(statusField, value == 'OPEN' ? '已开启' : '已关闭');
-                    return value == 'OPEN' ? '已关闭' : '已开启'
+                    return value == 'OPEN' ? '禁用' : '启用'
                 }
             };
             viewModel.setFormulas(o);
             viewModel.set(statusCodeField, "OPEN");
         }else {
-            viewModel.set('auditBtnText', "已关闭");
+            viewModel.set('auditBtnText', "禁用");
         }
     }
 });

frontend/saas-web/resources/json/navigation.json

@@ -221,8 +221,9 @@
             "viewType": "document-kind",
             "leaf": true
         }, {
+            "id":"other-productunit",
             "text": "计量单位",
-            "viewType": "document-kind",
+            "viewType": "other-productunit",
             "leaf": true
         }, {
             "id":"document-kind",