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

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -56,7 +56,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     VENDOR_ISCLOSE(79505, "供应商已关闭"),
     PRODUCT_ISCLOSE(79506, "物料已关闭"),
     CUSTOMER_ISCLOSE(79507, "客户资料已关闭"),
-
+    REQUIREDFIELD_NULL(79508,"存在必填字段未空"),
 
     //采购 70000-71999
     PURCCHECKIN_POST_ERROR(70000,""),
@@ -65,6 +65,8 @@ public enum BizExceptionCode implements BaseExceptionCode {
     PURCHASE_ORDER_HASAUDIT(70002, "存在已审核单据,单据编号:%s"),
     PURCHASE_ORDER_HASUNAUDIT(70003, "存在未审核单据,单据编号:%s"),
 
+
+
     //销售
     SALE_ALL_TURNOUT(72000, "该销售单已全部转出货,无法转出货单"),
     SALE_CLOSE(72001, "单据已关闭,无法进行操作"),

applications/commons/commons-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
 logging:

applications/document/document-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
   redis:

applications/money/money-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
   redis:

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

@@ -39,9 +39,9 @@
                 #{si_yearmonth,jdbcType=INTEGER},
             </if>
             <if test="si_amount_pay != null" >
-                select sum(pd_amount) from paybalancedet left join paybalance on pd_pbid=pb_id
+                (select sum(pd_amount) from paybalancedet left join paybalance on pd_pbid=pb_id
                 where paybalance.companyId= #{companyid,jdbcType=INTEGER}
-                and pd_ym=#{si_yearmonth,jdbcType=INTEGER} and pb_statuscode='AUDITED',
+                and pd_ym=#{si_yearmonth,jdbcType=INTEGER} and pb_statuscode='AUDITED'),
             </if>
             <if test="si_amount_otherpay != null" >
                 (select sum(os_amount) from othspendings RIGHT JOIN othspendingsdetail on os_id = osd_osid

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchaseMapper.java

@@ -38,4 +38,8 @@ public interface PurchaseMapper extends CommonBaseMapper<Purchase>{
     Integer validateProduct(@Param("id") Long id);
 
     void updateDelivery(@Param("id")Long id);
+
+    Integer checkPurchaseRequiredField(Long id);
+
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -498,12 +498,18 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     public Result singleAudit(Long id) {
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         Result result = Result.success(docBaseDTO);
+
         //检查供应商是否开启状态
         Integer count =0;
         count = purchaseMapper.validateVendor(id);
         if (count != 0) {
             throw new BizException(BizExceptionCode.VENDOR_ISCLOSE);
         }
+        //检验必填项
+        count = getMapper().checkPurchaseRequiredField(id);
+        if (count>0){
+            throw new BizException(BizExceptionCode.REQUIREDFIELD_NULL);
+        }
         //检查物料是否开启状态
         count = purchaseMapper.validateProduct(id);
         if (count != 0) {

applications/purchase/purchase-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
 logging:

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseMapper.xml

@@ -443,5 +443,8 @@
     update purchasedetail set PD_DELIVERY = (select PU_DELIVERY from purchase where pu_id=#{id}) where pd_puid=#{id} and PD_DELIVERY is null
   </update>
 
+  <select id="checkPurchaseRequiredField" resultType="int" parameterType="long">
+    select count(1) from purchase where pu_id = #{id} and (pu_vendid is null or pu_delivery is null or pu_shipaddresscode is null)
+  </select>
 
 </mapper>

applications/sale/sale-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
 logging:

applications/storage/storage-server/src/main/resources/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: saas
     password: select111***
 logging:

applications/storage/storage-server/src/main/resources/mapper/StockTakingMapper.xml

@@ -266,7 +266,7 @@
     count(a.st_prodid)
     from
     (select pd_prodid,pd_whid from prodiodetail left join prodinout on pd_piid = pi_id
-    where prodinout.companyId=#{companyId,jdbcType=INTEGER} and (pi_remark='盘盈单' or pi_remark='盘亏单')) b
+    where prodinout.companyId=#{companyId,jdbcType=INTEGER} and pi_statuscode!='AUDITED' and (pi_remark='盘盈单' or pi_remark='盘亏单')) b
     left join
     (select st_prodid,st_whid from stocktaking where companyId=#{companyId} ) a
     on a.st_prodid = b.pd_prodid and a.st_whid = b.pd_whid

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -64,7 +64,7 @@ public class AuthController {
     @Value("${auth.header:Authorization}")
     private String authHeader;
 
-    @Value("${auth.expire:18000}")
+    @Value("${auth.expire:1800000}")
     private int expire;
 
     @Value("${auth.max-errors:5}")

frontend/saas-portal-web/src/components/conenter/company.vue

@@ -56,7 +56,7 @@
       </div>
     </div>
 
-        <div class="gs-qiyebox" ref="qiyebox" style="margin-top: 70px;">
+        <div class="gs-qiyebox" ref="qiyebox" style="margin-top: 70px;" :class="isheigh ? 'heigh' : ''">
             <!-- 点击查看企业详情 -->
             <div v-for="(d , i) in arr " :key="i" class="gs-xiangqing xs">
                 <div class="left gs-xqleft" @click= "getEnterpriseInfo(d)">
@@ -102,7 +102,8 @@
                 isDefault: true,//开通默认
                 isAutoLogin: this.$store.state.isAutoLogin,
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
-                arr: []//企业列表信息
+                arr: [],//企业列表信息
+                isheigh:true//是否添加默认高度
             }
         },
         computed :{
@@ -256,8 +257,8 @@
                 .then(res=>{
                     // console.log('请求成功',res)
                     if (res.data.success) {
-                        this.ktsass = false;
                         this.saasid = res.data.data
+                        this.ktsass = false;
                     } else {
                         this.isokopensaas = true;
                     }
@@ -268,7 +269,6 @@
             },
             //进入saas服务
             showServeWin(){
-                debugger
                 let id = this.saasid;
                 this.isOpensaas = false;
                 // this.$options.methods.selectServe(id);
@@ -294,10 +294,10 @@
             //没有内容也要有一定的高度
             boxheight(){
                 let H = this.$refs.qiyebox.offsetHeight;
-                if (H < 300) {
-                    this.$refs.qiyebox.style.height = 500+'px';
+                if (H < 400) {
+                    this.isheigh = true
                 } else {
-                    this.$refs.qiyebox.style.height = '';
+                    this.isheigh = false
                 }
             },
         }
@@ -305,5 +305,7 @@
 </script>
 
 <style scoped>
-
+.heigh {
+    height: 500px;
+}
 </style>

frontend/saas-portal-web/src/components/conenter/home.vue

@@ -88,6 +88,8 @@
               <div class="mask-overly"></div>
               <div class="bg-img slider-1">
                 <img src="/static/img/banner@2x@2x.png" alt="">
+                <!-- <img src="/static/img/banner@3x@2x.png" alt=""> -->
+                <!-- <img src="/static/img/banner.png" alt=""> -->
               </div>
               <!-- 首页内容 -->
               <div class="my-text">
@@ -114,7 +116,7 @@
           <!-- 1 -->
           <div class="ts-box">
             <div class="ts-boximg">
-              <img src="/static/img/feature/illustration1@2x.png" alt="">
+              <img style="margin-left: 18px;" src="/static/img/feature/mix1x.png" alt="">
             </div>
             <div>
               <img class="ts-img" src="/static/img/feature/blue1@2x.png" alt="">
@@ -125,14 +127,14 @@
             <div>
               <img class="ts-img" src="/static/img/feature/yellow2@2x.png" alt="">
             </div>
-            <div class="ts-boximg" style="right:0">
-              <img src="/static/img/feature/illustration2@2x.png" alt="">
+            <div class="ts-boximg">
+              <img style="float: right;" src="/static/img/feature/mix2x.png" alt="">
             </div>
           </div>
           <!-- 3 -->
           <div class="ts-box">
             <div class="ts-boximg">
-              <img src="/static/img/feature/illustration3@2x.png" alt="">
+              <img src="/static/img/feature/mix3x.png" alt="">
             </div>
             <div>
               <img class="ts-img" src="/static/img/feature/blue3@2x.png" alt="">
@@ -141,10 +143,10 @@
           <!-- 4 -->
           <div class="ts-box">
             <div>
-              <img class="ts-img" src="/static/img/feature/yellow4@2x.png" alt="">
+              <img style="width:94%" class="ts-img" src="/static/img/feature/yellow4@2x.png" alt="">
             </div>
-            <div class="ts-boximg" style="right:0">
-              <img src="/static/img/feature/illustration4@2x.png" alt="">
+            <div class="ts-boximg">
+              <img style="float: right;" src="/static/img/feature/mix4x.png" alt="">
             </div>
           </div>
         </div>

frontend/saas-portal-web/static/css/main.css

@@ -337,10 +337,14 @@ main > section {
     /* margin-top: 50px; */
     position: relative;
     padding: 150px 0;
+    width: 98%;
 }
 .ts-boximg {
     position: absolute;
-    top: 40px;
+    top: 50px;
+}
+.ts-boximg img {
+    width: 65%;
 }
 .ts-lefttext p {
     text-align: right;
@@ -359,7 +363,8 @@ main > section {
     float: right;
 }
 .ts-img {
-    width: 100%;
+    width: 98%;
+    margin-left: 2%;
 }
 .right-text {
     text-align: right;

frontend/saas-web/app.json

@@ -296,6 +296,7 @@
         },
         "server": {
             "accountCenter":"https://saas.usoftchina.com",
+            "accountEnterprise":"https://saas.usoftchina.com/#/enterprise",
             "basePath": "https://saas-api.usoftchina.com",
             "urlPattern": "^\/api\/"
         }
@@ -307,6 +308,7 @@
     "testing": {
         "server": {
             "accountCenter":"http://192.168.0.181:8000",
+            "accountEnterprise":"http://192.168.0.181:8000/#/enterprise",
             "basePath": {
                 "https": "https://saas-api-dev.usoftchina.com:5443",
                 "http": "http://192.168.0.181:8560"
@@ -324,6 +326,7 @@
         },
         "server": {
             "accountCenter":"http://192.168.0.181:8000",
+            "accountEnterprise":"http://192.168.0.181:8000/#/enterprise",
             "basePath": {
                 "https": "https://saas-api-dev.usoftchina.com:5443",
                 "http": "http://192.168.0.181:8560"

frontend/saas-web/app/Application.scss

@@ -231,9 +231,9 @@ body.launching {
   background: #E5F7FF;
   border-right: 1px solid #ABDAFF;
 
-  &:last-child {
-    border: none;
-  }
+  // &:last-child {
+  //   border: none;
+  // }
 }
 
 .x-column-header-text-inner {

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -229,7 +229,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                         try {
                             var grid = me.items.items[1],
                             columns = grid.columns,
-                            summaryData = data.data.calculate || [];
+                            summaryData = data.data ? (data.data.calculate || []) : [];
     
                             Ext.Array.each(columns, function(c) {
                                 var type = c.summaryType,

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

@@ -11,11 +11,16 @@ Ext.define('saas.view.document.bom.BasePanel', {
         xtype : "textfield", 
         name : "bo_mothercode", 
         width:150, 
-        emptyText:'产品编号或名称',
+        emptyText:'产品',
         getCondition: function(value) {
            return  ' (bo_mothername like\'%' + value + '%\'' 
                 +' or bo_mothercode like \'%'+value+'%\' ) ';
         }
+    },{
+        xtype : "textfield", 
+        name : "bo_version", 
+        width:110, 
+        emptyText:'版本'
     },{
         xtype: 'combobox',
         name: 'bo_statuscode',
@@ -24,7 +29,7 @@ Ext.define('saas.view.document.bom.BasePanel', {
         valueField: 'bo_statuscode',
         emptyText :'状态',
         editable:false,
-        width:90,
+        width:110,
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['bo_statuscode', 'bo_status'],
         data: [

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

@@ -9,21 +9,27 @@ Ext.define('saas.view.document.customer.BasePanel', {
     deleteOneMsg: '删除的客户资料将不能恢复，请确认是否删除？',
 
     searchField:[{
+        xtype : "textfield", 
+        name : "cu_code", 
+        width:150, 
+        emptyText:'编号'
+    }, {
         xtype : "textfield", 
         name : "cu_name", 
         width:150, 
-        emptyText:'客户编号或名称',
-        getCondition: function(value) {
-           return  ' (cu_code like\'%' + value + '%\'' 
-                +' or cu_name like \'%'+value+'%\' ) ';
-        }
+        emptyText:'名称'
     },{
         xtype : "remotecombo", 
         storeUrl:'/api/document/customerkind/getCombo',
         name : "cu_type", 
-        emptyText : "类型", 
+        emptyText : "客户类型", 
         width:110,
         hiddenBtn:true
+    }, {
+        xtype : "employeeDbfindTrigger", 
+        name : "cu_sellername", 
+        width:150, 
+        emptyText:'业务员'
     },{
         xtype: 'combobox',
         name: 'cu_statuscode',
@@ -32,7 +38,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
         valueField: 'cu_statuscode',
         emptyText :'状态',
         editable:false,
-        width:90,
+        width:110,
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['cu_statuscode', 'cu_status'],
         data: [
@@ -48,11 +54,6 @@ Ext.define('saas.view.document.customer.BasePanel', {
                 return 'cu_statuscode=\'' + value + '\'';
             }
         }
-    },{
-        xtype : "textfield", 
-        name : "cu_sellername", 
-        emptyText : "业务员", 
-        width:110
     }],
 
     //字段属性

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

@@ -27,6 +27,15 @@ Ext.define('saas.view.document.customer.BasePanelController', {
                         }],
                     }) ;   
                 }
+            },'employeeDbfindTrigger[name=cu_sellername]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_name',to:'cu_sellername'
+                        }],
+                    }) ;   
+
+                }
             }
         });
     }

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

@@ -495,7 +495,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 fieldLabel: '联系电话',
                 name: 'em_mobile',
-                allowBlank:true,
+                allowBlank:false,
                 beforeLabelTextTpl: '',
                 maxLength: 20
             },{

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

@@ -9,22 +9,28 @@ Ext.define('saas.view.document.product.BasePanel', {
     deleteOneMsg: '删除的物料将不能恢复，请确认是否删除？',
 
     searchField:[{
+        xtype : "textfield", 
+        name : "pr_code", 
+        width:150, 
+        emptyText:'编号'
+    }, {
         xtype : "textfield", 
         name : "pr_detail", 
         width:150, 
-        emptyText:'物料编号或名称',
-        getCondition: function(value) {
-           return  ' (pr_code like\'%' + value + '%\'' 
-                +' or pr_detail like \'%'+value+'%\' ) ';
-        }
+        emptyText:'名称'
     }, {
         editable:true,
         hiddenBtn:true,
         xtype : "remotecombo", 
         storeUrl: '/api/document/producttype/getCombo',
         name : "pr_kind", 
-        emptyText : "类型",
+        emptyText : "物料类型",
         width:110,
+    }, {
+        xtype : "textfield", 
+        name : "pr_brand", 
+        emptyText : "品牌", 
+        width:110
     }, {
         xtype: 'combobox',
         name: 'pr_statuscode',
@@ -32,7 +38,7 @@ Ext.define('saas.view.document.product.BasePanel', {
         displayField: 'pr_status',
         valueField: 'pr_statuscode',
         emptyText :'状态',
-        width:90,
+        width:110,
         editable:false,
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['pr_statuscode', 'pr_status'],
@@ -49,11 +55,6 @@ Ext.define('saas.view.document.product.BasePanel', {
                 return 'pr_statuscode=\'' + value + '\'';
             }
         }
-    }, {
-        xtype : "textfield", 
-        name : "pr_brand", 
-        emptyText : "品牌", 
-        width:110
     }],
 
     //字段属性

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

@@ -7,20 +7,22 @@ Ext.define('saas.view.document.vendor.BasePanel', {
     deleteMoreMsg: '删除的供应商资料将不能恢复，请确认是否删除？',
     deleteOneMsg: '删除的供应商资料将不能恢复，请确认是否删除？',
 
-    searchField:[{
+    searchField:[
+    {
+        xtype : "textfield", 
+        name : "ve_code", 
+        width:150, 
+        emptyText:'编号'
+    }, {
         xtype : "textfield", 
         name : "ve_name", 
         width:150, 
-        emptyText:'供应商编号或名称',
-        getCondition: function(value) {
-           return  ' (ve_code like\'%' + value + '%\'' 
-                +' or ve_name like \'%'+value+'%\' ) ';
-        }
+        emptyText:'名称'
     },{
         xtype : "remotecombo", 
         storeUrl:'/api/document/vendorkind/getCombo',
         name : "ve_type", 
-        emptyText : "类别", 
+        emptyText : "供应商类型", 
         width:110,
         hiddenBtn:true
     },{
@@ -30,7 +32,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         displayField: 've_status',
         valueField: 've_statuscode',
         emptyText :'状态',
-        width:90,
+        width:110,
         editable:false,
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['ve_statuscode', 've_status'],

frontend/saas-web/app/view/main/Main.js

@@ -78,15 +78,13 @@ Ext.define('saas.view.main.Main', {
                         cls:'x-main-menu sa-nav-menu',
                         items: [{
                             text: '新手导航',
-                            //fa-comment-o sa-userGuite
                             iconCls:'x-fa sa-navicon fa-comment-o',
                             handler:function(){
                                saas.util.BaseUtil.openTab('sys-guide-formpanel','新手导航', 'sys-guide-formpanel-nav');
                             }
-                        },{
+                        }/* ,{
                             text: '用户手册',
                             hidden:true,
-                            //fa-address-book-o sa-userBook
                             iconCls:'x-fa sa-navicon  fa-address-book-o',
                             handler:function(){
                                 window.open('http://www.usoftchina.com','_blank');
@@ -97,7 +95,7 @@ Ext.define('saas.view.main.Main', {
                             handler:function(){
                                 window.open('http://www.usoftchina.com','_blank');
                             }
-                        },{
+                        } */,{
                             text: '客服热线',
                             iconCls:'x-fa fa-phone sa-navicon',
                             menu:{
@@ -141,7 +139,7 @@ Ext.define('saas.view.main.Main', {
                             text: '账户中心',
                             iconCls:'x-fa fa-user-o sa-navicon',
                             handler:function(){
-                                window.open(Ext.manifest.server.accountCenter,'_blank');
+                                window.open(Ext.manifest.server.accountEnterprise,'_blank');
                             }
                         },{  
                             text: '意见反馈',

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

@@ -19,11 +19,11 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     } ,{
         xtype : "bandinfoDbfindTrigger",
         name : "ftd_bankname",
-        fieldLabel : "转出账号",
+        fieldLabel : "转出账户",
     },{
         xtype : "bandinfoDbfindTrigger",
         name : "ftd_inbankname",
-        fieldLabel : "转入账号",
+        fieldLabel : "转入账户",
     },{
         xtype: 'combobox',
         name: 'ft_statuscode',
@@ -48,34 +48,24 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
                 return 'ft_statuscode=\'' + value + '\'';
             }
         }
-    },{
-        name : "ftd_paymethod",
-        fieldLabel : "结算方式",
-        xtype:'combo',
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        emptyText :'全部',
-        store:Ext.create('Ext.data.Store', {
-            fields: ['value', 'display'],
-            data : [
-                {value:"信用卡", display:"信用卡"},
-                {value:"支票", display:"支票"},
-                {value:"汇票", display:"汇票"},
-                {value:"现金", display:"现金"},
-                {value:"银行转账", display:"银行转账"},
-                {value:"支付宝转账", display:"支付宝转账"},
-                {value:"微信转账", display:"微信转账"}
-            ]
-        }),
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
         getCondition: function(value) {
             if(!value) {
                 return '1=1';
             }else {
-                return 'ftd_paymethod like \'%' + value + '\'%';
+                return 'fundtransfer.creatorName like\'%' + value + '%\'';
             }
         }
-    } ],
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'ft_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
+    }],
     moreQueryFormItems: [],
     queryGridConfig: {
         idField: 'id',

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

@@ -32,6 +32,28 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
                             }],
                     }) ;
 
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=ft_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'ft_auditman',
+                        }],
+                    }) ;   
+
                 }
             }
         });

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

@@ -10,22 +10,19 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
     queryFormItems: [ {
         xtype: 'textfield',
         name: 'or_code',
-        emptyText:'请输入单号或客户或账号',
-        getCondition: function(value) {
-           return  ' (or_code like\'%' + value + '%\'' 
-                +' or or_custcode like \'%'+value+'%\''
-                +' or or_custname like \'%'+value+'%\''
-                +' or or_bankcode like \'%'+value+'%\''
-                +' or or_bankname like \'%'+value+'%\''
-                +') ';
-        }
+        emptyText:'请输入单号'
     },  {
         xtype: 'condatefield',
         name: 'or_date',
         fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
-    } , {
+    }, {
+        xtype : "customerDbfindTrigger", 
+        name : "or_custname", 
+        fieldLabel : "客户",
+        emptyText:'请输入客户编号或名称'
+    }, {
         name: 'ord_type',
         fieldLabel: '收入类别',
         xtype : "remotecombo",
@@ -41,10 +38,15 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
                 return 'ord_type like \'%' + value + '%\'';
             }
         }
+    }, {
+        xtype : "bandinfoDbfindTrigger", 
+        name : "or_bankname", 
+        fieldLabel : "账户名称",
+        emptyText:'请输入账户编号或名称'
     }, {
         xtype: 'combobox',
         name: 'or_statuscode',
-        fieldLabel: '状态',
+        fieldLabel: '单据状态',
         queryMode: 'local',
         displayField: 'or_status',
         valueField: 'or_statuscode',
@@ -66,6 +68,23 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
                 return 'or_statuscode=\'' + value + '\'';
             }
         }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'othreceipts.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'or_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -4,6 +4,50 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'bandinfoDbfindTrigger[name=or_bankname]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'bk_bankcode', to: 'bk_bankcode' 
+                        },{
+                            from: 'bk_bankname', to: 'or_bankname' }
+                        ],
+                    });
+                }
+            },'customerDbfindTrigger[name=or_custname]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'cu_code', to: 'cu_code'
+                        }, {
+                            from: 'cu_name', to: 'or_custname'
+                        }],
+                    });
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=or_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'or_auditman',
+                        }],
+                    }) ;   
+
+                }
+            }
         });
     }
 });

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

