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

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

@@ -407,7 +407,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //检查转单状态
         String acceptstatus = purchase.getPu_acceptstatuscode();
 
-        if ("CLOSED".equals(acceptstatus)){
+        if (Status.CLOSE.name().equals(acceptstatus)){
             return Result.error(ExceptionCode.CLOSED_EXIST);
         }
         List<PurchaseDetail> purchaseDetails = purchasedetailMapper.selectByFK(id);

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

@@ -96,9 +96,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOut.setCompanyId(companyId);
         prodInOut.setCreatorId(userId);
         prodInOut.setCreateTime(new Date());
-        prodInOut.setPi_recordmanid(userId);
-        prodInOut.setPi_recorddate(new Date());
-        prodInOut.setPi_recordman(BaseContextHolder.getUserName());
 
         if(prodInOut.getPi_date() == null){
             prodInOut.setPi_date(new Date());
@@ -423,9 +420,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setCompanyId(sourcePi.getCompanyId());
         targetPi.setCreateTime(new Date());
         targetPi.setCreatorId(BaseContextHolder.getUserId());
-        targetPi.setPi_recordmanid(BaseContextHolder.getUserId());
-        targetPi.setPi_recorddate(new Date());
-        targetPi.setPi_recordman("TESTADMIN");
         targetPi.setPi_ioid(id);
         targetPi.setPi_inoutno(piInoutno);
         targetPi.setPi_class(BillCodeSeq.SALEIN.getName());

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

@@ -454,7 +454,6 @@ public class SaleServiceImpl implements SaleService{
         prodInOut.setPi_date(new Date());
         prodInOut.setPi_status(Status.UNAUDITED.getDisplay());
         prodInOut.setPi_statuscode(Status.UNAUDITED.name());
-        prodInOut.setPi_recorddate(new Date());
         prodInOut.setPi_custid(sale.getSa_custid());
         prodInOut.setPi_custcode(sale.getSa_custcode());
         prodInOut.setPi_custname(sale.getSa_custname());

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

@@ -197,7 +197,7 @@ import VDistpicker from 'v-distpicker'
                 let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu}
                 if (name != '' && qyname != '' && this.qymingzi && this.isaddress && this.isname && this.isspaceName && this.isemail) {
                     this.$ajax({
-                        url: this.rul.api+"/api/account/accountCenter/companyAccount/save",//http://192.168.253.31:8560
+                        url: this.$url.api+"/api/account/accountCenter/companyAccount/save",//http://192.168.253.31:8560
                         method: 'post',
                         data: {
                             companyRegDTO:company,

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

@@ -122,7 +122,7 @@
             let token = String(mytoken.token);
             //企业列表
             this.$ajax({
-                    url: this.rul.api+"/api/account/accountCenter/company/list",
+                    url: this.$url.api+"/api/account/accountCenter/company/list",//http://192.168.253.31:8560
                     method: 'get',
                     params: {
                         mobile: mytoken.account.mobile
@@ -192,7 +192,7 @@
                 let token = this.mytoken.token;
                 const frame = window.frames[window.frames.length - 1];
                 this.$ajax({
-                    url: this.$url.api+'/api/auth/switch/company?companyId='+id,//http://192.168.253.31:8560
+                    url: this.$url.api+'/api/auth/switch/company?companyId='+id,
                     method :'get',
                     headers: {
                         "Authorization":token

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

@@ -166,7 +166,7 @@
                     let company = {'name':qyname,'address':address, 'id':companyId, 'type':qyindustry};
                     let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu};
                     this.$ajax({
-                        url: this.rul.api+"/api/account/accountCenter/companyAccount/update",//http://192.168.253.31:8560
+                        url: this.$url.api+"/api/account/accountCenter/companyAccount/update",//http://192.168.253.31:8560
                         method: 'post',
                         data: {
                             companyRegDTO:company,

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

@@ -1,7 +1,7 @@
 .xs:hover {
     cursor:pointer;
-    border-bottom: 1px solid #2868c8;
-    box-shadow: 1px 1px 1px #ccc;
+    /* border-bottom: 1px solid #2868c8; */
+    /* box-shadow: 1px 1px 1px #ccc; */
 }
 .dianji:hover{
     border-bottom: 1px solid #2868c8;
@@ -230,6 +230,8 @@
 .qy-xiangxi {
     width: 84% !important;
     margin-top: 10px;
+    font-size: 12px;
+    padding-left: 10px;
 }
 .tj-bqleft {
     float: left;

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

@@ -326,10 +326,11 @@ main > section {
     width: 100%;
     padding: 0;
     margin: 0;
+    margin-top: 100px;
 }
 .ts-box {
     overflow: hidden;
-    margin-top: 50px;
+    /* margin-top: 50px; */
     position: relative;
 }
 .ts-minimg {
@@ -743,7 +744,7 @@ main > section {
 }
 
 .section-title {
-    margin-bottom: 80px;
+    /* margin-bottom: 80px; */
 }
 
 .section-title.white {

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

@@ -11,20 +11,25 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
     listUrl: '/api/money/report/customercheck',
     defaultCondition: null,
     reportTitle: '客户对账单',
-    QueryWidth:0.25,
+    QueryWidth:0.2,
     autoLoad:false,
     //筛选：客户、日期（必填）
     searchItems: [ {
         xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称',
-        columnWidth: 0.25,
+        columnWidth: 0.2,
         allowBlank:false,
+    }, {
+        xtype: 'monthdatefield',
+        name: 'ym',
+        fieldLabel: '期初日期',
+        columnWidth: 0.2
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.5
+        columnWidth: 0.4
     }],
 
     reportColumns: [
@@ -129,5 +134,39 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             text: '备注',
             dataIndex: 'pd_remark',
             width: 250
-        }]
+        }, {
+            text: '期初应付',
+            dataIndex: 'beginamount',
+            hidden: true,
+            width: 0,
+            summaryType: 'cus',
+        }, {
+            text: '本期发生',
+            dataIndex: 'nowamount',
+            hidden: true,
+            width: 0,
+            summaryType: 'cus',
+        }, {
+            text: '本期付款',
+            dataIndex: 'nowpay',
+            hidden: true,
+            width: 0,
+            summaryType: 'cus',
+        }, {
+            text: '本期结余',
+            dataIndex: 'nowbalance',
+            hidden: true,
+            width: 0,
+            summaryType: 'cus',
+        }],
+        applyParams: function(p) {
+            var me = this,
+            viewModel = me.getViewModel(),
+            formData = viewModel.get('form'),
+            ym = formData.ym;
+    
+            return Ext.Object.merge(p, {
+                ym: ym
+            });
+        }
 });

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

@@ -31,7 +31,7 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         emptyText : '仓库编号'
     },{
         width: 200,
-        name: 'wh_name',
+        name: 'wh_description',
         xtype: 'textfield',
         emptyText : '仓库名称'
     },{