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

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">