提交bug

src/components/FinancialModule/BasicDocuments.vue

@@ -262,17 +262,17 @@
     <div class="page_bdm" v-if="GetDetail" v-loading="loading">
         <p class="_tit">{{GetDetail.FinanceName}}</p>
         <div class="_conten">
-            <template v-if="GetDetail.Type===2">
+            <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7">
                 <my-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
             </template>
-            <template v-else-if="GetDetail.Type===1">
+            <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>
             <div class="_explain">
-                <p>附加说明：</p>
+                <p>附加说明：</p>1
                 <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>

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -219,7 +219,7 @@
                     <td height="26px"></td>
                 </tr>
                 <tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=1|| GetDetail.Type!=5)">
-                  <td height="34px" class="">{{$t('fnc.jiaoyifangshi')}}</td>
+                  <td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
                   <td height="34px" colspan="7" class="_color_b">
                     <template v-for="(item,index) in GetDetail.CashierDetail">
                       <p  class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p>

src/components/FinancialModule/FinancialSubmodule/GZBillModule.vue

@@ -233,7 +233,7 @@
                     <td height="26px"></td>
                 </tr>
                 <tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=1|| GetDetail.Type!=5)">
-                  <td height="34px" class="">{{$t('fnc.jiaoyifangshi')}}</td>
+                  <td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
                   <td height="34px" colspan="9" class="_color_b">
                     <template v-for="(item,index) in GetDetail.CashierDetail">
                       <p  class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p>

src/components/FinancialModule/invoicesManager.vue

@@ -82,7 +82,7 @@
 <template>
   <div class="page_iisMg">
     <ul class="_nav clearfix">
-      <li :class="active==1?'_active':''" @click="active=1,msg.InvoiceApplyState=0,getPageList()">全部发票</li>
+      <li :class="active==1?'_active':''" @click="active=1,msg.InvoiceApplyState=0,getPageList()">{{$t('invoices.qbfapiao')}}</li>
       <li :class="active==2?'_active':''" @click="active=2,msg.InvoiceApplyState=3,getPageList()">已开发票</li>
       <li :class="active==3?'_active':''" @click="active=3,msg.InvoiceApplyState=5,getPageList()">欠票发票</li>
     </ul>

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -104,19 +104,22 @@
         </td>
       </tr>
     </table>
-    <div class="iis_save" v-if="noDetail">
+    <div class="iis_save" v-if="!noDetail && detail.InvoiceApplyState===1">
       <button class="normalBtn" @click="setStatus(3)">通过</button>
       <button class="normalBtn" @click="dialogFormVisible = true">拒绝</button>
     </div>
+    <div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1">
+      <button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button>
+    </div>
     <el-dialog title="提示信息" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie" >
       <el-form label-width="110px">
         <el-form-item label="拒绝理由">
           <el-input type="textarea" v-model="msg.RefuseRemarks" class="w216"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-          <el-button class="hollowFixedBtn" @click="dialogFormVisible=false">{{$t('pub.cancelBtn')}}</el-button>
-          <el-button class="normalBtn" type="primary" @click="setStatus(4)">{{$t('pub.sureBtn')}}</el-button>
+      <div slot="footer" class="dialog-footer" >
+        <el-button class="hollowFixedBtn" @click="dialogFormVisible=false">{{$t('pub.cancelBtn')}}</el-button>
+        <el-button class="normalBtn" type="primary" @click="setStatus(4)">{{$t('pub.sureBtn')}}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -158,12 +161,22 @@ export default {
       this.apipost('InvoiceApply_get_UpdateInvoiceApply', this.msg, res=>{
         if (res.data.resultCode == 1) {
           this.$message.success(res.data.message)
-          setTimeout(()=>{
-            this.$router.push({
-              name: 'invoicesManager',
-              query: {blank: "y",}
-            });
-          },1000)
+          if (type !== 2) {
+            setTimeout(()=>{
+              this.$router.push({
+                name: 'invoicesManager',
+                query: {blank: "y",}
+              });
+            },1000)
+          } else {
+            setTimeout(()=>{
+              this.$router.push({
+                name: 'groupTourOrder',
+                query: {blank: "y",}
+              });
+            },1000)
+          }
+          
         }
       }, null)
     },

src/components/dmc/manager/dmcTotalTable.vue

@@ -455,7 +455,7 @@
           query: {
             "id": obj.TCIDS,
             NewCombinationNum:outItem.NewCombinationNum,
-            isUpdate: false,
+            isUpdate: true,
             blank: 'y',
             tab: title
           }