From 508cac77434dccb59547f2d4adbcefa6cf66cb97 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Wed, 30 Apr 2025 17:02:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=80=89=E6=8B=A9=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/dialog/LinkBillList.vue    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index d76178d6..146267dd 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -13,6 +13,11 @@
       @cancel="handleCancel"
       cancelText="关闭"
       style="top:20px;height: 95%;">
+      <template slot="footer">
+        <a-button @click="handleCancel">关闭(ESC)</a-button>
+        <a-button @click="handleBackBill" v-if="selectType === 'detail'">返回单据列表</a-button>
+        <a-button type="primary" @click="handleOk">确定</a-button>
+      </template>
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper" v-if="selectType === 'list'">
         <!-- 搜索区域 -->
@@ -129,6 +134,7 @@
         selectBillDetailRows: [],
         showType: 'basic',
         selectType: 'list',
+        oldTitle: '',
         linkNumber: '',
         organId: '',
         accountId: '',
@@ -219,6 +225,7 @@
         this.queryParam.status = status
         this.model = Object.assign({}, {});
         this.visible = true;
+        this.selectedDetailRowKeys = []
         this.initColumns(subType, organType)
         this.loadData(1)
       },
@@ -231,6 +238,7 @@
         this.queryParam.purchaseStatus = purchaseStatus
         this.model = Object.assign({}, {});
         this.visible = true;
+        this.selectedDetailRowKeys = []
         this.initColumns(subType, organType)
         this.loadData(1)
       },
@@ -277,13 +285,19 @@
       onSelectDetailChange(selectedRowKeys) {
         this.selectedDetailRowKeys = selectedRowKeys;
       },
+      handleBackBill() {
+        this.selectType = 'list'
+        this.title = this.oldTitle
+        this.selectedDetailRowKeys = []
+      },
       handleOk () {
         if(this.selectType === 'list') {
           this.getDepotByCurrentUser()
           this.getSelectBillRows();
-          this.selectType = 'detail'
-          this.title = "请选择单据明细"
           if(this.selectBillRows && this.selectBillRows.length>0) {
+            this.selectType = 'detail'
+            this.oldTitle = this.title
+            this.title = "请选择单据明细"
             let record = this.selectBillRows[0]
             this.linkNumber = record.number
             this.organId = record.organId
@@ -294,6 +308,8 @@
             this.remark = record.remark
             this.initListColumns()
             this.loadDetailData(1)
+          } else {
+            this.$message.warning('抱歉，请选择单据！')
           }
         } else {
           if(this.selectedDetailRowKeys.length) {