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

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -26,6 +26,9 @@
     .page_CompanyAccDetail .singeRowTable tr td{
       font-size: 14px;
     }
+    .PlatHebing td{
+      padding:5px;
+    }
 </style>
 <template>
     <div  class='flexOne page_CompanyAccDetail'>
@@ -191,7 +194,7 @@
         </div>
       <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
         <p class="_addChuNa_tit"><span>{{count}}</span>{{$t('fnc.a_hbtips')}} <span>{{ moneyFormat(allWPrice) }}</span> {{$t('fnc.a_hbtips2')}} <span>{{ moneyFormat(allBPrice) }}</span> </p>
-        <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;">
+        <table border="1" bordercolor="#D2D2D2" class="PlatHebing" style="border-collapse:collapse;text-align: center;">
           <template>
             <tr >
               <th height="34px">{{$t('fnc.zhfenlei')}}</th>
@@ -325,6 +328,15 @@
               </el-date-picker>
             </td>
           </tr>
+          <tr>
+            <td>交易流水号</td>
+            <td colspan="2">
+              <el-input v-model="addMsg.AccountNumber" type="text"></el-input>
+            </td>
+            <td colspan="4">
+              <span style="color:red;">外交平台需录入交易流水号</span>
+            </td>
+          </tr>
         </table>
         <div slot="footer" class="dialog-footer">
           <button class="normalBtn" type="primary" @click="submitAddChuNa">{{$t('pub.saveBtn')}}</button>
@@ -399,6 +411,8 @@ export default {
             RemitterName:'',
             TradeDate:'',
             BankList:[],
+            //交易流水号
+            AccountNumber:''
           },
           AccListT:[],
           accountListT:[],

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -361,7 +361,7 @@
       <button class="normalBtn" @click="dialogFormVisible2 = true">{{$t('ios.tonggei')}}</button>
       <button class="hollowFixedBtn" @click="dialogFormVisible = true">{{$t('ios.jujue')}}</button>
     </div>
-    <div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1 && (EmployeeId === detail.CreateBy || EmployeeId === 1)">
+    <div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1 && (EmployeeId === detail.CreateById || EmployeeId === 1)">
       <button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button>
     </div>
     <div class="imd_img_box">