标准化

frontend/saas-portal-web/src/pages/invitation_mobile_join/invitation_mobile_join.html

@@ -4,8 +4,8 @@
         <title>U企云服 - 邀请加入</title>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0,maximum-scale=1.0, user-scalable=no"/>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <meta name="renderer" content="webkit|ie-comp|ie-stand">
+        <!-- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="renderer" content="webkit|ie-comp|ie-stand"> -->
         <!-- 浏览器图标 -->
         <link type="image/x-icon" href="../../../static/img/logo.png" rel="shortcut icon">
         <link rel="stylesheet" type="text/css" href="../../../static/css/invitation_mobile_join.css">
@@ -184,8 +184,6 @@
                 <!-- 邀请语 -->
                 <span id="sendmsg" style="padding:10px 0 0 2px;margin:10px 0 0 0;color: #fff;"></span>
                 </br>
-                <!-- 邀请语 -->
-                <span style="padding:0 0 0 2px;margin:10px 0 0 0;color: #fff;">SAAS服务</span>
             </div>
             <input id="myMobile" class="input_style" type="text" onBlur="checkMobile()" style="margin:20px 0 0 26px;" placeholder="请输入手机号码"></input>
             <input class="input_style" id="selectCode" type="text" style="width: 130px;" placeholder="请输入验证码"></input>

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

