From 3119c47a50dc87cdb85944bc508aac4fa26ea9a1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 18 Nov 2024 17:14:44 +0800
Subject: [PATCH] md

---
 src/api/emis/emisSettlePayRel.js              |  1 +
 .../emisSettleBill/SiteInvoiceRecordApply.vue |  1 +
 .../panel/BillDetailPanelReadOnly.vue         | 40 +++++++++++--------
 .../panel/InvoiceRecordList.vue               | 15 +++++--
 .../ApplyInvoiceSubBillRelList.vue            | 13 ++++--
 .../InvoiceSubBillRelList.vue                 | 32 +++++++++------
 .../panel/PayRecordList.vue                   | 16 ++++++--
 .../panel/PayRecordSubBillRelList.vue         | 24 +++++++----
 8 files changed, 95 insertions(+), 47 deletions(-)

diff --git a/src/api/emis/emisSettlePayRel.js b/src/api/emis/emisSettlePayRel.js
index e9dc50ec..e7faa8ef 100644
--- a/src/api/emis/emisSettlePayRel.js
+++ b/src/api/emis/emisSettlePayRel.js
@@ -9,6 +9,7 @@ export function listEmisSettlePayRel(query) {
   })
 }
 
+
 export function listHasPayBySettleBillNo(query) {
   return request({
     url: '/emis/emisSettlePayRel/listHasPayBySettleBillNo',
diff --git a/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue b/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
index fb810b07..76061f39 100644
--- a/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
+++ b/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
@@ -66,6 +66,7 @@ export default {
     handleTabsClick(){
 
     },
+
     onSelectShowBill(item) {
       this.curSettleBillNo=item.settleBillNo;
       this.showBillDetail=true;
diff --git a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
index f38d7b7c..6e2241b9 100644
--- a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
+++ b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
@@ -45,36 +45,42 @@
           <el-tag type="info" v-if="settleBillItem.paymentStatus==0">未收款</el-tag>
           <el-tag type="success" v-if="settleBillItem.paymentStatus==1">已收款</el-tag>
           <el-tag type="warning" v-if="settleBillItem.paymentStatus==2">部分收款</el-tag>
-        </div>
-        <div>收款明细：总应收:<span style="color:red;font-weight:500;">￥{{ settleBillItem.recMoney }}</span>,已收:<span style="color:blue;font-weight:500;">￥{{ settleBillItem.recedMoney }}</span></div>
-        <div>
-          <PayRecordList :settleBillNo="settleBillNo"> </PayRecordList>
-        </div>
-        <div>收款单号列表</div>
-        <div>
-          <PayRecordSubBillRelList :settleBillNo="settleBillNo"> </PayRecordSubBillRelList>
-        </div>
-    </div>
-    <div style="margin-bottom:20px">
 
-      <div style="font-weight:500;margin-bottom:20px">
-          开票申请:
+          开票状态:
           <el-tag type="info" v-if="settleBillItem.openBillStatus==0">未开票</el-tag>
           <el-tag type="success" v-if="settleBillItem.openBillStatus==1">已开票</el-tag>
           <el-tag type="warning" v-if="settleBillItem.openBillStatus==2">部分开票</el-tag>
           <el-tag type="warning" v-if="settleBillItem.openBillStatus==3">不开票</el-tag>
+
         </div>
+
+
+        <div>收款明细：总应收:<span style="color:red;font-weight:500;">￥{{ settleBillItem.recMoney }}</span>,已收:<span style="color:blue;font-weight:500;">￥{{ settleBillItem.recedMoney }}</span></div>
+        <div>
+          <PayRecordList :settleBillNo="settleBillNo"> </PayRecordList>
+        </div>
+        <!-- <div>收款单号列表</div>
+        <div>
+          <PayRecordSubBillRelList :settleBillNo="settleBillNo"> </PayRecordSubBillRelList>
+        </div> -->
+    </div>
+    <div style="margin-bottom:20px">
+
+
         <!--
           <div>最高可开票金额:<span style="color:red;font-weight:500;">{{ settleBillItem.recMoney }}</span>,已开票:<span style="color:blue;font-weight:500;"></span></div>
         -->
         <div>
-          <InvoiceChRecordListReadOnly :settleBillNo="settleBillNo" > </InvoiceChRecordListReadOnly>
-          <!-- <InvoiceRecordList :settleBillNo="settleBillNo"> </InvoiceRecordList> -->
+          <!-- <div>已开发票列表</div>
+          <InvoiceChRecordListReadOnly :settleBillNo="settleBillNo" > </InvoiceChRecordListReadOnly> -->
+          <div>开票记录</div>
+          <InvoiceRecordList :settleBillNo="settleBillNo"> </InvoiceRecordList>
         </div>
-        <div>开票单号</div>
+
+        <!-- <div>开票单号</div>
         <div>
             <InvoiceSubBillRelList :settleBillNo="settleBillNo" > </InvoiceSubBillRelList>
-        </div>
+        </div> -->
 
 
     </div>
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
index 8397c129..a02ed3b7 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
@@ -16,6 +16,15 @@
            @sort-change="handleSortChange"
            >
 
+          <el-table-column type="expand">
+            <template slot-scope="scope">
+                <div style="padding: 8px 50px;background: white;">
+                  <div>开票单号:</div>
+                  <InvoiceSubBillRelList :applySeqNo="scope.row.applySeqNo"> </InvoiceSubBillRelList>
+                </div>
+            </template>
+          </el-table-column>
+
            <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="170" />
       <el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('发票文件')" align="center" prop="filePath" min-width="170" :show-overflow-tooltip="true">
@@ -29,9 +38,6 @@
                   size="mini"
                   @click="handleDownPDF(scope.row,$event)"
                 >复制发票地址</el-button>
-
-
-
         </template>
       </el-table-column>
       <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" width="100" >
@@ -90,6 +96,7 @@
 <script>
 import { listEmisSettleInvoiceRecord, getEmisSettleInvoiceRecord, delEmisSettleInvoiceRecord, addEmisSettleInvoiceRecord, updateEmisSettleInvoiceRecord } from "@/api/emis/emisSettleInvoiceRecord";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+import InvoiceSubBillRelList from '@/views/emis/emisSettleInvoiceRel/InvoiceSubBillRelList.vue';
 
 export default {
   name: "InvoiceRecordList",
@@ -98,7 +105,7 @@ export default {
         type:String
     }
   },
-  components: { elDateSimplePicker },
+  components: { elDateSimplePicker,InvoiceSubBillRelList },
   dicts: [
   ],
   data() {
diff --git a/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue b/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue
index 4ce4f65c..12fa2d0f 100644
--- a/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue
+++ b/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue
@@ -266,11 +266,11 @@ export default {
         this.exportData(this.selectBillList,loadingInstance);
       }
       else{
-          let qExportParam=this.initQueryParams();
+          let qExportParam={...this.queryParams};
           qExportParam.pageNum=1;
           qExportParam.pageSize=5000;
 
-          listEmisSettleSubBill(qExportParam).then(response => {
+          listEmisSettleInvoiceRel(qExportParam).then(response => {
             if (response.code === 200) {
               this.exportData(response.rows,loadingInstance);
             }
@@ -313,6 +313,13 @@ export default {
           return  v['waybillDetail']['sendSiteName'];
         }
 
+        if (j === 'custName') {
+          if(v['waybillDetail']['paymentType']==2||v['waybillDetail']['paymentType']==4||v['waybillDetail']['paymentType']==5){
+            return  v['waybillDetail']['custName'];
+          }
+        }
+
+
 
         if (j === 'waybillDetail.sendDate') {
           return  v['waybillDetail']['sendDate'];
@@ -355,7 +362,7 @@ export default {
           return  v['waybillDetail']['settlementWeight'];
         }
 
-        if (j === 'waybillDetail.freight') {
+        if (j === 'billFee') {
           return  v['waybillDetail']['freight'];
         }
 
diff --git a/src/views/emis/emisSettleInvoiceRel/InvoiceSubBillRelList.vue b/src/views/emis/emisSettleInvoiceRel/InvoiceSubBillRelList.vue
index d3bb8a3a..89686cea 100644
--- a/src/views/emis/emisSettleInvoiceRel/InvoiceSubBillRelList.vue
+++ b/src/views/emis/emisSettleInvoiceRel/InvoiceSubBillRelList.vue
@@ -13,11 +13,11 @@
            >
 
              <!-- max-height="500px" -->
-             <el-table-column  :label="$t('序号')" align="center" width="60">
+             <!-- <el-table-column  :label="$t('序号')" align="center" width="60">
                                   <template slot-scope="scope">
                                       <span > {{scope.$index+1}}</span>
                                   </template>
-                            </el-table-column>
+                            </el-table-column> -->
                             <el-table-column prop="billNo"  :label="$t('运单号')"  align="center" width="170">
                               <template slot-scope="scope">
                                  <span>{{ scope.row.billNo }}</span>
@@ -38,7 +38,7 @@
                                 {{ scope.row.money }}
                               </template>
                             </el-table-column>
-                            <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170"    :show-overflow-tooltip="true"/>
+                            <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" width="170"    :show-overflow-tooltip="true"/>
                             <el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                   <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
@@ -46,12 +46,12 @@
                             </el-table-column>
                             <el-table-column :label="$t('发件人')" align="center" prop="waybillDetail.sendName" width="100" :show-overflow-tooltip="true"/>
                             <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" width="150"  :show-overflow-tooltip="true"/>
-                            <el-table-column :label="$t('支付方式')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true"   >
+                            <el-table-column :label="$t('支付方式')" align="center" prop="waybillDetail.paymentType" width="80" :show-overflow-tooltip="true"   >
                               <template slot-scope="scope">
                                 <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
                               </template>
                             </el-table-column>
-                            <el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
+                            <el-table-column :label="$t('月结客户')" align="center" prop="custName" width="120" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                   <span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">{{scope.row.waybillDetail.custName}}</span>
                                   <span v-else></span>
@@ -60,14 +60,14 @@
                             <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" width="120" :show-overflow-tooltip="true"/>
                             <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" width="80"      />
                             <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" width="120"   />
-                            <el-table-column :label="$t('结算体积')" align="center" prop="waybillDetail.totalVolume" min-width="80"    />
+                            <el-table-column :label="$t('结算体积')" align="center" prop="waybillDetail.totalVolume" width="80"    />
 
     </el-table>
   </div>
 </template>
 
 <script>
-import { listHasOpenListBySettleBillNo } from "@/api/emis/emisSettleInvoiceRel";
+import { listEmisSettleInvoiceRel,listHasOpenListBySettleBillNo } from "@/api/emis/emisSettleInvoiceRel";
 
 export default {
   name: "InvoiceSubBillRelList",
@@ -152,11 +152,19 @@ export default {
     /** 查询开票子账单关联表列表 */
     getList() {
       this.loading = true;
-      listHasOpenListBySettleBillNo(this.queryParams).then(response => {
-        this.emisSettleInvoiceRelList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      if(this.queryParams.settleBillNo){
+        listHasOpenListBySettleBillNo(this.queryParams).then(response => {
+          this.emisSettleInvoiceRelList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }else{
+        listEmisSettleInvoiceRel(this.queryParams).then(response => {
+          this.emisSettleInvoiceRelList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
     },
 
     /** 搜索按钮操作 */
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
index cb577b56..7c21bd9a 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
@@ -13,11 +13,19 @@
            @sort-change="handleSortChange"
            >
 
-      <el-table-column label="序号" align="center" width="60">
+      <!-- <el-table-column label="序号" align="center" width="60">
             <template slot-scope="scope">
                 <span v-text="getIndex(scope.$index)"> </span>
             </template>
-      </el-table-column>
+      </el-table-column> -->
+      <el-table-column type="expand">
+       <template slot-scope="scope">
+          <div style="padding: 8px 50px;background: white;">
+            <div>收款单号:</div>
+            <PayRecordSubBillRelList :payId="scope.row.payId"> </PayRecordSubBillRelList>
+          </div>
+       </template>
+     </el-table-column>
       <el-table-column :label="$t('交易时间')" align="center" prop="tradeDate" width="170" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
               <span v-if="scope.row.recType == '1'">{{ scope.row.tradeDate }}</span>
@@ -104,6 +112,8 @@
 <script>
 import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+import PayRecordSubBillRelList from '@/views/emis/emisSettlePayRecord/panel/PayRecordSubBillRelList.vue';
+
 
 export default {
   name: "PayRecordList",
@@ -112,7 +122,7 @@ export default {
         type:String
     }
   },
-  components: { elDateSimplePicker },
+  components: { elDateSimplePicker,PayRecordSubBillRelList },
   dicts: ['emis_settlebill_pay_type'],
   data() {
     return {
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordSubBillRelList.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordSubBillRelList.vue
index aa1f60a7..9e10a68f 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordSubBillRelList.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordSubBillRelList.vue
@@ -10,11 +10,11 @@
            @queryTable="getList"
            >
 
-             <el-table-column  :label="$t('序号')" align="center" width="60">
+             <!-- <el-table-column  :label="$t('序号')" align="center" width="60">
                                   <template slot-scope="scope">
                                       <span > {{scope.$index+1}}</span>
                                   </template>
-                            </el-table-column>
+                            </el-table-column> -->
                             <el-table-column prop="billNo"  :label="$t('运单号')"  align="center" width="170">
                               <template slot-scope="scope">
                                  <span>{{ scope.row.billNo }}</span>
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { listHasPayBySettleBillNo } from "@/api/emis/emisSettlePayRel";
+import { listEmisSettlePayRel,listHasPayBySettleBillNo } from "@/api/emis/emisSettlePayRel";
 
 export default {
   name: "PayRecordSubBillRelList",
@@ -140,11 +140,19 @@ export default {
     /** 查询开票子账单关联表列表 */
     getList() {
       this.loading = true;
-      listHasPayBySettleBillNo(this.queryParams).then(response => {
-        this.emisSettlePayRelList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      if(this.queryParams.settleBillNo){
+        listHasPayBySettleBillNo(this.queryParams).then(response => {
+          this.emisSettlePayRelList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }else{
+        listEmisSettlePayRel(this.queryParams).then(response => {
+          this.emisSettlePayRelList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
     },
 
     /** 搜索按钮操作 */