地接批量单据

src/components/FinancialModule/BasicDocuments.vue

@@ -262,17 +262,22 @@
     <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 && GetDetail.Type!=4">
-                <my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-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>
+            <template v-if="!otherTable">
+                <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>
+                </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>
+                </template>
+                <template v-else-if="GetDetail.Type===7">
+                    <my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-GZ-Bill>
+                </template>
             </template>
-            <template v-else-if="GetDetail.Type===7">
-                <my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-GZ-Bill>
+            <template v-else>
+                <my-DJ-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-DJ-Bill>
             </template>
             <div class="_explain">
                 <p>附加说明：</p>
@@ -1105,15 +1110,18 @@ import newBill from "./FinancialSubmodule/NewBillModule.vue";
 import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
 import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
 import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
+import myDJBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
 import teamProductModule from "../commonPage/teamProductModule.vue";
 import TicketFinace from "../commonPage/TicketFinace.vue";
 import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
 import TicketingModule from "../commonPage/TicketingModule.vue";
+import { truncate } from 'fs';
 
 // import MsgBus from '../../assets/utils/msgBus.js';
 export default {
     data(){
         return{
+            otherTable: false,
           imageOptions:{
             navbar:false,
             title:false
@@ -1240,6 +1248,7 @@ export default {
         "new-Bill":newBill,
         "my-RVB-Bill":myrbvBill,
         "my-GZ-Bill": myGZBill,
+        'my-DJ-Bill': myDJBill,
         'TicketingModule':TicketingModule,
         'teamProductModule':teamProductModule,
         'SaleOrderModule':SaleOrderModule,
@@ -1841,7 +1850,10 @@ export default {
                     let AuditSteps=this.GetDetail.AuditSteps;
                     AuditSteps.forEach(item=>{
                         if(item.NextStep==1 && item.SpecialNode==2 && item.Status==1){
-                            this.Ststus=1;
+                            if (this.GetDetail.DijieBathFinanceList.length) {
+                                this.otherTable = true
+                            }
+                            this.Ststus = 1;
                             item.AuditRecordList.forEach(audit=>{
                                 if(audit.AuditStatus==2){
                                     this.Ststus=0;

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -150,7 +150,8 @@
               data.forEach(x => {
                 // 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50
                 // 如果不是吴珊，只显示49 
-                if (this.OrderSource === '5' && this.showTab === '2') {
+                // 如果没有 OrderSource 则49和50都不显示
+                if (this.OrderSource === '5' && this.showTab === '2' && (x.Id === 49 || x.Id === 50)) {
                   if (x.Id === 49 || x.Id === 50){
                     x.bigShow = false
                     if (x.Id === 49){
@@ -158,11 +159,11 @@
                     } else if (x.Id === 50 && this.EmployeeId === 639){
                       x.bigShow = true
                     }
-                    console.log('if',x.Id,x.bigShow)
                   } else {
                     x.bigShow = false
-                    console.log('else',x.Id,x.bigShow)
                   }
+                } else if (x.Id === 49 || x.Id === 50){
+                  x.bigShow = false
                 } else {
                   //    5-5       仅茈、而巳。  14:32:06
                   // 部门id  =  242 或者  240   就展示出  templeteId=33 的流程，  流程名字叫做  公司佣金收款

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -427,6 +427,7 @@
                     </div>
                 </div>
                 <my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon"  :color="colorSon"></my-HB-Bill>
+                <!-- <myDJieBill v-if="GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon"  :color="colorSon"/> -->
                 <!--<my-C-Bill v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-C-Bill>-->
                 <div class="_fujian_box" v-if="(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0) || saveMsg.length>0">
                     <div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true">
@@ -782,6 +783,7 @@ import teamProductModule from "../commonPage/teamProductModule.vue";
 import TicketFinace from "../commonPage/TicketFinace.vue";
 import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
 import TicketingModule from "../commonPage/TicketingModule.vue";
+import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
 export default {
     data(){
         return{
@@ -855,7 +857,8 @@ export default {
         'teamProductModule':teamProductModule,
         'TicketingModule':TicketingModule,
         'SaleOrderModule':SaleOrderModule,
-        'TicketFinace':TicketFinace
+        'TicketFinace':TicketFinace,
+        'myDJieBill': myDJieBill,
     },
     created(){
         this.ID = this.$route.query.id;

src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue

@@ -154,7 +154,7 @@
           <td height="34px">{{item.BName}}</td>
           <td height="34px">
               <template v-for="tc in item.TCIDAndTCNUMList">
-                <p class="_jump_page" @click="jumpPage('productQuery',o.TCID,1)">{{tc.TCNUM}}({{tc.TCID}})</p>
+                <p class="_jump_page" @click="jumpPage('productQuery',tc.TCID,1)">{{tc.TCNUM}}({{tc.TCID}})</p>
               </template>
           </td>
           <td height="34px">{{item.FinanceId}}</td>