@@ -8,36 +8,20 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
     viewName: 'money-othspendings-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'os_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0,
-        getCondition: function(value) {
-            return 'os_id=' + value;
-        }
-    },{
         xtype: 'textfield',
         name: 'os_code',
-        emptyText:'请输入单号或供应商或账号',
-        getCondition: function(value) {
-            if(value == 'ALL') {
-                return '1=1';
-            }else {
-                return  ' (os_code like\'%' + value + '%\'' 
-                +' or os_vendcode like \'%'+value+'%\''
-                +' or os_vendname like \'%'+value+'%\''
-                +' or os_bankcode like \'%'+value+'%\''
-                +' or os_bankname like \'%'+value+'%\''
-                +') ';
-            }
-        }
+        emptyText:'请输入单号'
     },{
         xtype: 'condatefield',
         name: 'os_date',
         columnWidth: 0.5,
         fieldLabel: '日期'
-    },{
+    }, {
+        xtype: 'vendorDbfindTrigger',
+        name: 'os_vendname',
+        fieldLabel: '供应商',
+        emptyText :'请输入供应商编号或名称'
+    }, {
         name: 'osd_type',
         fieldLabel: '支出类别',
         xtype : "remotecombo",
@@ -52,10 +36,15 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                 return 'osd_type like \'%' + value + '%\'';
             }
         }
