Merge remote-tracking branch 'origin/dev' into dev

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -33,8 +33,9 @@ public enum BizExceptionCode implements BaseExceptionCode {
     BIZ_PRODWHCODE_REPEAT(79309, "明细仓库重复"),
     BIZ_UNENDPRODUCT(79310,"系统还未结账，不能反结账"),
     BIZ_RELUPDATE_CODEANDNAME(79311,"存在关联单据,不允许更新编号,名称"),
-    BIZ_RELUPDATE_AMOUNT(79312,"存在关联单据,不允许更新期初应收，期初预收"),
+    BIZ_RELUPDATE_AMOUNT(79312,"存在关联单据,不允许更新期初应收，期初预收，期初日期"),
     NO_OPRATIONDATA(79400,"无可操作单据"),
+
     BOM_SAVE(79401, "产品编号+版本号已存在"),
     REPEAT_NAME(79501, "名称重复"),
     REPEAT_CODE(79502, "编号重复"),
@@ -87,6 +88,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     CHECK_SETACOUNT_EXIS(74006, "不能删除单据日期小于等于结账期间<u>%s</u>的单据"),
     VERIFICATION_CHECK_BALANCE(74007,"核销金额不能大于未核销金额"),
     DELETE_NOT_EXIS(74008,"删除失败，当前单据不存在!"),
+    DOCUMENTS_AUDITED(74009,"单据已审核"),
 
 
 

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

@@ -285,6 +285,10 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Fundtransfer fundtransfers = fundtransferMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay().equals(fundtransfers.getFt_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_AUDITED.getMessage());
+            }
             Fundtransfer fundtransfer = new Fundtransfer();
             fundtransfer.setId(Long.valueOf(docBaseDTO.getId()));
             fundtransfer.setFt_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());

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

@@ -260,7 +260,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             customer.setId(Long.valueOf(othreceipts.getOr_custid()));
             customer.setCu_preamount(preamount);
             customer.setCu_recamount(recamount - or_amount);
-            customer.setCu_leftamount(beginapamount + beginprepayamount + recamount - or_amount - preamount);
+            customer.setCu_leftamount(beginapamount - beginprepayamount + recamount - or_amount - preamount);
             recbalanceMapper.updateCustomerByPrimaryKeySelective(customer);
             subledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单",BaseContextHolder.getCompanyId());
         }
@@ -339,6 +339,10 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Othreceipts othreceipts1 = othreceiptsMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay().equals(othreceipts1.getOr_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_AUDITED.getMessage());
+            }
             Othreceipts othreceipts = new Othreceipts();
             othreceipts.setId(Long.valueOf(docBaseDTO.getId()));
             othreceipts.setOr_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());

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

@@ -293,7 +293,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
             vendor.setId(Long.valueOf(othspendings.getOs_vendid()));
             vendor.setVe_preamount(preamount);
             vendor.setVe_payamount(payamount + bk_amount);
-            vendor.setVe_leftamount(beginapamount + beginprepayamount - payamount + bk_amount + preamount);
+            vendor.setVe_leftamount(beginapamount - beginprepayamount + payamount + bk_amount - preamount);
             paybalanceMapper.updateVendorByPrimaryKeySelective(vendor);
 
             subledgerMapper.deleteByPrimaryKey(othspendings.getOs_code(), "其他支出单",BaseContextHolder.getCompanyId());
@@ -334,6 +334,10 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Othspendings othspendings1 = othspendingsMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay().equals(othspendings1.getOs_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_AUDITED.getMessage());
+            }
             Othspendings othspendings = new Othspendings();
             othspendings.setId(Long.valueOf(docBaseDTO.getId()));
             othspendings.setOs_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());

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

@@ -439,6 +439,10 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Paybalance paybalance1 = paybalanceMapper.selectByPrimaryKey(docBaseDTO.getId());
+            if (com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay().equals(paybalance1.getPb_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_AUDITED.getMessage());
+            }
             Paybalance paybalance = new Paybalance();
             paybalance.setId(Long.valueOf(docBaseDTO.getId()));
             paybalance.setPb_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());

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

