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

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalancedetMapper.java

@@ -14,9 +14,9 @@ public interface PaybalancedetMapper {
 
     int insertSelective(Paybalancedet record);
 
-    Paybalancedet selectByPrimaryKey(Integer pdId);
+    List<Paybalancedet> selectByPrimaryKey(Integer pdId);
 
-    int updateByPrimaryKeySelective(List<Paybalancedet> record);
+    int updateByPrimaryKeySelective(Paybalancedet record);
 
     int updateByPrimaryKey(Paybalancedet record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalancedetailMapper.java

@@ -14,7 +14,7 @@ public interface PaybalancedetailMapper {
 
     int insertSelective(Paybalancedetail record);
 
-    Paybalancedetail selectByPrimaryKey(Integer pbdId);
+    List<Paybalancedetail> selectByPrimaryKey(Integer pbdId);
 
     int updateByPrimaryKeySelective(Paybalancedetail record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalancedetail.java

@@ -13,7 +13,7 @@ public class Paybalancedetail extends CommonBaseEntity implements Serializable {
 
     private Integer pbd_ym;
 
-    private Integer pbd_sild;
+    private Integer pbd_slid;
 
     private String pbd_slcode;
 
@@ -63,12 +63,12 @@ public class Paybalancedetail extends CommonBaseEntity implements Serializable {
         this.pbd_ym = pbd_ym;
     }
 
-    public Integer getPbd_sild() {
-        return pbd_sild;
+    public Integer getPbd_slid() {
+        return pbd_slid;
     }
 
-    public void setPbd_sild(Integer pbd_sild) {
-        this.pbd_sild = pbd_sild;
+    public void setPbd_slid(Integer pbd_slid) {
+        this.pbd_slid = pbd_slid;
     }
 
     public String getPbd_slcode() {

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -70,7 +70,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             paybalancedet1.setPd_rbid(Math.toIntExact(rbId));
             paybalancedet1.setCompanyId(BaseContextHolder.getCompanyId());
             if (paybalancedet1.getId() > 0 ){
-                paybalancedetMapper.updateByPrimaryKey(paybalancedet1);
+                paybalancedetMapper.updateByPrimaryKeySelective(paybalancedet1);
             }else {
                 paybalancedetMapper.insertSelective(paybalancedet1);
             }
@@ -135,8 +135,8 @@ public class PaybalanceServiceImpl implements PaybalanceService {
     public Pay select(int id){
         Pay pay = new Pay();
         pay.setMain(paybalanceMapper.selectByPrimaryKey(id));
-        pay.setItems1((List<Paybalancedet>) paybalancedetMapper.selectByPrimaryKey(id));
-        pay.setItems2((List<Paybalancedetail>) paybalancedetailMapper.selectByPrimaryKey(id));
+        pay.setItems1(paybalancedetMapper.selectByPrimaryKey(id));
+        pay.setItems2(paybalancedetailMapper.selectByPrimaryKey(id));
         return pay;
     }
 

applications/money/money-server/src/main/resources/mapper/PaybalancedetailMapper.xml

@@ -6,7 +6,7 @@
     <result column="pbd_pbid" property="pbd_pbid" jdbcType="INTEGER" />
     <result column="pbd_detno" property="pbd_detno" jdbcType="INTEGER" />
     <result column="pbd_ym" property="pbd_ym" jdbcType="INTEGER" />
-    <result column="pbd_sild" property="pbd_sild" jdbcType="INTEGER" />
+    <result column="pbd_slid" property="pbd_slid" jdbcType="INTEGER" />
     <result column="pbd_slcode" property="pbd_slcode" jdbcType="VARCHAR" />
     <result column="pbd_slkind" property="pbd_slkind" jdbcType="VARCHAR" />
     <result column="pbd_sldate" property="pbd_sldate" jdbcType="TIMESTAMP" />
@@ -23,7 +23,7 @@
     <result column="pbd_text5" property="pbd_text5" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    pbd_id, pbd_pbid, pbd_detno, pbd_ym, pbd_sild, pbd_slcode, pbd_slkind, pbd_sldate,
+    pbd_id, pbd_pbid, pbd_detno, pbd_ym, pbd_slid, pbd_slcode, pbd_slkind, pbd_sldate,
     pbd_amount, pbd_nowbalance, pbd_remark, companyId, updaterId, updatedate, pbd_text1,
     pbd_text2, pbd_text3, pbd_text4, pbd_text5
   </sql>
@@ -45,14 +45,14 @@
 
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalancedetail" >
     insert into paybalancedetail (pbd_id, pbd_pbid, pbd_detno,
-      pbd_ym, pbd_sild, pbd_slcode,
+      pbd_ym, pbd_slid, pbd_slcode,
       pbd_slkind, pbd_sldate, pbd_amount,
       pbd_nowbalance, pbd_remark, companyId,
       updaterId, updatedate, pbd_text1,
       pbd_text2, pbd_text3, pbd_text4,
       pbd_text5)
     values (#{id,jdbcType=INTEGER}, #{pbd_pbid,jdbcType=INTEGER}, #{pbd_detno,jdbcType=INTEGER},
-      #{pbd_ym,jdbcType=INTEGER}, #{pbd_sild,jdbcType=INTEGER}, #{pbd_slcode,jdbcType=VARCHAR},
+      #{pbd_ym,jdbcType=INTEGER}, #{pbd_slid,jdbcType=INTEGER}, #{pbd_slcode,jdbcType=VARCHAR},
       #{pbd_slkind,jdbcType=VARCHAR}, #{pbd_sldate,jdbcType=TIMESTAMP}, #{pbd_amount,jdbcType=DOUBLE},
       #{pbd_nowbalance,jdbcType=DOUBLE}, #{pbd_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
       #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{pbd_text1,jdbcType=VARCHAR},
@@ -71,8 +71,8 @@
       <if test="pbd_ym != null" >
         pbd_ym,
       </if>
-      <if test="pbd_sild != null" >
-        pbd_sild,
+      <if test="pbd_slid != null" >
+        pbd_slid,
       </if>
       <if test="pbd_slcode != null" >
         pbd_slcode,
@@ -127,8 +127,8 @@
       <if test="pbd_ym != null" >
         #{pbd_ym,jdbcType=INTEGER},
       </if>
-      <if test="pbd_sild != null" >
-        #{pbd_sild,jdbcType=INTEGER},
+      <if test="pbd_slid != null" >
+        #{pbd_slid,jdbcType=INTEGER},
       </if>
       <if test="pbd_slcode != null" >
         #{pbd_slcode,jdbcType=VARCHAR},
@@ -186,8 +186,8 @@
       <if test="pbd_ym != null" >
         pbd_ym = #{pbd_ym,jdbcType=INTEGER},
       </if>
-      <if test="pbd_sild != null" >
-        pbd_sild = #{pbd_sild,jdbcType=INTEGER},
+      <if test="pbd_slid != null" >
+        pbd_slid = #{pbd_slid,jdbcType=INTEGER},
       </if>
       <if test="pbd_slcode != null" >
         pbd_slcode = #{pbd_slcode,jdbcType=VARCHAR},

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

@@ -271,7 +271,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 }
                 if(combo){
                     combo.store.load(function() {
-                        combo.setValue(params._value);
+                        typeof combo.setValue == 'function' && combo.setValue(params._value);
                     });
                 }
                 form.ownerCt.close();

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

@@ -32,7 +32,7 @@ Ext.define('saas.view.document.product.FormController', {
                             xtype : "textfield",
                             name: 'name',
                             getCondition: function(v) {
-                                return "upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%'";
+                                return "((ve_code) like '%"+v.toUpperCase()+"%' or (ve_name) like '%"+v.toUpperCase()+"%')";
                             },
                             emptyText : "请输入供应商编号或名称", 
                             columnWidth : 0.25
@@ -98,7 +98,7 @@ Ext.define('saas.view.document.product.FormController', {
                             allowBlank : true, 
                             width:260,
                             getCondition:function(v){
-                                return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
+                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         //窗口列设置
@@ -115,14 +115,14 @@ Ext.define('saas.view.document.product.FormController', {
                             "width": 100,
                             "xtype": "",
                         },{
-                            "text": "仓库类型",
+                            "text": "仓库名称",
                             "flex": 1,
-                            "dataIndex": "wh_type",
+                            "dataIndex": "wh_description",
                             "xtype": "",
                         },{
-                            "text": "仓库名称",
+                            "text": "仓库类型",
                             "flex": 1,
-                            "dataIndex": "wh_description",
+                            "dataIndex": "wh_type",
                             "xtype": "",
                         }]
                     }) ;   

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

@@ -122,7 +122,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         storeUrl:'/api/document/productbrand/getCombo',
         name : "pr_brand", 
         fieldLabel : "物料品牌", 
-        allowBlank : false, 
+        allowBlank : true, 
         columnWidth : 0.25,
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});

frontend/saas-web/app/view/main/Navigation.scss

@@ -97,6 +97,7 @@
         border-bottom-right-radius: 4px;
 
         .menu {
+            
             width: 200px;
             border-right: 1px dashed #ccc;
             letter-spacing: 1px;
@@ -125,7 +126,7 @@
                         cursor: pointer;
                         line-height: 24px;
                         white-space: nowrap;
-                        width: 124px;
+                        width: 130px;
                         overflow: hidden;
                         text-overflow: ellipsis;
                     }

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

@@ -26,7 +26,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             xtype : "textfield",
                             name: 'name',
                             getCondition: function(v) {
-                                return "upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
                             emptyText : "请输入账户编号或名称", 
                             columnWidth : 0.25
@@ -93,7 +93,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             xtype : "textfield", 
                             name: 'name',
                             getCondition: function(v) {
-                                return "upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
                             emptyText:'输入账户编号或名称',
                             columnWidth : 0.25

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             xtype: "textfield",
                             name: "search",
                             getCondition: function (v) {
-                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank: true,
                             columnWidth: 0.25
@@ -133,7 +133,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             xtype: "textfield",
                             name: "search",
                             getCondition: function (v) {
-                                return "upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank: true,
                             columnWidth: 0.25

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

@@ -33,7 +33,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             xtype: "textfield",
                             name: "search",
                             getCondition: function (v) {
-                                return "upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank: true,
                             columnWidth: 0.25

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

@@ -76,14 +76,23 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -49,7 +49,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         name: "rb_rdamount",
         fieldLabel: "总欠款"
     }, {
-        xtype: 'numberfield',
+        xtype: 'hidden',
         name: 'rb_rbdamount',
         fieldLabel: '本次核销金额'
     }, {
@@ -57,24 +57,24 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         name: "rb_date",
         fieldLabel: "日期"
     }, {
-        xtype: "textfield",
+        xtype: "hidden",
         name: "rb_manname",
         fieldLabel: "收款人"
     }, {
-        xtype: 'textareafield',
+        xtype: 'hidden',
         name: 'rb_remark',
         fieldLabel: '备注',
         columnWidth: 1
     }, {
-        xtype: "numberfield",
+        xtype: "hidden",
         name: "rb_discounts",
         fieldLabel: "整单折扣"
     }, {
-        xtype: 'numberfield',
+        xtype: 'hidden',
         name: 'rb_preamount',
         fieldLabel : '本次预收款'
     }, {
-        xtype: 'numberfield',
+        xtype: 'hidden',
         name: 'rb_havebalance',
         fieldLabel: '已核销金额'
     }, {
@@ -91,21 +91,24 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             dataIndex: 'rd_ym',
             editor: {
                 xtype: 'numberfield'
-            }
+            },
+            hidden: true
         }, {
             text: '资金账户ID',
             dataIndex: 'rd_bankid',
             width : 100.0, 
             editor: {
                 xtype: 'numberfield'
-            }
+            },
+            hidden: true
         }, {
             text: '资金账户编号',
             dataIndex: 'rd_bankcode',
             width : 100.0, 
             editor: {
                 xtype: 'textfield'
-            }
+            },
+            hidden: true
         }, {
             text: '资金账户',
             dataIndex: 'rd_bankname',
@@ -152,13 +155,15 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             dataIndex: 'rbd_ym',
             editor: {
                 xtype: 'numberfield'
-            }
+            },
+            hidden: true
         }, {
             text: '来源ID',
             dataIndex: 'rbd_slid',
             editor: {
                 xtype: 'numberfield'
-            }
+            },
+            hidden: true
         }, {
             text: '来源单号',
             dataIndex: 'rbd_slcode',
@@ -183,50 +188,55 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             editor: {
                 xtype: 'numberfield'
             }
-        // }, {
-        //     text: "已核销金额",
-        //     dataIndex: "rbd_nowbalance",
-        //     editor: {
-        //         xtype: 'numberfield'
-        //     }
-        // }, {
-        //     text: "未核销金额",
-        //     dataIndex: "pbd_nowbalance",
-        //     editor: {
-        //         xtype: 'numberfield'
-        //     }
         }, {
-            text: "本次核销金额",
+            text: "已核销金额",
+            dataIndex: "rbd_nowbalance",
+            editor: {
+                xtype: 'numberfield'
+            }
+        }, {
+            text: "未核销金额",
             dataIndex: "pbd_nowbalance",
             editor: {
                 xtype: 'numberfield'
             }
         }, {
-            text: '备注',
-            dataIndex: 'rbd_remark',
+            text: "本次核销金额",
+            dataIndex: "pbd_nowbalance",
             editor: {
-                xtype: 'textfield'
+                xtype: 'numberfield'
             }
+        // }, {
+        //     text: '备注',
+        //     dataIndex: 'rbd_remark',
+        //     editor: {
+        //         xtype: 'textfield'
+        //     }
         }]
     }, {
         xtype: 'numberfield',
         name: 'rb_recorderid',
-        fieldLabel: '录入人ID'
+        fieldLabel: '录入人ID',
+        hidden: true
     }, {
         xtype: 'textfield',
         name: 'rb_recorder',
-        fieldLabel: '录入人'
+        fieldLabel: '录入人',
+        hidden: true
     }, {
         xtype: 'numberfield',
         name: 'updaterId',
-        fieldLabel: '更新人ID'
+        fieldLabel: '更新人ID',
+        hidden: true
     }, {
         xtype: 'datefield',
         name: 'updatedate',
-        fieldLabel: '更新时间'
+        fieldLabel: '更新时间',
+        hidden: true
     }, {
         xtype: "datefield",
         name: "rb_recorddate",
-        fieldLabel: "创建时间"
+        fieldLabel: "创建时间",
+        hidden: true
     }]
 });

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

@@ -32,7 +32,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             emptyText:'输入客户编号或名称',
                             name : "cu_name", 
                             getCondition: function(v) {
-                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
                             },
                             fieldLabel : "客户名称", 
                             columnWidth : 0.25
@@ -91,7 +91,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             emptyText:'输入客户编号或名称',
                             name : "cu_name", 
                             getCondition: function(v) {
-                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
                             },
                             fieldLabel : "客户名称", 
                             columnWidth : 0.25

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

@@ -38,7 +38,8 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             text: 'id',
             dataIndex: 'id',
             width: 100,
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            hidden: true
         }, {
             text: '单据编号',
             dataIndex: 'rb_code',
@@ -54,21 +55,23 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             width: 200
         }, {
             text: '客户编号',
-            dataIndex: 'rb_custcode'
+            dataIndex: 'rb_custcode',
+            hidden: true
         }, {
             text: '客户名称',
-            dataIndex: 'rb_custname'
+            dataIndex: 'rb_custname',
         }, {
             text: '收款人',
             dataIndex: 'rb_manname',
             xtype: 'numbercolumn',
-            width: 120
+            width: 120,
         }, {
             text: '收款金额',
             dataIndex: 'rb_rdamount',
             xtype: 'numbercolumn',
             width: 120,
-            flex: 1
+            flex: 1,
+            hidden: true
         }]
     }
 });

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