+    }, {
+        xtype : "bandinfoDbfindTrigger", 
+        name : "os_bankname", 
+        fieldLabel : "账户名称",
+        emptyText:'请输入账户编号或名称'
     },{
         xtype: 'combobox',
         name: 'os_statuscode',
-        fieldLabel: '状态',
+        fieldLabel: '单据状态',
         queryMode: 'local',
         displayField: 'os_status',
         valueField: 'os_statuscode',
@@ -76,6 +65,23 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                 return 'os_statuscode=\'' + value + '\'';
             }
         }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'othspendings.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'os_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -3,7 +3,52 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
     alias: 'controller.money-othspendings-querypanel',
     init: function (form) {
         var me = this;
-        this.control({
+        this.control({ 
+            //放大镜赋值关系 以及 tpl模板
+            'bandinfoDbfindTrigger[name=os_bankname]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'bk_bankcode', to: 'bk_bankcode' 
+                        },{
+                            from: 'bk_bankname', to: 'os_bankname' }
+                        ]
+                    });
+                }
+            },'vendorDbfindTrigger[name=os_vendname]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from:'ve_code',to:'ve_code'
+                        },{
+                            from: 've_name', to: 'os_vendname'
+                        }],
+                    });
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=os_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'os_auditman',
+                        }],
+                    }) ;   
+
+                }
+            }
+        
         });
     }
 });

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

