Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -184,7 +184,7 @@ Ext.define('saas.util.FormUtil', {
                             idx++;
                         }
                     }
-                    form.setFormData(o);
+                    form.initFormData(o);
                 }
             })
             .catch(function(response) {
@@ -230,7 +230,7 @@ Ext.define('saas.util.FormUtil', {
                             formData['detail' + index] = datas;
                         });
 
-                        form.setFormData(formData);
+                        form.initFormData(formData);
                     }
                 }
             }).catch(function() {

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

@@ -252,11 +252,11 @@ Ext.define('saas.view.core.form.FormPanel', {
 
         for (var i = 0; i < detailCount; i++) {
             var g = detailGrids[i];
-            var gridDirtyData = g.getDirtyData();
+            var gridTrueData = g.getTrueData();
             var modelDetail = allData['detail' + i];
             var detailBindFields = modelDetail.detailBindFields;
 
-            Ext.Array.each(gridDirtyData, function(d) {
+            Ext.Array.each(gridTrueData, function(d) {
                 for(k in d) {
                     if(!Ext.Array.contains(detailBindFields, k)) {
                         delete d[k];
@@ -265,7 +265,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             });
             
 
-            data['detail' + i] = gridDirtyData;
+            data['detail' + i] = gridTrueData;
         }
 
         return data;
@@ -294,6 +294,11 @@ Ext.define('saas.view.core.form.FormPanel', {
         me.isValid();
     },
 
+    initFormData: function(data) {
+        var me = this;
+        me.setFormData(data);
+    },
+
     /**
      * 设置需要绑定的字段
      */

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

@@ -2,6 +2,8 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     extend: 'Ext.grid.Panel',
     xtype: 'detailGridField',
 
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+
     cls: 'x-detailgridfield',
 
     border: 1,
@@ -27,7 +29,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     showIndex: true,
     configUrl: '',
     editable: true,
-    allowEmpty: false, // 校验时只校验dirty数据
+    allowEmpty: false, // 表格为空时校验合法
     showCount: true, // 显示合计栏
 
     initComponent: function() {
@@ -231,27 +233,26 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
 
         var id = selectedRecord.data.id;
         if(id&&id!=0&&(typeof id) == 'number'){
-            Ext.Ajax.request({
+            me.BaseUtil.request({
                 url: me.deleteDetailUrl+id,
                 params: '',
                 method: 'POST',
-                headers: {
-                    'Access-Control-Allow-Origin': '*'
-                },
-                success: function (response, opts) {
-                    store.remove(selectedRecord);
-                    //解析参数
-                    showToast('删除成功');
-                },
-                failure: function (response, opts) {
-                    //失败
-                    showToast('删除失败');
-                }
+            })
+            .then(function() {
+                store.remove(selectedRecord);
+                me.fireEvent('validChange');
+                //解析参数
+                showToast('删除成功');
+            })
+            .catch(function() {
+                me.fireEvent('validChange');
+                //失败
+                showToast('删除失败');
             });
         }else{
             store.remove(selectedRecord);
+            me.fireEvent('validChange');
         }
-        me.fireEvent('validChange');
     },
 
     swapUp: function() {
@@ -326,7 +327,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
         var me = this,
         allowEmpty = me.allowEmpty;
         columns = me.columns,
-        data = allowEmpty ? me.getDirtyData() : me.getAllData(),
+        data = me.getTrueData(),
         valid = allowEmpty;
 
         // 判断列必填
@@ -388,13 +389,13 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     },
 
     /**
-     * 获得已修改的数据
+     * 获得有效数据
      */
-    getDirtyData: function() {
+    getTrueData: function() {
         var me = this,
         store = me.getStore(),
         allData = store.getData().items,
-        dirtyData = [];
+        trueData = [];
 
         Ext.Array.each(allData, function(item){
             var d = Object.assign({}, item.data),
@@ -409,10 +410,14 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                         d[k] = Ext.Date.format(d[k], 'Y-m-d H:i:s');
                     }
                 }
-                dirtyData.push(d);
+                trueData.push(d);
+            }else {
+                if(typeof d.id == "number") {
+                    trueData.push(d);
+                }
             }
         });
-        return dirtyData;
+        return trueData;
     }
 
 });

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

@@ -16,7 +16,7 @@ Ext.define('saas.view.document.bom.FormController', {
         status == 'OPEN' ? me.unAudit() : me.audit();
     },
 
-    audit: function(){
+    unAudit: function(){
         var me = this,
         form = this.getView(),
         viewModel = me.getViewModel();
@@ -39,7 +39,7 @@ Ext.define('saas.view.document.bom.FormController', {
             showToast('启用失败: ' + res.message);
         });
     },
-    unAudit: function() {
+    audit: function() {
         var me = this,
         form = this.getView(),
         viewModel = me.getViewModel();
@@ -51,15 +51,15 @@ Ext.define('saas.view.document.bom.FormController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                showToast('禁用成功');
                 form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
+                showToast('关闭成功');
             }
         })
         .catch(function(res) {
             console.log(res);
-            showToast('禁用失败: ' + res.message);
+            showToast('关闭失败: ' + res.message);
         });
     }
 });

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

@@ -106,12 +106,12 @@ Ext.define('saas.view.document.bom.FormPanel', {
     }],
 
     auditTexts: {
-        auditCode: 'OPEN',
-        auditText: '已开启',
-        unAuditCode: 'CLOSE',
-        unAuditText: '已关闭',
-        auditBtnText: '启用',
-        unAuditBtnText: '关闭',
+        auditCode: 'CLOSE',
+        auditText: '已关闭',
+        unAuditCode: 'OPEN',
+        unAuditText: '已开启',
+        auditBtnText: '关闭',
+        unAuditBtnText: '启用',
     },
 
 });

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

@@ -16,7 +16,7 @@ Ext.define('saas.view.document.customer.FormController', {
         status == 'OPEN' ? me.unAudit() : me.audit();
     },
 
-    audit: function(){
+    unAudit: function(){
         var me = this,
         form = this.getView(),
         viewModel = me.getViewModel();
@@ -39,7 +39,7 @@ Ext.define('saas.view.document.customer.FormController', {
             showToast('启用失败: ' + res.message);
         });
     },
-    unAudit: function() {
+    audit: function() {
         var me = this,
         form = this.getView(),
         viewModel = me.getViewModel();

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

@@ -337,11 +337,11 @@ Ext.define('saas.view.document.customer.FormPanel', {
             }]
     }],
     auditTexts: {
-        auditCode: 'OPEN',
-        auditText: '已开启',
-        unAuditCode: 'CLOSE',
-        unAuditText: '已关闭',
-        auditBtnText: '启用',
-        unAuditBtnText: '关闭',
+        auditCode: 'CLOSE',
+        auditText: '已关闭',
+        unAuditCode: 'OPEN',
+        unAuditText: '已开启',
+        auditBtnText: '关闭',
+        unAuditBtnText: '启用',
     },
 });

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

@@ -141,7 +141,7 @@ Ext.define('saas.view.document.product.FormController', {
         status == 'OPEN' ? me.unAudit() : me.audit();
     },
 
-    audit: function(){
+    unAudit: function(){
         var me = this,
         form = this.getView(),
         viewModel = me.getViewModel();
@@ -164,7 +164,7 @@ Ext.define('saas.view.document.product.FormController', {
             showToast('启用失败: ' + res.message);
         });
     },
-    unAudit: function() {
+    audit: function() {
         var me = this,
         form = this.getView(),
         viewModel = me.getViewModel();

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

@@ -179,11 +179,11 @@ Ext.define('saas.view.document.product.FormPanel', {
     }],
 
     auditTexts: {
-        auditCode: 'OPEN',
-        auditText: '已开启',
-        unAuditCode: 'CLOSE',
-        unAuditText: '已关闭',
-        auditBtnText: '启用',
-        unAuditBtnText: '关闭',
+        auditCode: 'CLOSE',
+        auditText: '已关闭',
+        unAuditCode: 'OPEN',
+        unAuditText: '已开启',
+        auditBtnText: '关闭',
+        unAuditBtnText: '启用',
     },
 });

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.document.vendor.FormController', {
         status == 'OPEN' ? me.unAudit() : me.audit();
     },
 
-    audit: function(){
+    unAudit: function(){
         var me = this,
         form = this.getView(),
         viewModel = me.getViewModel();
@@ -38,7 +38,7 @@ Ext.define('saas.view.document.vendor.FormController', {
             showToast('启用失败: ' + res.message);
         });
     },
-    unAudit: function() {
+    audit: function() {
         var me = this,
         form = this.getView(),
         viewModel = me.getViewModel();

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

@@ -238,11 +238,11 @@ Ext.define('saas.view.document.vendor.FormPanel', {
     ],
 
     auditTexts: {
-        auditCode: 'OPEN',
-        auditText: '已开启',
-        unAuditCode: 'CLOSE',
-        unAuditText: '已关闭',
-        auditBtnText: '启用',
-        unAuditBtnText: '关闭',
+        auditCode: 'CLOSE',
+        auditText: '已关闭',
+        unAuditCode: 'OPEN',
+        unAuditText: '已开启',
+        auditBtnText: '关闭',
+        unAuditBtnText: '启用',
     },
 });