diff --git a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
index f45ca991..35699fc1 100644
--- a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
@@ -1,15 +1,15 @@
 <template>
   <XdPageContainer >
         <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-            <el-form-item label="" prop="billCode" label-width="80px">
+            <el-form-item label="" prop="settleBillNo" label-width="80px">
                   <div slot="label">
-                      <el-radio-group class="query-label" v-model="queryOrderType">
+                      <el-radio-group class="query-label" v-model="queryParams.queryOrderType">
                         <el-radio :key="1" label="1">运单号</el-radio>
                         <el-radio :key="2" label="2">账单号</el-radio>
                       </el-radio-group>
                   </div>
                   <XdTextareaInput
-                    v-model="queryParams.billCode"
+                    v-model="queryParams.settleBillNo"
                     :placeholder="$t('多个流水号逗号或换行隔开')"
                     clearable
                     :rows="2"
@@ -248,6 +248,7 @@ export default {
       daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
+
         pageNum: 1,
         pageSize: 20,
         settleBillNo: null,
@@ -296,6 +297,7 @@ export default {
         confirmSiteCode: null,
         remark: null,
         delFlag: null,
+        queryOrderType:null,
         params:{
           billCode:null,
           canOpenBill:1,
@@ -306,7 +308,7 @@ export default {
    watch: {
   },
   created() {
-    this.queryOrderType="1"
+    this.queryParams.queryOrderType="1";
     this.getList();
   },
 
@@ -315,10 +317,12 @@ export default {
   getList() {
       this.loading = true;
 
+      console.log("this.queryParams.queryOrderType==>"+this.queryParams.queryOrderType);
       // 按运单查询时的处理
-      if(this.queryOrderType==1){
+      if(this.queryParams.queryOrderType=="1"){
         this.queryParams.params.billCode=this.queryParams.settleBillNo;
-        this.queryParams.settleBillNo=null;
+      }
+      else if(this.queryParams.queryOrderType=="2"){
       }
 
       console.log("====>this.$store.getters.ownerSiteCode==>",this.$store.getters.ownerSiteCode)
diff --git a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
index 9e5fb68e..1420c3ec 100644
--- a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
@@ -29,85 +29,16 @@
 
           </el-col>
 
-          <!-- <el-col :span="8">
-            <el-form-item label="开票抬头" prop="companyTaxNo">
-              <span slot="label">
-                <span style="color: red">开票抬头</span>
-              </span>
-              <CustomerInvoiceInfoPicker v-model="form.companyTaxNo" placeholder="开票抬头" @onChange="onCustomerInvoiceInSelect" > </CustomerInvoiceInfoPicker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="开票税号" prop="companyTaxNo">
-              <el-input v-model="form.companyTaxNo" placeholder="开票税号" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item label="开户行" prop="bankName">
-              <el-input v-model="form.bankName" placeholder="开户行" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item label="开户账号" prop="bankAccNo">
-              <el-input v-model="form.bankAccNo" placeholder="开户账号" disabled/>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="6">
-            <el-form-item label="开票电话" prop="companyTel">
-              <el-input v-model="form.companyTel" placeholder="开票电话" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="18">
-            <el-form-item label="开票地址" prop="companyAddress">
-              <el-input v-model="form.companyAddress" rows="1" placeholder="开票地址" disabled/>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="8">
-            <el-form-item label="联系人" prop="contact">
-              <el-input v-model="form.contact" placeholder="联系人" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="联系电话" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="邮箱" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="邮寄地址" prop="recieveAddress">
-              <el-input v-model="form.recieveAddress" type="textarea" rows="1" placeholder="纸质发票邮寄地址" disabled/>
-            </el-form-item>
-          </el-col> -->
 
           <el-col :span="24">
             <el-form-item label="开票账单" prop="settleBillNo">
               <span slot="label">
                 <span style="color: red">开票账单</span>
               </span>
-              <!-- <el-input v-model="form.settleBillNo" rows="2" type="textarea" placeholder="" disabled /> -->
-
               <el-input v-model="form.settleBillName" rows="2" type="textarea" placeholder="" disabled />
+            </el-form-item>
+          </el-col>
 
-              <!-- <SettleBillPicker v-model="form.settleBillNo" @onChange="onSelectBill"> </SettleBillPicker> -->
-              <!-- <el-input v-model="form.settleBillNo"  placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
-                <i slot="suffix" class="iconfont">&#xe656;</i>
-              </el-input> -->
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="8">
-            <el-form-item label="开票上限" prop="openMoneyMax">
-              <el-input v-model="form.openMoneyMax" placeholder="" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-          </el-col> -->
           <!-- <el-col :span="24">
             <el-form-item label="运单号" prop="params.billCodeStr" >
               <el-input v-model="form.params.billCodeStr" rows="2" type="textarea" placeholder="部分开票请填写单号,多单请使用逗号隔开" />
@@ -234,13 +165,11 @@ export default {
 
         this.reset();
 
-        console.log("===>billList==>",this.billList);
-        console.log("===>this.form==>",this.form);
         let maxFee=0;
         if(this.billList){
             this.form.settleBillNo="";
+            this.form.settleBillName="";
             this.billList.forEach(item=>{
-              console.log("===>this.item==>",item);
               this.form.settleBillNo=this.form.settleBillNo+item.settleBillNo+",";
               this.form.settleBillName= this.form.settleBillName+item.settleBillName+",";
               this.form.openMoneyMax=this.form.openMoneyMax+item.recMoney;
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index 6f7bf9b0..5d1f825d 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -182,7 +182,7 @@
                  v-hasPermi="['emis:emisSettleSubBill:setBillErrorBySite']"
                >置账单异常</el-button>
              </el-col> -->
-             <el-col :span="1.5" v-if="activeTab=='waitConfirm' || activeTab=='confirmNotBill' ">
+             <el-col :span="1.5" v-if="activeTab=='confirmNotBill' || activeTab=='hasConfirm' ">
                <el-button
                  type="danger"
                  plain