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

@@ -41,6 +41,8 @@ public enum BizExceptionCode implements BaseExceptionCode {
     BIZ_REPORT_NOCALLER(79316, "报表配置不存在"),
     BIZ_REPORT_NOTCORRECT(79317, "导入数据无效"),
     BIZ_IMPORT_ERROREXCEL(79318, "请导入对应的单据数据"),
+    BIZ_ENABLE_B2B(79350, "未启用B2B"),
+
 
     NO_OPRATIONDATA(79400,"无可操作单据"),
     NULL_DATA(23232,"无数据"),
@@ -73,6 +75,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     REQUIREDFIELD_NULL(79508,"存在必填字段为空"),
     USER_EXIST(79509, ""),
     CURRENCY_VALID(79510, "币别与源单据不一致不允许修改"),
+    BIZ_SAME(79511, "账户名称重复"),
 
     //采购 70000-71999
     PURCCHECKIN_POST_ERROR(70000,""),
@@ -116,7 +119,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     DOCUMENTS_AUDITED(74009,"存在已审核单据:%S"),
     DOCUMENTS_UNAUDITED(74010,"存在未审核单据:%S"),
     BANK_AMOUNT_NOTENOUGHS(74011, "资金账户:%S 余额不足"),
-    CURRENCY_NOT_EQUALS(74012, "币别不一致"),
+    BANKNAME_NOT_EQUALS(74012, "转出账户与转入账户相同"),
 
     //反结账
     EARLY_USERING(74012, "期初余额被使用，无法反结账"),

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/BankinformationMapper.java

@@ -36,4 +36,8 @@ public interface BankinformationMapper extends CommonBaseMapper<Bankinformation>
 
     int validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id, @Param("companyId") Long company);
 
