From 4d8c2a04d05e6e7a53c24eeb42c71bdf00829cd4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 26 Jul 2024 12:06:52 +0800
Subject: [PATCH] md

---
 .../InvoiceChRecordList.vue                   | 47 +++++++++++++------
 .../emisSettleInvoiceChRecordForm.vue         | 14 +++---
 .../emisSettleInvoiceRecordForm.vue           |  2 +-
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue
index 09f2d6a3..90c0814c 100644
--- a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue
@@ -46,7 +46,7 @@
                   @click="handleUpdate"
                 >修改</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="danger"
                   plain
@@ -54,9 +54,10 @@
                   size="mini"
                   :disabled="multiple"
                   @click="handleDelete"
-                  v-hasPermi="['emis:emisSettleInvoiceChRecord:remove']"
                 >删除</el-button>
-              </el-col> -->
+              </el-col>
+              <!-- v-hasPermi="['emis:emisSettleInvoiceChRecord:remove']" -->
+
               <!-- <el-col :span="1.5">
                 <el-button
                   type="warning"
@@ -87,6 +88,17 @@
             <dict-tag :options="dict.type.emis_invoice_ch_type" :value="scope.row.realInvoiceType" :show-overflow-tooltip="true" />
           </template>
         </el-table-column>
+        <el-table-column :label="$t('开票状态')" align="center" prop="openChStatus" width="100" :show-overflow-tooltip="true"  >
+        <template slot-scope="scope">
+            <el-tag v-if="scope.row.openChStatus==-1" type="error" >发送异常</el-tag>
+            <el-tag v-if="scope.row.openChStatus==0"  type="info" >未发送</el-tag>
+            <el-tag v-if="scope.row.openChStatus==1" type="info"  >已发送</el-tag>
+            <el-tag v-if="scope.row.openChStatus==2"  type="success" >开票成功</el-tag>
+            <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="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" /> -->
@@ -95,8 +107,7 @@
       <!-- <el-table-column :label="$t('开户账号')" align="center" prop="bankAccNo" width="100" /> -->
       <!-- <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="openMoney" width="100" :show-overflow-tooltip="true" />
+      <!-- <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"  />
       <el-table-column :label="$t('主体税号')" align="center" prop="salerCompanyTaxNo" width="100" :show-overflow-tooltip="true" />
@@ -113,8 +124,9 @@
       <!-- <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="openChId" width="100" /> -->
-      <el-table-column :label="$t('开票状态')" align="center" prop="openChStatus" width="100" :show-overflow-tooltip="true"  />
-      <el-table-column :label="$t('状态描述')" align="center" prop="openChStatusDesc" width="100" :show-overflow-tooltip="true"  />
+
+
+        <el-table-column :label="$t('状态描述')" align="center" prop="openChStatusDesc" width="100" :show-overflow-tooltip="true"  />
       <!-- <el-table-column :label="$t('使用的开票企业代码')" align="center" prop="openComCode" width="100" /> -->
       <!-- <el-table-column :label="$t('扩展信息，货物名称')" align="center" prop="extData" width="100" :show-overflow-tooltip="true" /> -->
       <el-table-column :label="$t('开票备注')" align="center" prop="remark" width="100" :show-overflow-tooltip="true" />
@@ -132,7 +144,7 @@
 </template>
 
 <script>
-import { listEmisSettleInvoiceChRecord, getEmisSettleInvoiceChRecord, delEmisSettleInvoiceChRecord, addEmisSettleInvoiceChRecord, updateEmisSettleInvoiceChRecord } from "@/api/emis/emisSettleInvoiceChRecord";
+import { listEmisSettleInvoiceChRecord,sendHXToOpen, getEmisSettleInvoiceChRecord, delEmisSettleInvoiceChRecord, addEmisSettleInvoiceChRecord, updateEmisSettleInvoiceChRecord } from "@/api/emis/emisSettleInvoiceChRecord";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisSettleInvoiceChRecordView from '@/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordView';
 import emisSettleInvoiceChRecordForm from '@/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm';
@@ -294,17 +306,22 @@ export default {
     cancelForm(){
       this.openForm = false;
     },
-    handleSendHXToOpen(row){
-      const ids = row.id || this.ids;
+    handleSendHXToOpen(){
+      const ids = this.ids;
       this.$modal.confirm('是否确认发送').then(async function() {
-        if(ids&&ids.length>1){
+        console.log("===>handleSendHXToOpen==>",ids);
+        if(ids&&ids.length>=1){
           var len=ids.length;
-          for(var i=0;i<len;i++){
-            let res=await sendHXToOpen({id:ids[i]});
+          let i=0;
+          for(i=0;i<len;i++){
+
+            const id=ids[i];
+            console.log("===>sendHXToOpen==>",id);
+            let res=await sendHXToOpen({id:id});
+            console.log("===>sendHXToOpen==res==>",res);
           }
-        }else{
-          sendHXToOpen({id:ids})
         }
+
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("发送成功");
diff --git a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
index 986b3928..5fbe7110 100644
--- a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
@@ -372,13 +372,13 @@ export default {
                 this.invoiceApplyData = response.data;
                 this.form.applySeqNo=this.invoiceApplyData.applySeqNo;
                 this.form.companyName=this.invoiceApplyData.companyName;
-                this.form.companyTaxNo=this.invoiceApplyData.companyName;
-                this.form.companyTel=this.invoiceApplyData.companyName;
-                this.form.companyAddress=this.invoiceApplyData.companyName;
-                this.form.bankName=this.invoiceApplyData.companyName;
-                this.form.bankAccNo=this.invoiceApplyData.companyName;
-                this.form.contact=this.invoiceApplyData.companyName;
-                this.form.phone=this.invoiceApplyData.companyName;
+                this.form.companyTaxNo=this.invoiceApplyData.companyTaxNo;
+                this.form.companyTel=this.invoiceApplyData.companyTel;
+                this.form.companyAddress=this.invoiceApplyData.companyAddress;
+                this.form.bankName=this.invoiceApplyData.bankName;
+                this.form.bankAccNo=this.invoiceApplyData.bankAccNo;
+                this.form.contact=this.invoiceApplyData.contact;
+                this.form.phone=this.invoiceApplyData.phone;
                 console.log("===>getEmisSettleInvoiceRecord==>",this.form)
                 this.loading = false;
               });
diff --git a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
index a3130f00..8e3bb8bd 100644
--- a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
@@ -113,7 +113,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="结算账单" prop="settleBillNo">
+            <el-form-item label="账单名称" prop="settleBillNo">
               <span slot="label">
                 <span style="color: red">结算编号</span>
               </span>