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

src/components/FinancialModule/BasicDocuments.vue

@@ -262,9 +262,11 @@
     <div class="page_bdm" v-if="GetDetail" v-loading="loading">
         <p class="_tit">{{GetDetail.FinanceName}}</p>
         <div class="_conten">
-            <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7">
+            <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4">
                 <my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
-                <!-- <new-Bill :ID="GetDetail.FrID"></new-Bill> -->
+            </template>
+            <template v-else-if="GetDetail.Type===4">
+                <new-Bill :ID="GetDetail.FrID"></new-Bill>
             </template>
             <template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
                 <my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
@@ -273,7 +275,7 @@
                 <my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-GZ-Bill>
             </template>
             <div class="_explain">
-                <p>附加说明：</p>1
+                <p>附加说明：</p>
                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
                     <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
                         <td :colspan="4">{{o.TCNUM}}（{{o.TCID}}）</td>
@@ -1099,6 +1101,7 @@
 <script>
 import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
 import myBill from "./FinancialSubmodule/BillModule.vue";
+import newBill from "./FinancialSubmodule/NewBillModule.vue";
 import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
 import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
 import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
@@ -1107,7 +1110,6 @@ import TicketFinace from "../commonPage/TicketFinace.vue";
 import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
 import TicketingModule from "../commonPage/TicketingModule.vue";
 
-// import newBill from "./FinancialSubmodule/NewBillModule.vue";
 // import MsgBus from '../../assets/utils/msgBus.js';
 export default {
     data(){
@@ -1233,6 +1235,7 @@ export default {
     },components:{
         "my-FlowChartModule": myFlowChartModule,
         "my-Bill": myBill,
+        "new-Bill":newBill,
         "my-RVB-Bill":myrbvBill,
         "my-GZ-Bill": myGZBill,
         'TicketingModule':TicketingModule,
@@ -1240,7 +1243,6 @@ export default {
         'SaleOrderModule':SaleOrderModule,
         'TicketFinace':TicketFinace,
         'my-HB-Bill':myhrBill,
-        // 'new-Bill':newBill
     },methods:{
     payMsgListShow: function (type, index) {
         if(this.choiceMsg.Status==1){
@@ -1842,6 +1844,7 @@ export default {
                         //     this.$router.push({name:data.URL+'1',query:{'SourceID':this.SourceID,'Callback':this.Callback,id:this.ID}});
                         // }
                     }
+                    console.log(this.GetDetail,'getdetail');
                 }
             }, err => {})
         },

src/components/FinancialModule/FinancialSubmodule/NewBillModule.vue

@@ -410,7 +410,7 @@ export default {
     },
   },
   mounted(){
-    //this.getList(this.ID);
+    this.getList(this.ID);
   },
   watch: {  // 监听参数变化
         GetDetail: {