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

frontend/saas-web/app/Application.scss

@@ -109,7 +109,7 @@ body.launching {
   }
 }
 
-.x-form-item-default.x-item-disabled {
+.x-form-item-default.x-form-readonly {
   opacity: 1;
 
   .x-form-item-label-default {

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

@@ -234,7 +234,7 @@ Ext.define('saas.util.FormUtil', {
                             var detnoColumn = grid.detnoColumn;
                             var datas = [];
                             
-                            Ext.Array.each(new Array(10), function() {
+                            Ext.Array.each(new Array(5), function() {
                                 detno += 1;
                                 var data = {};
                                 data[detnoColumn] = detno;

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

@@ -373,8 +373,8 @@ Ext.define('saas.view.core.form.FormPanel', {
         });
 
         Ext.Array.each(items, function(item) {
-            if(typeof item.setEditable == 'function') {
-                typeof item.setDisabled == 'function' && item.setDisabled(!able);
+            if(typeof item.setReadOnly  == 'function') {
+               item.setReadOnly (!able);
             }
         });
     },

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

@@ -8,7 +8,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
 
     border: 1,
     margin: '0 5 5 0', // formpanel的fieldDefaults未生效
-    height: 300,
+    height: 245,
     columnWidth : 1.0, 
 
     requires: [

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -30,7 +30,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             dataIndex: 'ft_code',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'ft_status',
             width: 120
         }, {

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -56,7 +56,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             dataIndex: 'or_code',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'or_status',
             width: 120
         }, {

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -56,7 +56,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             dataIndex: 'os_code',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'os_status',
             width: 120
         }, {

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -32,11 +32,11 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             dataIndex: 'pb_code',
             width: 200
         }, {
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pb_status',
             width: 120
         }, {
-            text: '日期',
+            text: '单据日期',
             dataIndex: 'pb_date',
             width: 160
         }, {

frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -45,11 +45,11 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             dataIndex: 'rb_code',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'rb_status',
             width: 120
         }, {
-            text: '日期',
+            text: '单据日期',
             dataIndex: 'rb_date',
             xtype: 'datecolumn',
             width: 200

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

@@ -107,7 +107,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             dataIndex: 'pu_vendname',
             width: 120
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pu_status',
             width: 120
         },{
@@ -147,7 +147,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             dataIndex: 'pu_code',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pu_status',
             width: 120
         }, {

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

@@ -112,7 +112,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             xtype:'datecolumn',
             width: 200
         },{
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -142,11 +142,11 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

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

@@ -120,7 +120,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             xtype:'datecolumn',
             width: 200
         },{
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -150,11 +150,11 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -90,7 +90,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pi_class',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
@@ -131,7 +131,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -127,7 +127,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -127,7 +127,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             dataIndex: 'pi_class',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
@@ -164,7 +164,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -31,28 +31,25 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号',
         allowBlank: true,
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
+        hidden: true,
         showDetail: true
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pr_detail',
-        bind: '{pr_detail}',
         fieldLabel: '物料名称',
         showDetail: true
     }, {
@@ -108,7 +105,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             xtype:'datecolumn',
             width: 200
         },{
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -138,11 +135,11 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js

@@ -6,16 +6,16 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendname]':{
+            'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
+                            from:'ve_code',to:'pi_vendcode'
                         },{
-                            from:'ve_name',to:'pu_vendname'
+                            from:'ve_name',to:'pi_vendname'
                         }],
                         dbtpls:[{
                             field:'ve_code',width:100
@@ -77,8 +77,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
 
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
+            // 物料名称
+            'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
@@ -87,7 +87,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                         addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
-                            from:'pr_unit',to:'pd_unit'
+                        }, {
+                            from:'pr_detail',to:'pr_detail'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100
@@ -166,7 +167,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
                             "width": 100,
-                        }]
+                        }]   
                     }) ;   
 
                 }

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -37,22 +37,21 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pi_vendname',
         bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
+        hidden: true,
         showDetail: true
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pr_detail',
-        bind: '{pr_detail}',
         fieldLabel: '物料名称',
         showDetail: true
     }, {
@@ -108,7 +107,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             xtype:'datecolumn',
             width: 200
         },{
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -138,11 +137,11 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js

@@ -5,17 +5,17 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendname]':{
+            // 供应商名称
+            'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
+                            from:'ve_code',to:'pi_vendname'
                         },{
-                            from:'ve_name',to:'pu_vendname'
+                            from:'ve_name',to:'pi_vendname'
                         }],
                         dbtpls:[{
                             field:'ve_code',width:100
@@ -77,17 +77,18 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
 
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
+            // 物料名称
+            'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+                        conditionCode:'pr_code',
                         dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
+                            from:'pr_code',to:'pd_prodcode',
                         }, {
-                            from:'pr_unit',to:'pd_unit'
+                            from:'pr_detail',to:'pr_detail'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100
@@ -166,7 +167,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
                             "width": 100,
-                        }]
+                        }]   
                     }) ;   
 
                 }