@@ -205,7 +205,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             saas.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
-        debugger
         var sum_pd_amount = store1.sum('pd_amount'); // 付款金额合计
         var pb_discounts = viewModel.get('pb_discounts'); // 折扣金额
         var sum_pbd_nowbalance = store2.sum('pbd_nowbalance'); // 本次核销金额合计

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

@@ -18,51 +18,45 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pb_code',
-        emptyText :'请输入单号或供应商',
-        getCondition: function(value) {
-            if(value == 'ALL') {
-                return '1=1';
-            }else {
-                return  ' (pb_code like\'%' + value + '%\' '
-                +' or pb_vendcode like \'%'+value+'%\' '
-                +' or pb_vendname like \'%'+value+'%\') ';
-            }
-        }
-    },{
-        xtype: 'bandinfoDbfindTrigger',
-        name: 'pd_bankname',
-        fieldLabel: '资金账户',
-        showDetail: true
-    },{
+        emptyText :'请输入单号'
+    }, {
         xtype: 'condatefield',
         name: 'pb_date',
         fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
-    },{
-        xtype: 'combobox',
-        name: 'pb_statuscode',
-        fieldLabel: '状态',
-        queryMode: 'local',
-        displayField: 'name',
-        valueField: 'value',
-        emptyText :'全部',
-        editable:false,
-        store: Ext.create('Ext.data.ArrayStore', {
-            fields: ['value', 'name'],
-            data: [
-                ["ALL", "全部"],
-                ["AUDITED", "已审核"],
-                ["UNAUDITED", "未审核"]
-            ]
-        }),
+    }, {
+        xtype: 'vendorDbfindTrigger',
+        name: 'pb_vendname',
+        fieldLabel: '供应商',
+        emptyText :'请输入供应商编号或名称'
+    }/*,  {
+        xtype: 'textfield',
+        name: 'pbd_slcode',
+        fieldLabel: '来源单号',
+        showDetail: true
+    } ,{
+        xtype:'textfield',
+        name:'pbd_slkind',
+        fieldLabel: '业务类型',
+        showDetail: true
+    }*/, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
         getCondition: function(value) {
-            if(value == 'ALL') {
+            if(!value) {
                 return '1=1';
             }else {
-                return 'pb_statuscode=\'' + value + '\'';
+                return 'paybalance.creatorName like\'%' + value + '%\'';
             }
         }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'pb_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -5,18 +5,33 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            'dbfindtrigger[name=pd_bankname]':{
+            'vendorDbfindTrigger[name=pb_vendname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{
-                            from: 'id',
-                            to: 'pd_bankid',ignore:true
-                        }, {
-                            from: 'bk_bankcode',
-                            to: 'pd_bankcode'
+                            from: 've_code', to: 've_code'
                         },{
-                            from: 'bk_bankname',
-                            to: 'pd_bankname'
+                            from: 've_name', to: 'pb_vendname'
+                        }],
+                    });
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from: 'em_name', to: 'creatorName'
+                        }],
+                    });
+                }
+            },'employeeDbfindTrigger[name=pb_auditman]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from: 'em_name', to: 'pb_auditman'
                         }],
                     });
                 }

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

