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

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

@@ -17,6 +17,7 @@ import com.usoftchina.saas.document.mapper.ProductMapper;
 import com.usoftchina.saas.page.PageRequest;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ProductService extends CommonBaseService<ProductMapper, Product> {
 
@@ -109,7 +110,7 @@ public interface ProductService extends CommonBaseService<ProductMapper, Product
      * @param listReqDTO
      * @return
      */
-    PageInfo<ProductReserveCostDTO> getReserveCost(PageRequest page, ListReqDTO listReqDTO);
+    Map<String, Object> getReserveCost(PageRequest page, ListReqDTO listReqDTO);
 
     /**
      * 通过明细ID删除明细

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

@@ -481,7 +481,8 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
     }
 
     @Override
-    public PageInfo<ProductReserveCostDTO> getReserveCost(PageRequest page, ListReqDTO listReqDTO) {
+    public Map<String, Object> getReserveCost(PageRequest page, ListReqDTO listReqDTO) {
+        Map<String, Object> map = new HashMap<String, Object>();
         //设置分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -492,7 +493,9 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         List<ProductReserveCostDTO> reserveCostList = geReserveCost(listReqDTO);
         //取分页信息
         PageInfo<ProductReserveCostDTO> pageInfo = new PageInfo<ProductReserveCostDTO>(reserveCostList);
-        return pageInfo;
+        map.put("list", pageInfo);
+        map.put("calculate", null);
+        return map;
     }
 
     @Override

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

@@ -315,6 +315,8 @@ public class SaleServiceImpl implements SaleService{
         sale.setUpdaterId(BaseContextHolder.getUserId());
         //更新存在字段
         saleMapper.updateByPrimaryKeySelective(sale);
+        commonService.commonResAudit("sale", "sa_id=" + id, "sa_status",
+                "sa_statuscode", "sa_auditdate", "sa_auditman");
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
         messageLogService.unAudit(docBaseDTO);

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

@@ -92,6 +92,7 @@ import VDistpicker from 'v-distpicker'
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
                 reg: new RegExp(/[\@\#\$\%\&\*!\￥]/),//非法字符
                 isaddress: false,//公司地址验证
+                isaddressname: false,//公司地址是否为空
                 isname: true,//姓名验证
                 isspaceName: false,//公司名验证
                 isemail: true,//验证邮箱
@@ -165,7 +166,9 @@ import VDistpicker from 'v-distpicker'
                 let address = this.$refs.address.value.replace(/\s+/g, "");//过滤空格
                 if (address == '') {
                     this.$refs.ress.innerHTML = '地址不能为空'
+                    this.isaddressname = false
                 } else {
+                    this.isaddressname = true
                     if (this.reg.test(address)) {
                         this.$refs.ress.innerHTML = '不能包含非法字符'
                         this.isaddress = false
@@ -211,33 +214,51 @@ import VDistpicker from 'v-distpicker'
                 // console.log('姓名',this.isname)//个人姓名正则
                 // console.log('企业名字',this.isspaceName)//企业名字正则
                 // console.log('邮箱',this.isemail)//邮箱正则
-                if (name != '' && qyname != '' && this.qymingzi && this.isaddress && this.isname && this.isspaceName && this.isemail) {
-                    
-                    this.$ajax({
-                        url: this.$url.api+"/api/account/accountCenter/companyAccount/save",//http://192.168.253.31:8560
-                        method: 'post',
-                        data: {
-                            companyRegDTO:company,
-                            accountRegDTO:account,
-                            type: 0
-                        },
-                        headers: {
-                            "Authorization":token,
-                        }
-                    })
-                    .then(res=>{
-                        // console.log("请求成功",res)
-                        document.documentElement.scrollTop = 0;
-                        this.$router.push({name:'company'})
-                    })
-                    .catch(err=>{
-                        // console.log("请求失败",err)
-                    })
+                if (name == '') {
+                    this.$refs.tjtishi.innerHTML = '个人姓名不能为空'
+                } else if (qyname == '') {
+                    this.$refs.tjtishi.innerHTML = '企业名字不能为空'
                 } else {
-                    this.$refs.tjtishi.innerHTML = '企业名称,地址,姓名不能为空或包含有非法字符'
-                    setTimeout(() => {
-                        this.$refs.tjtishi.innerHTML = ''
-                    }, 3000);
+                    switch (this.qymingzi && this.isaddress && this.isname && this.isspaceName && this.isemail && this.isaddressname) {
+                        case this.qymingzi:
+                        if (this.qymingzi) {
+                            this.$ajax({
+                                url: this.$url.api+"/api/account/accountCenter/companyAccount/save",//http://192.168.253.31:8560
+                                method: 'post',
+                                data: {
+                                    companyRegDTO:company,
+                                    accountRegDTO:account,
+                                    type: 0
+                                },
+                                headers: {
+                                    "Authorization":token,
+                                }
+                            })
+                            .then(res=>{
+                                document.documentElement.scrollTop = 0;
+                                this.$router.push({name:'company'})
+                            })
+                            this.$refs.tjtishi.innerHTML = ''
+                        } else {
+                            this.$refs.tjtishi.innerHTML = '企业名字已在优软云注册'
+                        }
+                        break;
+                        case this.isaddressname:
+                        this.$refs.tjtishi.innerHTML = '企业地址不能为空'
+                        break;
+                        case this.isaddress:
+                        this.$refs.tjtishi.innerHTML = '企业地址不能包含非法字符'
+                        break;
+                        case this.isname:
+                        this.$refs.tjtishi.innerHTML = '个人姓名不能包含非法字符'
+                        break;
+                        case this.isspaceName:
+                        this.$refs.tjtishi.innerHTML = '企业名字不能包含非法字符'
+                        break;
+                        case this.isemail:
+                        this.$refs.tjtishi.innerHTML = '请输入正确邮箱'
+                        break;
+                    }
                 }
             },
             //获取省市区

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

@@ -118,7 +118,7 @@
                 })
             }
         },
-        mounted(){
+        created(){
             let mytoken = JSON.parse(localStorage.getItem('app-state-session'));
             let token = String(mytoken.token);
             //企业列表
@@ -155,6 +155,8 @@
                 .catch(err=>{
                     // console.log("请求失败",err)
                 })
+        },
+        mounted(){
             this.boxheight();
         },
         methods: {
@@ -257,8 +259,9 @@
                 .then(res=>{
                     // console.log('请求成功',res)
                     if (res.data.success) {
-                        this.saasid = res.data.data
-                        this.ktsass = false;
+                        // this.saasid = res.data.data
+                        // this.ktsass = false;
+                        this.$router.go(0);
                     } else {
                         this.isokopensaas = true;
                     }
@@ -268,12 +271,11 @@
                 })
             },
             //进入saas服务
-            showServeWin(){
-                let id = this.saasid;
-                this.isOpensaas = false;
-                // this.$options.methods.selectServe(id);
-                this.selectServe(id)
-            },
+            // showServeWin(){
+            //     let id = this.saasid;
+            //     this.isOpensaas = false;
+            //     this.selectServe(id)
+            // },
             //查看企业详情
             getEnterpriseInfo(d){
                 document.documentElement.scrollTop = 0;

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

@@ -137,19 +137,11 @@ import { setTimeout } from 'timers';
             },
             //退出
             loginout(){
-                //this.$router.push({path:'/name'});
                 const frame = window.frames[window.frames.length - 1]
                 frame.postMessage('', '*')
                 Session.remove()
                 window.location.href=this.$url.sso+'/logquit?appId=sp&returnURL=https://'+window.location.host
-                // this.loginout2()
             }
-            // ,
-            // loginout2(){
-            //     const frame = window.frames[window.frames.length - 1]
-            //     frame.postMessage('', '*')
-            //     Session.remove()
-            // } 
         },
     }
 </script>

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

@@ -16,7 +16,7 @@
                 </h1>
             </div>
             <div class="collapse navbar-collapse navbar-right" role="navigation">
-          <ul id="nav" class="nav navbar-nav menu">
+          <ul @click="gohome" id="nav" class="nav navbar-nav menu">
             <li><a href="#"><span>首页</span></a></li>
             <li><a href="https://www.usoftchina.com/" target="_blank"><span>优软云</span></a></li>
             <li>
@@ -41,17 +41,14 @@
           </ul>
         </div>
         </div>
-
     </div>
 
     <iframe hidden :src="setTokenPage"></iframe>
-    <main class="site-content" role="main">
-      <!-- 遮罩 -->
+    <!-- 遮罩 -->
       <div class="zhezhao" v-if="isLogin || isRegister || isexperience"></div>
       <div class="box" v-if="isLogin || isRegister">
         <div>
-          <img @click="closeModal" class="tc-on shut"
-               src="/static/img/qiye/chahao.png" alt="">
+          <img @click="closeModal" class="tc-on shut" src="/static/img/qiye/chahao.png" alt="">
         </div>
         <iframe id="iframe" width="430" height="504" :src="ssoPage"></iframe>
         <iframe hidden :src="setTokenPage"></iframe>
@@ -77,24 +74,19 @@
           <span>客服电话：400-830-1818</span>
         </div>
       </div>
-
+    <main v-if="isproblem" class="site-content" role="main">
       <!--Home Slider==================================== -->
-      <section id="home-slider">
+      <!-- <section id="home-slider">
         <div id="slider" class="sl-slider-wrapper">
           <div class="sl-slider">
-
             <div class="sl-slide" data-orientation="horizontal" data-slice1-rotation="-25" data-slice2-rotation="-25"
                  data-slice1-scale="2" data-slice2-scale="2">
               <div class="mask-overly"></div>
               <div class="bg-img slider-1">
-                <img src="/static/img/banner@2x@2x.png" alt="">
-                <!-- <img src="/static/img/banner@3x@2x.png" alt=""> -->
-                <!-- <img src="/static/img/banner.png" alt=""> -->
+                <img src="/static/img/banner@3x@2x.png" alt="">
               </div>
-              <!-- 首页内容 -->
               <div class="my-text">
                 <button class='my-tiyan' @click="experience">立即体验</button>
-
               </div>
               <div class="slide-caption">
                 <div class="caption-content"></div>
@@ -102,8 +94,15 @@
             </div>
           </div>
         </div>
-      </section>
-
+      </section> -->
+      <div>
+        <div class="bg-img slider-1" style="position: relative;">
+          <img src="/static/img/banner@3x@2x.png" alt="">
+          <div class="my-text" style="top:63%">
+            <button class='my-tiyan' @click="experience">立即体验</button>
+          </div>
+        </div>
+      </div>
       <!-- End Home SliderEnd==================================== -->
 
       <!-- 特色 -->
@@ -250,76 +249,8 @@
         </div>
       </section>
       <!-- end Service section -->
-
-      <!-- 帮助中心 -->
-      <!-- <section id="prototype">
-        <div class="container">
-          <div class="row">
-            <div class="section-title text-center">
-              <p class="ts-title">帮助中心</p>
-            </div>
-            <div class="bz-worp">
-              <div class="bz-box">
-                <div class="bz-sskuang">
-                  <span><img class="bz-sousuoimg" src="/static/img/assets/sou.png" alt=""></span>
-                  <input class="bz-sousuo" type="text" placeholder="输入标题搜索"/>
-                </div>
-                <button class="bz-btn">搜索</button>
-              </div>
-              <div class="bz-content">
-                <div class="bz-left">
-                  <ul class="bz-ul">
-                    <li v-for="(d,i) in arr" :key="i" :class= "{active:Nowindex == i}" @click="tab(i)">{{d}}</li>
-                  </ul>
-                </div>
-                <div class="bz-right">
-                  <div class="bz-right-conent">
-                    <div :class= "{shows:Nowindex == 0}">
-                      <ul>
-                        <li>
-                          <span class="left bz-yuandian"></span>
-                          <span class="left">方式不同吧好像是差不多 </span>
-                          <span class="right">2018年10月31日  12:00</span>
-                        </li>
-                        <li>
-                          <span class="left bz-yuandian"></span>
-                          <span class="left">XXXXXXXXXXXXXXX操作文档</span>
-                          <span class="right">2018年10月31日  12:00</span>
-                        </li>
-                        <li>
-                          <span class="left bz-yuandian"></span>
-                          <span class="left">XXXXXXXXXXXXXXX操作文档</span>
-                          <span class="right">2018年10月31日  12:00</span>
-                        </li>
-                      </ul>
-                    </div>
-                    <div :class= "{shows:Nowindex == 1}">
-                      <ul>
-                        <li>
-                          <span class="left bz-yuandian"></span>
-                          <span class="left">方式不同吧好像是差不多哇来访黑哇哦发检测句ID回复开展了好xxxxx常见问题 </span>
-                          <span class="right">2018年11月24日  12:00</span>
-                        </li>
-                        <li>
-                          <span class="left bz-yuandian"></span>
-                          <span class="left">方式不同吧好像是差不多哇来访黑哇哦发检测句ID回复开展了好xxxxx常见问题</span>
-                          <span class="right">2018年11月24日  12:00</span>
-                        </li>
-                        <li>
-                          <span class="left bz-yuandian"></span>
-                          <span class="left">XXXXXXXXXXXXXXX常见问题</span>
-                          <span class="right">2018年11月24日  12:00</span>
-                        </li>
-                      </ul>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </section> -->
     </main>
+    <problem v-else></problem>
   </div>
 </template>
 
@@ -327,6 +258,7 @@
   import {subscribe, disconnect} from '@/api/socket'
   import Session from '@/utils/session'
   import { setTimeout } from 'timers'
+  import problem from '../conenter/problem.vue'
 
   export default {
     data() {
@@ -336,8 +268,15 @@
         clientId: null,
         account: null,
         isexperience: false,
-        arr: ["操作文档","常见手册"],
-        Nowindex: 0,
+        isproblem: true,//常见问题
+      }
+    },
+    components: {
+      problem
+    },
+    watch: {
+      getnewproblem(val){
+          this.isproblem = val
       }
     },
     created(){
@@ -355,7 +294,7 @@
           this.account = Session.getAccount();
         })
         .catch(err=>{
-          console.log("请求失败",err)
+          // console.log("请求失败",err)
         })
     },
     mounted() {
@@ -376,26 +315,12 @@
           return this.$url.sso + '/sassLogin/register?appId=sp&baseUrl=' +
             encodeURIComponent(this.$url.api + '/api/auth/sso/callback/' + this.clientId)
         }
+      },
+      getnewproblem() {
+        return this.$store.state.isproblem;
       }
     },
     methods: {
-      //   hasCookie(cookieName){
-      //     var hasUid=false;
-      //     if (document.cookie && document.cookie != '') {
-      //         var cookies = document.cookie.split(';');
-      //         for (var i = 0; i < cookies.length; i++) {
-      //             var cookie = cookies[i];
-      //             if (cookie.substring(0, cookieName.length+1).trim() == cookieName.trim() + "=") {
-      //                   hasUid=true;
-      //                   break;
-      //             }
-      //         }
-      //     }
-      //     return hasUid;
-      // },
-      tab(i){
-        this.Nowindex = i;
-      },
       home() {
         document.documentElement.scrollTop = 0;
       },
@@ -498,17 +423,15 @@
           }
         }
       },
+      gohome(e){
+        this.$store.commit('problemtrue')
+        this.isproblem = true
+      }
     }
   }
 </script>
 
 <style scoped>
-.shows {
-  display: block !important;
-}
-.bz-right-conent div {
-  display: none;
-}
 .shut {
   cursor: pointer;
   position: absolute;

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

@@ -0,0 +1,82 @@
+<template>
+    <div>
+        <div class="bz-container">
+            <div class="bz-title">
+              <span>常见问题</span>
+            </div>
+          <div class="bz-titlebox">
+            <div class="bz-worp">
+              <div class="bz-box">
+                <div class="bz-sskuang">
+                  <span><img class="bz-sousuoimg" src="/static/img/assets/sou.png" alt=""></span>
+                  <input class="bz-sousuo" type="text" placeholder="请输入标题搜索"/>
+                </div>
+                <button class="bz-btn">搜索</button>
+              </div>
+              <div class="bz-content">
+                <div class="bz-right">
+                  <div class="bz-right-conent">
+                    <div class= "shows">
+                      <ul>
+                        <li>
+                          <span class="left bz-yuandian"></span>
+                          <span class="left">方式不同吧好像是差不多 </span>
+                          <img class="right bz-copy" src="/static/img/Triangle Copy 4.png" alt="">
+                        </li>
+                        <li>
+                          <span class="left bz-yuandian"></span>
+                          <span class="left">XXXXXXXXXXXXXXX操作文档</span>
+                          <img class="right bz-copy" src="/static/img/Triangle Copy 4.png" alt="">
+                        </li>
+                        <li>
+                          <span class="left bz-yuandian"></span>
+                          <span class="left">XXXXXXXXXXXXXXX操作文档</span>
+                          <img class="right bz-copy" src="/static/img/Triangle Copy 4.png" alt="">
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        
+    }
+</script>
+
+<style scoped>
+.bz-container {
+    width: 55%;
+    margin: 0 auto;
+    font-size: 14px;
+    margin-top: 180px;
+    margin-bottom: 190px;
+}
+.bz-titlebox {
+    background: #FFFFFF;
+    border: 1px solid rgba(30,136,245,0.32);
+    box-shadow: 0 20px 60px 10px rgba(13,37,62,0.05);
+    border-radius: 4px;
+}
+.bz-title {
+    text-align: left;
+    font-size: 14px;
+    color: white;
+    margin-bottom: 36px;
+}
+.bz-title span {
+    background: #1E88F5;
+    border-radius: 2px;
+    padding: 6px 24px;
+}
+.bz-copy {
+    margin-right: 7px;
+    cursor: pointer;
+}
+</style>

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

@@ -4,7 +4,6 @@
 			<div class="container">
 				<div class="footer-list">
 					<div class="about">
-						<!-- <div class="logo"><img src="../../../static/img/logo_w.png" alt=""/></div> -->
 						<div class="logo"><img src="/static/img/assets/dalogo@2x_1.png" alt=""/></div>
 						<div class="time">客服热线：400-830-1818</div>
 						<div class="time">工作时间：周一至周五08:30~18:00</div>
@@ -19,7 +18,7 @@
 						</ul>
 						<ul>
 							<li><span>帮助中心</span></li>
-							<li><a href="#">常见问题</a></li>
+							<li><a @click="problem">常见问题</a></li>
 							<li><a href="#">操作手册</a></li>
 						</ul>
 						<ul>
@@ -40,22 +39,12 @@
 					<div class="qr">
 						<div class="qr-top">
 							<div class="qr-tech qr-code">
-								<!-- <img src="/static/img/qr-tech.png" alt=""> -->
 								<img src="/static/img/qrusoftchina_1.jpg" alt="">
 								<div class="db-text">
 									<span>科技公众号</span>
 								</div>
 							</div>
-							
-							<!-- <div class="qr-mall qr-code">
-								<img src="./img/qr_mall.jpg" alt="">
-								商城公众号
-							</div> -->
 						</div>
-						<!-- <div class="qr-bottom">
-							粤ICP备15112126号
-							<br/>2018 © 深圳市优软科技有限公司
-						</div> -->
 					</div>
 				</div>
 				
@@ -63,19 +52,25 @@
 		</div>
 		<div class="friend-link">
 			<span>版权所有：深圳市优软科技有限公司 Copyright @ 2017 All Rights Reserved</span>
-			<!-- <ul>
-				<li><span>常用链接：</span></li>
-				<li><a href="https://uas.usoftchina.com/" target="_blank">UAS官网</a></li>
-				<li><a href="https://www.usoftchina.com/" target="_blank">U软云</a></li>
-				<li><a href="http://www.yitoa.com/" target="_blank">英唐官网</a></li>
-			</ul> -->
 		</div>
     </div>
 </template>
 
 <script>
     export default {
-        
+        data(){
+			return {
+
+			}
+		},
+		methods:{
+			problem(){
+				this.$router.push({path: '/name', query: {isporblem: false}})
+				// this.$router.go(0)
+				this.$store.commit("problemfalse")
+				document.documentElement.scrollTop = 0;
+			}
+		}
     }
 </script>
 

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

@@ -7,6 +7,7 @@ export default new Vuex.Store({
         data: [],
         email:'',
         isAutoLogin: false,
+        isproblem: true,//常见问题
     },
     mutations:{
          Logintrue(state) {
@@ -15,5 +16,11 @@ export default new Vuex.Store({
          Loginfalse(state) {
              state.isAutoLogin = false;   
          },
+         problemfalse(state) {
+            state.isproblem = false;
+         },
+         problemtrue(state) {
+            state.isproblem = true;
+         }
     }
 })

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

@@ -316,7 +316,7 @@ main > section {
     z-index: 1000;
 }
 .my-tiyan {
-    background: #5172DD;
+    background: #1E88F5;
     border-radius: 4px;
     width: 100%;
     height: 100%;
@@ -434,9 +434,8 @@ main > section {
 /* 帮助 ........................................*/
 .bz-worp {
     background: white;
-    width: 90%;
     margin: 0 auto;
-    padding: 40px;
+    padding: 42px 40px 109px 48px;
 }
 .bz-box {
     border: 1px solid #1E88F5;
@@ -444,12 +443,12 @@ main > section {
     border-right: 0;
 }
 .bz-sskuang {
-    width: 90%;
+    width: 88%;
     float: left;
     line-height: 38px;
 }
 .bz-sousuo {
-    width: 94%;
+    width: 70%;
     margin: 0 -5px;
     border: 0;
     outline: none;
@@ -460,7 +459,7 @@ main > section {
 .bz-btn {
     background: #1E88F5;
     border-radius: 0 5px 5px 0;
-    width: 10%;
+    width: 12%;
     border: 0;
     color: white;
     height: 40px;
@@ -500,15 +499,16 @@ main > section {
     border-radius: 50%;
     margin: 4px 8px 0 0;
 }
-.bz-right-conent div {
-    display: none;
-}
 .bz-right-conent li {
-    margin-bottom: 14px;
+    border-bottom: 1px solid #E8ECEF;
+    padding: 10px 0;
     list-style: none;
     overflow: hidden;
     margin-left: -40px;
 }
+.bz-right-conent li:last-child {
+    border-bottom: 0;
+}
 .bz-right-conent {
     /* margin: 30px; */
 }
@@ -954,13 +954,13 @@ h1.navbar-brand {
 }
 .slider-1 img{
     width: 100%;
-    height: 100%;
+    /* height: 100%; */
 }
 .sl-slider-wrapper {
     width: 100%;
     margin: 0 auto;
     position: relative;
-    overflow: hidden;
+    /* overflow: hidden; */
 }
 
 .sl-slider {

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

@@ -118,16 +118,13 @@ $(document).ready(function(){
 
     // Slider Height
     var slideHeight = $(window).height();
-
+    let W = $(window).width();
     $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
-
     $(window).resize(function(){
         $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
-        $(".slider-1 img").css("height",slideHeight)
+        // $(".slider-1 img").css("height",slideHeight)
+        $("bg-img").css('width',W)
     });
-    // $(window).resize(function(){'use strict',
-    //     $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
-    // });
 	
 	$("#works, #testimonial").owlCarousel({	 
 		navigation : true,

frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -70,7 +70,6 @@ Ext.define('saas.view.document.bom.FormPanel', {
         name: 'pr_spec',
         fieldLabel: '产品规格',
         reddOnly:true,
-        ignore:true
     },{
         xtype: 'hidden',
         name: 'bo_statuscode',

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

@@ -599,5 +599,65 @@ Ext.define('saas.view.money.verification.FormPanelController', {
             saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
             form.fireEvent('aftersave', false, form, res);
         });
-    }
+    },
+    audit: function() {
+        var me = this,
+        form = me.getView(),
+        viewModel = me.getViewModel(),
+        detailCount = form.detailCount,
+        modelData = viewModel.getData();
+
+        //form里面数据
+        var formData = form.getFormData();
+        var params = {
+            main: formData.main
+        };
+
+        for(var i = 0; i < detailCount; i++) {
+            params['items' + ( i + 1)] = formData['detail' + i];
+        }
+
+        saas.util.BaseUtil.request({
+            url: form._auditUrl,
+            params: JSON.stringify(params),
+            method: 'POST',
+        })
+        .then(function(localJson) {
+            if(localJson.success){
+                // 未保存直接审核会返回id
+                if(localJson.data) {
+                    var id = localJson.data.id;
+                    var code = localJson.data.code;
+                    
+                    form.initId = id;
+
+                    var newId = form.xtype + '-' + id;
+                    var newTitle = form._title + '(' + code + ')';
+
+                    saas.util.BaseUtil.refreshTabTitle(newId, newTitle);
+                }
+                saas.util.FormUtil.loadData(form);
+                form.setEditable(false);
+                saas.util.BaseUtil.showSuccessToast('审核成功' + (localJson.message ? ': ' + localJson.message : ''));
+                form.fireEvent('afteraudit', true, form, localJson);
+            }
+        })
+        .catch(function(res) {
+            console.error(res);
+            if(res.data) {
+                var id = localJson.data.id;
+                var code = localJson.data.code;
+                
+                form.initId = id;
+
+                var newId = form.xtype + '-' + id;
+                var newTitle = form._title + '(' + code + ')';
+
+                saas.util.BaseUtil.refreshTabTitle(newId, newTitle);
+                saas.util.FormUtil.loadData(form);
+            }
+            saas.util.BaseUtil.showErrorToast('审核失败: ' + res.message);
+            form.fireEvent('afteraudit', false, form, res);
+        });
+    },
 });

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -105,6 +105,12 @@ Ext.define('saas.view.purchase.report.Purchase', {
             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);
+        },
+        summaryRenderer: 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: '单价',
@@ -182,12 +188,6 @@ Ext.define('saas.view.purchase.report.Purchase', {
             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);
-        },
-        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: '收货金额',