Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/financial/PlatformAccount.vue

@@ -997,7 +997,7 @@ export default {
     downMuban() {
       let msg=this.msg;
       let userInfo = this.getLocalStorage();
-      msg.UId=userInfo.EmployeeId;
+      msg.UId=userInfo.Id;
       this.GetLocalFile(
         "BankAccount_post_OutToExcelPlatform",
         msg,

src/pages/financial/accountingWork.vue

@@ -278,7 +278,7 @@
         SingleList: [],
         schoolMsg: {
           pageIndex: 1,
-          pageSize: 12,
+          pageSize: 999,
           rowsPerPage: 12,
           SName: "",
           Status: '-1'

src/pages/financial/financalDocument/CapitalAllocation.vue

@@ -282,8 +282,8 @@
     created(){
       this.getList()
       let userInfo = this.getLocalStorage();    // 读取缓存数据
-      this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    // 集团ID
-      this.EmId=userInfo.EmployeeId;
+      this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.Group_Id;    // 集团ID
+      this.EmId=userInfo.Id;
       let ActionMenuCode=userInfo.ActionMenuCode;
       // if(ActionMenuCode.indexOf('F_CreateBranchMoneyAllot')!=-1){
       //   this.btnShow=true;
@@ -324,6 +324,7 @@
         if(!this.msg.Status)this.msg.Status=0;
         if(!this.msg.FrID)this.msg.FrID=0;
         this.msg.EmployeeId=this.EmId;
+        
         this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
       getCompanyList: function () { //获取公司列表
         getSchoolPage(this.schoolMsg).then(res => {

src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue

@@ -123,56 +123,49 @@
          if(this.active==1){
           // 手配费 收款单参数Handmsg
           if(this.$route.query.Handmsg){
-            let tempStr = '/financial/financalDocument/addReceivablesDocuments' + '?Handmsg=' + this.Handmsg + '&tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
-            // this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
             this.$router.push({
-                path: tempStr
+                path: '/financial/financalDocument/addReceivablesDocuments',
+                query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
             });
           }
           // 财务收据
           else if(this.$route.query.czmsg){
             let Handmsg=this.$route.query.czmsg;
-            let tempStr = '/financial/financalDocument/addReceivablesDocuments' + '?Handmsg=' + this.Handmsg + '&tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
-            // this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
             this.$router.push({
-                path: tempStr
+                path: '/financial/financalDocument/addReceivablesDocuments',
+                query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
             });
           }
           else{
-            let tempStr = '/financial/financalDocument/addReceivablesDocuments'+ '?tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
             this.$router.push({
-                path: tempStr
+                path: '/financial/financalDocument/addReceivablesDocuments',
+                query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
             });
-            // this.$router.push({ name: "addReceivablesDocuments",query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
           }
         }else if(this.active==2){
           // 付款单参数czmsg
           // 领队报账  预付款冲抵  返款制单
           if(this.$route.query.czmsg){
-            let tempStr = '/financial/financalDocument/' + path + '?czmsg=' +this.czmsg +'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
             this.$router.push({
-                path: tempStr
+                path: '/financial/financalDocument/' + path,
+                query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}
             });
-            // this.$router.push({ name: path,query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
           }else{
-            let tempStr = '/financial/financalDocument/' + path + '?id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
             this.$router.push({
-                path: tempStr
+                path: '/financial/financalDocument/' + path,
+                query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}
             });
-            // this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
           }
         }else if(this.active==4){
-          let tempStr = '/financial/financalDocument/' + path + '?id='+id+'&Name='+Name+'&Type='+2+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
           this.$router.push({
-            path: tempStr
+            path: '/financial/financalDocument/' + path,
+            query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}
           });
-          // this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
         }else {
-          let tempStr = '/financial/financalDocument/addFinancialGZDocuments' + '?id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
           this.$router.push({
-            path: tempStr
+            path: '/financial/financalDocument/addFinancialGZDocuments',
+            query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'}
           });
-          // this.$router.push({ name: "addFinancialGZDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'}})
         }
       },
       getFlowChart(id){  //获取流程图
@@ -288,8 +281,8 @@
     }
     ,mounted(){
       let userInfo = this.getLocalStorage();
-      this.DepartID = userInfo.RB_Department_Id;
-      this.EmployeeId = userInfo.EmployeeId;
+      this.DepartID = userInfo.DeptId;
+      this.EmployeeId = userInfo.Id;
       this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
       this.OrderSource = this.$route.query.OrderSource ? this.$route.query.OrderSource : null
       this.showTab = this.$route.query.Type?this.$route.query.Type:0;
@@ -315,7 +308,6 @@
 
       this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
       this.orderObj = this.$route.query.orderObj;
-      console.log(this.orderObj ,'this.orderObj ')
       this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
       this.czmsg = this.$route.query.czmsg?this.$route.query.czmsg:this.czmsg;
 

src/router/routes.js

@@ -276,6 +276,11 @@ const routes = [{
         component: () =>
           import("pages/financial/financalDocument/CapitalAllocationDetail.vue")
       },
+      {
+        path: "/financial/financalDocument/addFinancialDocuments",  //新增财务单据
+        component: () =>
+        import("pages/financial/financalDocument/addFinancialDocuments.vue")
+      },
       {
         path: "/test", //API测试
         component: () =>

src/utils/erpindex.js

@@ -151,7 +151,9 @@ export default{
         "cmd": cmd,
         "timestamp": timestamp,
         "token": token,
-        "sign": md5Str
+        "sign": md5Str,
+        "groupId":tokenData.data.Group_Id,
+        "requestFrom":6
       }
       this.$http.post(apiurl, postData, {
         responseType: 'arraybuffer'
@@ -271,6 +273,35 @@ export default{
           x1 = x1.replace(rgx, '$1' + ',' + '$2');
         }
         return x1 + x2;
+      },
+      //验证只能输入整数【负数：isMinus传true】
+      Vue.prototype.checkInteger = function (item, filed, isMinus) {
+        var value = "" + item[filed]; //转字符串
+        var t = value.charAt(0);
+        value = value.replace(this.$commonUtils.Regex.isInteger, "");
+        //是否允许负数
+        if (isMinus && t == '-') {
+          value = '-' + value;
+        }
+        item[filed] = value;
+      },
+      //验证只能输入2位小数【负数：isMinus传true】
+      Vue.prototype.checkPrice = function (item, filed, isMinus) {
+        var value = "" + item[filed]; //转字符串
+        var t = value.charAt(0);
+        value = value.replace(/[^\d.]/g, ""); //清除“数字”和“.”以外的字符
+        value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的
+        value = value
+          .replace(".", "$#$")
+          .replace(/\./g, "")
+          .replace("$#$", ".");
+        value = value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3'); //只能输入两个小数
+        //如果第一位是负号，则允许添加   如果不允许添加负号 可以把这块注释掉
+        //是否允许负数
+        if (isMinus && t == '-') {
+          value = '-' + value;
+        }
+        item[filed] = value;
       }
 
   }