@@ -43,7 +43,7 @@ body {
 .x-join-center .subtitle {
 	display: block;
     height: 50px;
-    background: url(../img/assets/logo@3x.png) no-repeat;
+    background: url(../img/assets/dalogo@2x_1.png) no-repeat;
     background-size: contain;
     background-position: center;
     text-indent: -9999px;
@@ -94,7 +94,7 @@ body {
     padding-left: 6px;
     width: 240px;
     margin-top: 10px;
-	height: 26px;
+	height: 36px;
 	display: block;
     color: #555;
     background-color: #fff;
@@ -110,11 +110,11 @@ body {
 
 .btn-check{
 	line-height: 13px;
-    height: 26px;
+    height: 36px;
 	margin-top: 10px;
     margin-left: -15px;
     color: #fff;
-    background-image: linear-gradient(to bottom, #428bca 0, #428bca 100%);
+    background-image: linear-gradient(to bottom, #69b5f7 0, #579dda 100%);
     border-color: #428bca;
     width: 110px;
 	display: inline-block;
@@ -136,7 +136,7 @@ body {
 
 .btn-submit{
 	color: #fff;
-    background-image: linear-gradient(to bottom, #428bca 0, #428bca 100%);
+    background:#004CE0;
     border-color: #428bca;
     width: 135px;
 	margin-top: 42px;

frontend/saas-portal-web/static/css/toast.style.css

@@ -83,8 +83,15 @@ i {
     right: 20px;
     top: 20px; }
   .toast-item-wrapper.toast-top-center {
-    left: 53px;
-    top: 20px;
+    min-width: 240px !important;
+    position: absolute;
+    margin-left: 5px;
+    top: 10%;
+    left: 50%;
+    -ms-transform: translate(-50%,-50%);
+    -moz-transform: translate(-50%,-50%);
+    -o-transform: translate(-50%,-50%);
+    transform: translate(-50%,-50%); 
   }
   .toast-item-wrapper.toast-bottom-left {
     left: 20px;

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

@@ -15,16 +15,16 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
     autoLoad: false,
     //筛选：客户、日期（必填）
     searchItems: [{
-        xtype: 'textfield',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         emptyText: '请输入客户名称',
         columnWidth: 0.2,
-        // listeners: {
-        //     beforequery: function(f) {
-        //         return !!f.value;
-        //     },
-        //     change: 'pi_custname_change'
-        // }
+        listeners: {
+            beforequery: function(f) {
+                return !!f.value;
+            },
+            change: 'pi_custname_change'
+        }
     }, {
         xtype: 'condatefield',
         name: 'pi_date',

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

@@ -16,8 +16,13 @@ Ext.define('saas.view.money.report.ProfitDetail', {
     reportTitle: '毛利润分析表',
     QueryWidth: 0.2,
     searchItems: [{
-        xtype: 'textfield',
+
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
+        columnWidth: 0.15,
+        dbfinds:[{
+            from:'cu_name',to:'pi_custname'
+        }],
         emptyText: '请输入客户名称',
         columnWidth: 0.15
     }, {

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

@@ -15,18 +15,18 @@ 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+'%\') ';
         }
+    },{
+        margin:'0 0 0 20',
+        xtype: 'productDbfindTrigger',
+        name: 'pr_detail',
+        showDetail: true,
+        emptyText:'输入物料编号或名称',
     }, {
         xtype: 'condatefield',
         name: 'pu_date',
         fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        showDetail: true,
-        emptyText:'输入物料编号或名称',
     }, {
         xtype: 'combobox',
         name: 'pu_statuscode',

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

@@ -14,18 +14,17 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
         }
+    }, {
+        xtype: 'productDbfindTrigger',
+        name: 'pr_detail',
+        emptyText:'输入物料编号或名称',
+        showDetail: true
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        emptyText:'输入物料编号或名称',
-        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',

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

@@ -14,19 +14,18 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         getCondition: function (value) {
             return ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%' + value + '%\' or pi_vendname like \'%' + value + '%\') ';
         }
+    },{
+        xtype: 'productDbfindTrigger',
+        name: 'pr_detail',
+        emptyText: '输入物料编号或名称',
+        showDetail: true
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        emptyText: '输入物料编号或名称',
-        showDetail: true
-    }, {
+    },  {
         xtype: 'combobox',
         name: 'pi_statuscode',
         fieldLabel: '单据状态',

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -13,13 +13,10 @@ Ext.define('saas.view.purchase.report.Purchase', {
     reportTitle: '采购明细报表',
     QueryWidth: 0.2,
     searchItems: [{
-        xtype: 'textfield',
+        xtype: 'vendorDbfindTrigger',
         name: 'pu_vendname',
         columnWidth: 0.2,
-        emptyText:'请输入供应商名称',
-        getCondition: function (v) {
-            return "(upper(pu_vendname) like '%" + v.toUpperCase() + "%' )";
-        }
+        emptyText:'请输入供应商名称'
     }, {
         xtype: 'condatefield',
         name: 'pu_date',

frontend/saas-web/app/view/purchase/report/PurchaseController.js

@@ -3,6 +3,17 @@ Ext.define('saas.view.purchase.report.PurchaseController', {
     alias: 'controller.purchase-report-purchase',
     init: function (form) {
         this.control({
+            // 供应商编号
+            'dbfindtrigger[name=pu_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'ve_name',to:'pu_vendname'
+                        }],
+                    }) ;   
+
+                }
+            }
         });
     }
 });

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

@@ -14,14 +14,10 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     QueryWidth:0.25,
     searchItems: [
     {
-        xtype: 'textfield',
+        xtype: 'vendorDbfindTrigger',
         name: 'pu_vendname',
-        fieldLabel: '供应商名称',
         columnWidth: 0.25,
-        emptyText:'请输入供应商名称',
-        getCondition: function (v) {
-            return "(upper(pu_vendname) like '%" + v.toUpperCase() + "%' )";
-        }
+        emptyText:'请输入供应商名称'
     }, {
         xtype: 'condatefield',
         name: 'createTime',

frontend/saas-web/app/view/purchase/report/PurchasePayController.js

@@ -3,6 +3,19 @@ Ext.define('saas.view.purchase.report.PurchasePayController', {
     alias: 'controller.purchase-report-purchasepay',
     init: function (form) {
         this.control({
+            // 供应商编号
+            'dbfindtrigger[name=pu_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'ve_code',to:'pu_vendcode'
+                        },{
+                            from:'ve_name',to:'pu_vendname'
+                        }],
+                    }) ;   
+
+                }
+            }
         });
     }
 });

frontend/saas-web/app/view/sale/report/Sale.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.report.Sale', {
     QueryWidth:0.2,
     searchItems: [
     {
-        xtype: 'textfield',
+        xtype: 'customerDbfindTrigger',
         name: 'sa_custname',
         emptyText:'请输入客户名称',
         columnWidth: 0.2

frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
     reportTitle: '销售收款报表',
     QueryWidth:0.25,
     searchItems: [{	
-        xtype: 'textfield',
+        xtype: 'customerDbfindTrigger',
         name: 'rb_custname',
         emptyText:'请输入客户名称',
         columnWidth: 0.25

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

@@ -14,15 +14,12 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         getCondition: function(value) {
            return  ' (sa_code like\'%' + value + '%\' or sa_custcode like \'%'+value+'%\' or sa_custname like \'%'+value+'%\') ';
         }
-    }, {
+    },{
         margin:'0 0 0 20',
-        xtype: 'textfield',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         showDetail: true,
-        emptyText:'输入物料编号或名称',
-        getCondition: function(value) {
-            return  ' (pr_detail like\'%' + value + '%\' or pr_code like \'%'+value+'%\' )';
-         }
+        emptyText:'输入物料编号或名称'
     }, {
         xtype: 'condatefield',
         name: 'sa_date',

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

@@ -14,15 +14,12 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' ) ';
         }
-    }, {
+    },{
         margin:'0 0 0 20',
-        xtype: 'textfield',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         showDetail: true,
         emptyText:'输入物料编号或名称',
-        getCondition: function(value) {
-            return  ' (pr_detail like\'%' + value + '%\' or pr_code like \'%'+value+'%\' )';
-         }
     },{
         xtype: 'condatefield',
         name: 'pi_date',

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

@@ -16,20 +16,17 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         }
     },{
         margin:'0 0 0 20',
-        xtype: 'textfield',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         showDetail: true,
         emptyText:'输入物料编号或名称',
-        getCondition: function(value) {
-            return  ' (pr_detail like\'%' + value + '%\' or pr_code like \'%'+value+'%\' )';
-         }
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '日期',
         allowBlank: true,
         columnWidth: 0.5
-    },  {
+    },{
         xtype: 'combobox',
         name: 'pi_statuscode',
         fieldLabel: '单据状态',