合并冲突

licp

2024-04-03 67d2338b3dd43c5972159822aa3dd8f53cd3c78b

 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() {