@@ -10,51 +10,45 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
     queryFormItems: [{
         xtype: 'textfield',
         name: 'rb_code',
-        emptyText :'请输入单号或客户',
-        getCondition: function(value) {
-            if(value == 'ALL') {
-                return '1=1';
-            }else {
-                return  ' (rb_code like\'%' + value + '%\' '
-                +' or rb_custcode like \'%'+value+'%\' '
-                +' or rb_custname like \'%'+value+'%\') ';
-            }
-        }
-    },{
-        xtype: 'bandinfoDbfindTrigger',
-        name: 'rd_bankname',
-        fieldLabel: '资金账户',
-        showDetail: true
+        emptyText :'请输入单号'
     },{
         xtype: 'condatefield',
         name: 'rb_date',
         fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
+    }, {
+        xtype: 'customerDbfindTrigger',
+        name: 'rb_custname',
+        fieldLabel: '客户',
+        emptyText :'请输入客户编号或名称'
+    }/* , {
+        xtype: 'textfield',
+        name: 'rbd_slcode',
+        fieldLabel: '来源单号',
+        showDetail: true
     },{
-        xtype: 'combobox',
-        name: 'rb_statuscode',
-        fieldLabel: '状态',
-        queryMode: 'local',
-        displayField: 'name',
-        valueField: 'value',
-        emptyText :'全部',
-        editable:false,
-        store: Ext.create('Ext.data.ArrayStore', {
-            fields: ['value', 'name'],
-            data: [
-                ["ALL", "全部"],
-                ["AUDITED", "已审核"],
-                ["UNAUDITED", "未审核"]
-            ]
-        }),
+        xtype:'textfield',
+        name:'rbd_slkind',
+        fieldLabel: '业务类型',
+        showDetail: true
+    } */, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
         getCondition: function(value) {
-            if(value == 'ALL') {
+            if(!value) {
                 return '1=1';
             }else {
-                return 'rb_statuscode=\'' + value + '\'';
+                return 'recbalance.creatorName like\'%' + value + '%\'';
             }
         }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'rb_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -5,18 +5,31 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            'dbfindtrigger[name=rd_bankname]':{
+            'customerDbfindTrigger[name=rb_custname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{
-                            from: 'id',
-                            to: 'rd_bankid',ignore:true
-                        }, {
-                            from: 'bk_bankcode',
-                            to: 'rd_bankcode'
+                            from: 'cu_code', to: 'cu_code'
                         },{
-                            from: 'bk_bankname',
-                            to: 'rd_bankname'
+                            from: 'cu_name', to: 'rb_custname'
+                        }],
+                    });
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'em_name',
+                            to: 'creatorName'
+                        }],
+                    });
+                }
+            },'employeeDbfindTrigger[name=rb_auditman]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'em_name',
+                            to: 'rb_auditman'
                         }],
                     });
                 }

frontend/saas-web/app/view/money/report/AccountDetails.js

@@ -21,25 +21,50 @@ Ext.define('saas.view.money.report.AccountDetails', {
     //筛选：客户/供应商、日期、单据类型（必填）
     tbar: [{
         width: 150,
-        name: 'sl_kind',
+        name: 'sl_code',
         xtype: 'textfield',
-        emptyText : '单据类型'
+        emptyText : '单号'
     },{
         width: 400,
         name: 'date',
         xtype: 'condatefield',
-        emptyText : '单据日期'
-    },{
+        emptyText : '日期'
+    }, {
+        xtype: 'multicombo',
+        name: 'sl_kind',
+        fieldLabel: '单据类型',
+        width: 150,
+        datas: [
+            ["采购验收单", "采购验收单"],
+            ["采购验退单", "采购验退单"],
+            ["出货单", "出货单"],
+            ["销售退货单", "销售退货单"],
+            ["完工入库单", "完工入库单"],
+            ["生产领料单", "生产领料单"],
+            ["拆件领料单", "拆件领料单"],
+            ["其它入库单", "其它入库单"],
+            ["其它出库单", "其它出库单"],
+            ["调拨单", "调拨单"],
+            ["库存初始化","库存初始化"]
+        ]
+    }, {
+        width: 150,
+        name: 'pb_code',
+        xtype: 'textfield',
+        emptyText : '核销单号'
+    }, {
+        xtype : "customerDbfindTrigger", 
+        width: 200,
+        name : "cu_name", 
+        fieldLabel : "客户",
+        emptyText:'请输入客户编号或名称'
+    }, {
+        xtype: 'vendorDbfindTrigger',
         width: 200,
         name: 've_name',
-        xtype: 'textfield',
-        emptyText : '供应商名称'
-    },{
-            width: 200,
-            name: 'cu_name',
-            xtype: 'textfield',
-            emptyText : '客户名称'
-    },{
+        fieldLabel: '供应商',
+        emptyText :'请输入供应商编号或名称'
+    }, {
         cls:'x-formpanel-btn-blue',
         xtype:'button',
         text:'查询',

frontend/saas-web/app/view/money/report/AccountDetailsController.js

@@ -29,6 +29,30 @@ Ext.define('saas.view.money.report.AccountDetailsController', {
     init: function (form) {
         var me = this;
         this.control({
+            'customerDbfindTrigger[name=cu_name]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'cu_code',to:'cu_code'
+                        },{
+                            from:'cu_name',to:'cu_name'
+                        }]
+                    }) ;   
+
+                }
+            },
+            'vendorDbfindTrigger[name=ve_name]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'ve_code',to:'ve_code'
+                        },{
+                            from:'ve_name',to:'ve_name'
+                        }]
+                    }) ;   
+
+                }
+            }
         });
     }
 });

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

@@ -10,23 +10,23 @@ Ext.define('saas.view.money.verification.QueryPanel', {
     queryFormItems: [{
         xtype: 'textfield',
         name: 'vc_code',
-        fieldLabel: '',
-        emptyText :'请输入单号或者供应商名或者客户名',
-        getCondition: function(value) {
-            if(value == 'ALL') {
-                return '1=1';
-            }else {
-                return  ' (vc_code like\'%' + value + '%\' '
-                    +' or vc_vendcode like \'%'+value+'%\' '
-                    +' or vc_custcode like \'%'+value+'%\') ';
-            }
-        }
+        emptyText :'请输入单号'
     },{
         xtype: 'condatefield',
         name: 'vc_date',
-        fieldLabel: '单据日期',
+        fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
+    }, {
+        xtype: 'customerDbfindTrigger',
+        name: 'vc_custname',
+        fieldLabel: '客户',
+        emptyText :'请输入客户编号或名称'
+    }, {
+        xtype: 'vendorDbfindTrigger',
+        name: 'vc_vendname',
+        fieldLabel: '供应商',
+        emptyText :'请输入供应商编号或名称'
     },{
         xtype: 'combobox',
         name: 'vc_statuscode',
@@ -51,33 +51,23 @@ Ext.define('saas.view.money.verification.QueryPanel', {
                 return 'vc_statuscode=\'' + value + '\'';
             }
         }
-    },{
-        xtype: 'combobox',
-        name: 'vc_kind',
-        fieldLabel: '业务类型',
-        queryMode: 'local',
-        displayField: 'name',
-        valueField: 'value',
-        emptyText :'全部',
-        editable:false,
-        store: Ext.create('Ext.data.ArrayStore', {
-            fields: ['value', 'name'],
-            data: [
-                ["ALL", "全部"],
-                ["预收冲应收", "预收冲应收"],
-                ["预付冲应付", "预付冲应付"],
-                ["应收冲应付", "应收冲应付"],
-                ["应收转应收", "应收转应收"],
-                ["应付转应付", "应付转应付"]
-            ]
-        }),
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
         getCondition: function(value) {
-            if(value == 'ALL') {
+            if(!value) {
                 return '1=1';
             }else {
-                return 'vc_kind=\'' + value + '\'';
+                return 'verification.creatorName like\'%' + value + '%\'';
             }
         }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'vc_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -6,176 +6,45 @@ Ext.define('saas.view.money.verification.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl: '/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
+            'customerDbfindTrigger[name=vc_custname]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'cu_code', to: 'cu_code'
                         },{
-                            from:'ve_name',to:'pu_vendname'
+                            from:'cu_name',to:"vc_custname"
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
+                    });
+                }
+            },'vendorDbfindTrigger[name=vc_vendname]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 've_code', to: 've_code'
                         },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
+                            from:'ve_name',to:'vc_vendname'
                         }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
