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

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

@@ -203,7 +203,7 @@
 
   <sql id="Prodinout_Column_List" >
     prodinout.pi_id pi_id,prodinout.pi_inoutno pi_inoutno,prodinout.pi_class pi_class,prodinout.pi_date pi_date,prodinout.pi_vendid pi_vendid,prodinout.pi_vendcode pi_vendcode,prodinout.pi_vendname pi_vendname,prodinout.pi_custid pi_custid,prodinout.pi_custcode pi_custcode,prodinout.pi_custname pi_custname,prodinout.pi_puid pi_puid,prodinout.pi_pucode pi_pucode,prodinout.pi_said pi_said,prodinout.pi_sacode pi_sacode,prodinout.pi_total pi_total,prodinout.pi_address pi_address,prodinout.pi_ioid pi_ioid,prodinout.pi_status pi_status,prodinout.pi_statuscode pi_statuscode,prodinout.pi_printstatus pi_printstatus,prodinout.pi_printstatuscode pi_printstatuscode,prodinout.companyid companyid,prodinout.updaterId updaterId,prodinout.updatetime updatetime,prodinout.pi_text1 pi_text1,prodinout.pi_text2 pi_text2,prodinout.pi_text3 pi_text3,prodinout.pi_text4 pi_text4,prodinout.pi_text5 pi_text5,prodinout.pi_nettotal pi_nettotal,prodinout.pi_auditdate pi_auditdate,prodinout.pi_auditman pi_auditman,prodinout.pi_remark pi_remark,
-prodinout.creatorName creatorName,prodinout.creatorId creatorId,prodinout.createTime createTime,prodinout.updaterName updaterName,prodinout.pi_macode pi_macode,prodinout.pi_maid pi_maid,prodinout.pi_prstatuscode pi_prstatuscode,prodinout.pi_prstatus pi_prstatus,prodinout.pi_iocode pi_iocode,prodinout.pi_currency pi_currency
+prodinout.creatorName creatorName,prodinout.creatorId creatorId,prodinout.createTime createTime,prodinout.updaterName updaterName,prodinout.pi_macode pi_macode,prodinout.pi_maid pi_maid,prodinout.pi_prstatuscode pi_prstatuscode,prodinout.pi_prstatus pi_prstatus,prodinout.pi_iocode pi_iocode,prodinout.pi_currency pi_currency,
   </sql>
   <sql id="Prodiodetail_Column_List" >
     prodiodetail.pd_id pd_id,prodiodetail.pd_piid pd_piid,prodiodetail.pd_inoutno pd_inoutno,prodiodetail.pd_piclass pd_piclass,prodiodetail.pd_pdno pd_pdno,prodiodetail.pd_ordercode pd_ordercode,prodiodetail.pd_orderdetno pd_orderdetno,prodiodetail.pd_prodid pd_prodid,prodiodetail.pd_prodcode pd_prodcode,prodiodetail.pd_unit pd_unit,prodiodetail.pd_inqty pd_inqty,prodiodetail.pd_outqty pd_outqty,prodiodetail.pd_orderprice pd_orderprice,prodiodetail.pd_sendprice pd_sendprice,prodiodetail.pd_price pd_price,prodiodetail.pd_total pd_total,prodiodetail.pd_taxrate pd_taxrate,prodiodetail.pd_netprice pd_netprice,prodiodetail.pd_nettotal pd_nettotal,prodiodetail.pd_whid pd_whid,prodiodetail.pd_whcode pd_whcode,prodiodetail.pd_whname pd_whname,prodiodetail.pd_inwhid pd_inwhid,prodiodetail.pd_inwhcode pd_inwhcode,prodiodetail.pd_inwhname pd_inwhname,prodiodetail.pd_orderid pd_orderid,prodiodetail.pd_sdid pd_sdid,prodiodetail.pd_status pd_status,prodiodetail.pd_remark pd_remark,prodiodetail.pd_text1 pd_text1,prodiodetail.pd_text2 pd_text2,prodiodetail.pd_text3 pd_text3,

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

@@ -53,8 +53,8 @@
                             </div>
                         </li>
                         <li>
-                            <span class="qy-biaoti"><span class="xingxing">*</span>姓名</span>
-                            <input class="inpind" @change= "yzusername" ref="name" type="text" value="">
+                            <span class="qy-biaoti"><span class="xingxing">*</span>您的姓名</span>
+                            <input class="inpind" @change= "yzusername" ref="name" type="text" value="" placeholder="请输入姓名">
                             <div class="qy-Tips Tips-buttom"><span ref="usname" style="color:red"></span></div>
                         </li>
                         <li><span class="qy-biaoti">手机号</span><span class="qy-mobile">{{mytoken.account.mobile}}</span></li>

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

