From 01aea4d1c0b87dd5eee037542389884fb09471c6 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 6 Aug 2024 15:28:02 +0800
Subject: [PATCH] md

---
 .../emis/EmisBaseTools/BaseInvoiceInfoPicker.vue     |  4 ++--
 src/views/emis/emisBaseInvoiceInfo/index.vue         |  2 +-
 .../emis/emisSettleBill/SiteInvoiceRecordApply.vue   |  3 +++
 .../emisSettleInvoiceChRecordForm.vue                |  3 ++-
 .../emis/emisSettleSubBill/subBillMergeMgnt.vue      | 12 +++++++++++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/BaseInvoiceInfoPicker.vue b/src/views/emis/EmisBaseTools/BaseInvoiceInfoPicker.vue
index c864da78..13085261 100644
--- a/src/views/emis/EmisBaseTools/BaseInvoiceInfoPicker.vue
+++ b/src/views/emis/EmisBaseTools/BaseInvoiceInfoPicker.vue
@@ -17,7 +17,7 @@
       @click.native="onClick"
       @visible-change="reverseArrow"
       >
-        <el-option v-for="item in optionItems" :key="item.companyTaxNo" :label="item.comCode" :value="item.companyTaxNo" ></el-option>
+        <el-option v-for="item in optionItems" :key="item.comCode" :label="item.comCode" :value="item.comCode" ></el-option>
     </el-select>
 </template>
 <script>
@@ -88,7 +88,7 @@
       },
       onChange() {
           this.$emit("input", this.svalue);
-          let itemData = this.optionItems.find(item => item.companyTaxNo == this.svalue);
+          let itemData = this.optionItems.find(item => item.comCode == this.svalue);
           this.$emit("change",itemData);
           this.$emit("onChange",itemData);
           this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
diff --git a/src/views/emis/emisBaseInvoiceInfo/index.vue b/src/views/emis/emisBaseInvoiceInfo/index.vue
index 2610d251..fac57cc2 100644
--- a/src/views/emis/emisBaseInvoiceInfo/index.vue
+++ b/src/views/emis/emisBaseInvoiceInfo/index.vue
@@ -107,7 +107,7 @@
 
       -->
 
-      <el-table-column :label="$t('别名')" align="center" prop="comCode" min-width="100" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('别名')" align="center" prop="comCode" min-width="170" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('税号')" align="center" prop="companyTaxNo" min-width="170" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('公司名称')" align="center" prop="companyName" min-width="200" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册电话')" align="center" prop="companyTel" min-width="100" />
diff --git a/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue b/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
index 2479dd55..4a9f0e93 100644
--- a/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
+++ b/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
@@ -3,6 +3,9 @@
 
       <div class="tab-container">
         <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick"  @tab-remove="removeTab">
+          <el-tab-pane label="待票账单列表" name="billList" >
+            <InvoiceRecordApplyListPanel @onSelect="onSelectApply"> </InvoiceRecordApplyListPanel>
+          </el-tab-pane>
           <el-tab-pane label="开票申请记录" name="billList" >
             <InvoiceRecordApplyListPanel @onSelect="onSelectApply"> </InvoiceRecordApplyListPanel>
           </el-tab-pane>
diff --git a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
index a6b56509..37c95025 100644
--- a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
@@ -22,7 +22,7 @@
                   <span slot="label">
                     <span style="color: red">开票主体</span>
                   </span>
-                  <BaseInvoiceInfoPicker v-model="form.salerCompanyTaxNo" placeholder="开票主体" @onChange="onBaseInvoiceInSelect" > </BaseInvoiceInfoPicker>
+                  <BaseInvoiceInfoPicker v-model="form.comCode" placeholder="开票主体" @onChange="onBaseInvoiceInSelect" > </BaseInvoiceInfoPicker>
                 </el-form-item>
                 <el-form-item label="开票类型" prop="realInvoiceType">
               <el-select clearable v-model="form.realInvoiceType" placeholder="请选择" style="width:100%">
@@ -324,6 +324,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        comCode:null,
         reqNo: null,
         applySeqNo: null,
         blEcinv: null,
diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
index b4f1d8c0..5bbdd9b6 100644
--- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
+++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
@@ -158,7 +158,16 @@
                >合账</el-button>
              </el-col>
 
-
+             <el-col :span="1.5">
+               <el-button
+                 type="primary"
+                 plain
+                 size="mini"
+                 :disabled="single"
+                 @click="handleSplit"
+               >拆分子账单</el-button>
+             </el-col>
+             <!-- v-hasPermi="['emis:emisSettleSubBill:splitSubBill']" -->
 
              <el-col :span="1.5">
                <el-button
@@ -205,6 +214,7 @@
        </template>
      </el-table-column>
 
+     <el-table-column :label="$t('子账单')" align="center" prop="subBillNo" width="130" />
      <el-table-column :label="$t('运单号')" align="center" prop="billCode" width="130" />
       <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="80" :show-overflow-tooltip="true">
           <template slot-scope="scope">