修复

pages/teamLeader/components/report/otherInfor1.vue

@@ -354,10 +354,10 @@ export default {
         addData(){
             this.ReimDatas = {
                 ...this.ReimDatas,
-                CostProject: null,
+                CostProject: 0,
                 CostProjectStr: '',
                 CurrencyName: '',
-                Currency: null,
+                Currency: 0,
                 Rebate: 0,
                 UnitPrice: 0,
                 Remark: '',

pages/teamLeader/components/report/otherInfor2.vue

@@ -347,10 +347,10 @@ export default {
         addData(){
             this.ReimDatas = {
                 ...this.ReimDatas,
-                CostProject: null,
+                CostProject: 0,
                 CostProjectStr: '',
                 CurrencyName: '',
-                Currency: null,
+                Currency: 0,
                 Rebate: 0,
                 UnitPrice: 0,
                 Remark: '',

pages/teamLeader/components/report/otherInfor3.vue

@@ -351,10 +351,10 @@ export default {
         addData(){
             this.ReimDatas = {
                 ...this.ReimDatas,
-                CostProject: null,
+                CostProject: 0,
                 CostProjectStr: '',
                 CurrencyName: '',
-                Currency: null,
+                Currency: 0,
                 Rebate: 0,
                 UnitPrice: 0,
                 Remark: '',

pages/teamLeader/components/report/otherInfor4.vue

@@ -351,10 +351,10 @@ export default {
         addData(){
             this.ReimDatas = {
                 ...this.ReimDatas,
-                CostProject: null,
+                CostProject: 0,
                 CostProjectStr: '',
                 CurrencyName: '',
-                Currency: null,
+                Currency: 0,
                 Rebate: 0,
                 UnitPrice: 0,
                 Remark: '',

pages/teamLeader/components/report/otherInfor5.vue

@@ -353,10 +353,10 @@ export default {
         addData(){
             this.ReimDatas = {
                 ...this.ReimDatas,
-                CostProject: null,
+                CostProject: 0,
                 CostProjectStr: '',
                 CurrencyName: '',
-                Currency: null,
+                Currency: 0,
                 Rebate: 0,
                 UnitPrice: 0,
                 Remark: '',

pages/teamLeader/components/report/productInfor1.vue

@@ -328,7 +328,7 @@ export default {
                 ...this.ReimDatas,
                 StartPlace: '',
                 EndPlace: '',
-                UserType: null,
+                UserType: 0,
                 UserTypeStr: '',
                 UserNum: 0,
                 UnitPrice: 0,
@@ -337,7 +337,7 @@ export default {
             
         },
         onSuccess(infor){
-            this.datas.VoucherPicList.push({
+            this.datas.ReimburseList.VoucherPicList.push({
                 FileName: infor.name,
                 url: infor.url,
             })

pages/teamLeader/components/report/productInfor2.vue

@@ -314,7 +314,7 @@ export default {
         addData(){
             this.ReimDatas = {
                 ...this.ReimDatas,
-                UserType: null,
+                UserType: 0,
                 UserTypeStr: '',
                 UserNum: 0,
                 UnitPrice: 0,
@@ -322,7 +322,7 @@ export default {
             this.datas.HotelOrderList[this.datas.hotelIndex].ReimburseList.ReimburseDetailsList.push(JSON.parse(JSON.stringify(this.ReimDatas)))
         },
         onSuccess(infor){
-            this.datas.HotelOrderList[this.datas.hotelIndex].VoucherPicList.push({
+            this.datas.HotelOrderList[this.datas.hotelIndex].ReimburseList.VoucherPicList.push({
                 FileName: infor.name,
                 url: infor.url,
             })

pages/teamLeader/components/report/productInfor3.vue

@@ -313,7 +313,7 @@ export default {
         addData(){
             this.ReimDatas = {
                 ...this.ReimDatas,
-                UserType: null,
+                UserType: 0,
                 UserTypeStr: '',
                 UserNum: 0,
                 UnitPrice: 0,
@@ -321,7 +321,7 @@ export default {
             this.datas.DiningSummaryList[this.datas.diningIndex].ReimburseList.ReimburseDetailsList.push(JSON.parse(JSON.stringify(this.ReimDatas)))
         },
         onSuccess(infor){
-            this.datas.DiningSummaryList[this.datas.diningIndex].VoucherPicList.push({
+            this.datas.DiningSummaryList[this.datas.diningIndex].ReimburseList.VoucherPicList.push({
                 FileName: infor.name,
                 url: infor.url,
             })

pages/teamLeader/components/report/productInfor4.vue

@@ -313,7 +313,7 @@ export default {
         addData(){
             this.ReimDatas = {
                 ...this.ReimDatas,
-                UserType: null,
+                UserType: 0,
                 UserTypeStr: '',
                 UserNum: 0,
                 UnitPrice: 0,
@@ -321,7 +321,7 @@ export default {
             this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.ReimburseDetailsList.push(JSON.parse(JSON.stringify(this.ReimDatas)))
         },
         onSuccess(infor){
-            this.datas.ScenicStatisticsList[this.datas.scenicIndex].VoucherPicList.push({
+            this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.VoucherPicList.push({
                 FileName: infor.name,
                 url: infor.url,
             })

pages/teamLeader/components/upload.vue

@@ -39,17 +39,19 @@ export default {
                             that.upFile(res.tempFilePaths[0], (uploadRes) => {
                                 let BusinessLicense = JSON.parse(
                                     uploadRes.data
-                                ).data;
+                                );
                                 let infor = {
                                     url: '',
                                     name: ''
                                 }
-                                const tempFilePath = BusinessLicense;
-                                infor.name = tempFilePath.substring(tempFilePath.lastIndexOf('/') + 1);
-                                infor.url = BusinessLicense
-                                console.log('图片名称:');
-                                console.log("infor", infor);
+                                // console.log('图片名称:',BusinessLicense);
+
+                                const tempFilePath = BusinessLicense.FileName;
+                                infor.name = tempFilePath;
+                                infor.url = that.hostErpFile+BusinessLicense.FilePath
                                 that.$emit('onSuccess', infor);
+
+                                // console.log("infor", infor);
                             },err=>{
                                 uni.hideLoading()
                             });
@@ -64,7 +66,8 @@ export default {
         upFile(filePath,resCall) {
             let that = this;
             let MallBaseId = uni.getStorageSync("mall_UserInfo").MallBaseId ? uni.getStorageSync("mall_UserInfo").MallBaseId : 1;
-            let action = this.host2 + '/api/File/UploadTencent?MallBaseId=' + MallBaseId
+            let path = "/Upload/Temporary/"
+            let action = this.hostErpUpload+`/Upload/Index?filePath=${path}`
             uni.uploadFile({
                 url: action,
                 filePath: filePath,

pages/teamLeader/reimbursementInfor.vue

@@ -318,7 +318,115 @@ export default {
         });
     },
     methods: {
+        VerificationBusList(){
+            let msg = ''
+            for(let i=0;i<this.params.BusList.length;i++){
+                let obj = this.params.BusList[i]
+                for(let j=0;j<obj.ReimburseList.ReimburseDetailsList.length;j++){
+                    let child = obj.ReimburseList.ReimburseDetailsList[j]
+                    if(msg==''&&
+                    (child.CurrencyId==0||child.CurrencyId=='')&&
+                    (obj.ReimburseList.SettlementType>0||obj.ReimburseList.Remarks!=''||
+                    obj.ReimburseList.VoucherPicList.length>0||child.StartPlace!=''||
+                    child.EndPlace!=''||child.UserNum>0||child.UnitPrice>0||child.UserType)
+                    ){
+                        msg = `请选择车辆币种`//日期:${obj.PlanDateStr}
+                    }
+                    if(msg==''&&child.StartPlace==''&&
+                    (obj.ReimburseList.SettlementType>0||obj.ReimburseList.Remarks!=''||
+                    obj.ReimburseList.VoucherPicList.length>0||child.CurrencyId||
+                    child.EndPlace!=''||child.UserNum>0||child.UnitPrice>0||child.UserType)
+                    ){
+                        msg = `请输入车辆出发地`
+                    }
+                    if(msg==''&&child.EndPlace==''&&
+                    (obj.ReimburseList.SettlementType>0||obj.ReimburseList.Remarks!=''||
+                    obj.ReimburseList.VoucherPicList.length>0||child.StartPlace!=''||
+                    child.CurrencyId||child.UserNum>0||child.UnitPrice>0||child.UserType)
+                    ){
+                        msg = `请输入车辆目的地`
+                    }
+                }
+                // obj.ReimburseList.ReimburseDetailsList = obj.ReimburseList.ReimburseDetailsList.filter(x=> {return x.UserNum>0&&x.UnitPrice>0&&x.UserType})
+            }
+            return msg
+        },
+        VerificationHotel(){
+            let msg = ''
+            for(let i=0;i<this.params.HotelOrderListReport.length;i++){
+                let obj = this.params.HotelOrderListReport[i]
+                for(let j=0;j<obj.HotelOrderList.length;j++){
+                    let child = obj.HotelOrderList[j]
+                    for(let x=0;x<child.ReimburseList.ReimburseDetailsList.length;x++){
+                        let grandson = child.ReimburseList.ReimburseDetailsList[x]
+                        if(msg==''&&(grandson.CurrencyId==0||grandson.CurrencyId=='')&&
+                        (child.ReimburseList.SettlementType>0||child.ReimburseList.Remarks!=''||
+                        child.ReimburseList.VoucherPicList.length>0||grandson.UserNum>0||
+                        grandson.UnitPrice>0||grandson.UserType)
+                        ){
+                            msg = `请选择酒店币种`
+                        }
+                    }
+                    // child.ReimburseList.ReimburseDetailsList = child.ReimburseList.ReimburseDetailsList.filter(x=> {return x.UserNum>0&&x.UnitPrice>0&&x.UserType})
+                }
+            }
+            return msg
+        },
+        VerificationDining(){
+            let msg = ''
+            for(let i=0;i<this.params.DiningList.length;i++){
+                let obj = this.params.DiningList[i]
+                for(let j=0;j<obj.DiningSummaryList.length;j++){
+                    let child = obj.DiningSummaryList[j]
+                    for(let x=0;x<child.ReimburseList.ReimburseDetailsList.length;x++){
+                        let grandson = child.ReimburseList.ReimburseDetailsList[x]
+                        if(msg==''&&(grandson.CurrencyId==0||grandson.CurrencyId=='')&&
+                        (child.ReimburseList.SettlementType>0||child.ReimburseList.Remarks!=''||
+                        child.ReimburseList.VoucherPicList.length>0||grandson.UserNum>0||
+                        grandson.UnitPrice>0||grandson.UserType)
+                        ){
+                            msg = `请选择餐币种`
+                        }
+                    }
+                    // child.ReimburseList.ReimburseDetailsList = child.ReimburseList.ReimburseDetailsList.filter(x=> {return x.UserNum>0&&x.UnitPrice>0&&x.UserType})
+                }
+            }
+            return msg
+        },
+        VerificationScenic(){
+            let msg = ''
+            for(let i=0;i<this.params.ScenicList.length;i++){
+                let obj = this.params.ScenicList[i]
+                for(let j=0;j<obj.ScenicStatisticsList.length;j++){
+                    let child = obj.ScenicStatisticsList[j]
+                    for(let x=0;x<child.ReimburseList.ReimburseDetailsList.length;x++){
+                        let grandson = child.ReimburseList.ReimburseDetailsList[x]
+                        if(msg==''&&(grandson.CurrencyId==0||grandson.CurrencyId=='')&&
+                        (child.ReimburseList.SettlementType>0||child.ReimburseList.Remarks!=''||
+                        child.ReimburseList.VoucherPicList.length>0||grandson.UserNum>0||
+                        grandson.UnitPrice>0||grandson.UserType)
+                        ){
+                            msg = `请选择门票币种`
+                        }
+                    }
+                    // child.ReimburseList.ReimburseDetailsList = child.ReimburseList.ReimburseDetailsList.filter(x=> {return x.UserNum>0&&x.UnitPrice>0&&x.UserType})
+                }
+            }
+            return msg
+        },
         saveData(){
+            let msg = ''
+            if(this.params.type==1) msg = this.VerificationBusList()
+            else if(this.params.type==2) msg = this.VerificationHotel()
+            else if(this.params.type==3) msg = this.VerificationDining()
+            else if(this.params.type==4) msg = this.VerificationScenic()
+            if(msg) {
+                return uni.showToast({
+                    title: msg,
+                    icon: "none",
+                })
+            }
+            console.log(this.params.BusList,'-----')
             if(this.loading) return
             this.loading = true
             uni.showLoading()

plugin/api.js

@@ -25,8 +25,10 @@ export default {
 		// "http://192.168.5.204:8030"
 		Vue.prototype.host2 = process.env.NODE_ENV=="development"?"https://erpmallapi.oytour.com":"https://erpmallapi.oytour.com"
 		Vue.prototype.host3 = process.env.NODE_ENV=="development"?"http://192.168.5.204:8030":"https://reborn.oytour.com"
+		Vue.prototype.hostErpUpload = process.env.NODE_ENV=="development"?"http://upload.oytour.com":"http://upload.oytour.com"
+		Vue.prototype.hostErpFile = process.env.NODE_ENV=="development"?"https://imgfile.oytour.com":"https://imgfile.oytour.com"
 		// Vue.prototype.host3 = "http://192.168.5.204:8030"
-		Vue.prototype.host3 = "https://reborn.oytour.com"
+		// Vue.prototype.host3 = "https://reborn.oytour.com"
 		// "http://192.168.5.204:8030":
 		console.log()