@@ -76,14 +76,23 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -31,7 +31,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             xtype : "textfield", 
                             name : "search", 
                             getCondition: function(v) {
-                                return "upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25
@@ -94,7 +94,6 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         dataUrl: '/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
-                        defaultCondition:"pr_statuscode='OPEN'",
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
@@ -111,7 +110,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        //窗口字段设置
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
@@ -119,14 +118,15 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail） like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%'";
+                                return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%')";
                             }
                         }],
                         //窗口列设置
                         dbColumns:[{
                             "text": "物料ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                        },{
+                        }, {
                             "text": "物料编号",
                             "dataIndex": "pr_code",
                         }, {

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

@@ -76,14 +76,23 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -41,7 +41,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         dbColumns:[{
@@ -110,26 +110,24 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             field:'pr_spec',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
-                        //窗口字段设置
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
+                            emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
                             allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
-                            }
+                            columnWidth : 0.25
                         }],
                         //窗口列设置
                         dbColumns:[{
                             "text": "物料ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                        }, {
                             "text": "物料编号",       
                             "dataIndex": "pr_code",
                             "width": 100,
@@ -259,7 +257,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
                             }
                         }],                        
                         dbColumns:[{

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

@@ -75,14 +75,23 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -40,7 +40,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         dbColumns:[{
@@ -109,26 +109,24 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             field:'pr_unit',width:100
                         }],
-                        defaultCondition:"pr_statuscode='OPEN'",
-                        //窗口字段设置
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
                             allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_spec) like '%"+v.toUpperCase()+"%'";
-                            }
-                        }],                       
+                            columnWidth : 0.25
+                        }],                      
                         //窗口列设置
                         dbColumns:[{
                             "text": "物料ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                        }, {
                             "text": "物料编号",       
                             "dataIndex": "pr_code",
                             "width": 100,
@@ -258,7 +256,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
                             }
                         }],                        
                         dbColumns:[{

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

@@ -75,14 +75,23 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -32,7 +32,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             xtype : "textfield", 
                             name : "search", 
                             getCondition: function(v) {
-                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25
@@ -126,14 +126,23 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
                                 "text": "物料ID",
-                                "flex": 0,
+                                "hidden": true,
                                 "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
                             },{
                                 "text": "物料编号",
                                 "flex": 1,

frontend/saas-web/app/view/sale/sale/QueryPanelController.js

@@ -76,14 +76,23 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
                                 "text": "物料ID",
-                                "flex": 0,
+                                "hidden": true,
                                 "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
                             },{
                                 "text": "物料编号",
                                 "flex": 1,

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

@@ -33,7 +33,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             xtype : "textfield", 
                             name : "search", 
                             getCondition: function(v) {
-                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25
@@ -126,14 +126,23 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
                                 "text": "物料ID",
-                                "flex": 0,
+                                "hidden": true,
                                 "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
                             },{
                                 "text": "物料编号",
                                 "flex": 1,

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

@@ -81,14 +81,23 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
                                 "text": "物料ID",
-                                "flex": 0,
+                                "hidden": true,
                                 "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
                             },{
                                 "text": "物料编号",
                                 "flex": 1,

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                             xtype : "textfield", 
                             name : "search", 
                             getCondition: function(v) {
-                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25
@@ -124,14 +124,23 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
                                 "text": "物料ID",
-                                "flex": 0,
+                                "hidden": true,
                                 "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
                             },{
                                 "text": "物料编号",
                                 "flex": 1,

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

@@ -113,15 +113,24 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
-                        {
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            {
+                                "text": "物料ID",
+                                "hidden": true,
+                                "dataIndex": "id",
+                            },{
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -196,24 +196,22 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         },{
                             field:'pr_spec',width:100
                         }],
-                        defaultCondition:"pr_statuscode='OPEN'",
-                        //窗口字段设置
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
                             allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_spec) like '%"+v.toUpperCase()+"%'";
-                            }
-                        }],                         
+                            columnWidth : 0.25
+                        }],                   
                         dbColumns:[{
                             "text": "物料ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
                             "text": "物料编号",       
                             "dataIndex": "pr_code",

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

@@ -74,7 +74,23 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
+                            "text": "物料ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                        },{
                             "text": "物料ID",
                             "flex": 0,
                             "dataIndex": "pr_id",

frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -97,7 +97,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         //窗口列设置
@@ -162,7 +162,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         //窗口列设置

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

@@ -76,9 +76,21 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "pr_id",
                             "width": 0,
                             "xtype": "",

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         dbColumns:[{
@@ -107,7 +107,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         dbColumns:[{
@@ -202,24 +202,24 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             field: 'pr_spec',
                             width: 100
                         }],
-                        defaultCondition:"pr_statuscode='OPEN'",
-                        //窗口字段设置
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
                             allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_spec) like '%"+v.toUpperCase()+"%'";
-                            }
+                            columnWidth : 0.25
                         }],                        
                         dbColumns:[{
                             "text": "物料ID",
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
-                            "items": null
+                            "hidden": true
                         },{
                             "text": "物料编号",       
                             "dataIndex": "pr_code",
@@ -354,7 +354,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
                             }
                         }],                        
                         dbColumns: [{

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

@@ -75,9 +75,21 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "pr_id",
                             "width": 0,
                             "xtype": "",

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%')";
                             }
                         }],                        
                         dbColumns:[{
@@ -102,7 +102,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         dbColumns:[{
@@ -190,24 +190,24 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             field:'pr_spec',width:100
                         }],
-                        defaultCondition:"pr_statuscode='OPEN'",
-                        //窗口字段设置
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
                             allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_spec) like '%"+v.toUpperCase()+"%'";
-                            }
-                        }],                        
+                            columnWidth : 0.25
+                        }],                      
                         dbColumns:[{
                             "text": "物料ID",
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
-                            "items": null
+                            "hidden": true
                         },{
                             "text": "物料编号",       
                             "dataIndex": "pr_code",
@@ -338,7 +338,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
                             }
                         }],                        
                         dbColumns:[{

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

@@ -75,9 +75,21 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "pr_id",
                             "width": 0,
                             "xtype": "",

frontend/saas-web/app/view/sys/config/FormPanel.js

@@ -25,13 +25,19 @@ Ext.define('saas.view.sys.config.FormPanel', {
         columnWidth: 0.25,
         blankText: '该字段不能为空'
     },
-    
-    tbar:[{
-        text:'保存',
-        handler:function(){
 
-        }
-    }],
+    tbar:{
+        style: {
+            'border-bottom': '1px solid #35baf6 !important'
+        },
+        frame:true,
+        items:['->',{
+            text:'保存',
+            handler:function(){
+
+            }
+        }]
+    },
 
     items: [{
         xtype: 'hidden',

frontend/saas-web/app/view/sys/messagelog/DataList.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.sys.messagelog.DataList', {
         width: 150,
         name: 'ml_name',
         xtype: 'textfield',
-        emptyText : '单据类别'
+        emptyText : '单据类型'
     },{
         width: 150,
         name: 'ml_code',
@@ -52,7 +52,7 @@ Ext.define('saas.view.sys.messagelog.DataList', {
         dataIndex : "id", 
         xtype : "numbercolumn",   
     },{
-        text:'单据类别',
+        text:'单据类型',
         dataIndex : "ml_name",
         width : 120.0, 
     },{

frontend/saas-web/ext/packages/modern-locale/overrides/zh_CN/window/Window.js

@@ -0,0 +1,7 @@
+Ext.define('Ext.locale.zh_CN.window.Window', {
+    override: 'Ext.window.Window',
+
+    config: {
+        closeToolText: '关闭面板'
+    }
+});