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

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/ProdInOutServiceImpl.java

@@ -464,7 +464,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //设置公司id
         targetPi.setCompanyId(sourcePi.getCompanyId());
         targetPi.setCreateTime(new Date());
-        targetPi.setCreatorId(BaseContextHolder.getUserId());
+
         targetPi.setPi_ioid(id);
         targetPi.setPi_inoutno(piInoutno);
         targetPi.setPi_class(BillCodeSeq.SALEIN.getName());
@@ -488,6 +488,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         getMapper().insertSelective(targetPi);
         //插入销售退货单从表
         long pi_id = targetPi.getId();
+        getMapper().updateCreator(BaseContextHolder.getUserId(), BaseContextHolder.getUserName(),pi_id);
         for (int i = 0;i<sourceDetails.size();i++){
             ProdIODetail sourcePid = sourceDetails.get(i);
             ProdIODetail targetPid = new ProdIODetail();

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

@@ -103,7 +103,7 @@
                 isAutoLogin: this.$store.state.isAutoLogin,
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
                 arr: [],//企业列表信息
-                isheigh:true,//是否添加默认高度
+                isheigh:false,//是否添加默认高度
                 admin: '',
                 adminMobile: ''
             }
@@ -309,7 +309,7 @@
             //没有内容也要有一定的高度
             boxheight(){
                 let H = this.$refs.qiyebox.offsetHeight;
-                if (H < 400) {
+                if (H < 500) {
                     this.isheigh = true
                 } else {
                     this.isheigh = false

frontend/saas-portal-web/src/components/conenter/qiyexiangxi.vue → frontend/saas-portal-web/src/components/conenter/details.vue

@@ -2,12 +2,12 @@
     <div>
         <span class="Tips" ref="Tips"></span>
         <!-- 企业详细信息 -->
-        <div v-if="xiugai">
+        <div v-if="modify">
             <div class="gs-worp qy-worp" style="width:100%">
                 <div class="qy-title">
                     <span><img @click= "gobick" style="float: left;padding: 20px; cursor:pointer" src="/static/img/fanhui.png" alt=""></span>
                     <span>企业基本信息</span>
-                    <span v-if="isxiugaiId" @click="xiugaiqiye" class="qy-xiugai dianji">修改</span>
+                    <span v-if="ismodifyId" @click="xiugaiqiye" class="qy-xiugai dianji">修改</span>
                 </div>
                 <div class="qy-conent">
                     <ul>
@@ -101,21 +101,21 @@
     export default {
         data(){
             return {
-                xiugai:true,
+                modify:true,
                 content: JSON.parse(window.sessionStorage.getItem("content")),
                 Email: '',
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
                 isId: false,
                 isemail: true,//正则邮箱
-                isxiugaiId: false
+                ismodifyId: false
             }
         },
         mounted(){
             //不是管理员隐藏修改按钮
             if (this.content.adminId == this.mytoken.account.id) {
-                this.isxiugaiId = true;
+                this.ismodifyId = true;
             } else {
-                this.isxiugaiId = false
+                this.ismodifyId = false
             }
         },
         methods: {
@@ -133,7 +133,7 @@
             //修改企业信息
             xiugaiqiye(){
                 document.documentElement.scrollTop = 0;
-                this.xiugai = false;
+                this.modify = false;
                 setTimeout(()=>{
                     this.selects()
                 },10)
@@ -157,7 +157,7 @@
             // 取消修改
             quxiaoxiugai(){
                 document.documentElement.scrollTop = 0;
-                this.xiugai = true;
+                this.modify = true;
             },
             // 保存修改
             baocunxiugai(){
@@ -188,7 +188,7 @@
                         // console.log("请求成功",res)
                         if (res.data.success) {
                             document.documentElement.scrollTop = 0;
-                            this.xiugai = true;
+                            this.modify = true;
                             this.content.type = qyindustry;
                             this.content.adminEmail = email
                         };

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

@@ -36,7 +36,7 @@
             <!-- 顶部tab -->
             <div class="gs-tab">
                 <ul>
-                    <li class="xs" v-for="(btn , index) in tab" :key='index' :class= "{gsactive:nowindex == index}" @click= "qiehuan(index)">{{btn.name}}</li>
+                    <li class="xs" v-for="(btn , index) in tab" :key='index' :class= "{gsactive:nowindex == index}" @click= "tabswitch(index)">{{btn.name}}</li>
                 </ul>
             </div>
             <div class="gs-none">
@@ -122,7 +122,7 @@ import { setTimeout } from 'timers';
         },
         methods: {
             // tab切换
-            qiehuan(index){
+            tabswitch(index){
                 this.nowindex = index;
             },
             //退出

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

@@ -275,9 +275,6 @@
         Session.set(session);
         this.account = Session.getAccount();
       })
-      .catch(err=>{
-        // console.log("请求失败",err)
-      })
     },
     mounted() {
       this.clientId = Math.random().toString(36).substr(2)
@@ -346,7 +343,7 @@
         frame.postMessage('', '*')
         Session.remove()
         window.location.href=this.$url.sso+'/logquit?appId=sp&returnURL='+window.location.origin
-        //this.$router.go(0);
+        // this.$router.go(0);
       },
       // 关闭窗口
       closeModal() {

frontend/saas-portal-web/src/router/index.js

@@ -3,8 +3,8 @@ import Router from 'vue-router'
 import Home from '../components/conenter/home.vue'
 import enterprise from '../components/conenter/enterprise.vue'//企业设置首页
 import company from '../components/conenter/company.vue'//企业列表
-import addenterprise from '../components/conenter/addgongsi.vue'//添加公司
-import details from '../components/conenter/qiyexiangxi.vue'//企业详细
+import addenterprise from '../components/conenter/addenterprise.vue'//添加公司
+import details from '../components/conenter/details.vue'//企业详细
 
 Vue.use(Router)
 

frontend/saas-web/app/Application.scss

@@ -10,20 +10,20 @@ body.launching {
   background-image: $auth-background-image;
   background-position: center;
 
-  &::before {
+  &::after {
     @include animation(rotate-animation 1s linear infinite);
     @include transform-origin(50% 50%);
     @include background-size(cover);
-    background-image: url(get-resource-path('images/loading.png'));
+    background-image: url(get-resource-path('images/loading.gif'));
     background-position: center;
     content: '';
     position: absolute;
     margin-top: -15px;
     margin-left: -15px;
-    top: 50%;
+    top: 65%;
     left: 50%;
-    width: 41px;
-    height: 41px;
+    width: 64px;
+    height: 64px;
   }
 }
 
@@ -491,4 +491,69 @@ div::-webkit-scrollbar-track {
   & > div > div > div.x-box-inner.x-box-scroller-body-vertical.x-scroller > div > div > a > span {
     margin-left: 28px;
   }
+}
+
+/** responsivecolumn **/
+.x-responsivecolumn {
+  padding: 0;
+
+  & > * {
+      margin: 0;
+
+  }
+}
+
+// @mixin responsivecolumn-item($width: 100%) {
+//   width: #{$width};
+// }
+
+.big-100 {
+  // width: 100%;
+  @include responsivecolumn-item(100%);
+}
+
+.big-60 {
+  // width: 60%;
+  @include responsivecolumn-item(60%);
+}
+
+.big-50 {
+  float: left;
+  // width: 50%;
+  @include responsivecolumn-item(50%);
+}
+
+.big-40 {
+  float: left;
+  // width: 40%;
+  @include responsivecolumn-item(40%);
+}
+
+.big-33 {
+  float: left;
+  // width: 33.33%;
+  @include responsivecolumn-item(33.33%);
+}
+
+.big-20 {
+  float: left;
+  // width: 20%;
+  @include responsivecolumn-item(20%);
+}
+
+//--------------------------------------------------------
+// And classes for small-size responsive items
+
+.x-responsivecolumn-small {
+   > .small-100 {
+      float: left;
+      // width: 100%;
+      @include responsivecolumn-item(100%);
+   }
+
+   > .small-50 {
+      float: left;
+      // width: 50%;
+      @include responsivecolumn-item(50%);
+   }
 }

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

@@ -4,9 +4,6 @@ Ext.define('saas.view.home.Home', {
     id: 'home',
 
     requires: [
-        'Ext.slider.Single',
-        'Ext.form.field.Display',
-        'Ext.layout.container.Border',
         'Ext.ux.layout.ResponsiveColumn'
     ],
 
@@ -37,41 +34,45 @@ Ext.define('saas.view.home.Home', {
     }, {
         xtype: 'panel',
         style: {
-            marginRight: '0',
+            background: '#EEF4F9',
         },
-        // title: '2018年11月经营分析',
+
         latyout: 'responsivecolumn',
         defaults: {
-            margin: '0 0 0 14',
-            userCls: 'big-33 small-50',
+            margin: '0 16 0 0',
+            userCls: 'x-home-chart big-33 small-50',
         },
         items: [{
             xtype: 'month-sale',
+            padding: '0 0 0 14',
         }, {
             xtype: 'month-purchase',
+            padding: '0 0 0 14',
         }, {
             xtype: 'key-data',
+            margin: 0,
+            padding: '0 14 0 14',
         }]
     }, {
         xtype: 'panel',
-        // title: '2018年11月经营分析',
         latyout: 'responsivecolumn',
         style: {
-            marginRight: '0',
-            marginBottom: '0'
+            background: '#EEF4F9',
         },
         defaults: {
-            margin: '0 0 0 14',
-            userCls: 'big-33 small-50',
+            margin: '0 16 0 0',
+            userCls: 'x-home-chart big-33 small-50',
         },
         items: [{
             xtype: 'month-io',
+            padding: '0 0 0 14',
         }, {
             xtype: 'sale-trend',
+            padding: '0 0 0 14',
         }, {
-        //     xtype: 'purchase-trend'
-        // }, {
-            xtype: 'stock-amount'
+            xtype: 'stock-amount',
+            margin: 0,
+            padding: '0 14 0 14',
         }]
     }],
 

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

@@ -92,9 +92,11 @@ $unaudit-purc-container-color: dynamic(#e91e63);
 }
 
 .x-home-panel {
+    background: #EEF4F9;
 
     &> .x-autocontainer-outerCt {
         display: block;
+        background: #EEF4F9;
 
         &> .x-autocontainer-innerCt {
             display: block;
@@ -104,6 +106,25 @@ $unaudit-purc-container-color: dynamic(#e91e63);
 
 .x-home-box {
     border-radius: 2px;
+    margin: 0 0 16px 0 !important;
+    
+
+    &:last-child {
+        margin: 0 !important;
+    }
+
+    & > .x-panel-bodyWrap > .x-panel-body >.x-autocontainer-outerCt > .x-autocontainer-innerCt {
+        background: #EEF4F9;
+        display: flex;
+        justify-content: space-around;
+
+        .x-home-chart {
+            background: #fff;
+            border-radius: 4px;
+        }
+    }
+
+    
 
     &>.x-panel-header {
         background-color: #fff;
@@ -143,59 +164,5 @@ $unaudit-purc-container-color: dynamic(#e91e63);
             color: #485465;
         }
     }
-}
-
-.x-responsivecolumn {
-    padding: 0;
-}
-
-.big-100 {
-    // width: 100%;
-    @include responsivecolumn-item(100%);
-}
-
-.big-60 {
-    // width: 60%;
-    @include responsivecolumn-item(60%);
-}
-
-.big-50 {
-    float: left;
-    // width: 50%;
-    @include responsivecolumn-item(50%);
-}
-
-.big-40 {
-    float: left;
-    // width: 40%;
-    @include responsivecolumn-item(40%);
-}
-
-.big-33 {
-    float: left;
-    // width: 33.33%;
-    @include responsivecolumn-item(33.33%);
-}
-
-.big-20 {
-    float: left;
-    // width: 20%;
-    @include responsivecolumn-item(20%);
-}
 
-//--------------------------------------------------------
-// And classes for small-size responsive items
-
- .x-responsivecolumn-small {
-     > .small-100 {
-        float: left;
-        // width: 100%;
-        @include responsivecolumn-item(100%);
-     }
-
-     > .small-50 {
-        float: left;
-        // width: 50%;
-        @include responsivecolumn-item(50%);
-     }
 }

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

@@ -202,42 +202,42 @@ Ext.define('saas.view.home.HomeModel', {
             } 
         },
 
-        purchase_trend: {
-            fields: ['x', 'y'],
-            autoLoad: true,
-            proxy: {
-                type: 'ajax',
-                // url: 'http://192.168.253.58:8920/homePage/purchaseData?sixMonths=true',
-                url: '/api/commons/homePage/purchaseData?sixMonths=true',
-                timeout: 8000,
-                actionMethods: {
-                    read: 'GET'
-                },
-                reader: {
-                    type: 'json',
-                    rootProperty: 'data',
-                },
-                listeners: {
-                    exception: function(proxy, response, operation, eOpts) {
-                        var p = Ext.getCmp('purchase_trend');
-                        p && p.setLoading(false);
-                    }
-                }
-            },
-            sorters: [
-                { property: 'x', direction: 'ASC' }
-            ],
-            listeners: {
-                beforeload: function() {
-                    var p = Ext.getCmp('purchase_trend');
-                        p && p.setLoading(true);
-                },
-                load: function(s, d) {
-                    var p = Ext.getCmp('purchase_trend');
-                        p && p.setLoading(false);
-                }
-            } 
-        },
+        // purchase_trend: {
+        //     fields: ['x', 'y'],
+        //     autoLoad: true,
+        //     proxy: {
+        //         type: 'ajax',
+        //         // url: 'http://192.168.253.58:8920/homePage/purchaseData?sixMonths=true',
+        //         url: '/api/commons/homePage/purchaseData?sixMonths=true',
+        //         timeout: 8000,
+        //         actionMethods: {
+        //             read: 'GET'
+        //         },
+        //         reader: {
+        //             type: 'json',
+        //             rootProperty: 'data',
+        //         },
+        //         listeners: {
+        //             exception: function(proxy, response, operation, eOpts) {
+        //                 var p = Ext.getCmp('purchase_trend');
+        //                 p && p.setLoading(false);
+        //             }
+        //         }
+        //     },
+        //     sorters: [
+        //         { property: 'x', direction: 'ASC' }
+        //     ],
+        //     listeners: {
+        //         beforeload: function() {
+        //             var p = Ext.getCmp('purchase_trend');
+        //                 p && p.setLoading(true);
+        //         },
+        //         load: function(s, d) {
+        //             var p = Ext.getCmp('purchase_trend');
+        //                 p && p.setLoading(false);
+        //         }
+        //     } 
+        // },
 
         stock_amount: {
             fields: ['x', 'y'],

frontend/saas-web/app/view/home/infoCardList/Recment.js

@@ -53,6 +53,9 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         xtype:'numbercolumn',
         width: 100,
         renderer : function(v) {
+            if (v == 0) {
+                v= '';
+            }
             var format = '0'
             return Ext.util.Format.number(v, format);
         }

frontend/saas-web/app/view/stock/report/DataList.js

@@ -59,35 +59,36 @@ Ext.define('saas.view.stock.report.DataList', {
         text: "物料规格",
         dataIndex: "rc_prodSpec",
         width: 200,
-    }, {
-        text: "单位",
-        dataIndex: "rc_prodUnit",
-        width: 150,
-    }, {
+    },  {
         text: "仓库编号",
         dataIndex: "rc_whCode",
         width: 200,
+        hidden:true
     }, {
         text: "仓库名称",
         dataIndex: "rc_whName",
-        width: 200,
+        width: 110,
     }, {
         text: "数量",
         xtype: 'numbercolumn',
         dataIndex: "rc_number",
-        width: 150,
+        width: 120,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
             var format = '0.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
+    },{
+        text: "单位",
+        dataIndex: "rc_prodUnit",
+        width: 80
     }, {
         text: "单价",
         xtype: 'numbercolumn',
         align: 'end',
         dataIndex: "rc_price",
-        width: 150,
+        width: 120,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
@@ -98,7 +99,7 @@ Ext.define('saas.view.stock.report.DataList', {
         text: "金额",
         xtype: 'numbercolumn',
         dataIndex: "rc_amount",
-        width: 150,
+        width: 120,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -127,26 +128,26 @@ Ext.define('saas.view.stock.report.DataList', {
         text: "物料规格",
         dataIndex: "rc_prodSpec",
         width: 200,
-    }, {
-        text: "单位",
-        dataIndex: "rc_prodUnit",
-        width: 150,
     }, {
         text: "数量",
         xtype: 'numbercolumn',
         dataIndex: "rc_number",
-        width: 150,
+        width: 120,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
             var format = '0.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
+    },{
+        text: "单位",
+        dataIndex: "rc_prodUnit",
+        width: 80,
     }, {
         text: "金额",
         xtype: 'numbercolumn',
         dataIndex: "rc_amount",
-        width: 150,
+        width: 120,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -162,5 +163,5 @@ Ext.define('saas.view.stock.report.DataList', {
         }
     }, {
         flex: 1
-    }],
+    }]
 })

frontend/saas-web/ext/packages/ux/classic/sass/var/layout/ResponsiveColumn.scss

@@ -6,7 +6,7 @@
  * @var {number}
  * The space between items in a responsive column layout
  */
-$responsivecolumn-item-spacing: dynamic(20px);
+$responsivecolumn-item-spacing: dynamic(0px);
 
 /**
  * Configures the width of an item in a responsive column layout