md

src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue

@@ -26,7 +26,7 @@ import InvoiceDetailPanel from '@/views/emis/emisSettleInvoiceRecord/panel/Invoi
 
 
 export default {
-  name: "SiteInvoiceRecordApply",
+  name: "CenterInvoiceRecordDeal",
   components: {
     CenterInvoiceRecordDealListPanel,
     InvoiceDetailPanel

src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue

@@ -72,14 +72,13 @@
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <!--
+
       <el-table-column label="序号" align="center" width="60">
              <template slot-scope="scope">
                 <span v-text="getIndex(scope.$index)"> </span>
              </template>
       </el-table-column>
-      -->
+      <el-table-column :label="$t('流水号')" align="center" prop="reqNo" width="100" />
-      <!-- <el-table-column :label="$t('渠道请求号')" align="center" prop="reqNo" width="100" /> -->
       <!-- <el-table-column :label="$t('发票申请序号')" align="center" prop="applySeqNo" width="100" /> -->
       <!-- <el-table-column :label="$t('是否电子发票')" align="center" prop="blEcinv" width="100" /> -->
       <!-- <el-table-column :label="$t('申请开票类型')" align="center" prop="invoiceType" width="100" :show-overflow-tooltip="true" /> -->

src/views/emis/emisSettleInvoiceRecord/OpenBillForm.vue

@@ -4,11 +4,15 @@
       <el-descriptions title="账单信息" size="mini" border :column="4" v-if="emisSettleInvoiceRecord">
             <el-descriptions-item label="申请序号">{{ emisSettleInvoiceRecord.applySeqNo }}</el-descriptions-item>
             <el-descriptions-item label="申请时间">{{ emisSettleInvoiceRecord.applyDate }}</el-descriptions-item>
-            <el-descriptions-item label="申请人">{{ emisSettleInvoiceRecord.applyManCode }}</el-descriptions-item>
+            <el-descriptions-item label="申请人">{{ emisSettleInvoiceRecord.applyManName }}</el-descriptions-item>
             <el-descriptions-item label="账单编号">{{ emisSettleInvoiceRecord.settleBillNo }}</el-descriptions-item>
             <el-descriptions-item label="账单名称">{{ emisSettleInvoiceRecord.settleBillName }}</el-descriptions-item>
             <el-descriptions-item label="申请开票金额">{{ emisSettleInvoiceRecord.applyMoney }}</el-descriptions-item>
-            <el-descriptions-item label="开票类型">{{ emisSettleInvoiceRecord.invoiceType }}</el-descriptions-item>
+            <el-descriptions-item label="开票类型">
+              <span v-if="emisSettleInvoiceRecord.invoiceType==1"> 增值税电子普通发票</span>
+              <span v-if="emisSettleInvoiceRecord.invoiceType==2"> 增值税普通发票</span>
+              <span v-if="emisSettleInvoiceRecord.invoiceType==3"> 增值税专用发票</span>
+            </el-descriptions-item>
             <el-descriptions-item label="开票抬头">{{ emisSettleInvoiceRecord.companyName }}</el-descriptions-item>
             <el-descriptions-item label="开票税号">{{ emisSettleInvoiceRecord.companyTaxNo }}</el-descriptions-item>
             <el-descriptions-item label="开票电话">{{ emisSettleInvoiceRecord.companyTel }}</el-descriptions-item>

src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue

@@ -421,8 +421,8 @@
 
       <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="170" :show-overflow-tooltip="true"/>
 
-      <el-table-column :label="$t('申请人')" align="center" prop="applyManCode" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('申请人')" align="center" prop="applyManName" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('申请站点')" align="center" prop="applySiteCode" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('申请站点')" align="center" prop="applySiteName" min-width="100" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('异常描述')" align="center" prop="invoiceStatusDesc" min-width="100" :show-overflow-tooltip="true"/>
       <!-- <el-table-column :label="$t('纸质发票邮寄地址')" align="center" prop="recieveAddress" min-width="100" /> -->

src/views/emis/emisWaybill/centerWaybillList.vue

@@ -625,7 +625,7 @@ import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 import { formatSearchStr,deepClone } from '@/utils/index'
 
 export default {
-  name: "SendWaybillList",
+  name: "CenterWaybillList",
   // name: "DispatchWaybillList",
 
   components: {

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1127,12 +1127,12 @@ methods: {
                 // printDataList.push(customerItem);
 
                 // 主单
-                // let mainBillItem ={
+                let mainBillItem ={
-                //   "tplCode":"TAN-GM-130",
+                  "tplCode":"TAN-GM-130",
-                //   "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
+                  "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
-                //   "orderList":orderList.toString()
+                  "orderList":orderList.toString()
-                // }
+                }
-                // printDataList.push(mainBillItem);
+                printDataList.push(mainBillItem);