rainco преди 7 години
родител
ревизия
cea073821a

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

@@ -204,7 +204,7 @@ Ext.define('saas.view.core.form.FormPanel', {
         viewModel.set('createTime', Ext.Date.format(new Date(), 'Y-m-d H:i:s'));
         viewModel.set('updateTime', Ext.Date.format(new Date(), 'Y-m-d H:i:s'));
         viewModel.set('creatorId', saas.util.BaseUtil.getCurrentUser().id);
-        viewModel.set('creator', saas.util.BaseUtil.getCurrentUser().realname);
+        viewModel.set('creatorName', saas.util.BaseUtil.getCurrentUser().realname);
 
         if (statusCodeField) {
             var o = {};

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

@@ -56,7 +56,7 @@ Ext.define('saas.view.document.product.BasePanel', {
         ]
         }),
         getCondition: function(value) {
-            if(value == 'ALL') {
+            if(value == 'ALL' || !value) {
                 return '1=1';
             }else {
                 return 'pr_statuscode=\'' + value + '\'';

+ 1 - 1
frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -182,7 +182,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         hidden:true
     }, {
         xtype : "textfield", 
-        name : "creator", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {

+ 2 - 6
frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -38,10 +38,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         xtype: 'hidden',
         name: 'id',
         fieldLabel: 'id'
-    },{
-        xtype: 'numberfield',
-        name: 'pi_ioid',
-        fieldLabel: 'pi_ioid'
     },{
         xtype : "hidden", 
         name : "pu_vendid", 
@@ -359,7 +355,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     },
     {
         xtype : "textfield", 
-        name : "creator", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
@@ -375,7 +371,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         readOnly:true
     },{
         xtype : "hidden", 
-        name : "updater", 
+        name : "updaterName", 
         fieldLabel : "更新人", 
         readOnly:true
     }, {

+ 1 - 1
frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -143,7 +143,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 0
         }, {
             text: '录入人',
-            dataIndex: 'creator',
+            dataIndex: 'creatorName',
             width: 0
         }, {
             text: '录入日期',

+ 2 - 2
frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -350,7 +350,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     },
     {
         xtype : "textfield", 
-        name : "creator", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
@@ -366,7 +366,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         readOnly:true
     },{
         xtype : "hidden", 
-        name : "updater", 
+        name : "updaterName", 
         fieldLabel : "更新人", 
         readOnly:true
     }, {

+ 2 - 2
frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js

@@ -133,7 +133,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             width: 0
         }, {
             text: '录入人',
-            dataIndex: 'creator',
+            dataIndex: 'creatorName',
             width: 0
         }, {
             text: '录入日期',
@@ -146,7 +146,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             width: 0
         }, {
             text: '更新人',
-            dataIndex: 'updater',
+            dataIndex: 'updaterName',
             width: 0
         }, {
             text: '更新日期',

+ 2 - 2
frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -335,7 +335,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     },
     {
         xtype : "textfield", 
-        name : "creator", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
@@ -351,7 +351,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         readOnly:true
     },{
         xtype : "hidden", 
-        name : "updater", 
+        name : "updaterName", 
         fieldLabel : "更新人", 
         readOnly:true
     }, {

+ 2 - 2
frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -137,7 +137,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             width: 0
         }, {
             text: '录入人',
-            dataIndex: 'creator',
+            dataIndex: 'creatorName',
             width: 0
         }, {
             text: '录入日期',
@@ -150,7 +150,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             width: 0
         }, {
             text: '更新人',
-            dataIndex: 'updater',
+            dataIndex: 'updaterName',
             width: 0
         }, {
             text: '更新日期',

+ 1 - 1
frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -44,7 +44,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         width: 200
     }, {
         text: '录入人',
-        dataIndex: 'creator',
+        dataIndex: 'creatorName',
         width: 200
     }, {
         text : "日期",