代码提交

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

@@ -137,7 +137,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             o['auditBtnText'] = {
                 bind: '{form.' + statusCodeField + '}',
                 get: function(value) {
-                    viewModel.set('form.' + statusField, value == 'AUDITED' ? '审核' : '反审核');
+                    viewModel.set('form.' + statusField, value == 'AUDITED' ? '已审核' : '未审核');
                     return value == 'AUDITED' ? '反审核' : '审核'
                 }
             };

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

@@ -134,15 +134,13 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
 
     deleteDetail: function() {
         var me = this,
-            form = me.ownerCt;
             store = me.getStore(),
             selectedRecord = me.selModel.lastSelected;
 
         var id = selectedRecord.data.id;
-        var form = me.ownerGrid.ownerCt;
         if(id&&id!=0&&(typeof id) == 'number'){
             Ext.Ajax.request({
-                url: form._deleteDetailUrl+id,
+                url: me._deleteDetailUrl+id,
                 params: '',
                 headers: {
                     'Access-Control-Allow-Origin': '*'

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

@@ -5,7 +5,7 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
     controller: 'customer-panel-formpanel',
     viewModel: 'customer-panel-formpanel',
     
-    caller:'Purchase',
+    caller:'Customer',
 
     //字段属性
     _title:'客户资料',
@@ -17,7 +17,6 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
     _saveUrl:'http://192.168.253.228:9480/customer/save',
     _auditUrl:'http://192.168.253.228:8800/purchase/audit',
     _deleteUrl:'http://192.168.253.228:8800/purchase/delete/',
-    _deleteDetailUrl:'http://192.168.253.228:8800/purchase/deleteItem/',
     initId:0,
 
     defaultItems: [{
@@ -52,7 +51,7 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
         columnWidth: 0.25
     },{
         xtype : "remotecombo", 
-        storeUrl:"http://192.168.253.41:9480/customerkind/getCombo",
+        storeUrl:"http://192.168.253.31:9480/customerkind/getCombo",
         name : "cu_type", 
         fieldLabel : "客户类型", 
         allowBlank : true, 
@@ -64,8 +63,8 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
             vendorkind:{
                 keyField:'id',
                 dataField:'ck_name',
-                reqUrl:'http://192.168.253.41:9480/customerkind/save',
-                delUrl:'http://192.168.253.41:9480/customerkind/delete'
+                reqUrl:'http://192.168.253.31:9480/customerkind/save',
+                delUrl:'http://192.168.253.31:9480/customerkind/delete'
             }
         },
         addHandler:function(b){
@@ -84,7 +83,7 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
             this.dialog.show();
         }
     },{
-        format : "Y-m-d", 
+        format : "Y-m-d",
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "创建时间", 
@@ -142,7 +141,6 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
         format : "Y-m-d",
         xtype : "datefield", 
         name : "updateTime", 
-        bind : "{updateTime}", 
         fieldLabel : "更新时间", 
         allowBlank : true, 
         columnWidth : 0.25
@@ -150,6 +148,7 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
         xtype : "detailGridField", 
         _detnoColumn:  'cc_detno',
         storeModel:'saas.model.document.customercontact',
+        _deleteDetailUrl:'http://192.168.253.228:8800/purchase/deleteItem/',
         columns : [
             {
                 text : "序号", 
@@ -163,6 +162,18 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
                     return Ext.String.format('合计： {0}条', value);
                 },
             },
+            {
+                text : "ID", 
+                dataIndex : "id", 
+                width : 0, 
+                xtype : "numbercolumn"
+            },
+            {
+                text : "关联ID", 
+                dataIndex : "cc_cuid", 
+                width : 0, 
+                xtype : "numbercolumn"
+            },
             {
                 text : "联系人", 
                 editor : {
@@ -240,6 +251,7 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
         xtype : "detailGridField", 
         _detnoColumn:  'ca_detno',
         storeModel:'saas.model.document.customeraddress',
+        _deleteDetailUrl:'http://192.168.253.228:8800/purchase/deleteItem/',
         columns : [
             {
                 text : "序号", 
@@ -253,6 +265,18 @@ Ext.define('saas.view.document.customer.panel.FormPanel', {
                     return Ext.String.format('合计： {0}条', value);
                 },
             }, 
+            {
+                text : "ID", 
+                dataIndex : "id", 
+                width : 0, 
+                xtype : "numbercolumn"
+            },
+            {
+                text : "关联ID", 
+                dataIndex : "ca_cuid", 
+                width : 0, 
+                xtype : "numbercolumn"
+            },
             {
                 text : "送货地址", 
                 editor : {

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

@@ -123,6 +123,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 align : 'center',
                 format:'0',
                 summaryType: 'count',
+                locked:true,
                 summaryRenderer: function(value, summaryData, dataIndex) {
                     return Ext.String.format('合计： {0}条', value);
                 },