代码提交

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

@@ -235,7 +235,9 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         return Ext.apply(conf, me.etc[kind]);
     },
     onSave:function(){
+        var me = this;
         var belong = this.belong;
+        me.setLoading(true);
         var form=this.down('form');
         var combo = this._combo;
         var params = {};
@@ -258,6 +260,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             method: 'POST',
         })
         .then(function(localJson) {
+            me.setLoading(false);
             if(localJson.success){
                 showToast('保存成功');
                 var grid = form.ownerCt._parent.lookup('document-kind-Grid');
@@ -273,6 +276,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             }
         })
         .catch(function(res) {
+            me.setLoading(false);
             console.error(res);
             showToast('保存失败: ' + res.message);
         });

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

@@ -31,9 +31,9 @@ Ext.define('saas.view.document.kind.Kind', {
             value: 'vendorkind',
             typeText:'供应商类型'
         }, {
-            text: '商品',
+            text: '物料',
             value: 'productkind',
-            typeText:'商品类型'
+            typeText:'物料类型'
         }, {
             text: '收支',
             value: 'inoutkind',