+    int getBankNameSame(@Param("name") String name, @Param("companyId") Long company);
+
+    int getBankNameSameById(@Param("name") String name, @Param("id") Long id, @Param("companyId") Long company);
+
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -33,6 +33,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.usoftchina.saas.commons.exception.BizExceptionCode.BIZ_SAME;
+
 /**
  * @author heqw
  * @date 2018/10/25 15:36
@@ -101,6 +103,16 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
                 }
             }
 
+
+            //判断账户名称是否存在
+            if (bankinformationMapper.getBankNameSame(bankinformation.getBk_bankname(), BaseContextHolder.getCompanyId()) > 1){
+                throw new BizException(BIZ_SAME.getCode(),BIZ_SAME.getMessage());
+            }else if (bankinformationMapper.getBankNameSame(bankinformation.getBk_bankname(), BaseContextHolder.getCompanyId()) == 1){
+                if (bankinformationMapper.getBankNameSameById(bankinformation.getBk_bankname(), docBaseDTO.getId(),
+                        BaseContextHolder.getCompanyId()) == 1){
+                    throw new BizException(BIZ_SAME.getCode(),BIZ_SAME.getMessage());
+                }
+            }
 //            Long id = bankinformationMapper.selectBankId(bankinformation.getBk_bankcode(), BaseContextHolder.getCompanyId());
             if (bktion > 0){
                     bankinformationMapper.updateByPrimaryKeySelective(bankinformation);

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java

@@ -10,6 +10,7 @@ import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
+import com.usoftchina.saas.commons.cache.ConfigsCache;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.ComboDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
@@ -28,6 +29,7 @@ import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.inquiry.api.PublicProductApi;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.transfers.api.SendMessageApi;
+import com.usoftchina.saas.transfers.dto.MessageInfo;
 import com.usoftchina.saas.utils.CollectionUtils;
 import com.usoftchina.saas.utils.JsonUtils;
 import com.usoftchina.saas.utils.ObjectUtils;
@@ -752,8 +754,13 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
      */
     @Override
     public void uploadToB2B() {
-        /*MessageInfo messageInfo = new MessageInfo(BaseContextHolder.getUserId(), BillCodeSeq.PRODUCT.name(), "", BaseContextHolder.getCompanyId());
-        sendMessageApi.sendMsg(messageInfo);*/
+        boolean enable = ConfigsCache.current().enableB2B();
+        if (enable) {
+            MessageInfo messageInfo = new MessageInfo(BaseContextHolder.getUserId(), BillCodeSeq.PRODUCT.name(), "", BaseContextHolder.getCompanyId());
+            sendMessageApi.sendMsg(messageInfo);
+        }else {
+            throw new BizException(BizExceptionCode.BIZ_ENABLE_B2B);
+        }
     }
 
     /**

applications/document/document-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -24,7 +24,6 @@
     <result column="bk_spending" property="bk_spending" jdbcType="DOUBLE" />
     <result column="bk_income" property="bk_income" jdbcType="DOUBLE" />
     <result column="bk_currency" property="bk_currency" jdbcType="VARCHAR" />
-    <result column="cr_rate" property="cr_rate" jdbcType="DOUBLE" />
   </resultMap>
   <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.document.entities.Bankinformation" extends="BaseResultMap" >
     <result column="bk_remark" property="bk_remark" jdbcType="LONGVARCHAR" />
@@ -32,7 +31,7 @@
   <sql id="Base_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount, 
     bk_status, bk_statuscode, bk_ym, bankinformation.companyid companyid,
-    bankinformation.updaterId updaterId, bankinformation.updateTime updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_currency,cr_rate
+    bankinformation.updaterId updaterId, bankinformation.updateTime updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_currency
   </sql>
   <sql id="Blob_Column_List" >
     bk_remark
@@ -367,4 +366,12 @@
   <select id="validateCodeWhenUpdate" resultType="int" >
         select count(*) from bankinformation where bk_bankcode = #{code} and bk_id != #{id} and companyId =#{companyId}
     </select>
+
+  <select id="getBankNameSame" resultType="int">
+    select count(*) from bankinformation where bk_bankname = #{name} and companyId =#{companyId}
+  </select>
+
+  <select id="getBankNameSameById" resultType="int">
+    select count(*) from bankinformation where bk_bankname = #{name} and bk_id != #{id} and companyId =#{companyId}
+  </select>
 </mapper>

applications/document/document-server/src/main/resources/mapper/ProductMapper.xml

@@ -973,7 +973,7 @@
     <select id="getProdStorage" resultType="com.usoftchina.saas.document.dto.ProdStorageDTO">
       SELECT * FROM (
       SELECT pr_id prodId, pr_detail prodName, pr_code prodCode, pr_spec prodSpec, pr_unit prodUnit, pr_brand prodBrand,
-      pr_orispeccode prodSpeccode,pr_leadtime prodLeadtime, 1 status, b2bStatus
+      pr_orispeccode prodOrispeccode,pr_leadtime prodLeadtime, 1 status, b2bStatus
       FROM product
       <where>
           <if test="userId != null">
@@ -985,7 +985,7 @@
         </where>
         union all
         SELECT pr_id prodId, pr_detail prodName, pr_code prodCode, pr_spec prodSpec, pr_unit prodUnit, pr_brand prodBrand,
-        pr_orispeccode prodSpeccode,pr_leadtime prodLeadtime, 0 status, b2bStatus
+        pr_orispeccode prodOrispeccode,pr_leadtime prodLeadtime, 0 status, b2bStatus
         FROM product
         <where>
           <if test="userId != null">

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/FundtransferServiceImpl.java

@@ -93,9 +93,9 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             fundtransferdetail.setCompanyId(BaseContextHolder.getCompanyId());
             fundtransferdetail.setFtd_ftid(Math.toIntExact(id));
             fundtransferdetail.setFt_date(fundtransfer.getFt_date());
-//            if (!(fundtransferdetail.getFtd_currency().equals(fundtransferdetail.getFtd_incurrency()))){
-//                throw new BizException(500, BizExceptionCode.CURRENCY_NOT_EQUALS.getMessage());
-//            }
+            if (fundtransferdetail.getFtd_inbankname().equals(fundtransferdetail.getFtd_bankname())){
+                throw new BizException(BizExceptionCode.BANKNAME_NOT_EQUALS.getCode(), BizExceptionCode.BANKNAME_NOT_EQUALS.getMessage());
+            }
             if (fundtransferdetail.getId() > 0 ){
                 fundtransferdetailMapper.updateByPrimaryKeySelective(fundtransferdetail);
             }else {
@@ -118,12 +118,13 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         DocBaseDTO docBaseDTO = this.insert(fundtran);
         Long id = docBaseDTO.getId();
 
-        List<String> bankName = fundtransferMapper.checkAmount(BaseContextHolder.getCompanyId(), id);
-        if (bankName.size() > 0){
-            String name = org.apache.commons.lang3.StringUtils.join(bankName, ",");
-            String message = BizExceptionCode.BANK_AMOUNT_NOTENOUGHS.getMessage();
-            throw new BizException(500, String.format(message, name));
-        }
+        //判断资金余额
+//        List<String> bankName = fundtransferMapper.checkAmount(BaseContextHolder.getCompanyId(), id);
+//        if (bankName.size() > 0){
+//            String name = org.apache.commons.lang3.StringUtils.join(bankName, ",");
+//            String message = BizExceptionCode.BANK_AMOUNT_NOTENOUGHS.getMessage();
+//            throw new BizException(500, String.format(message, name));
+//        }
 
 
         //取从表金额更新中间表、资金账号表
@@ -227,7 +228,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             Double inamount = banksubledgerMapper.selectThisamount(fundtransferdetail.getFtd_inbankcode(), BaseContextHolder.getCompanyId());
             banksubledgerMapper.updateBankcode(amount, fundtransferdetail.getFtd_nowbalance(),
                     fundtransferdetail.getFtd_bankcode(), "+", BaseContextHolder.getCompanyId());
-            banksubledgerMapper.updateBankcode(inamount, fundtransferdetail.getFtd_nowbalance(),
+            banksubledgerMapper.updateBankcode(inamount, fundtransferdetail.getFtd_innowbalance(),
                     fundtransferdetail.getFtd_bankcode(), "-", BaseContextHolder.getCompanyId());
 
             //资金账号表
@@ -235,6 +236,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             int bk_inid = fundtransferdetail.getFtd_inbankid();
 
             Double bk_amount = fundtransferdetail.getFtd_nowbalance();
+            Double bk_inamount = fundtransferdetail.getFtd_innowbalance();
             //付款方
             Bankinformation bankinformation = bankinformationMapper.selectByPrimaryKey(bk_id);
             Double beginamount = bankinformation.getBk_beginamount()== null ? new Double(0) : bankinformation.getBk_beginamount();
@@ -253,8 +255,8 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             Double inspending = inbankinformation.getBk_spending() == null ? new Double(0) : inbankinformation.getBk_spending();
             Double inincomme = inbankinformation.getBk_income() == null ? new Double(0) : inbankinformation.getBk_income();
             Bankinformation newinbankinformation = new Bankinformation();
-            newinbankinformation.setBk_thisamount(inbeginamount + (inincomme-bk_amount) - inspending );
-            newinbankinformation.setBk_income(inincomme-bk_amount);
+            newinbankinformation.setBk_thisamount(inbeginamount + (inincomme-bk_inamount) - inspending );
+            newinbankinformation.setBk_income(inincomme-bk_inamount);
             newinbankinformation.setBk_spending(inspending);
             newinbankinformation.setId(Long.valueOf(bk_inid));
             newinbankinformation.setCompanyId(BaseContextHolder.getCompanyId());

frontend/operation-web/app/util/State.js

@@ -7,7 +7,8 @@ Ext.define('saas.util.State', {
     ],
 
     store: new Ext.util.LocalStorage({
-        id: 'app-state'
+        id: 'app-state',
+        session: true
     }),
 
     get: function(key, defaultValue) {

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

@@ -186,8 +186,7 @@ import { setTimeout, clearTimeout } from 'timers';
             },
             //取消添加企业
             tjquxiao(){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
                 this.$router.push({name:'company',}); 
             },
             //检测企业名称1
@@ -401,8 +400,7 @@ import { setTimeout, clearTimeout } from 'timers';
                             // this.$store.state.ishongdian = true;//显示红点
                             setTimeout(()=>{
                                 this.$router.push({name:'company'});
-                                document.documentElement.scrollTop = 0;
-                                window.pageYOffset = 0;
+                                $(document).scrollTop(0);
                             },3000)
                         } else {
                             this.$message.error(res.data.message);
@@ -495,8 +493,7 @@ import { setTimeout, clearTimeout } from 'timers';
                             .then(res=>{
                                 this.isadd = true;//添加成功弹窗
                                 setTimeout(()=>{
-                                    document.documentElement.scrollTop = 0;
-                                    window.pageYOffset = 0;
+                                    $(document).scrollTop(0);
                                     let session = Session.get();
                                     session.account.realname = name;
                                     session.account.email = email;

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

@@ -219,8 +219,7 @@
         methods: {
             //分页
             handleCurrentChange(val){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
                 this.pagingtion(val,this.size);
             },
             //分页函数
@@ -383,15 +382,13 @@
             },
             //查看企业详情
             getEnterpriseInfo(d){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
                 window.sessionStorage.setItem('content',JSON.stringify(d))
                 this.$router.push({path:'/details'});
             },
              //添加企业
             addEnterprise(){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
             },
             //关闭弹窗
             guanbitc(){

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

@@ -140,8 +140,7 @@ import Session from '@/utils/session'
             },
             //修改企业信息
             xiugaiqiye(){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
                 this.modify = false;
                 setTimeout(()=>{
                     this.selects()
@@ -170,8 +169,7 @@ import Session from '@/utils/session'
             },
             // 取消修改
             quxiaoxiugai(){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
                 this.modify = true;
             },
             // 保存修改
@@ -200,8 +198,7 @@ import Session from '@/utils/session'
                     })
                     .then(res=>{
                         if (res.data.success) {
-                            document.documentElement.scrollTop = 0;
-                            window.pageYOffset = 0;
+                            $(document).scrollTop(0);
                             this.modify = true;
                             let session = Session.get();
                             session.account.email = email;

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

@@ -153,15 +153,6 @@
                     <div class="gs-news" ref="qiyebox" :class="isheigh ? 'heigh' : ''">
                         <ul>
                             <li>
-                                <!-- <span>消息类型</span>
-                                <span>时间</span>
-                                <span class="newscentent" style="position: relative;top: 7px;">
-                                    <span>消息内容</span>
-                                    <span>管理员</span>
-                                    <span>联系方式</span>
-                                </span>
-                                <span>状态</span>
-                                <span>操作</span> -->
                                 <span>内容</span>
                                 <span>状态</span>
                                 <span>时间</span>
@@ -177,16 +168,6 @@
                                 <span v-else-if='d.status == 1' style="color: #3CC600;">已通过</span>
                                 <span v-else-if='d.status == 2' style="color: #1E88F5;">待批准</span>
                                 <span>{{d.createTime}}</span>
-                                <!-- <span>{{d.createTime}}</span>
-                                <span class="newscentent" style="position:relative;top:9px">
-                                    <span>{{d.companyName}}</span>
-                                    <span>{{d.admin}}</span>
-                                    <span>{{d.adminMobile}}</span>
-                                </span>
-                                <span v-if='d.status == 0' style="color: #FF3900;">未通过</span>
-                                <span v-else-if='d.status == 1' style="color: #3CC600;">已通过</span>
-                                <span v-else-if='d.status == 2' style="color: #1E88F5;">待批准</span>
-                                <span><button v-if="d.status == 0" @click="Rejoin(i)" class="news-btn">重新加入</button></span> -->
                             </li>
                             <li v-if="!isnews" class="wushuju">
                                 <img src="/static/img/zanwushuju2x.png" alt="">
@@ -473,9 +454,7 @@ import { setTimeout } from 'timers';
                 this.$store.commit('problemtrue')
             },
             scrollout(){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
-                document.body.scrollTop = 0;
+                $(document).scrollTop(0)
             },
             //内容不足500固定高度
             boxheight(){

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

@@ -318,7 +318,7 @@
         this.isproblem = this.$route.params.isporblem
       };
       let token = '';
-      if(localStorage.getItem('app-state-session')){
+      if(sessionStorage.getItem('app-state-session')){
         token = Session.getToken();
       }
       this.$ajax({
@@ -395,7 +395,7 @@
     },
     methods: {
       handleFun(){
-        let top = $(window).scrollTop();
+        let top = $(document).scrollTop();
         let Y = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop;
         if ($('#feature').offset()) {
           // var scrollH = Math.floor($('#feature').offset().top) - 260;//500
@@ -611,6 +611,7 @@
           let featH = Math.floor($('#feature').offset().top) - 70;
           this.animate(featH);//690
         },10);
+        // console.log($(document).scrollTop())
       },
       //功能
       service2(){
@@ -642,14 +643,13 @@
             var step = (target - leader) / 10;
             step = step > 0 ? Math.ceil(step) : Math.floor(step);
             leader = leader + step;
-            document.documentElement.scrollTop++;
-            if(document.documentElement.scrollTop ){
-              document.documentElement.scrollTop = leader;
-        　　}else if(window.pageYOffset){
-              window.pageYOffset = leader;
-        　　}else if(document.body.scrolltop){
-              document.body.scrolltop = leader;
-        　　}
+            $(document).scrollTop(leader);
+        //     document.documentElement.scrollTop++;
+        //     if(document.documentElement.scrollTop ){
+        //       document.documentElement.scrollTop = leader;
+        // 　　}else if(document.body.scrolltop){
+        //       document.body.scrolltop = leader;
+        // 　　}
             if (leader == target) {
                 clearInterval(this.timer);
             }

frontend/saas-portal-web/src/components/footer/footer.vue

@@ -66,7 +66,7 @@
 			problem(){
 				this.$router.push({name: 'Home', params: {isporblem: false}})
 				this.$store.commit("problemfalse")
-				document.documentElement.scrollTop = 0;
+				$(document).scrollTop(0)
 			},
 			gohome(){
 				this.$store.commit("problemtrue")

frontend/saas-portal-web/src/utils/session.js

@@ -6,7 +6,7 @@ function isValid(session) {
 
 export default {
   get() {
-    const str = localStorage.getItem(storeKey)
+    const str = sessionStorage.getItem(storeKey)
     if (str) {
       return JSON.parse(str)
     }
@@ -14,16 +14,16 @@ export default {
   },
   set(session) {
     session.span = session.timestamp - new Date().getTime()
-    return localStorage.setItem(storeKey, JSON.stringify(session))
+    return sessionStorage.setItem(storeKey, JSON.stringify(session))
   },
   remove() {
-    return localStorage.removeItem(storeKey)
+    return sessionStorage.removeItem(storeKey)
   },
   // Authorization Header
   getToken() {
     const session = this.get()
     if (!isValid(session)) {
-      localStorage.removeItem(storeKey)
+      sessionStorage.removeItem(storeKey)
       return null
     }
     return session.token
@@ -31,7 +31,7 @@ export default {
   getAccount() {
     const session = this.get()
     if (!isValid(session)) {
-      localStorage.removeItem(storeKey)
+      sessionStorage.removeItem(storeKey)
       return null
     }
     return session.account

frontend/saas-portal-web/static/set-token.html

@@ -6,10 +6,10 @@
         }
         var storeKey = 'app-state-session';
         if (e.data) {
-            localStorage.setItem(storeKey, e.data);
+            sessionStorage.setItem(storeKey, e.data);
         } else {
-            localStorage.removeItem(storeKey);
+            sessionStorage.removeItem(storeKey);
         }
         window.parent.postMessage("success", "*");
     });
-</script>
+</script>

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

@@ -7,6 +7,7 @@ Ext.define('saas.util.State', {
     ],
 
     store: new Ext.util.LocalStorage({
+        session: true,
         id: 'app-state'
     }),
 

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

@@ -138,10 +138,10 @@ Ext.define('saas.view.main.Main', {
                         afterrender:function(b){
                             var main = b.ownerCt.ownerCt;
                             //调用
-                            var _localStorage = Ext.decode(localStorage.getItem('app-state-session'));
-                            var nowCompanyId = _localStorage.account.companyId;
-                            if(_localStorage.account.rolesMap){
-                                var rolesMap = _localStorage.account.rolesMap[nowCompanyId];
+                            var user = saas.util.BaseUtil.getCurrentUser();
+                            var nowCompanyId = user.companyId;
+                            if(user.rolesMap){
+                                var rolesMap = user.rolesMap[nowCompanyId];
                                 if(rolesMap&&rolesMap.length>0){
                                     for(var i = 0; i < rolesMap.length; i++) {
                                         if(rolesMap[i].type==0){

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

@@ -56,12 +56,6 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 name: "or_bankname",
                 fieldLabel: "账户名称",
                 allowBlank: false
-            }, {
-                xtype: 'datefield',
-                name: 'or_date',
-                fieldLabel: '单据日期',
-                defaultValue: new Date(),
-                allowBlank: false
             }, {
                 xtype: 'condbfindtrigger',
                 fieldLabel: '币别汇率',
@@ -87,19 +81,25 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 },
-            // }, {
-            //     xtype: "currencyDbfindTrigger",
-            //     name: "or_currency",
-            //     fieldLabel: "币别",
-            //     defaultValue: 'RMB'
-            // }, {
-            //     xtype: "numberfield",
-            //     name: "or_rate",
-            //     fieldLabel: "汇率",
-            //     defaultValue: 1,
-            //     decimalPrecision: 6,
-            //     vtype: 'positiveNumber'
-            }, {
+                // }, {
+                //     xtype: "currencyDbfindTrigger",
+                //     name: "or_currency",
+                //     fieldLabel: "币别",
+                //     defaultValue: 'RMB'
+                // }, {
+                //     xtype: "numberfield",
+                //     name: "or_rate",
+                //     fieldLabel: "汇率",
+                //     defaultValue: 1,
+                //     decimalPrecision: 6,
+                //     vtype: 'positiveNumber'
+            },{
+                xtype: 'datefield',
+                name: 'or_date',
+                fieldLabel: '单据日期',
+                defaultValue: new Date(),
+                allowBlank: false
+            },  {
                 name: "detailGridField",
                 xtype: "detailGridField",
                 storeModel: 'saas.model.money.Othreceipts',

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

@@ -54,12 +54,6 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 listeners: {
                     change: 'clearDetails'
                 }
-            }, {
-                xtype: "datefield",
-                name: "pb_date",
-                fieldLabel: "日期",
-                defaultValue: new Date(),
-                allowBlank: false
             }, {
                 xtype: 'condbfindtrigger',
                 fieldLabel: '币别汇率',
@@ -80,7 +74,13 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 }
-            }, {
+            },{
+                xtype: "datefield",
+                name: "pb_date",
+                fieldLabel: "日期",
+                defaultValue: new Date(),
+                allowBlank: false
+            },  {
                 xtype: 'textfield',
                 name: 'pb_manname',
                 fieldLabel: '付款人',

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

@@ -53,12 +53,6 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 listeners: {
                     change: 'clearDetails'
                 }
-            }, {
-                xtype: "datefield",
-                name: "rb_date",
-                fieldLabel: "日期",
-                defaultValue: new Date(),
-                allowBlank: false
             }, {
                 xtype: 'condbfindtrigger',
                 fieldLabel: '币别汇率',
@@ -79,6 +73,12 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 }
+            },{
+                xtype: "datefield",
+                name: "rb_date",
+                fieldLabel: "日期",
+                defaultValue: new Date(),
+                allowBlank: false
             }, {
                 xtype: "textfield",
                 name: "rb_manname",

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

@@ -510,21 +510,6 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         listeners: {
                             change: 'clearDetails'
                         }
-                    }, {
-                        fieldLabel: '客户编号',
-                        xtype: 'hidden',
-                        name: 'vc_custcode',
-                    }, {
-                        fieldLabel: '客户名称',
-                        xtype: 'customerDbfindTrigger',
-                        name: 'vc_custname',
-                        allowBlank: false
-                    }, {
-                        fieldLabel: '日期',
-                        xtype: 'datefield',
-                        defaultValue: new Date(),
-                        allowBlank: false,
-                        name: 'vc_date'
                     }, {
                         xtype: 'condbfindtrigger',
                         fieldLabel: '币别汇率',
@@ -547,7 +532,22 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             decimalPrecision: 6,
                             vtype: 'positiveNumber'
                         },
+                    },  {
+                        fieldLabel: '客户编号',
+                        xtype: 'hidden',
+                        name: 'vc_custcode',
+                    }, {
+                        fieldLabel: '客户名称',
+                        xtype: 'customerDbfindTrigger',
+                        name: 'vc_custname',
+                        allowBlank: false
                     }, {
+                        fieldLabel: '日期',
+                        xtype: 'datefield',
+                        defaultValue: new Date(),
+                        allowBlank: false,
+                        name: 'vc_date'
+                    },{
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',
@@ -581,12 +581,6 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         name: "vc_vendname",
                         fieldLabel: "供应商名称",
                         allowBlank: false
-                    }, {
-                        fieldLabel: '日期',
-                        xtype: 'datefield',
-                        defaultValue: new Date(),
-                        allowBlank: false,
-                        name: 'vc_date'
                     }, {
                         xtype: 'condbfindtrigger',
                         fieldLabel: '币别汇率',
@@ -609,6 +603,12 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             decimalPrecision: 6,
                             vtype: 'positiveNumber'
                         },
+                    }, {
+                        fieldLabel: '日期',
+                        xtype: 'datefield',
+                        defaultValue: new Date(),
+                        allowBlank: false,
+                        name: 'vc_date'
                     }, {
                         xtype: 'hidden',
                         name: 'vc_amount1',
@@ -671,13 +671,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             from: 've_name',
                             to: 'vc_vendname'
                         }],
-                    }, {
-                        fieldLabel: '日期',
-                        xtype: 'datefield',
-                        defaultValue: new Date(),
-                        allowBlank: false,
-                        name: 'vc_date'
-                    }, {
+                    },  {
                         xtype: 'condbfindtrigger',
                         fieldLabel: '币别汇率',
                         allowBlank: false,
@@ -700,6 +694,12 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             vtype: 'positiveNumber'
                         },
                     }, {
+                        fieldLabel: '日期',
+                        xtype: 'datefield',
+                        defaultValue: new Date(),
+                        allowBlank: false,
+                        name: 'vc_date'
+                    },{
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',
@@ -749,13 +749,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         xtype: 'customerDbfindTrigger',
                         name: 'vc_turncustname',
                         allowBlank: false,
-                    }, {
-                        fieldLabel: '日期',
-                        xtype: 'datefield',
-                        defaultValue: new Date(),
-                        allowBlank: false,
-                        name: 'vc_date'
-                    }, {
+                    },  {
                         xtype: 'condbfindtrigger',
                         fieldLabel: '币别汇率',
                         allowBlank: false,
@@ -778,6 +772,12 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             vtype: 'positiveNumber'
                         },
                     }, {
+                        fieldLabel: '日期',
+                        xtype: 'datefield',
+                        defaultValue: new Date(),
+                        allowBlank: false,
+                        name: 'vc_date'
+                    },{
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',
@@ -827,12 +827,6 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         xtype: 'vendorDbfindTrigger',
                         name: 'vc_turnvendname',
                         allowBlank: false,
-                    }, {
-                        fieldLabel: '日期',
-                        xtype: 'datefield',
-                        defaultValue: new Date(),
-                        allowBlank: false,
-                        name: 'vc_date'
                     }, {
                         xtype: 'condbfindtrigger',
                         fieldLabel: '币别汇率',
@@ -855,7 +849,13 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             decimalPrecision: 6,
                             vtype: 'positiveNumber'
                         },
-                    }, {
+                    },{
+                        fieldLabel: '日期',
+                        xtype: 'datefield',
+                        defaultValue: new Date(),
+                        allowBlank: false,
+                        name: 'vc_date'
+                    },  {
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',

frontend/saas-web/app/view/sys/invitation/DataList.js

@@ -223,7 +223,7 @@ Ext.define('saas.view.sys.invitation.DataList', {
                         if (Ext.isEmpty(condition)) {
                             condition = [];
                         }
-                        var _localStorage = Ext.decode(localStorage.getItem('app-state-session'));
+                        var _localStorage = Ext.decode(sessionStorage.getItem('app-state-session'));
                         var nowCompanyId = _localStorage.account.companyId;
                         condition.push({
                             type:'condition',

frontend/saas-web/app/view/viewport/ViewportController.js

@@ -42,23 +42,6 @@ Ext.define('saas.view.viewport.ViewportController', {
         if(!Ext.isChrome && !Ext.isFirefox) {
             saas.util.BaseUtil.showConfirm('温馨提示', '为了更好地呈现页面效果，推荐使用Chrome浏览器或火狐浏览器');
         }
-        //读取系统参数
-        saas.util.BaseUtil.request({url:'/api/commons/configs/list'})
-        .then(function(res) {
-            if(res.success) {
-                var list = res.data.list;
-                if(list.length>0){
-                    var d = {};
-                    Ext.each(list, function(item, index){
-                        d[item.code] = item.data;
-                    });
-                    me.getViewModel().setData(d)
-                }
-            }
-        })
-        .catch(function(e) {
-            console.error(e);
-        });
     },
 
     showView: function(xtype) {
@@ -82,6 +65,23 @@ Ext.define('saas.view.viewport.ViewportController', {
 
     showMain: function() {
         var me = this;
+        //读取系统参数
+        saas.util.BaseUtil.request({url:'/api/commons/configs/list'})
+        .then(function(res) {
+            if(res.success) {
+                var list = res.data.list;
+                if(list.length>0){
+                    var d = {};
+                    Ext.each(list, function(item, index){
+                        d[item.code] = item.data;
+                    });
+                    me.getViewModel().setData(d)
+                }
+            }
+        })
+        .catch(function(e) {
+            console.error(e);
+        });
         me.showView('main');
     },
 

frontend/saas-web/set-token.html

@@ -6,9 +6,9 @@
         }
         var storeKey = 'app-state-session';
         if (e.data) {
-            localStorage.setItem(storeKey, e.data);
+            sessionStorage.setItem(storeKey, e.data);
         } else {
-            localStorage.removeItem(storeKey);
+            sessionStorage.removeItem(storeKey);
         }
         window.parent.postMessage("success", "*");
     });

frontend/web/src/utils/auth.js

@@ -2,12 +2,12 @@ const authKey = 'Authorization'
 const expireAt = 'Authorization-Expire-At'
 
 function setExpire(expire) {
-  localStorage.setItem(expireAt, new Date().getTime() + expire * 1000)
+  sessionStorage.setItem(expireAt, new Date().getTime() + expire * 1000)
 }
 
 // 是否过期
 function isExpire() {
-  const expire = localStorage.getItem(expireAt)
+  const expire = sessionStorage.getItem(expireAt)
   if (expire) {
     return Number(expire) <= new Date().getTime()
   }
@@ -16,18 +16,18 @@ function isExpire() {
 
 export function getToken() {
   if (isExpire()) {
-    localStorage.removeItem(expireAt)
-    localStorage.removeItem(authKey)
+    sessionStorage.removeItem(expireAt)
+    sessionStorage.removeItem(authKey)
     return null
   }
-  return localStorage.getItem(authKey)
+  return sessionStorage.getItem(authKey)
 }
 
 export function setToken(token, expire) {
   setExpire(expire)
-  return localStorage.setItem(authKey, token)
+  return sessionStorage.setItem(authKey, token)
 }
 
 export function removeToken() {
-  return localStorage.removeItem(authKey)
+  return sessionStorage.removeItem(authKey)
 }