@@ -444,6 +444,10 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Recbalance recbalance1 = recbalanceMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay().equals(recbalance1.getRb_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_AUDITED.getMessage());
+            }
             Recbalance recbalance = new Recbalance();
             recbalance.setId(Long.valueOf(docBaseDTO.getId()));
             recbalance.setRb_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());

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

@@ -12,10 +12,10 @@
                 </div>
                 <div class="qy-conent">
                     <ul>
-                        <li>
+                        <li style="margin: 0">
                             <span class="qy-biaoti"><span class="xingxing">*</span>公司名称</span>
                             <input ref="qyname" @change= "spaceName" type="text">
-                            <span ref="qyno" style="color:red"></span>
+                            <dir class="qy-Tips"><span ref="qyno" style="color:red"></span></dir>
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
@@ -41,13 +41,15 @@
                         </li>
                         <li style="height:70px;">
                             <span class="qy-biaoti left">公司地址</span>
-                            <div class="addbiaoqian" style="float: left;margin: 0;">
+                            <div class="addbiaoqian">
                                 <!-- <v-distpicker @province= 'qyprovince' @city= 'qycity' @area= 'qyarea'></v-distpicker> -->
                                 <v-distpicker @selected= 'selected'></v-distpicker>
                                 <input ref="address" @change="address" :disabled="disabled" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
                                 
                             </div>
-                            <span ref="ress" style="color:red;margin-top: 40px;display: inline-block;"></span>
+                            <div class="qy-Tips left">
+                                <span ref="ress" style="color:red;margin-left:40px;"></span>
+                            </div>
                         </li>
                     </ul>
                 </div>
@@ -58,16 +60,16 @@
                 </div>
                 <div class="qy-conent">
                     <ul>
-                        <li>
+                        <li style="margin:0">
                             <span class="qy-biaoti"><span class="xingxing">*</span>姓名</span>
                             <input @change= "yzusername" ref="name" type="text">
-                            <span ref="usname" style="color:red"></span>
+                            <div class="qy-Tips Tips-buttom"><span ref="usname" style="color:red"></span></div>
                         </li>
                         <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
-                        <li>
+                        <li style='margin:0'>
                             <span class="qy-biaoti">邮箱</span>
                             <input @change="email" ref="email" type="email">
-                            <span style="color:red">{{Email}}</span>
+                            <div class="qy-Tips Tips-buttom"><span style="color:red">{{Email}}</span></div>
                         </li>
                     </ul>
                 </div>
