应收应付

src/components/FinancialModule/addFinancialDocuments.vue

@@ -182,13 +182,13 @@
                 <p class="_yewudanju" v-if="OrderSource==8">订单号：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?'无':msg.OrderID}}</span></p>
                 <div class="rb_top_row _r_mb5">
                     <el-radio-group v-model="msg.IsPublic" @change="IsPublicChange" class="_IsPublic">
-                        <el-radio :label="1">公账</el-radio>
-                        <el-radio :label="0">私账</el-radio>
-                        <el-radio :label="2">人民币现金</el-radio>
-                        <el-radio :label="3">外币现金</el-radio>
-                        <el-radio :label="4">资金池</el-radio>
-                        <el-radio :label="5">平台虚拟账户</el-radio>
-                        <el-radio :label="6">地接虚拟账户</el-radio>
+                        <el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>公账</el-radio>
+                        <el-radio :label="0" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>私账</el-radio>
+                        <el-radio :label="2" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>人民币现金</el-radio>
+                        <el-radio :label="3" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>外币现金</el-radio>
+                        <el-radio :label="4" v-if='msg.TemplateId===36 || msg.TemplateId===37'>资金池</el-radio>
+                        <el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>平台虚拟账户</el-radio>
+                        <el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>地接虚拟账户</el-radio>
                         <!-- <el-radio :label="3">资金池</el-radio> -->
                     </el-radio-group>
                 </div>
@@ -582,7 +582,8 @@ export default {
               TCIDAndTCNUMList:[],
               IsLeader:1,
               PayDate:'',
-              CallType:0
+              CallType:0,
+              Type:0
             },
             detailList:{
                 ID:0,
@@ -875,9 +876,9 @@ export default {
                         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}})
+                         this.$router.push({ name:'addFinancialDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,'InPay':this.$route.query.InPay,"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}}) ;    
+                         this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type,'InPay':this.$route.query.InPay}}) ;    
                     });
                 }else{
                   this.resultCode = res.data.resultCode;
@@ -1206,6 +1207,13 @@ export default {
                     this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:'';
                     this.$forceUpdate();
                     this.loading=false;
+                    if(this.$route.query.InPay)
+                    {
+                        this.msg.Type=this.$route.query.InPay;
+                    }else
+                    {
+                        this.msg.Type=this.$route.query.Type;
+                    }
                 }else{
                     this.loading=false;
                     this.$message.error(res.data.message);

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -517,7 +517,8 @@ export default {
           Obj:{},
           SourceID:0,
           TCIDAndTCNUMList:[],
-              CallType:0
+              CallType:0,
+              Type:0
       },
       AccountNumber:'',
       queryAccMsg:{
@@ -1040,7 +1041,6 @@ export default {
             delete x.rate;
           });
           this.loading = true;
-          console.log(this.msg);
             this.apipost('Financial_post_Set',this.msg,res=>{
                 if(res.data.resultCode==1){
                     this.$confirm('操作成功，是否继续制单?', '提示', {
@@ -1048,9 +1048,9 @@ export default {
                         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}});      
+                         this.$router.push({name:'addReceivablesDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,'InPay':this.$route.query.InPay,"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}}) ;    
+                         this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type,'InPay':this.$route.query.InPay}}) ;    
                     });
                     
                 }else{
@@ -1353,6 +1353,13 @@ export default {
                     this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:'';
                     this.$forceUpdate();
                     this.loading=false;
+                    if(this.$route.query.InPay)
+                    {
+                        this.msg.Type=this.$route.query.InPay;
+                    }else
+                    {
+                        this.msg.Type=this.$route.query.Type;
+                    }
                 }else{
                     this.loading=false;
                     this.$message.error(res.data.message);

src/router/config.js

@@ -2243,6 +2243,14 @@ export default {
               meta: {
                 title: '应付团款查询'
               },
+            },
+            { //财务 财务单据 应收应付查询
+              path: '/RecPayQueryV2',
+              name: '/RecPayQueryV2',
+              component: resolve => require(['@/components/FinancialModule/RecPayQueryV2'], resolve),
+              meta: {
+                title: '应收应付查询'
+              },
             },
              { //财务 财务单据 出纳工作台
               path: '/CashierWork',