conflict done

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

@@ -404,7 +404,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         double pdQty=0, pdYqty=0;
         //检查转单状态
         String acceptstatus = purchase.getPu_acceptstatuscode();
-
         if (Status.CLOSE.name().equals(acceptstatus)){
             return Result.error(ExceptionCode.CLOSED_EXIST);
         }
@@ -530,12 +529,19 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
 
     @Transactional
     public void singleUnAudit(Long id) {
-        Purchase purchase = new Purchase();
+        //校验关闭状态
+        Purchase purchase = getMapper().selectByPrimaryKey(id);
+        //检查转单状态
+        String acceptstatus = purchase.getPu_acceptstatuscode();
+        if (Status.CLOSE.name().equals(acceptstatus)){
+            throw new  BizException(ExceptionCode.CLOSED_EXIST);
+        }
         //检查是否已转验收单
         Integer num = getMapper().checkTurnInstatus(id);
         if (num > 0) {
             throw new BizException(BizExceptionCode.PURCHASE_UNAUDIT_ERROR);
         }
+        purchase = new Purchase();
         //生成更新对象
         purchase.setId(id);
         purchase.setPu_status(Status.UNAUDITED.getDisplay());

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

@@ -63,7 +63,7 @@
                     <ul>
                         <li style="margin:0">
                             <span class="qy-biaoti"><span class="xingxing">*</span>姓名</span>
-                            <input class="inpind" @change= "yzusername" ref="name" type="text">
+                            <input class="inpind" @change= "yzusername" ref="name" type="text" value="">
                             <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>
@@ -102,7 +102,8 @@ import VDistpicker from 'v-distpicker'
             VDistpicker
         },
         mounted(){
-
+            this.$refs.name.value = this.mytoken.account.realname
+            this.$refs.email.value = this.mytoken.account.email
         },
         methods: {
             //取消添加企业

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

@@ -38,9 +38,9 @@
       <div>
         <div class="tc-okkaitong"><span>该企业已开通服务，联系管理员邀请加入</span></div>
         <div class="tc-context">
-          <p><span>管理员：</span><span>{{arr[0].admin}}</span></p>
-          <p><span>管理员手机号：</span><span>{{mytoken.account.mobile}}</span></p>
-          <p><span>管理员邮箱：</span><span></span></p>
+          <p><span>saas服务管理员：</span><span>{{arr[0].admin}}</span></p>
+          <p><span>saas服务管理员手机号：</span><span>{{mytoken.account.mobile}}</span></p>
+          <p><span>saas服务管理员邮箱：</span><span></span></p>
         </div>
       </div>
     </div>
@@ -62,7 +62,7 @@
                 <div class="left gs-xqleft" @click= "getEnterpriseInfo(d)">
                     <div class="gs-lefttext">
                         <p class="gs-qynema"><span>企业名称：</span>{{d.name}}</p>
-                        <p><span>管理员：</span>{{d.admin}}</p>
+                        <p v-if= "d.saas_" ><span>saas服务管理员：</span>{{d.admin}}</p>
                         <p v-if= "d.time"><span>开通日期：</span>{{d.time}}</p>
                     </div>
                 </div>
@@ -149,8 +149,7 @@
                         }
                     }
                     this.$store.commit('Loginfalse')
