From c5c9b8ff16e4b8d13bb66c5f4b57bfb2d2341b49 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 9 Aug 2024 15:52:45 +0800
Subject: [PATCH] md

---
 .../InvoiceChRecordListReadOnly.vue           | 47 -------------------
 .../emis/emisSettleInvoiceChRecord/index.vue  | 28 +++++------
 .../emis/emisWaybill/waybillIsPrinted.vue     |  3 +-
 3 files changed, 15 insertions(+), 63 deletions(-)

diff --git a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue
index b31dd180..c0cdf714 100644
--- a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue
@@ -14,48 +14,7 @@
 
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  plain
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="handleAdd"
 
-                >新增航信开票</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  plain
-                  size="mini"
-                  :disabled="multiple"
-                  @click="handleSendHXToOpen"
-
-                >发送航信开票</el-button>
-              </el-col>
-                <!-- v-hasPermi="['emis:emisSettleInvoiceChRecord:edit']"
-              v-hasPermi="['emis:emisSettleInvoiceChRecord:add']" -->
-              <el-col :span="1.5">
-                <el-button
-                  type="success"
-                  plain
-                  icon="el-icon-edit"
-                  size="mini"
-                  :disabled="single"
-                  @click="handleUpdate"
-                >修改</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button
-                  type="danger"
-                  plain
-                  icon="el-icon-delete"
-                  size="mini"
-                  :disabled="multiple"
-                  @click="handleDelete"
-                >删除</el-button>
-              </el-col>
               <!-- v-hasPermi="['emis:emisSettleInvoiceChRecord:remove']" -->
 
               <!-- <el-col :span="1.5">
@@ -132,12 +91,6 @@
 
     </XdTable>
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <emisSettleInvoiceChRecordForm :id="currentId" :applyId="applyId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleInvoiceChRecordForm>
-    </el-dialog>
-
-
-
 
   </div>
 </template>
diff --git a/src/views/emis/emisSettleInvoiceChRecord/index.vue b/src/views/emis/emisSettleInvoiceChRecord/index.vue
index feafe221..eaaa604b 100644
--- a/src/views/emis/emisSettleInvoiceChRecord/index.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/index.vue
@@ -137,16 +137,16 @@
             <el-tag v-if="scope.row.openChStatus==3"  type="error" >开票失败</el-tag>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('开票金额')" align="center" prop="openMoney" width="100" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('开票金额')" align="center" prop="openMoney" width="80" :show-overflow-tooltip="true" />
 
-      <el-table-column :label="$t('开票公司')" align="center" prop="companyName" width="100" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('税号')" align="center" prop="companyTaxNo" width="100"  :show-overflow-tooltip="true" />
-      <!-- <el-table-column :label="$t('开票电话')" align="center" prop="companyTel" width="100" /> -->
-      <el-table-column :label="$t('开票地址')" align="center" prop="companyAddress" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('开户行')" align="center" prop="bankName" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('开户账号')" align="center" prop="bankAccNo" width="100" :show-overflow-tooltip="true"/>
-      <!-- <el-table-column :label="$t('联系人')" align="center" prop="contact" width="100" /> -->
-      <!-- <el-table-column :label="$t('联系电话')" align="center" prop="phone" width="100" /> -->
+      <el-table-column :label="$t('开票公司')" align="center" prop="companyName" width="170" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('税号')" align="center" prop="companyTaxNo" width="170"  :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('开票电话')" align="center" prop="companyTel" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('开票地址')" align="center" prop="companyAddress" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('开户行')" align="center" prop="bankName" width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('开户账号')" align="center" prop="bankAccNo" width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('联系人')" align="center" prop="contact" width="100" />
+      <el-table-column :label="$t('联系电话')" align="center" prop="phone" width="100" />
       <!-- <el-table-column :label="$t('税率')" align="center" prop="taxRate" width="100" :show-overflow-tooltip="true" /> -->
       <!-- <el-table-column :label="$t('发票投递邮箱')" align="center" prop="email" width="100" /> -->
       <el-table-column :label="$t('开票主体')" align="center" prop="salerCompanyName" width="100" :show-overflow-tooltip="true"  />
@@ -155,14 +155,14 @@
       <el-table-column :label="$t('主体地址')" align="center" prop="salerCompanyAddress" width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('主体银行')" align="center" prop="salerBankName" width="100" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('主体账号')" align="center" prop="salerBankAccNo" width="100" :show-overflow-tooltip="true" />
-      <!-- <el-table-column :label="$t('销方联系人')" align="center" prop="salerContact" width="100" /> -->
-      <!-- <el-table-column :label="$t('销方联系电话')" align="center" prop="salerPhone" width="100" /> -->
+      <el-table-column :label="$t('销方联系人')" align="center" prop="salerContact" width="100" />
+      <el-table-column :label="$t('销方联系电话')" align="center" prop="salerPhone" width="100" />
       <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" width="100" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('pdf下载路径')" align="center" prop="filePath" width="150" :show-overflow-tooltip="true"  />
       <!-- <el-table-column :label="$t('qr路径')" align="center" prop="qrPath" width="100" /> -->
-      <!-- <el-table-column :label="$t('操作人')" align="center" prop="opManCode" width="100" /> -->
-      <!-- <el-table-column :label="$t('操作时间')" align="center" prop="opDate" width="100" /> -->
-      <!-- <el-table-column :label="$t('操作站点')" align="center" prop="opSiteCode" width="100" /> -->
+      <el-table-column :label="$t('操作人')" align="center" prop="opManName" width="100" />
+      <el-table-column :label="$t('操作时间')" align="center" prop="opDate" width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作站点')" align="center" prop="opSiteName" width="100" />
       <!-- <el-table-column :label="$t('开票渠道编号')" align="center" prop="openChId" width="100" /> -->
 
         <el-table-column :label="$t('状态描述')" align="center" prop="openChStatusDesc" width="100" :show-overflow-tooltip="true"  />
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index fa60585c..97604940 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -566,10 +566,9 @@ export default {
         }
       }else{
         qParam={...this.queryParams}
+        qParam.params.isQueryPrintOrder=1;
       }
 
-      qParam.params.isQueryPrintOrder=1;
-
       return qParam;
     },
     /** 查询运单列表列表 */