+                    });
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
                         },{
-                            "text": "供应商编号",
-                            "flex": 1,
-                            "dataIndex": "ve_code",
-                            "width": 100
-                        }, {
-                            "text": "供应商名称",
-                            "flex": 1,
-                            "dataIndex": "ve_name",
-                            "width": 100
-                        }, {
-                            "text": "供应商类型",
-                            "flex": 0,
-                            "dataIndex": "ve_type",
-                            "width": 200,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "flex": 1,
-                            "dataIndex": "ve_taxrate",
-                            "width": 100
-                        }, {
-                            "text": "结算天数",
-                            "flex": 1,
-                            "dataIndex": "ve_promisedays",
-                            "width": 100
-                        }, {
-                            "text": "纳税人识别号",
-                            "flex": 1,
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "开户银行",
-                            "flex": 1,
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "flex": 1,
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
+                            from:'em_name',to:'creatorName'
+                        }],
                     }) ;   
 
                 }
-            },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
+            },'employeeDbfindTrigger[name=vc_auditman]':{
                 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_detail',to:'pr_detail'
-                        }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
+                            from:'em_code',to:'em_code'
                         },{
-                            field:'pr_detail',width:100
+                            from:'em_name',to:'vc_auditman',
                         }],
-                        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": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }

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

@@ -24,12 +24,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         getCondition: function(value) {
             return  ' (pu_code like\'%' + value + '%\' or pu_vendcode like \'%'+value+'%\' or pu_vendname like \'%'+value+'%\') ';
         }
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        showDetail: true,
-        hidden:true
     }, {
         xtype: 'condatefield',
         name: 'pu_date',
@@ -42,10 +36,16 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         fieldLabel: '物料',
         showDetail: true,
         emptyText:'输入物料编号或名称',
+    }, {
+        xtype: 'textfield',
+        name: 'pd_prodcode',
+        fieldLabel: '物料编号',
+        showDetail: true,
+        hidden:true
     }, {
         xtype: 'combobox',
         name: 'pu_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '单据状态',
         queryMode: 'local',
         displayField: 'pu_status',
         valueField: 'pu_statuscode',
@@ -77,6 +77,28 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             ["PART2IN", "部分入库"],
             ["CLOSE", "已关闭"]
         ]
+    }, {
+        xtype: 'textfield',
+        name: 'pd_salecode',
+        fieldLabel: '关联销售单号',
+        showDetail: true,
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'purchase.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'pu_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     queryGridConfig: {
         idField: 'pu_id',

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

@@ -16,6 +16,28 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                         }],
                     }) ;   
 
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=pu_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'pu_auditman',
+                        }],
+                    }) ;   
+
                 }
             }
         });

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

@@ -20,11 +20,11 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
         }
     }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
@@ -33,14 +33,10 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         showDetail: true
     }, {
         xtype: 'textfield',
-        name: 'pi_pucode',
-        fieldLabel: '关联单号'
-    }, {
-        xtype: 'condatefield',
-        name: 'pi_date',
-        fieldLabel: '日期',
-        columnWidth: 0.5,
-        operation: 'between'
+        name: 'pd_prodcode',
+        fieldLabel: '物料编号',
+        hidden:true,
+        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
@@ -66,6 +62,42 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                 return 'pi_statuscode=\'' + value + '\'';
             }
         }
+    }, {
+        xtype: 'multicombo',
+        name: 'pi_prstatus',
+        fieldLabel: '付款状态',
+        emptyText :'全部',
+        datas: [
+            ["PAYNONE", "未付款"],
+            ["PAYPART", "部分付款"],
+            ["PAYALL", "已付款"]
+        ]
+    }, {
+        xtype: 'warehouseDbfindTrigger',
+        name: 'pd_whname',
+        fieldLabel: '仓库',
+        emptyText:'请输入仓库编号或名称',
+    }, {
+        xtype: 'textfield',
+        name: 'pi_pucode',
+        fieldLabel: '关联采购单号'
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'prodinout.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'pi_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     queryGridConfig: {
         idField:'id',

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

@@ -16,6 +16,39 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         }],
                     }) ;   
 
+                }
+            }, 'warehouseDbfindTrigger[name=pd_whname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'wh_code',to:'wh_code'
+                        },{
+                            from:'wh_description',to:'pd_whname',
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=pi_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'pi_auditman',
+                        }],
+                    }) ;   
+
                 }
             }
         });

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

@@ -23,11 +23,11 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
         }
     }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
@@ -36,14 +36,10 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         showDetail: true
     }, {
         xtype: 'textfield',
-        name: 'pi_pucode',
-        fieldLabel: '关联单号'
-    }, {
-        xtype: 'condatefield',
-        name: 'pi_date',
-        fieldLabel: '日期',
-        columnWidth: 0.5,
-        operation: 'between'
+        name: 'pd_prodcode',
+        fieldLabel: '物料编号',
+        hidden:true,
+        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
@@ -69,6 +65,42 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                 return 'pi_statuscode=\'' + value + '\'';
             }
         }
+    }, {
+        xtype: 'multicombo',
+        name: 'pi_prstatus',
+        fieldLabel: '付款状态',
+        emptyText :'全部',
+        datas: [
+            ["PAYNONE", "未付款"],
+            ["PAYPART", "部分付款"],
+            ["PAYALL", "已付款"]
+        ]
+    }, {
+        xtype: 'warehouseDbfindTrigger',
+        name: 'pd_whname',
+        fieldLabel: '仓库',
+        emptyText:'请输入仓库编号或名称'
+    }, {
+        xtype: 'textfield',
+        name: 'pi_iocode',
+        fieldLabel: '关联验收单号'
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'prodinout.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'pi_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     queryGridConfig: {
         idField:'id',

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

@@ -16,6 +16,39 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                         }],
                     }) ;   
 
+                }
+            }, 'warehouseDbfindTrigger[name=pd_whname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'wh_code',to:'wh_code'
+                        },{
+                            from:'wh_description',to:'pd_whname',
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=pi_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'pi_auditman',
+                        }],
+                    }) ;   
+
                 }
             }
         });

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

@@ -23,24 +23,19 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
            return  ' (sa_code like\'%' + value + '%\' or sa_custcode like \'%'+value+'%\' or sa_custname like \'%'+value+'%\') ';
         }
     }, {
-        xtype: 'hidden',
-        name: 'sd_prodcode',
-        fieldLabel: '物料编号',
-        showDetail: true
+        xtype: 'condatefield',
+        name: 'sa_date',
+        fieldLabel: '日期',
+        columnWidth: 0.5
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料',
         showDetail: true
-    }, {
-        xtype: 'condatefield',
-        name: 'sa_date',
-        fieldLabel: '日期',
-        columnWidth: 0.5
     }, {
         xtype: 'combobox',
         name: 'sa_statuscode',
-        fieldLabel: '审核状态',
+        fieldLabel: '单据状态',
         queryMode: 'local',
         displayField: 'sa_status',
         valueField: 'sa_statuscode',
@@ -73,6 +68,25 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             ["PARTOUT", "部分出库"],
             ["CLOSE", "已关闭"]
         ]
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'sa_seller',
+        fieldLabel: '业务员'
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'sale.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'sa_auditman',
+        fieldLabel: '审核人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -15,6 +15,39 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         }],
                     }) ;   
 
+                }
+            },'employeeDbfindTrigger[name=sa_seller]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'sa_seller'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=sa_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'sa_auditman',
+                        }],
+                    }) ;   
+
                 }
             }
         });

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

@@ -14,26 +14,21 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        emptyText:'请输入单号或客户或关联单号',
+        emptyText:'请输入单号或客户',
         getCondition: function(value) {
-            return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' or pi_sacode like \'%'+value+'%\') ';
+            return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' ) ';
         }
