diff --git a/src/api/emis/emisInvoiceCancellation.js b/src/api/emis/emisInvoiceCancellation.js
index 828566b7..f67f6fa7 100644
--- a/src/api/emis/emisInvoiceCancellation.js
+++ b/src/api/emis/emisInvoiceCancellation.js
@@ -62,3 +62,20 @@ export function rejectEmisInvoiceCancellation(data) {
     data: data
   })
 }
+
+//红冲发票作废申请POST请求
+export function addInvoiceReversalRed(data) {
+  return request({
+    url: '/emis/emisInvoiceCancellation/red',
+    method: 'post',
+    data: data
+  })
+}
+//红冲编辑
+export function updateInvoiceReversalRed(data) {
+  return request({
+    url: 'emis/emisInvoiceCancellation/red/edit',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/emis/emisSettleBill/InvoiceReversalList.vue b/src/views/emis/emisSettleBill/InvoiceReversalList.vue
index 22fecbca..c64a8e36 100644
--- a/src/views/emis/emisSettleBill/InvoiceReversalList.vue
+++ b/src/views/emis/emisSettleBill/InvoiceReversalList.vue
@@ -6,10 +6,22 @@
                 <el-col :span="8">
                     <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
                         <el-col :span="24">
-                            <el-form-item label="发票申请序号" prop="applySeqNo">
+                            <!-- <el-form-item label="发票申请序号" prop="applySeqNo">
                                 <XdTextareaInput v-model="queryParams.params.applySeqNo"
                                     :placeholder="$t('多个流水号逗号或换行隔开')" clearable :rows="4" />
-                            </el-form-item>
+                            </el-form-item> -->
+                          <el-form-item label="" prop="queryCode" label-width="120px">
+                            <div slot="label">
+                                <el-radio-group class="query-label" v-model="queryOrderType">
+                                <el-radio :key="4" label="4">发票申请序号</el-radio>
+                                <el-radio :key="1" label="1">运单号</el-radio>
+                                <el-radio :key="2" label="2">账单号</el-radio>
+                                <el-radio :key="3" label="3">发票号</el-radio>
+                                </el-radio-group>
+                            </div>   
+                            <XdTextareaInput v-model="queryCode" :placeholder="$t('多个流水号逗号或换行隔开')"
+                                        clearable :rows="4" />
+                         </el-form-item>
                         </el-col>
                         <el-col :span="24">
                             <el-form-item label="登记时间" prop="dateTimeRange">
@@ -32,14 +44,44 @@
                             clearable>
                         </EmisSiteSimplePicker>
                     </el-form-item>
-
+                    <el-form-item label="开票状态" prop="invoiceStatus">
+                        <el-select clearable v-model="queryParams.invoiceStatus" placeholder="请选择" style="width:100%">
+                            <el-option label="已开票" :value="1"></el-option>
+                            <el-option label="已作废" :value="2"></el-option>
+                        </el-select>
+                     </el-form-item>
+                     <el-form-item label="开票抬头" prop="companyName">
+                        <el-input
+                        v-model="queryParams.params.companyName"
+                        :placeholder="$t('开票抬头')"
+                        clearable
+                        />
+                     </el-form-item>
+                       <el-form-item label="开票主体" prop="salerCompanyName">
+                            <BaseInvoiceInfoFullNamePicker v-model="queryParams.salerCompanyName" :placeholder="$t('开票主体')"  isInitiated="true" :disabled="false"></BaseInvoiceInfoFullNamePicker>
+                        </el-form-item>
+                        <el-form-item label="开票金额" prop="applyMoney">
+                            <el-input
+                            v-model="queryParams.params.applyMoney"
+                            :placeholder="$t('开票金额')"
+                            clearable
+                            />
+                        </el-form-item>
+                        <el-form-item label="月结客户" prop="custNo">
+                            <AllMonthpayAccountPicker v-model="queryParams.params.custNo" :placeholder="$t('请选择月结客户')"
+                                multiple clearable></AllMonthpayAccountPicker>
+                        </el-form-item>
+                        <el-form-item label="销售联系人" prop="salesmen">
+                            <EmpNamePicker1 v-model="queryParams.params.salesmen" :placeholder="$t('请选择销售联系人')" multiple clearable>
+                            </EmpNamePicker1>
+                        </el-form-item>
                 </el-col>
             </el-row>
         </SearchForm>
         <XdTable ref="refTable" slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight) + 'px'"
             border stripe size="mini" storageName="invoiceReversalList_main" :data="invoiceCancellationList"
             :showSearch.sync="showSearch" :queryParams="queryParams" :total="total" @queryTable="getList"
-            @selection-change="handleSelectionChange" @row-dblclick="handleView">
+            @selection-change="handleSelectionChange" @row-dblclick="handleView" v-loading="loading">
 
             <div slot="toolbar">
                 <el-row :gutter="10" class="mb8">
@@ -62,6 +104,14 @@
                         <el-button type="primary" plain :disabled="single" size="mini" @click="handleView"
                             v-hasPermi="['emis:emisInvoiceCancellation:query']">查看</el-button>
                     </el-col>
+                    <el-col :span="1.5">    
+                        <el-button type="primary" plain size="mini" @click="handleReduction" :disabled="single || selectedRows[0].auditStatus!=='1' || selectedRows[0].redInvoiceNo!==null"
+                            v-hasPermi="['emis:emisInvoiceCancellation:red']">红冲发票</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button  plain size="mini" @click="handleReductionEdit" :disabled="single  || selectedRows[0].redInvoiceNo==='' || selectedRows[0].redInvoiceNo == null"
+                            v-hasPermi="['emis:emisInvoiceCancellation:redEdit']">修改红冲发票号</el-button>
+                    </el-col>
                 </el-row>
             </div>
 
@@ -73,19 +123,21 @@
                 min-width="150" />
             <el-table-column :label="$t('账单月份')" align="center" prop="billMonth" min-width="150" />
             <el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="150" />
-            <el-table-column :label="$t('申请金额')" align="center" prop="emisSettleInvoiceRecord.applyMoney"
-                min-width="150" />
+           
             <el-table-column :label="$t('加开税点')" align="center" prop="emisSettleInvoiceRecord.addTaxRate"
-                min-width="150" />
+            min-width="150" />
             <el-table-column :label="$t('加开金额')" align="center" prop="emisSettleInvoiceRecord.addOpenMoney"
-                min-width="150" />
+            min-width="150" />
             <el-table-column :label="$t('已收金额')" align="center" prop="emisSettleInvoiceRecord.recedMoney"
-                min-width="150" />
+            min-width="150" />
             <el-table-column :label="$t('发票申请序号')" align="center" prop="emisSettleInvoiceRecord.applySeqNo" min-width="150" />
-            <el-table-column :label="$t('开票抬头')" align="center" prop="emisSettleInvoiceRecord.companyName"
-                min-width="150" />
-            <el-table-column :label="$t('开票税号')" align="center" prop="emisSettleInvoiceRecord.companyTaxNo"
-                min-width="150" />
+            <el-table-column :label="$t('开票税号')" align="center" prop="emisSettleInvoiceRecord.companyTaxNo" min-width="150" />
+            <el-table-column :label="$t('开票主体')" align="center" prop="emisSettleInvoiceRecord.salerCompanyName" min-width="150" />
+            <el-table-column :label="$t('开票抬头')" align="center" prop="emisSettleInvoiceRecord.companyName"min-width="150" />
+            <el-table-column :label="$t('开票金额')" align="center" prop="emisSettleInvoiceRecord.applyMoney" min-width="150" />
+            <el-table-column :label="$t('发票号')" align="center" prop="emisSettleInvoiceRecord.invoiceNo" min-width="150" />
+            <el-table-column :label="$t('红冲发票号')" align="center" prop="redInvoiceNo" min-width="150" />
+            <el-table-column :label="$t('开票时间')" align="center" prop="emisSettleInvoiceRecord.applyDate" min-width="150" />
             <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="150" />
             <el-table-column :label="$t('申请人')" align="center" prop="applyManName" min-width="150" />
             <el-table-column :label="$t('申请网点')" align="center" prop="applySiteName" min-width="150" />
@@ -100,10 +152,21 @@
                     <el-tag type="danger" v-if="scope.row.auditStatus === '3'">已撤销</el-tag>
                 </template>
             </el-table-column>
+               <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" min-width="150" >
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.invoiceStatus=='1'" >已开票</el-tag>
+                    <el-tag v-if="scope.row.invoiceStatus=='2'" >已作废</el-tag>
+                </template>
+            </el-table-column>  
             <!-- <el-table-column :label="$t('登记网点')" align="center" prop="siteName" min-width="150" /> -->
             <el-table-column :label="$t('驳回原因')" align="center" prop="auditRejectReason" min-width="150" />
             <!-- <el-table-column :label="$t('修改人')" align="center" prop="updateByName" min-width="150" /> -->
             <!-- <el-table-column :label="$t('修改时间')" align="center" prop="updateTime" min-width="150" /> -->
+            <el-table-column :label="$t('红冲发票登记人')" align="center" prop="redCreateByName" min-width="150" />
+            <el-table-column :label="$t('红冲发票登记网点')" align="center" prop="redCreateSiteName" min-width="150" />
+            <el-table-column :label="$t('发票作废时间')" align="center" prop="redCreateTime" min-width="150" />
+            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmens" min-width="150" />
+            <el-table-column :label="$t('对应面单号')" align="center" prop="billCodes" min-width="150" />
         </XdTable>
         <!-- 作废申请 弹窗 -->
         <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag
@@ -111,6 +174,12 @@
             <InvoiceCancellationForm ref="invoiceCancellationForm" @on-cancel="handleCancel" :openType="openType"
                 :id="currentId"></InvoiceCancellationForm>
         </el-dialog>
+        <!-- 红冲发票 弹窗 -->
+        <el-dialog :title="redTitleForm" :visible.sync="redOpenForm" width="40%" :destroy-on-close="true" v-dialogDrag
+            append-to-body>
+            <InvoiceReversalRedForm ref="invoiceReversalRedForm" @on-cancel="handleRedCancel" @on-submit-success="handleRedSubmitSuccess"
+                :id="currentId" :redInvoiceNo="currentRedInvoiceNo" :redOpenType="redOpenType"></InvoiceReversalRedForm>
+        </el-dialog>
     </XdPageContainer>
 </template>
 <script>
@@ -118,14 +187,22 @@ import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import InvoiceCancellationForm from '@/views/emis/emisWaybillAjustApply/InvoiceCancellationForm.vue';
 import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker2.vue';
+import InvoiceReversalRedForm from '@/views/emis/emisSettleBill/InvoiceReversalRedForm.vue';
 import { listEmisInvoiceCancellation, passEmisInvoiceCancellation, rejectEmisInvoiceCancellation } from '@/api/emis/emisInvoiceCancellation';
+import BaseInvoiceInfoFullNamePicker from '@/views/emis/EmisBaseTools/BaseInvoiceInfoFullNamePicker.vue';
+import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import {timeFormat} from '@/utils/dateUtils'
+
 export default {
     name: 'InvoiceReversalList',
     components: {
         elDateAdvPicker,
         AllMonthpayAccountPicker,
         InvoiceCancellationForm,
-        EmisSiteSimplePicker
+        EmisSiteSimplePicker,
+        InvoiceReversalRedForm,
+        BaseInvoiceInfoFullNamePicker,
+        EmpNamePicker1,
     },
     data() {
         return {
@@ -141,17 +218,29 @@ export default {
             invoiceCancellationList: [],
             showSearch: true,
             openForm: false,
+            redOpenForm: false,
             openType: null,
+            redOpenType: null,
             titleForm: null,
+            redTitleForm: null,
             dateTimeRange: [],
             currentId: null,
+            currentRedInvoiceNo:null,
             selectedRows:[],
+            queryCode:null,
+            queryOrderType:"4",
             queryParams: {
                 pageNum: 1,
                 pageSize: 20,
                 auditStatus: null,
+                invoiceStatus:null,
+                companyName:null,
+                salerCompanyName:null,
                 params: {
                     applySeqNo: null,
+                    applyMoney: null,
+                    custNo: null,
+                    salesmen: null,
                 }
             }
         }
@@ -162,7 +251,23 @@ export default {
         },
     },
     created() {
-        this.getList();
+        //登记时间默认当月时间
+        
+      let start = new Date()
+      start.setDate(1)
+      start.setHours(0,0,0,0)
+
+      let end = new Date()
+      var currentMonth = end.getMonth()
+      var nextMonth = ++currentMonth
+      var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1)
+      var oneDay = 1000 * 60 * 60 * 24
+
+      end=new Date(nextMonthFirstDay - oneDay)
+      end.setHours(23,59,59,0)
+
+      this.dateTimeRange=[timeFormat(start), timeFormat(end)]
+      this.getList();
     },
     methods: {
         getList() {
@@ -178,7 +283,6 @@ export default {
         },
         handleView(row) {
             this.currentId = row.id || this.currentId;
-            console.log('handleView', this.currentId);
             this.titleForm = "发票作废详情";
             this.openForm = true;
             this.openType = "view";
@@ -188,6 +292,7 @@ export default {
             this.single = selection.length !== 1
             this.multiple = !selection.length
             this.currentId = selection.length ? selection[0].id : null;
+            this.currentRedInvoiceNo = selection.length ? selection[0].redInvoiceNo : null;
             this.selectedRows = selection;
         },
         handlePass() {
@@ -258,8 +363,32 @@ export default {
         handleCancel() {
             this.openForm = false;
         },
+        handleRedCancel() {
+            this.redOpenForm = false;
+        },
         initQueryParams() {
             let params = { ...this.queryParams };
+            if(this.queryOrderType=='1'){
+                params.params.billCode = this.queryCode;
+                params.params.applySeqNo = null;
+                 params.params.invoiceNo = null;
+                 params.params.settleBillNo = null;
+            }else if(this.queryOrderType=='2'){
+                params.params.settleBillNo = this.queryCode;
+                params.params.billCode = null;
+                 params.params.applySeqNo = null;
+                 params.params.invoiceNo = null;
+            }else if(this.queryOrderType=='3'){
+                params.params.invoiceNo = this.queryCode;
+                params.params.billCode = null;
+                 params.params.applySeqNo = null;
+                 params.params.settleBillNo = null;
+            }else{
+                params.params.applySeqNo = this.queryCode;
+                 params.params.billCode = null;
+                 params.params.invoiceNo = null;
+                 params.params.settleBillNo = null;
+            }
             params = this.addDateRange(params, this.dateTimeRange, 'applyDate');
             return params;
         },
@@ -326,8 +455,40 @@ export default {
                 if (j === 'emisSettleInvoiceRecord.applySeqNo') {
                     return v['emisSettleInvoiceRecord']['applySeqNo'];
                 }
+                if (j === 'emisSettleInvoiceRecord.salerCompanyName') {
+                    return v['emisSettleInvoiceRecord']['salerCompanyName'];
+                }
+                if (j === 'emisSettleInvoiceRecord.invoiceNo') {
+                    return v['emisSettleInvoiceRecord']['invoiceNo'];
+                }
+                if (j === 'emisSettleInvoiceRecord.createTime') {
+                    return v['emisSettleInvoiceRecord']['createTime'];
+                }
+                if(j === 'invoiceStatus'){
+                   if (v[j] === '1') {
+                        return '已开票'
+                    } else{
+                        return '已作废'
+                    }
+                }
                 return v[j]
             }))
+        },
+        handleReduction(row) {
+            this.currentRedInvoiceNo = null;
+            this.redOpenForm = true;
+            this.redOpenType = 'add';
+            this.redTitleForm = '红冲发票';
+        },
+        handleReductionEdit(row) {
+            this.redOpenType = 'edit';
+            this.currentRedInvoiceNo = this.selectedRows[0].redInvoiceNo;
+            this.redOpenForm = true;
+            this.redTitleForm = '编辑红冲发票';
+        },
+        handleRedSubmitSuccess() {
+            this.redOpenForm = false;
+            this.getList();
         }
     }
 }
diff --git a/src/views/emis/emisSettleBill/InvoiceReversalRedForm.vue b/src/views/emis/emisSettleBill/InvoiceReversalRedForm.vue
new file mode 100644
index 00000000..8c7ab317
--- /dev/null
+++ b/src/views/emis/emisSettleBill/InvoiceReversalRedForm.vue
@@ -0,0 +1,107 @@
+<template>
+    <div>
+        <el-form :model="form" ref="form" :rules="rules" label-position="left" label-width="95px">
+            <el-form-item label="红冲发票号" prop="redInvoiceNo">
+                <el-input v-model="form.redInvoiceNo" placeholder="请输入红冲发票号" clearable></el-input>
+            </el-form-item>
+            <div style="text-align: right;margin-bottom: 10px;">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-form>
+    </div>
+</template>
+<script>
+import { addInvoiceReversalRed, updateInvoiceReversalRed } from '@/api/emis/emisInvoiceCancellation';
+export default {
+    name: 'InvoiceReversalRedForm',
+    props: {
+        id: {
+            type: Number,
+            default: null
+        },
+        redInvoiceNo: {
+            type: String,
+            default: ''
+        },
+        redOpenType: {
+            type: String,
+            default: 'add'
+        }
+    },
+    data() {
+
+        return {
+            form: {
+                redInvoiceNo:null
+            },
+            rules: {
+                redInvoiceNo: [
+                    //纯数字
+                    { required: true, message: '请输入红冲发票号', trigger: 'blur' },
+                    { pattern: /^\d+$/, message: '请输入纯数字', trigger: 'blur' }
+                ],
+            }
+        }
+
+    },
+    watch: {
+        "id": {
+            handler(newValue, oldValue) {
+                this.id = newValue;
+                this.initData();
+            },
+            deep: true
+        },
+        "redOpenType": {
+            handler(newValue, oldValue) {
+                this.redOpenType = newValue;
+                this.initData();
+            },
+            deep: true
+        },
+    },
+    created() {
+        this.initData();
+    },
+    methods: {
+        initData() {
+         this.form.redInvoiceNo = this.redInvoiceNo;
+         this.form.id = this.id;
+        },
+        async submitForm() {
+            // const validSearch = await this.$refs.searchForm.validate();
+            this.$refs.form.validate(validate => {
+                if (validate) {
+                    if (!this.redInvoiceNo) {
+                        addInvoiceReversalRed(this.form).then(res => {
+                            if (res.code === 200) {
+                                this.$modal.msgSuccess("提交成功");
+                                this.$emit("on-submit-success");
+                            }
+                        });
+                    } else {
+                        updateInvoiceReversalRed({ id: this.id, ...this.form }).then(res => {
+                            if (res.code === 200) {
+                                this.$modal.msgSuccess("提交成功");
+                                this.$emit("on-submit-success");
+                            }
+                        });
+                    }
+                }
+            })
+
+        },
+        cancel() {
+            this.reset();
+            this.$emit("on-cancel");
+        },
+        reset() {
+            this.form = {
+                redInvoiceNo: ''
+            }
+        }
+    }
+}
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/emis/emisWaybillAjustApply/InvoiceCancellationForm.vue b/src/views/emis/emisWaybillAjustApply/InvoiceCancellationForm.vue
index 877ff2d0..8ef8e927 100644
--- a/src/views/emis/emisWaybillAjustApply/InvoiceCancellationForm.vue
+++ b/src/views/emis/emisWaybillAjustApply/InvoiceCancellationForm.vue
@@ -13,18 +13,24 @@
             <!-- </el-form> -->             
             <!-- 数据表格 -->
             <el-table :data="invoiceList" style="width: 100%; margin-bottom: 20px;" border>
-                <el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="150" />
-                <el-table-column :label="$t('账单号')" align="center" prop="settleBillNo" min-width="150" />
-                <el-table-column :label="$t('金额')" align="center" prop="applyMoney" min-width="150" />
-                <el-table-column :label="$t('状态')" align="center" prop="invoiceStatus" min-width="150">
+                <el-table-column :label="$t('账单名称')" align="center" prop="emisSettleInvoiceRecord.settleBillName" min-width="150" />
+                <el-table-column :label="$t('账单号')" align="center" prop="emisSettleInvoiceRecord.settleBillNo" min-width="150" />
+                <el-table-column :label="$t('开票金额')" align="center" prop="emisSettleInvoiceRecord.applyMoney" min-width="150" />
+                <el-table-column :label="$t('状态')" align="center" prop="emisSettleInvoiceRecord.invoiceStatus" min-width="150">
                     <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="warning">开票中</el-tag>   
-                        <el-tag v-if="scope.row.invoiceStatus == '2'" type="success">已开票</el-tag>
-                        <el-tag v-if="scope.row.invoiceStatus == '3'" type="error">开票异常</el-tag>
+                        <el-tag v-if="scope.row.emisSettleInvoiceRecord.invoiceStatus == '0'" type="info">未开票</el-tag>
+                        <el-tag v-if="scope.row.emisSettleInvoiceRecord.invoiceStatus == '1'" type="warning">开票中</el-tag>   
+                        <el-tag v-if="scope.row.emisSettleInvoiceRecord.invoiceStatus == '2'" type="success">已开票</el-tag>
+                        <el-tag v-if="scope.row.emisSettleInvoiceRecord.invoiceStatus == '3'" type="error">开票异常</el-tag>
                     </template>
                 </el-table-column>
-                <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="150" />
+                <el-table-column :label="$t('申请时间')" align="center" prop="emisSettleInvoiceRecord.applyDate" min-width="150" />
+                <el-table-column :label="$t('开票主体')" align="center" prop="emisSettleInvoiceRecord.salerCompanyName" min-width="150" />
+                <el-table-column :label="$t('开票抬头 ')" align="center" prop="emisSettleInvoiceRecord.companyName" min-width="150" />
+                <el-table-column :label="$t('发票号')" align="center" prop="emisSettleInvoiceRecord.invoiceNo" min-width="150" />
+                <el-table-column :label="$t('开票时间')" align="center" prop="emisSettleInvoiceRecord.applyDate" min-width="150" />
+                <el-table-column :label="$t('对应运单号')" align="center" prop="billCodes" min-width="150" />
+                <el-table-column :label="$t('销售联系人')" align="center" prop="salesmens" min-width="150" />
             </el-table>
             <!-- 输入框 -->
             <el-form-item label="申请原因" prop="applyReason" class="label-top-item">
@@ -122,13 +128,15 @@ export default {
                     invoiceId:data.invoiceId,
                     applyReason: data.applyReason,
                     applyTextUrl: data.applyTextUrl,
-                    applySeqNo: data.emisSettleInvoiceRecord?.applySeqNo || ''
+                    applySeqNo: data.emisSettleInvoiceRecord?.applySeqNo || '',
+                    
                 }
                 this.fileList = this.form.applyTextUrl ? [{
                     name: this.form.applyTextUrl.split('/').pop(),
                     url: this.form.applyTextUrl
                 }] : [];
-                this.invoiceList = [data.emisSettleInvoiceRecord ]|| [];
+                // this.invoiceList = [data.emisSettleInvoiceRecord ]|| [];
+                this.invoiceList = [data]|| [];
             } else {
                 this.reset();
             }
diff --git a/src/views/emis/emisWaybillAjustApply/InvoiceCancellationList.vue b/src/views/emis/emisWaybillAjustApply/InvoiceCancellationList.vue
index f0164ef1..2699531f 100644
--- a/src/views/emis/emisWaybillAjustApply/InvoiceCancellationList.vue
+++ b/src/views/emis/emisWaybillAjustApply/InvoiceCancellationList.vue
@@ -6,10 +6,22 @@
                 <el-col :span="8">
                     <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
                         <el-col :span="24">
-                            <el-form-item label="发票申请序号" prop="applySeqNo">
+                          <el-form-item label="" prop="queryCode" label-width="120px">
+                            <div slot="label">
+                                <el-radio-group class="query-label" v-model="queryOrderType">
+                                <el-radio :key="4" label="4">发票申请序号</el-radio>
+                                <el-radio :key="1" label="1">运单号</el-radio>
+                                <el-radio :key="2" label="2">账单号</el-radio>
+                                <el-radio :key="3" label="3">发票号</el-radio>
+                                </el-radio-group>
+                            </div>   
+                            <XdTextareaInput v-model="queryCode" :placeholder="$t('多个流水号逗号或换行隔开')"
+                                        clearable :rows="4" />
+                            <!-- <el-form-item label="发票申请序号" prop="applySeqNo">
                                 <XdTextareaInput v-model="queryParams.params.applySeqNo" :placeholder="$t('多个流水号逗号或换行隔开')"
                                     clearable :rows="4" />
-                            </el-form-item>
+                            </el-form-item> -->
+                         </el-form-item>
                         </el-col>
                         <el-col :span="24">
                             <el-form-item label="登记时间" prop="dateTimeRange">
@@ -39,13 +51,26 @@
                         <AllMonthpayAccountPicker v-model="queryParams.params.custNo" :placeholder="$t('请选择月结客户')"
                             multiple clearable></AllMonthpayAccountPicker>
                     </el-form-item>
+                    <el-form-item label="开票状态" prop="invoiceStatus">
+                        <el-select clearable v-model="queryParams.invoiceStatus" placeholder="请选择" style="width:100%">
+                            <el-option label="已开票" :value="1"></el-option>
+                            <el-option label="已作废" :value="2"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="开票抬头" prop="companyName">
+                        <el-input
+                        v-model="queryParams.params.companyName"
+                        :placeholder="$t('开票抬头')"
+                        clearable
+                        />
+                    </el-form-item>
                 </el-col>
             </el-row>
         </SearchForm>
         <XdTable  ref="refTable" slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight) + 'px'" border stripe
             size="mini" storageName="invoiceCancellationList_main" :data="invoiceCancellationList"
             :showSearch.sync="showSearch" :queryParams="queryParams" :total="total" @queryTable="getList"
-            @selection-change="handleSelectionChange" @row-dblclick="handleView">
+            @selection-change="handleSelectionChange" @row-dblclick="handleView" v-loading="loading">
 
             <div slot="toolbar">
                 <el-row :gutter="10" class="mb8">
@@ -81,13 +106,19 @@
             <el-table-column :label="$t('账单编号')" align="center" prop="emisSettleInvoiceRecord.settleBillNo" min-width="150" />
             <el-table-column :label="$t('账单月份')" align="center" prop="billMonth" min-width="150" />
             <el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="150" />
-            <el-table-column :label="$t('申请金额')" align="center" prop="emisSettleInvoiceRecord.applyMoney" min-width="150" />
             <el-table-column :label="$t('加开税点')" align="center" prop="emisSettleInvoiceRecord.addTaxRate" min-width="150" />
             <el-table-column :label="$t('加开金额')" align="center" prop="emisSettleInvoiceRecord.addOpenMoney" min-width="150" />
             <el-table-column :label="$t('已收金额')" align="center" prop="emisSettleInvoiceRecord.recedMoney" min-width="150" />
             <el-table-column :label="$t('发票申请序号')" align="center" prop="emisSettleInvoiceRecord.applySeqNo" min-width="150" />
-            <el-table-column :label="$t('开票抬头')" align="center" prop="emisSettleInvoiceRecord.companyName" min-width="150" />
             <el-table-column :label="$t('开票税号')" align="center" prop="emisSettleInvoiceRecord.companyTaxNo" min-width="150" />
+            <el-table-column :label="$t('开票主体')" align="center" prop="emisSettleInvoiceRecord.salerCompanyName" min-width="150" />
+            <el-table-column :label="$t('开票抬头')" align="center" prop="emisSettleInvoiceRecord.companyName" min-width="150" />
+            <el-table-column :label="$t('开票金额')" align="center" prop="emisSettleInvoiceRecord.applyMoney" min-width="150" />
+            <el-table-column :label="$t('发票号')" align="center" prop="emisSettleInvoiceRecord.invoiceNo" min-width="150" />
+            <el-table-column :label="$t('开票时间')" align="center" prop="emisSettleInvoiceRecord.applyDate" min-width="150" />
+            <el-table-column :label="$t('对应面单号')" align="center" prop="billCodes" min-width="150" />
+            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmens" min-width="150" />
+
             <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="150" />
             <el-table-column :label="$t('申请人')" align="center" prop="applyManName" min-width="150" />
             <el-table-column :label="$t('申请网点')" align="center" prop="applySiteName" min-width="150" />
@@ -102,6 +133,12 @@
                       <el-tag type="danger" v-if="scope.row.auditStatus === '3'">已撤销</el-tag>
                 </template>
             </el-table-column>
+            <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" min-width="150" >
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.invoiceStatus=='1'" type="success">已开票</el-tag>
+                    <el-tag v-if="scope.row.invoiceStatus=='2'" type="danger">已作废</el-tag>
+                </template>
+            </el-table-column>
             <el-table-column :label="$t('驳回原因')" align="center" prop="auditRejectReason" min-width="150" />
             <!-- <el-table-column :label="$t('修改人')" align="center" prop="updateByName" min-width="150" />
             <el-table-column :label="$t('修改时间')" align="center" prop="updateTime" min-width="150" /> -->
@@ -150,10 +187,13 @@ export default {
             currentId:null,
             currentStatus:null,
             selectedRows:[],
+            queryCode:null,
+            queryOrderType:"4",
             queryParams: {
                 pageNum: 1,
                 pageSize: 20,
                 auditStatus:null,
+                invoiceStatus:null,
                 params:{
                     applySeqNo:null,
                     invoiceNo:null,
@@ -161,6 +201,7 @@ export default {
                     settleBillNo:null,
                     beginApplyDate:null,
                     endApplyDate:null,
+                    companyName:null,
                     salesmen:null,
                     payee:null,
                     custNo:null,
@@ -196,7 +237,6 @@ export default {
             this.openType="view";
         },
         handleCancel(row) {
-            console.log('row--撤销')
             //确认撤销吗
             const ids = row.id || this.ids;
             this.$modal.confirm('是否确认撤销').then(function () {
@@ -261,6 +301,27 @@ export default {
         },
         initQueryParams(){
             let params={...this.queryParams};
+             if(this.queryOrderType=='1'){
+                params.params.billCode = this.queryCode;
+                params.params.applySeqNo = null;
+                 params.params.invoiceNo = null;
+                 params.params.settleBillNo = null;
+            }else if(this.queryOrderType=='2'){
+                params.params.settleBillNo = this.queryCode;
+                params.params.billCode = null;
+                 params.params.applySeqNo = null;
+                 params.params.invoiceNo = null;
+            }else if(this.queryOrderType=='3'){
+                params.params.invoiceNo = this.queryCode;
+                params.params.billCode = null;
+                 params.params.applySeqNo = null;
+                 params.params.settleBillNo = null;
+            }else{
+                params.params.applySeqNo = this.queryCode;
+                 params.params.billCode = null;
+                 params.params.invoiceNo = null;
+                 params.params.settleBillNo = null;
+            }
             params = this.addDateRange(params, this.dateTimeRange,'applyDate');
             return params;
         },
@@ -327,6 +388,22 @@ export default {
                 if (j === 'emisSettleInvoiceRecord.applySeqNo') {
                     return v['emisSettleInvoiceRecord']['applySeqNo'];
                 }
+                if (j === 'emisSettleInvoiceRecord.salerCompanyName') {
+                    return v['emisSettleInvoiceRecord']['salerCompanyName'];
+                }
+                if (j === 'emisSettleInvoiceRecord.invoiceNo') {
+                    return v['emisSettleInvoiceRecord']['invoiceNo'];
+                }
+                if (j === 'emisSettleInvoiceRecord.createTime') {
+                    return v['emisSettleInvoiceRecord']['createTime'];
+                }
+                if(j === 'invoiceStatus'){
+                   if (v[j] === '1') {
+                        return '已开票'
+                    } else{
+                        return '已作废'
+                    }
+                }
                 return v[j]
             }))
         },