md

src/views/emis/EmisBaseTools/SettleBillPicker.vue

@@ -101,6 +101,7 @@
         let queryParams = {
           pageNum:1,
           pageSize:10,
+          blConfirmSite:1,
           settleBillName:val
         };
         listEmisSettleBill(queryParams).then(response => {

src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue

@@ -42,8 +42,15 @@ export default {
   created() {
   },
   methods: {
-    handleTabsClick(){
+    handleTabsClick(tab, event) {
-
+        // console.log(tab, event);
+        if (tab.name == 'billList') {
+          // this.queryParams.blConfirmCenter=null;
+        }
+        else if (tab.name == 'dtlList') {
+          // this.queryParams.blConfirmCenter='0';
+        }
+       this.getList();
     },
     onSelectApply(item) {
       let old=this.billTabs.find(mItem=>mItem.applySeqNo==item.applySeqNo);

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

@@ -470,6 +470,13 @@ import OpenBillForm from '@/views/emis/emisSettleInvoiceRecord/OpenBillForm';
 export default {
   name: "CenterInvoiceRecordDealListPanel",
   components: { elDateSimplePicker,OpenBillForm },
+  props: {
+      invoiceStatus:{
+        type: String,
+        required: false
+      },
+
+  },
   dicts: [
   ],
   data() {
@@ -555,13 +562,19 @@ export default {
     };
   },
   created() {
-    this.queryParams.invoiceStatus='0';
+    this.queryParams.invoiceStatus=this.invoiceStatus;
     this.getList();
   },
   methods: {
     handleSendDbClick(row){
       this.$emit("onSelect",row);
     },
+    watch: {
+      invoiceStatus(newVal,oldVal) {
+        this.queryParams.invoiceStatus=this.invoiceStatus;
+        this.getList();
+     },
+    },
     handleRefuse(row){
 
     },

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

@@ -386,8 +386,9 @@
       <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" width="100" >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.invoiceStatus=='0'" type="info">未开票</el-tag>
-          <el-tag v-if="scope.row.invoiceStatus=='1'" type="success">已开票</el-tag>
+          <el-tag v-if="scope.row.invoiceStatus=='1'" type="success">开票中</el-tag>
-          <el-tag v-if="scope.row.invoiceStatus=='2'" type="warning">开票异常</el-tag>
+          <el-tag v-if="scope.row.invoiceStatus=='2'" type="warning">已开票</el-tag>
+          <el-tag v-if="scope.row.invoiceStatus=='3'" type="warning">开票异常</el-tag>
         </template>
       </el-table-column>
         <!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
@@ -404,14 +405,14 @@
       <el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" :show-overflow-tooltip="true"/>
       <!-- <el-table-column :label="$t('税类型')" align="center" prop="realTaxType" min-width="100" /> -->
       <!-- <el-table-column :label="$t('开票上限')" align="center" prop="openMoneyMax" min-width="100" /> -->
-      <el-table-column :label="$t('开票金额')" align="center" prop="openMoney" min-width="100" />
+      <el-table-column :label="$t('实际开票金额')" align="center" prop="openMoney" min-width="150" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="100" />
+      <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="170" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('发票下载路径')" align="center" prop="filePath" min-width="170" :show-overflow-tooltip="true"/>
 
       <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" /> -->
@@ -424,10 +425,10 @@
           <el-tag v-if="scope.row.blAudit=='2'" type="warning">审核不通过</el-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="100" /> -->
+      <el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="170" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('审核人')" align="center" prop="auditManCode" min-width="100" />
+      <el-table-column :label="$t('审核人')" align="center" prop="auditManName" min-width="100" />
       <!-- <el-table-column :label="$t('审核站点')" align="center" prop="auditSiteCode" min-width="100" /> -->
-      <el-table-column :label="$t('操作人')" align="center" prop="opManCode" min-width="100" />
+      <el-table-column :label="$t('操作人')" align="center" prop="opManName" min-width="100" />
       <!-- <el-table-column :label="$t('操作时间')" align="center" prop="opDate" min-width="100" /> -->
       <!-- <el-table-column :label="$t('操作站点')" align="center" prop="opSiteCode" min-width="100" /> -->
       <!-- <el-table-column :label="$t('开票渠道编号')" align="center" prop="openChId" min-width="100" /> -->
@@ -435,6 +436,13 @@
       <!-- <el-table-column :label="$t('开票渠道描述')" align="center" prop="openChStatusDesc" min-width="100" /> -->
       <!-- <el-table-column :label="$t('使用的开票企业代码')" align="center" prop="openComCode" min-width="100" /> -->
 
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>