From 67d2338b3dd43c5972159822aa3dd8f53cd3c78b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 四月 2024 11:14:00 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-report-preparation.vue | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index e5dc31b..753b297 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -35,8 +35,14 @@
padding: 20px;
}
- .el-form-item {
- margin-bottom: 16px;
+ .el-form-item {
+ margin-bottom: 16px;
+ }
+
+ .full-screen{
+ position: absolute;
+ right: 52px;
+ top: 22px;
}
</style>
@@ -60,33 +66,38 @@
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.entrustCode"
@keyup.enter.native="refreshTable()"></el-input>
</div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
+ </div>
+ <div class="search_thing" style="padding-left: 30px;">
+ <el-button size="small" @click="refresh()">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ </div>
+ </div>
+ <div class="table">
+ <ValueTable ref="ValueTable" :url="$api.insReport.pageInsReport" :componentData="componentData"
+ :key="upIndex"/>
+ </div>
+ </div>
+ <el-dialog title="鍦ㄧ嚎缂栧埗" :visible.sync="claimVisible" width="25cm" :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;" >
</div>
- <div class="table">
- <ValueTable ref="ValueTable" :url="$api.insReport.pageInsReport" :componentData="componentData"
- :key="upIndex" />
- </div>
- </div>
- <el-dialog title="鍦ㄧ嚎缂栧埗" :visible.sync="claimVisible" width="80%" :modal-append-to-body="false">
- <Word style="height:70vh" v-if="claimVisible" ref="Word" />
- <span slot="footer" class="dialog-footer">
- <el-button @click="claimVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="confirmClaim">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- </div>
+ <Word :style="fullscreen?'height:83vh':'height:70vh'" v-if="claimVisible" ref="Word" :value="value"/>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="claimVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="confirmClaim">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
</template>
<script>
import ValueTable from '../tool/value-table.vue'
import Word from '../tool/word.vue'
- export default {
- components: {
- ValueTable,
+ // import convertFileToHtml from '../../util/file';
+ export default {
+ components: {
+ ValueTable,
Word,
},
data() {
@@ -185,7 +196,9 @@
entityCopy: {},
upIndex: 0,
statusList: [],
- claimVisible: false
+ claimVisible: false,
+ fullscreen:false,
+ value:''
}
},
mounted() {
--
Gitblit v1.9.3