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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -868,8 +868,15 @@ export default {
           this.loading = true;
             this.apipost('Financial_post_Set',this.msg,res=>{
                 if(res.data.resultCode==1){
-                  // this.MsgBus.$emit('msg');
-                  this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}})
+                  this.$confirm('是否继续制单?', '提示', {
+                        confirmButtonText: '继续制单',
+                        cancelButtonText: '不了，谢谢',
+                        type: 'warning'
+                        }).then(() => {
+                         this.$router.push({ name:'addFinancialDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,"Type":this.$route.query.Type,"orderObj":this.$route.query.orderObj,'IsUploadPic':this.$route.query.IsUploadPic,'companyID':this.$route.query.companyID}})
+                        }).catch(() => {
+                         this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}}) ;    
+                    });
                 }else{
                   this.resultCode = res.data.resultCode;
                   this.$message.error(res.data.message);

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1044,7 +1044,16 @@ export default {
           console.log(this.msg);
             this.apipost('Financial_post_Set',this.msg,res=>{
                 if(res.data.resultCode==1){
-                    this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}})
+                    this.$confirm('是否继续制单?', '提示', {
+                        confirmButtonText: '继续制单',
+                        cancelButtonText: '不了，谢谢',
+                        type: 'warning'
+                        }).then(() => {
+                         this.$router.push({name:'addReceivablesDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,"Type":this.$route.query.Type,"orderObj":this.$route.query.orderObj,'IsUploadPic':this.$route.query.IsUploadPic,'companyID':this.$route.query.companyID}});      
+                        }).catch(() => {
+                         this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}}) ;    
+                    });
+                    
                 }else{
                   this.resultCode = res.data.resultCode;
                   this.$message.error(res.data.message);