-                    // console.log(res.data.data)
-                    this.$store.state.email = this.arr[0].adminEmail
+                    this.$store.state.email = res.data.data.spaces[0].adminEmail
                 })
                 .catch(err=>{
                     // console.log("请求失败",err)
@@ -258,6 +257,7 @@
                     // console.log('请求成功',res)
                     if (res.data.success) {
                         this.ktsass = false;
+                        this.saasid = res.data.data
                     } else {
                         this.isokopensaas = true;
                     }

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

@@ -71,7 +71,7 @@
                     </div>
                 </div>
     <!-- 安全信息----------------------------------------------------------------------------- -->
-                <!-- <sjld></sjld> -->
+
                 <div :class="{gsqiye:nowindex == 2}">
                     <div class="gs-anquanxinxi">
                         <div class="over aq-title"><span class="left">登录密码</span><button class="right dianji">更换密码</button></div>
@@ -111,7 +111,6 @@ import { setTimeout } from 'timers';
             return{
                 nowindex: 0,//tab切换
                 tianjiaqiye: true,//添加企业切换
-                email: this.$store.state.email,
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')).account,//本地储存的用户信息
                 tab: [
                     {name: '企业信息'},
@@ -123,10 +122,13 @@ import { setTimeout } from 'timers';
         computed :{
             setTokenPage() {
                 return this.$url.web + '/set-token.html'
+            },
+            email(){
+                return this.$store.state.email
             }
         },
         mounted(){
-
+            
         },
         methods: {
             // tab切换

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

@@ -68,7 +68,7 @@
             <span><img style="margin: 6px 8px 10px 15px;" src="/static/img/assets/phone.png" alt=""></span>
             <input ref="typhone" type="text" placeholder="请输入您的11位手机号">
           </div>
-          <div class="left" style="margin-left: 8px;"><button @click="experience1">立即体验</button></div>
+          <div class="left" style="margin-left: 8px;"><button @click="openexperience">立即体验</button></div>
         </div>
         <div style="text-align: left;">
           <span class="Caution" ref="Caution"></span>
@@ -316,6 +316,36 @@
         Nowindex: 0,
       }
     },
+    created(){
+      document.cookie='uid=4sjrtiHZOu3sG71-9lOyB1jEPXOxBgJ_3jjuugBiDcZs9xlBhPHqdaypVsfMCD42Vnkf8n4lqYvq5Ux7dZ8CnPtKpXynrTXaF3HU7xqLKvyKJY5hp1PubmQcAsE7TQAuNlXd1aSjqY4nxAoXNKXqri2l2s6-FJ1nYOGpSPLIJoCd56Tvs14W4Az7WpFDtNHke2vs0V4_fEC8t2t1q5H2ihUDUDQqbjcVPcZJEWy3dyUUpdlfvHQtS-Ve2eOm6TES-wlXAIqyovp35Pu2LIqxPZdexh5Vb5LUjbsJV1bNe_LCx87mxhd-7E01mpaALMHuK3GJwyvEnuKf_GkPzb2eygn2r3wpgt18uUBGCEDTGBYYyTZTtrqpvigkWX8YIMIKhp0ftp2G90minOjRqySApPSAwAqTXF44x7OQK6GkMFw98BVoJqGHAWkc7knzz_sjywCg2L8nDceAq2Js26MorJfm6JBUAfvp2D0VY1R2NiyK7VFKYCR8XO7x8ubTNE4u13fCvTKY1mQYTtgSoL-h3eXOWJn7oe0iL-z_OLqWbS9N3LIadLKPHLxUfqay-PUdxnmNICBZEaX7KcOVTxlH3SgzsUeFCQoyQ1D3yFIiu6vuTdv0fzBSo4gPZ1gj1n7NNC7ghs0.';
+      $.ajax({
+               type: "POST",
+               url: "http://192.168.253.31:8560/api/auth/info",
+               dataType: 'jsonp',
+               xhrFields: {
+                      withCredentials: true
+              },
+            crossDomain: true,
+
+           success:function(a,b,c){
+              // debugger
+      },
+           error:function(a,b,c){
+              // debugger
+          }
+      })
+
+      // this.$ajax({
+      //         url: 'http://192.168.253.31:8560/api/auth/info',
+      //         method: 'get',
+      //       })
+      //        .then(res=>{
+      //           console.log("请求成功",res)
+      //       })
+      //       .catch(err=>{
+      //           console.log("请求失败",err)
+      //       })
+    },
     mounted() {
       this.clientId = Math.random().toString(36).substr(2)
       // 从本地加载已经登录的信息
@@ -401,7 +431,7 @@
         this.isexperience = false;
       },
       //进入体验
-      experience1(){
+      openexperience(){
         let me = this
         let phone = this.$refs.typhone.value;
         let reg = new RegExp('^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$')

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

@@ -19,7 +19,7 @@
             </div>
             <div class="gs-worp qy-worp" style="width:100%">
                 <div class="qy-title">
-                    <span>管理员信息</span>
+                    <span>saas服务管理员信息</span>
                 </div>
                 <div class="qy-conent">
                     <ul>
@@ -78,7 +78,7 @@
             </div>
             <div class="gs-worp qy-worp" style="width: 100%">
                 <div class="qy-title">
-                    <span>管理员信息</span>
+                    <span>saas服务管理员信息</span>
                 </div>
                 <div class="qy-conent">
                     <ul>

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

@@ -5,6 +5,7 @@ import router from '../../router'
 import Axios from 'axios'
 import store from '../../store'
 
+Axios.defaults.withCredentials=true;
 Vue.prototype.$ajax = Axios;
 Vue.config.productionTip = false
 

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

@@ -158,7 +158,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype : "employeeDbfindTrigger", 
         name : "cu_sellername", 
         fieldLabel : "业务员", 
-        editable:false,
         allowBlank : false, 
         columnWidth : 0.25
     },{

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -183,7 +183,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'datefield',
                 name:'bk_date',
                 fieldLabel:'建账日期',
-                format:'Y-m-d H:i:s',
+                format:'Y-m-d',
                 listeners:{
                     beforerender:function(d){
                         d.setValue(new Date())

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

@@ -85,6 +85,7 @@ Ext.define('saas.view.main.Main', {
                             }
                         },{
                             text: '用户手册',
+                            hidden:true,
                             //fa-address-book-o sa-userBook
                             iconCls:'x-fa sa-navicon  fa-address-book-o',
                             handler:function(){

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

@@ -59,7 +59,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             xtype: 'numbercolumn',
             dataIndex: 've_beginapamount',
             xtype: 'numbercolumn',
-            width: 110,
+            width: 180,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -78,7 +78,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
             xtype: 'numbercolumn',
-            width: 110,
+            width: 180,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

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

@@ -82,7 +82,7 @@ Ext.define('saas.view.money.report.RecDetail', {
             xtype: 'numbercolumn',
             dataIndex:'rb_rdamount',
             xtype: 'numbercolumn',
-            width: 110,
+            width: 180,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -99,7 +99,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '客户编号',
             dataIndex: 'sa_custcode',
-            width: 0
+            hidden :true
         }, {
             text: '客户名称',
             dataIndex: 'sa_custname',
@@ -132,7 +132,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '录入人',
             dataIndex: 'creatorName',
-            width: 0
+            hidden :true
         }, {
             text: '审核人',
             dataIndex: 'sa_auditman',
@@ -140,7 +140,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '收货地址',
             dataIndex: 'sa_toplace',
-            width: 0
+            hidden :true
         }, {
             text: '备注',
             dataIndex: 'sa_remark',

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -124,7 +124,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 0
+            hidden :true
         }],
         relativeColumn: [{
             text: 'id',

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -159,7 +159,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }, {
                 text : "仓库ID", 
                 dataIndex : "pd_whid", 
-                width : 0
+                hidden :true
             }, {
                 text : "仓库", 
                 dataIndex : "pd_whcode", 

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -121,11 +121,11 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '未含税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 0
+            hidden :true
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 0
+            hidden :true
         }],
         relativeColumn: [{
             text: 'id',

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -19,10 +19,10 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         emptyText:'请输入单号或物料',
         showDetail: true,
         getCondition: function(value) {
-            if(value != '') {
-                return  ' (pi_inoutno like\'%' + value + '%\' or pd_prodcode like \'%'+value+'%\' ) ';
-            }else {
+            if(value == ''|| value ==null) {
                 return '1=1';
+            }else {
+                return  ' (pi_inoutno like\'%' + value + '%\' or pd_prodcode like \'%'+value+'%\' ) ';
             }
         }
     }, {
@@ -66,10 +66,10 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         emptyText :'请输入仓库名或仓库编号',
         showDetail: true,
         getCondition: function(value) {
-            if(value != '') {
-                return  ' (pd_whcode like\'%' + value + '%\' or pd_whname like \'%'+value+'%\' or pd_inwhcode like\'%' + value + '%\' or pd_inwhname like \'%'+value+'%\') ';
-            }else {
+            if(value == '' || value == null) {
                 return '1=1';
+            }else {
+                return  ' (pd_whcode like\'%' + value + '%\' or pd_whname like \'%'+value+'%\' or pd_inwhcode like\'%' + value + '%\' or pd_inwhname like \'%'+value+'%\') ';                
             }
         }
     }],
@@ -167,7 +167,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 width: 80
             },{
                 text: '数量',
-                dataIndex: 'pd_inqty',
+                dataIndex: 'pd_outqty',
                 xtype:'numbercolumn',
                 width: 110
             },{