-    }, {
-        xtype: 'hidden',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        showDetail: true
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        showDetail: true
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '日期',
         allowBlank: true,
         columnWidth: 0.5
+    }, {
+        xtype: 'productDbfindTrigger',
+        name: 'pr_detail',
+        fieldLabel: '物料',
+        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
@@ -58,6 +53,39 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                 return 'pi_statuscode=\'' + value + '\'';
             }
         }
+    }, {
+        xtype: 'multicombo',
+        name: 'pi_prstatus',
+        fieldLabel: '付款状态',
+        emptyText :'全部',
+        datas: [
+            ["PAYNONE", "未付款"],
+            ["PAYPART", "部分付款"],
+            ["PAYALL", "已付款"]
+        ]
+    }, {
+        xtype: 'warehouseDbfindTrigger',
+        name: 'pd_whname',
+        fieldLabel: '仓库'
+    }, {
+        xtype: 'textfield',
+        name: 'pi_iocode',
+        fieldLabel: '关联出货单号'
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'prodinout.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'pi_auditman',
+        fieldLabel: '审核人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -15,6 +15,39 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                         }],
                     }) ;   
 
+                }
+            }, 'warehouseDbfindTrigger[name=pd_whname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'wh_code',to:'wh_code'
+                        },{
+                            from:'wh_description',to:'pd_whname',
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=pi_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'pi_auditman',
+                        }],
+                    }) ;   
+
                 }
             }
         });

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

@@ -15,26 +15,21 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        emptyText:'请输入单号或客户或关联单号',
+        emptyText:'请输入单号或客户',
         getCondition: function(value) {
-            return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' or pi_iocode like \'%'+value+'%\') ';
+            return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' ) ';
         }
-    }, {
-        xtype: 'hidden',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        showDetail: true
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        showDetail: true
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '日期',
         allowBlank: true,
         columnWidth: 0.5
+    }, {
+        xtype: 'productDbfindTrigger',
+        name: 'pr_detail',
+        fieldLabel: '物料',
+        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
@@ -59,6 +54,40 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                 return 'pi_statuscode=\'' + value + '\'';
             }
         }
+    }, {
+        xtype: 'multicombo',
+        name: 'pi_prstatus',
+        fieldLabel: '付款状态',
+        emptyText :'全部',
+        datas: [
+            ["RECNONE", "未收款"],
+            ["RECPART", "部分收款"],
+            ["RECALL", "已收款"]
+        ]
+    }, {
+        xtype: 'warehouseDbfindTrigger',
+        name: 'pd_whname',
+        emptyText:'请输入物料编号或名称',
+        fieldLabel: '仓库'
+    }, {
+        xtype: 'textfield',
+        name: 'pi_sacode',
+        fieldLabel: '关联销售单号'
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'prodinout.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'pi_auditman',
+        fieldLabel: '审核人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -16,6 +16,39 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                         }],
                     }) ;   
 
+                }
+            }, 'warehouseDbfindTrigger[name=pd_whname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'wh_code',to:'wh_code'
+                        },{
+                            from:'wh_description',to:'pd_whname',
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=pi_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'pi_auditman',
+                        }],
+                    }) ;   
+
                 }
             }
         });

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

@@ -16,13 +16,13 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        emptyText:'请输入单号或物料',
+        emptyText:'请输入单号',
         showDetail: true,
         getCondition: function(value) {
             if(value == ''|| value ==null) {
                 return '1=1';
             }else {
-                return  ' (pi_inoutno like\'%' + value + '%\' or pd_prodcode like \'%'+value+'%\' ) ';
+                return  ' (pi_inoutno like\'%' + value + '%\' ) ';
             }
         }
     }, {
@@ -31,14 +31,19 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         fieldLabel: '日期',
         allowBlank: true,
         columnWidth: 0.5
+    }, {
+        xtype: 'productDbfindTrigger',
+        name: 'pr_detail',
+        fieldLabel: '物料',
+        emptyText:'请输入物料编号或名称',
+        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        fieldLabel: '状态',
+        fieldLabel: '单据状态',
         allowBlank: true,
         editable:false,
         columnWidth: 0.25,
-        showDetail: true,
         queryMode: 'local',
         emptyText :'全部',
         editable:false,
@@ -61,17 +66,47 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         }
     },{
         xtype: 'warehouseDbfindTrigger',
-        name: 'pd_whcode',
-        fieldLabel: '仓库',
+        name: 'pd_whname',
+        fieldLabel: '拨出仓',
         emptyText :'请输入仓库名或仓库编号',
         showDetail: true,
         getCondition: function(value) {
             if(value == '' || value == null) {
                 return '1=1';
             }else {
-                return  ' (pd_whcode like\'%' + value + '%\' or pd_whname like \'%'+value+'%\' or pd_inwhcode like\'%' + value + '%\' or pd_inwhname like \'%'+value+'%\') ';                
+                return  ' (pd_whcode like\'%' + value + '%\' or pd_whname like \'%'+value+'%\' ) ';                
             }
         }
+    },{
+        xtype: 'warehouseDbfindTrigger',
+        name: 'pd_inwhname',
+        fieldLabel: '拨入仓',
+        emptyText :'请输入仓库名或仓库编号',
+        showDetail: true,
+        getCondition: function(value) {
+            if(value == '' || value == null) {
+                return '1=1';
+            }else {
+                return  ' (pd_inwhcode like\'%' + value + '%\' or pd_inwhname like \'%'+value+'%\') ';                
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'prodinout.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'pi_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -6,13 +6,59 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
         var me = this;
         this.control({
              //放大镜赋值关系 以及 tpl模板
-            'warehouseDbfindTrigger[name=pd_whcode]':{
+             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'wh_code',to:'pd_whcode'                          
+                            from:'pr_code',to:'pd_prodcode'
                         },{
-                            from:'wh_description',to:'pd_whname'
+                            from:'pr_detail',to:'pr_detail'
+                        }]
+                    }) ;   
+
+                }
+            },
+            'warehouseDbfindTrigger[name=pd_whname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'wh_code',to:'wh_code'
+                        },{
+                            from:'wh_description',to:'pd_whname'                          
+                        }]
+                    }) ;   
+
+                }
+            },
+            'warehouseDbfindTrigger[name=pd_inwhname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'wh_code',to:'wh_code'
+                        },{
+                            from:'wh_description',to:'pd_inwhname'                          
+                        }]
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=pi_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'pi_auditman',
                         }],
                     }) ;   
 

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

@@ -18,9 +18,15 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'ma_code',
-        emptyText :'请输入单据编号',
+        emptyText :'请输入单号',
+    }, {
+        xtype: 'condatefield',
+        name: 'createTime',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
     },{
-        xtype: 'textfield',
+        xtype: 'productDbfindTrigger',
         name: 'ma_prodcode',
         fieldLabel: '产品',
         emptyText :'请输入产品名称或编号',
@@ -31,12 +37,6 @@ Ext.define('saas.view.stock.make.QueryPanel', {
                 return  ' (ma_prodcode like\'%' + value + '%\' or ma_proddetail like \'%'+value+'%\') ';
             }
         }
-    }, {
-        xtype: 'condatefield',
-        name: 'createTime',
-        fieldLabel: '日期',
-        columnWidth: 0.5,
-        operation: 'between'
     }, {
         xtype: 'combobox',
         name: 'ma_type',
@@ -87,6 +87,23 @@ Ext.define('saas.view.stock.make.QueryPanel', {
                 return 'ma_statuscode=\'' + value + '\'';
             }
         }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'make.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'ma_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -5,7 +5,41 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-        });
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=ma_prodcode]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'pr_code',to:'ma_prodcode',
+                        },{
+                            from:'pr_detail',to:'pr_detail'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
 
+                }
+            },'employeeDbfindTrigger[name=ma_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'ma_auditman'
+                        }],
+                    }) ;   
+
+                }
+            }
+        });
     }
 });

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

