From dcab0e19a1764af5c05ac8868ddc080dce81d8c0 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:28:26 +0800
Subject: [PATCH] 单元格合并；修复部分bug
---
src/components/view/b1-report-preparation.vue | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 2f546ee..5ffc79a 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -112,22 +112,21 @@
<el-button size="small">涓嶉�氳繃</el-button>
</div> -->
<span slot="footer" class="dialog-footer">
- <el-button @click="issuedReasonVisible=true">涓嶉�氳繃</el-button>
- <el-button type="primary" @click="subIssued" :loading="loadingIssued">閫� 杩�</el-button>
- </span>
- </el-dialog>
+ <el-button @click="issuedReasonVisible=true" :disabled="loadingIssued">涓嶉�氳繃</el-button>
+ <el-button type="primary" @click="subIssued" :loading="loadingIssued">閫� 杩�</el-button>
+ </span>
+ </el-dialog>
<el-dialog title="涓嶉�氳繃鍘熷洜" :visible.sync="issuedReasonVisible" width="400px" :modal-append-to-body="false">
<div class="search_thing">
<div class="search_label">涓嶉�氳繃鍘熷洜锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="reason"></el-input></div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="issuedReasonVisible=false">鍙栨秷</el-button>
- <el-button type="primary" @click="handleIssuedReason" :loading="loadingIssuedReason">纭畾</el-button>
- </span>
- </el-dialog>
- <el-dialog title="鎶ュ憡鎵瑰噯" :visible.sync="approveVisible" width="400px" :modal-append-to-body="false"
- :fullscreen="fullscreen">
+ <el-button @click="issuedReasonVisible=false" :disabled="loadingIssuedReason">鍙栨秷</el-button>
+ <el-button type="primary" @click="handleIssuedReason" :loading="loadingIssuedReason">纭畾</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="鎶ュ憡鎵瑰噯" :visible.sync="approveVisible" width="400px" :modal-append-to-body="false" :fullscreen="fullscreen">
<!-- <div class="full-screen">
<i class="el-icon-full-screen" style="cursor: pointer;font-size: 18px" @click="fullscreen=true;" v-if="!fullscreen"></i>
<img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
@@ -137,21 +136,21 @@
<el-button size="small">涓嶆壒鍑�</el-button>
</div> -->
<span slot="footer" class="dialog-footer">
- <el-button @click="approveReasonVisible=true">涓嶆壒鍑�</el-button>
- <el-button type="primary" @click="subApprove" :loading="loadingApprove">鎵� 鍑�</el-button>
- </span>
- </el-dialog>
+ <el-button @click="approveReasonVisible=true" :disabled="loadingApprove">涓嶆壒鍑�</el-button>
+ <el-button type="primary" @click="subApprove" :loading="loadingApprove">鎵� 鍑�</el-button>
+ </span>
+ </el-dialog>
<el-dialog title="涓嶆壒鍑嗗師鍥�" :visible.sync="approveReasonVisible" width="400px" :modal-append-to-body="false">
<div class="search_thing">
<div class="search_label">涓嶆壒鍑嗗師鍥狅細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="reason"></el-input></div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="approveReasonVisible=false">鍙栨秷</el-button>
- <el-button type="primary" @click="handleApproveReason" :loading="loadingApproveReason">纭畾</el-button>
- </span>
- </el-dialog>
- </div>
+ <el-button @click="approveReasonVisible=false" :disabled="loadingApproveReason">鍙栨秷</el-button>
+ <el-button type="primary" @click="handleApproveReason" :loading="loadingApproveReason">纭畾</el-button>
+ </span>
+ </el-dialog>
+ </div>
</template>
<script>
--
Gitblit v1.9.3