@@ -114,7 +116,7 @@ import VDistpicker from 'v-distpicker'
                     this.$refs.qyno.innerHTML = '企业名不能为空';
                 } else {
                     if (this.reg.test(qyname)) {
-                        this.$refs.qyno.innerHTML = '包含非法字符';
+                        this.$refs.qyno.innerHTML = '不能包含非法字符';
                         this.isspaceName = false;
                     } else {
                         this.$refs.qyno.innerHTML = '';
@@ -148,7 +150,7 @@ import VDistpicker from 'v-distpicker'
                     this.$refs.usname.innerHTML = '姓名不能为空'
                 } else {
                     if (this.reg.test(name)) {
-                        this.$refs.usname.innerHTML = '包含非法字符'
+                        this.$refs.usname.innerHTML = '不能包含非法字符'
                         this.isname = false
                     } else {
                         this.$refs.usname.innerHTML = ''
@@ -163,7 +165,7 @@ import VDistpicker from 'v-distpicker'
                     this.$refs.ress.innerHTML = '地址不能为空'
                 } else {
                     if (this.reg.test(address)) {
-                        this.$refs.ress.innerHTML = '包含非法字符'
+                        this.$refs.ress.innerHTML = '不能包含非法字符'
                         this.isaddress = false
                     } else {
                         this.$refs.ress.innerHTML = ''
@@ -222,7 +224,6 @@ import VDistpicker from 'v-distpicker'
                         this.$refs.tjtishi.innerHTML = ''
                     }, 3000);
                 }
-                
             },
             //获取省市区
             selected(data){
@@ -267,4 +268,13 @@ import VDistpicker from 'v-distpicker'
 .addbiaoqian>>>.distpicker-address-wrapper select {
     height: 30px;
 }
+.qy-Tips {
+    margin: 0;
+    text-align: left;
+    height: 26px;
+    margin-left: 16%;
+}
+.Tips-buttom {
+    margin-left: 22%;
+}
 </style>

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

@@ -48,7 +48,7 @@
                 </div>
     <!-- 个人信息------------------------------------------------------------------- -->
                 <div :class= "{gsqiye:nowindex == 1}">
-                    <div class="over gr-worp" style="margin-bottom: 30px;">
+                    <div class="over gr-worp" style="margin-bottom: 30px;margin-top: 60px;">
                         <div class="left gr-left">
                             <img src="../../../static/img/qiye/yonghu@2x.png" alt="">
                         </div>

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

@@ -53,7 +53,7 @@
           <img @click="closeModal" class="tc-on shut"
                src="/static/img/qiye/chahao.png" alt="">
         </div>
-        <iframe id="iframe" width="430" height="474" :src="ssoPage"></iframe>
+        <iframe id="iframe" width="430" height="504" :src="ssoPage"></iframe>
         <iframe hidden :src="setTokenPage"></iframe>
       </div>
 
@@ -135,7 +135,7 @@
         <div class="container" style="position: relative;">
           <img class="gn-beijing" src="/static/img/gongneng/xu xian@3x.png" alt="">
           <div class="row">
-            <div class="section-title text-center">
+            <div class="section-title text-center" style="margin-bottom: 80px;">
               <p class="ts-title">我们的功能</p>
             </div>
             <div class="gn-hei">

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

@@ -99,7 +99,7 @@
                         <li>
                             <span class="qy-biaoti">邮箱</span>
                             <input @change="email" ref="email" type="text" value="">
-                            <span style="color:red">{{Email}}</span>
+                            <dir class="qy-Tips"><span style="color:red">{{Email}}</span></dir>
                         </li>
                     </ul>
                 </div>
@@ -154,10 +154,11 @@
             },
             // 保存修改
             baocunxiugai(){
-                if (this.isemail) {
+                let qyindustry = this.$refs.qyindustry.value;//所属行业
+                if (this.isemail && qyindustry!='') {
                     let email = this.$refs.email.value;
                     let qyname = this.content.name;//公司名字
-                    let qyindustry = this.$refs.qyindustry.value;//所属行业
+                    // let qyindustry = this.$refs.qyindustry.value;//所属行业
                     let address = this.content.address;//公司详细地址
                     let companyId = this.content.id;
                     let name = this.content.realname;//名字
@@ -188,7 +189,7 @@
                         // console.log("请求失败",err)
                     })
                 } else {
-                    this.$refs.Tips.innerHTML= "请填写正确的邮箱"
+                    this.$refs.Tips.innerHTML= "请填写正确的邮箱或选择行业"
                     // this.isTipsmail = true;
                     setTimeout(()=>{
                         this.$refs.Tips.innerHTML= ""
@@ -223,4 +224,10 @@
     color: red;
     height: 20px;
 }
+.qy-Tips {
+    margin: 0;
+    text-align: left;
+    height: 26px;
+    margin-left: 16%;
+}
 </style>

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

@@ -223,12 +223,14 @@
     color: #ffffff;
 }
 .addbiaoqian {
-    width: 71%;
-    float: right;
-    margin-right: 102px;
+    width: 59%;
+    /* float: right;
+    margin-right: 102px; */
+    float: left;
+    margin-left: 4px;
 }
 .qy-xiangxi {
-    width: 84% !important;
+    width: 100% !important;
     margin-top: 10px;
     font-size: 12px;
     padding-left: 10px;
@@ -248,9 +250,13 @@
 .gr-worp div {
     width: 50%;
 }
+.gr-left {
+    text-align: center;
+    line-height: 290px;
+}
 .gr-left img {
     width: 189px;
-    margin: 49px 88px 69px 186px
+    /* margin: 49px 88px 69px 186px */
 }
 .gr-right li {
     list-style: none;

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

@@ -115,13 +115,13 @@ main > section {
 
 .box{
     width: 430px;
-    height: 474px;
+    height: 504px;
     position: fixed;
     background:white;
-    top: 55%;
+    top: 50%;
     left:50%;
     margin-left: -215px;
-    margin-top: -237px;
+    margin-top: -252px;
     z-index: 10001;
 }
 

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -8,49 +8,41 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
             'vendorDbfindTrigger[name=os_vendname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dbColumns: [{
-                            conditionCode: 'id',
-                            text: "客户ID",
+                        dbColumns:[{
+                            text: "供应商ID",
+                            hidden: true,
                             dataIndex: "id",
-                            hidden:true,
-                            xtype: "",
-                        }, {
-                            conditionCode: 'cu_code',
-                            text: "客户编号",
-                            dataIndex: "cu_code",
-                            width: 150,
-                            xtype: "",
+                            xtype: "numbercolumn"
+                        },{
+                            text: "供应商编号",
+                            dataIndex: "ve_code",
+                            width: 150
                         }, {
-                            conditionCode: 'cu_name',
-                            text: "客户名称",
-                            dataIndex: "cu_name",
-                            width: 200,
-                            xtype: "",
+                            text: "供应商名称",
+                            dataIndex: "ve_name",
+                            width: 200
                         }, {
-                            conditionCode: 'cu_type',
-                            text: "客户类型",
-                            dataIndex: "cu_type",
+                            text: "供应商类型",
+                            dataIndex: "ve_type",
                             width: 110,
-                            xtype: "",
-                        }, {
-                            text: "业务员编号",
-                            dataIndex: "cu_sellercode",
-                            width:110
-                        }, {
-                            text: "业务员",
-                            dataIndex: "cu_sellername",
-                            width:110
                         }, {
                             text: "税率",
-                            dataIndex: "cu_taxrate",
+                            dataIndex: "ve_taxrate",
+                            width: 80,
                             xtype: 'numbercolumn',
-                            width:80,
-                            renderer: function (v) {
-                                return Ext.util.Format.number(v, '0');
+                            align:'end',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                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: "cu_leftamount",
+                        }, {
+                            text: "应付款余额",
+                            dataIndex: "ve_leftamount",
                             width:110,
                             xtype: 'numbercolumn',
                             renderer : function(v) {
@@ -62,23 +54,27 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                                 var format = '0.' + xr.join();
                                 return Ext.util.Format.number(v, format);
                             }
-                        }, {
+                        },{
                             text: "结算天数",
-                            dataIndex: "cu_promisedays",
-                            width:110,
+                            dataIndex: "ve_promisedays",
+                            width: 110,
                             xtype: 'numbercolumn',
-                            renderer: function (v) {
+                            align: 'end',
+                            renderer : function(v) {
                                 return Ext.util.Format.number(v, '0');
                             }
                         }, {
-                            text: "额度",
-                            dataIndex: "cu_credit",
-                            width:110,
-                            xtype: 'numbercolumn',
+                            text: "纳税人识别号",
+                            dataIndex: "ve_nsrzh",
+                            width: 150
+                        }, {
+                            text: "开户银行",
+                            dataIndex: "ve_bankcode",
+                            width: 150
                         }, {
-                            text: "客户地址",
-                            dataIndex: "ca_address",
-                            width: 250
+                            text: "银行账户",
+                            dataIndex: "ve_bankaccount",
+                            width: 200
                         }],
                         dbfinds: [{
                             from: 'id',