@@ -227,7 +227,6 @@ import { setTimeout } from 'timers';
             let phone = this.mytoken.mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
             this.mobile = phone;
             this.boxheight();
-            $("#navigation").removeClass("animated-header");
         },
         watch:{
             arr:function(){

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

@@ -89,7 +89,7 @@
             <span><img style="margin: 6px 8px 10px 15px;" src="/static/img/assets/phone.png" alt=""></span>
             <input ref="typhone" type="text" placeholder="请输入您的11位手机号">
           </div>
-          <div class="left" style="margin-left: 8px;"><button @click="openexperience">立即体验</button></div>
+          <div class="left" style="margin-left: 8px;"><button @click="openexperience">立即申请试用</button></div>
         </div>
         <div style="text-align: left;">
           <span class="Caution" ref="Caution"></span>
@@ -327,7 +327,6 @@
       })
     },
     mounted() {
-      $("#navigation").removeClass("animated-header");
       this.clientId = Math.random().toString(36).substr(2)
       // 从本地加载已经登录的信息
       this.account = Session.getAccount()

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

@@ -32,6 +32,16 @@
 
         <script src="./static/js/sockjs.min.js"></script>
         <script src="./static/js/stomp.min.js"></script>
+
+        <script>
+          var _hmt = _hmt || [];
+          (function () {
+              var hm = document.createElement("script");
+              hm.src = "https://hm.baidu.com/hm.js?d546fc8629cd13b2ebe5e1d71f8272fa";
+              var s = document.getElementsByTagName("script")[0];
+              s.parentNode.insertBefore(hm, s);
+          })();
+        </script>
     <title>U企云服</title>
   </head>
   <body>

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

@@ -101,7 +101,7 @@ main > section {
     height: 100%;
     width: 100%;
     background: #000;
-    opacity: 0.8;
+    opacity: 0.3;
     z-index: 10000;
 }
 /* 登录弹窗 */
@@ -497,9 +497,10 @@ main > section {
     /* background-color: rgba(0, 0, 0, 0.77); */
     /* box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); */
     background: #1C1F48;
+    opacity: 0.8;
 }
 #navigation.animated-header {
-    padding: 10px 0;
+    /* padding: 10px 0; */
 }
 
 h1.navbar-brand {

frontend/saas-portal-web/static/js/mains.js

@@ -1,13 +1,3 @@
-/* ========================================================================= */
-/*	Preloader
-/* ========================================================================= */
-
-jQuery(window).load(function(){
-
-    $("#preloader").fadeOut("slow");
-
-});
-
 
 $(document).ready(function(){
 // 分类过滤排序插件
@@ -54,17 +44,17 @@ $(document).ready(function(){
 	// 	}
 	// });
 // 顶部导航高度变化
-    $(window).scroll(function () {
-        if ($(window).scrollTop() > 10) {
-            $(".navbar-brand a").css("color","#fff");
-            $("#navigation").addClass("animated-header");
-            $(".el-menu--popup-bottom-start").css("margin-top","15px")
-        } else {
-            $(".navbar-brand a").css("color","inherit");
-            $("#navigation").removeClass("animated-header");
-            $(".el-menu--popup-bottom-start").css("margin-top","5px")
-        }
-    });
+    // $(window).scroll(function () {
+    //     if ($(window).scrollTop() > 10) {
+    //         $(".navbar-brand a").css("color","#fff");
+    //         $("#navigation").addClass("animated-header");
+    //         $(".el-menu--popup-bottom-start").css("margin-top","15px")
+    //     } else {
+    //         $(".navbar-brand a").css("color","inherit");
+    //         $("#navigation").removeClass("animated-header");
+    //         $(".el-menu--popup-bottom-start").css("margin-top","5px")
+    //     }
+    // });
 
 	/* ========================================================================= */
 	/*	Fix Slider Height

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

@@ -269,7 +269,7 @@ Ext.define('saas.util.FormUtil', {
                 Ext.Array.insert(items, formIndex + index, [{
                     xtype: 'container',
                     userCls: 'x-field-separator',
-                    height: 24,
+                    height: 36,
                     html: group.title,
                     columnWidth: 1,
                     ignore: true,

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.core.form.FormPanel', {
     bodyPadding: '8 12 8 12',
 
     fieldDefaults: {
-        margin: '0 0 10 0',
+        margin: '0 0 10 10',
         labelAlign: 'right',
         labelWidth: 90,
         columnWidth: 0.25,

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

@@ -2,7 +2,7 @@
     padding: 8px 12px 8px 12px;
 
     .x-toolbar-default-docked-top{
-        padding: 6px 0 12px 8px;
+        padding: 12px 5px 12px 8px;
     }
     .x-tb {
         color: #A2A2A2;
@@ -72,6 +72,9 @@
         &>div {
             padding-left: 20px;
             font-weight: bold;
+            height: 100%;
+            line-height: 100%;
+            vertical-align: middle;
 
             &:before {
                 content: ' ';
@@ -81,7 +84,7 @@
                 border-radius: 4px;
                 background: #33b4ee;
                 left: 4px;
-                top: 1px;
+                top: 10px;
             }
         }
     }

frontend/saas-web/app/view/home/Home.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.home.Home', {
     }, {
         xtype: 'panel',
         style: {
-            background: '#EEF4F9',
+            background: '#f4f4f4',
         },
 
         latyout: 'responsivecolumn',
@@ -56,7 +56,7 @@ Ext.define('saas.view.home.Home', {
         xtype: 'panel',
         latyout: 'responsivecolumn',
         style: {
-            background: '#EEF4F9',
+            background: '#f4f4f4',
         },
         defaults: {
             margin: '0 16 0 0',

frontend/saas-web/app/view/home/Home.scss

@@ -92,11 +92,11 @@ $unaudit-purc-container-color: dynamic(#e91e63);
 }
 
 .x-home-panel {
-    background: #EEF4F9;
+    background: $panel-body-background;
 
     &> .x-autocontainer-outerCt {
         display: block;
-        background: #EEF4F9;
+        background: $panel-body-background;
 
         &> .x-autocontainer-innerCt {
             display: block;

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

@@ -59,15 +59,17 @@ Ext.define('saas.view.main.Main', {
                 '->',
                 {
                     iconCls:'icon-usoftchina',
+                    text: '优软云',
                     ui: 'header',
                     tooltip: '优软云',
-                    handler:function(){
-					    window.open('http://www.usoftchina.com','_blank');
-                    }
+                    // handler:function(){
+					//     window.open('http://www.usoftchina.com','_blank');
+                    // }
                 },
                 {
                     margin:'0 3 0 6',
-                    iconCls:'x-fa fa-share-square',
+                    // iconCls:'x-fa fa-share-square',
+                    iconCls:'x-sa sa-invite',
                     cls:'sa-nav-button',
                     ui: 'header',
                     tooltip: '邀请同事',
@@ -129,7 +131,8 @@ Ext.define('saas.view.main.Main', {
                     },
                     style:{
                         cursor:'default',
-                        textAlign:'center'
+                        textAlign:'center',
+                        color: '#9A9A9A',
                     },
                     listeners:{
                         afterrender:function(b){

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

@@ -7,7 +7,7 @@ $font-weight-bold: dynamic(500);
 $accordion-header-background-color: dynamic($lightest-color);
 $accordion-header-color: dynamic(#333);
 
-$panel-body-background: dynamic(#EEF4F9) !default;
+$panel-body-background: dynamic(#f4f4f4) !default;
 
 $treelist-nav-ui: (
         padding: 0 10px,
@@ -116,6 +116,16 @@ $treelist-nav-ui: (
         background: url(../../../../resources/images/default/user-profile-default.png) 0 0 no-repeat;
         background-position: center;
     }
+
+    .x-btn,.x-btn-over,.x-btn-pressed{
+        .x-btn-wrap{
+          .x-btn-button{
+            .x-btn-inner{
+              color:#34BAF6 !important;
+            }
+          }
+        }
+      }
 }
 .x-btn.header-right-profile-image.x-btn-menu-active.x-btn-header-small,
 .x-btn.header-right-profile-image.x-btn-pressed.x-btn-header-small {

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

@@ -160,8 +160,8 @@ $menu-body-background-color: #65678C;
                 background: $menu-body-background-color;
 
                 .menu-title-text {
-                    height: 40px;
-                    line-height: 40px;
+                    height: 56px;
+                    line-height: 56px;
                     font-size: 16px;
                     font-weight: bold;
                     color: #eeeef2;
@@ -172,6 +172,7 @@ $menu-body-background-color: #65678C;
 
             .menu-content {
                 height: 100%;
+                padding-bottom: 20px;
                 background: $menu-body-background-color;
                 
                 .menuitem {

frontend/saas-web/packages/font-saas/resources/fonts/iconfont.svg

@@ -26,6 +26,9 @@ Created by iconfont
     <glyph glyph-name="bar" unicode="&#59412;" d="M1024-67.76470600000005l0-60.235294-1024 0 0 60.235294 1024 0zM120.470588 293.647059l120.470588 0 0-301.176471 60.235294 0 0 361.411765-240.941176 0 0-361.411765 60.235294 0 0 301.176471zM421.647059 474.352941l120.470588 0 0-481.882353 60.235294 0 0 542.117647-240.941176 0 0-542.117647 60.235294 0 0 481.882353zM722.823529 715.294118l120.470588 0 0-722.823529 60.235294 0 0 783.058824-240.941176 0 0-783.058824 60.235294 0 0 722.823529z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="invite" unicode="&#59416;" d="M724.89984 293.34528c12.04224-9.56928 31.30368-4.7872 40.9344 9.5744 4.8128 7.18336 4.8128 14.3616 4.8128 21.53984-2.41152 7.17824-7.22432 14.3616-12.04224 19.14368-16.85504 9.5744-33.71008 21.53984-52.97152 28.71808 24.07936 23.936 43.3408 50.25792 55.37792 81.37728 14.4384 33.50016 21.67296 69.4016 21.67296 107.69408 0 148.3776-120.3968 268.04736-269.68576 268.04736S245.71904 707.38432 245.71904 559.00672c0-71.79776 28.89728-138.81344 79.4624-189.07648-156.50816-71.79264-257.6384-227.35872-257.6384-399.67744 0-16.75264 12.03712-28.71808 28.89216-28.71808s28.89216 11.96544 28.89216 28.71808c0 160.34816 101.12512 303.94368 250.4192 358.9888 84.28032-50.24768 192.63488-47.86688 274.49856 0 26.496-9.56416 52.98688-21.53472 74.65472-35.89632z m-211.8912 57.44128c-115.57888 0-209.48992 93.34272-209.48992 208.22016 0 114.87232 93.90592 208.20992 209.48992 208.20992 115.584 0 209.48992-93.3376 209.48992-208.20992 0-28.71808-4.8128-57.4464-16.85504-83.7632-9.63072-23.936-26.49088-45.47584-45.75744-64.61952-38.51776-38.2976-91.49952-59.83744-146.87744-59.83744z m411.71968-221.95712h-95.1296v95.13472a31.70816 31.70816 0 1 1-63.41632 0v-95.13472h-95.13472a31.70816 31.70816 0 0 1 0-63.42144h95.13472v-95.1296a31.71328 31.71328 0 1 1 63.41632 0v95.1296h95.1296a31.70816 31.70816 0 1 1 0 63.42144z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="tuichu" unicode="&#59409;" d="M509-64H163.5c-54.8 0-99.5 44.6-99.5 99.5v696c0 54.8 44.6 99.5 99.5 99.5H511c16.6 0 30-13.4 30-30s-13.4-30-30-30H163.5c-21.8 0-39.5-17.7-39.5-39.5v-696.1c0-21.8 17.7-39.5 39.5-39.5H509c16.6 0 30-13.4 30-30S525.6-64 509-64zM898 354H414c-16.6 0-30 13.4-30 30s13.4 30 30 30h484c16.6 0 30-13.4 30-30s-13.4-30-30-30zM703.7 150.5c-7.7 0-15.4 2.9-21.2 8.8-11.7 11.7-11.7 30.7 0 42.4L864.8 384 682.5 566.3c-11.7 11.7-11.7 30.7 0 42.4s30.7 11.7 42.4 0l203.5-203.5c11.7-11.7 11.7-30.7 0-42.4L724.9 159.29999999999995c-5.9-5.9-13.5-8.8-21.2-8.8z"  horiz-adv-x="1024" />
 
     

frontend/saas-web/packages/font-saas/sass/etc/icons.scss

@@ -1,7 +1,10 @@
+
 .sa-home:before { content: "\e817"; }
 
 .sa-bar:before { content: "\e814"; }
 
+.sa-invite:before { content: "\e818"; }
+
 .sa-tuichu:before { content: "\e811"; }
 
 .sa-feedback:before { content: "\e810"; }