@@ -30,14 +30,12 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : true, 
@@ -45,19 +43,16 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     },{
         xtype : "hidden", 
         name : "pi_custid", 
-        bind : "{pi_custid}", 
         fieldLabel : "客户ID", 
         allowBlank : true, 
         columnWidth : 0.0
     },{
         xtype: 'hidden',
         name: 'pi_custcode',
-        bind: '{pi_custcode}',
         fieldLabel: '客户编号'
     }, {
         xtype: 'hidden',
         name: 'pi_custname',
-        bind: '{pi_custname}',
         fieldLabel: '客户名称'
     },{
         xtype : "hidden", 
@@ -77,7 +72,6 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     },{
         xtype : "datefield", 
         name : "pi_date", 
-        bind : "{pi_date}", 
         fieldLabel : "单据日期", 
         allowBlank : false, 
         columnWidth : 0.25,
@@ -85,7 +79,6 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     },{
         xtype : "textfield", 
         name : "pi_total", 
-        bind : "{pi_total}", 
         fieldLabel : "总额", 
         allowBlank : true,
         readOnly: true,

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

@@ -16,20 +16,20 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        emptyText:'请输入单号或供应商',
+        emptyText:'请输入单号',
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
             }else {
-                return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
+                return  ' (pi_inoutno like\'%' + value + '%\') ';
             }
         }
     }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
@@ -37,15 +37,20 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         emptyText:'输入物料编号或名称',
         showDetail: true
     }, {
-        xtype: 'condatefield',
-        name: 'pi_date',
-        fieldLabel: '单据日期',
-        columnWidth: 0.5,
-        operation: 'between'
+        xtype: 'textfield',
+        name: 'pd_prodcode',
+        fieldLabel: '物料编号',
+        hidden:true,
+        showDetail: true
+    }, {
+        xtype: 'vendorDbfindTrigger',
+        name: 'pi_vendcode',
+        fieldLabel: '供应商',
+        emptyText:'输入供应商编号或名称'
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        fieldLabel: '状态',
+        fieldLabel: '单据状态',
         allowBlank: true,
         emptyText :'全部',
         editable:false,
@@ -67,6 +72,29 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                 return 'pi_statuscode=\'' + value + '\'';
             }
         }
+    }, {
+        xtype: 'warehouseDbfindTrigger',
+        name: 'pd_whname',
+        fieldLabel: '仓库',
+        showDetail: true,
+        emptyText:'请输入仓库编号或名称'
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'prodinout.creatorName like \'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'pi_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     queryGridConfig: {
         idField:'id',

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

@@ -6,7 +6,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
         var me = this;
         this.control({
             // 物料编号
-            'dbfindtrigger[name=pr_detail]':{
+            'productDbfindTrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
@@ -16,6 +16,50 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                         }],
                     }) ;   
 
+                }
+            },'vendorDbfindTrigger[name=pi_vendcode]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'ve_code',to:'pi_vendcode'
+                        },{
+                            from:'ve_name',to:'ve_name'
+                        }]
+                    }) ;   
+
+                }
+            }, 'warehouseDbfindTrigger[name=pd_whname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'wh_code',to:'wh_code'
+                        },{
+                            from:'wh_description',to:'pd_whname'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=pi_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'pi_auditman',
+                        }],
+                    }) ;   
+
                 }
             }
         });

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

@@ -29,14 +29,12 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
     }, {
         xtype: "textfield",
         name: "pi_class",
-        bind: "{pi_class}",
         fieldLabel: "单据类型",
         readOnly: true,
         allowBlank: true,
@@ -44,25 +42,21 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     }, {
         xtype: "hidden",
         name: "pi_custid",
-        bind: "{pi_custid}",
         fieldLabel: "客户ID",
         allowBlank: true,
         columnWidth: 0.0
     }, {
         xtype: 'hidden',
         name: 'pi_custcode',
-        bind: '{pi_custcode}',
         fieldLabel: '客户编号'
     }, {
         xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
-        bind: '{pi_custname}',
         allowBlank : true,
         fieldLabel: '客户名称'
     }, {
         xtype: "datefield",
         name: "pi_date",
-        bind: "{pi_date}",
         fieldLabel: "单据日期",
         allowBlank: false,
         columnWidth: 0.25,
@@ -70,7 +64,6 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     }, {
         xtype: "textfield",
         name: "pi_total",
-        bind: "{pi_total}",
         fieldLabel: "总额",
         allowBlank: true,
         readOnly: true,

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

@@ -16,20 +16,20 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
-        emptyText:'请输入单号或客户',
+        emptyText:'请输入单号',
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
             }else {
-                return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\') ';
+                return  ' (pi_inoutno like\'%' + value + '%\') ';
             }
         }
     }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
+        xtype: 'condatefield',
+        name: 'pi_date',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
@@ -37,15 +37,14 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         emptyText:'输入物料编号或名称',
         showDetail: true
     }, {
-        xtype: 'condatefield',
-        name: 'pi_date',
-        fieldLabel: '单据日期',
-        columnWidth: 0.5,
-        operation: 'between'
+        xtype: 'customerDbfindTrigger',
+        name: 'pi_custname',
+        fieldLabel: '客户',
+        emptyText:'输入客户编号或名称'
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        fieldLabel: '状态',
+        fieldLabel: '单据状态',
         allowBlank: true,
         emptyText :'全部',
         editable:false,
@@ -67,6 +66,29 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                 return 'pi_statuscode=\'' + value + '\'';
             }
         }
+    }, {
+        xtype: 'warehouseDbfindTrigger',
+        name: 'pd_whname',
+        fieldLabel: '仓库',
+        emptyText:'请输入仓库编号或名称',
+        showDetail: true
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'creatorName',
+        fieldLabel: '录入人',
+        emptyText:'请输入人员编号或名称',
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'prodinout.creatorName like\'%' + value + '%\'';
+            }
+        }
+    }, {
+        xtype: 'employeeDbfindTrigger',
+        name: 'pi_auditman',
+        fieldLabel: '审核人',
+        emptyText:'请输入人员编号或名称'
     }],
     queryGridConfig: {
         idField:'id',

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

@@ -6,7 +6,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
         var me = this;
         this.control({
             // 物料编号
-            'dbfindtrigger[name=pr_detail]':{
+            'productDbfindTrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
@@ -16,6 +16,50 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                         }],
                     }) ;   
 
+                }
+            },'customerDbfindTrigger[name=pi_custname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'cu_code',to:'cu_code'
+                        },{
+                            from:'cu_name',to:'pi_custname'
+                        }],
+                    }) ;   
+
+                }
+            }, 'warehouseDbfindTrigger[name=pd_whname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'wh_code',to:'wh_code'
+                        },{
+                            from:'wh_description',to:'pd_whname',
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=creatorName]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'creatorName'
+                        }],
+                    }) ;   
+
+                }
+            },'employeeDbfindTrigger[name=pi_auditman]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'em_code',to:'em_code'
+                        },{
+                            from:'em_name',to:'pi_auditman',
+                        }],
+                    }) ;   
+
                 }
             }
         });