修改提示

nasc-ui/src/views/matter/index/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="8" :xs="24" class="matter-content">
+      <el-col v-show="!showMatterView" :span="8" :xs="24" class="matter-content">
         <div class="head-container left-search-div">
           <el-input v-model="matterName" placeholder="请输入审查事项名称" clearable size="small" prefix-icon="el-icon-search" />
           <el-button type="primary" size="small" @click="handleSearchClick">查询</el-button>
@@ -31,15 +31,21 @@
           </el-tree>
         </div>
       </el-col>
-      <el-col :span="15" :xs="24" class="matter-content" style="margin-left: 10px;">
+      <el-col v-show="showMatterView" :span="1" :xs="24" class="matter-content" >
+        <i class="el-icon-d-arrow-right"
+           style="color: #409eff; cursor: pointer; position: absolute; top: 49%; transform: translateX(50%);"
+           @click="changeView"
+           title="展开"></i>
+      </el-col>
+      <el-col :span="showMatterView ? 22 : 15" :xs="24" class="matter-content" style="margin-left: 10px;">
         <template v-if="preQuestionPart">
-          <div style="font-style: italic; color: #00afff; margin-bottom: -10px;">
-            <i class="el-icon-collection"></i>&nbsp;&nbsp;前置问题
+          <div class="matter-title-h" style="font-style: italic; color: #00afff; margin-bottom: -10px;" :title="currMatter.itemName">
+            <i class="el-icon-collection"></i>&nbsp;&nbsp;{{ currMatter.itemName }}
           </div>
           <el-divider></el-divider>
           <el-alert :title="currMatterQuestion.desc" type="success" class="matter-title" :closable="false">
           </el-alert>
-          <el-row style="margin-top: 20px;overflow-y: scroll;height: calc(100% - 120px);">
+          <el-row class="pre-question-div" style="margin-top: 20px;overflow-y: scroll;height: calc(100% - 120px);">
             <template v-for="option in currMatterQuestion.preQuestionOptionList">
               <el-row style="display: flex; justify-content: center; margin: 10px;">
                 <el-button type="primary" plain class="text-wrap-button" style="width: 50%;"
@@ -56,7 +62,7 @@
             <el-button type="warning" size="mini" @click="handleConnDesktop">远程连接</el-button>
           </el-row>
           <el-row id="print_material" style="height: 100%; padding: 10px;">
-            <h2 style="font-style: italic; color: #00afff; margin-bottom: -10px;" class="qzprblem"
+            <h2 style="font-style: italic; color: #00afff; margin-bottom: -10px; font-size: 16px;" class="qzprblem"
               :title="currMatter.itemName">
               <i class="el-icon-collection"></i>&nbsp;&nbsp; {{ currMatter.itemName }}
             </h2>
@@ -88,11 +94,11 @@
                         <div style="margin: 10px; color: #aea6a3">暂无数据</div>
                       </template>
                       <template v-if="currMaterialInfo.memo">
-                        <label>材料描述</label>
+                        <label>审查要点</label>
                         <div v-html="currMaterialInfo.memo" style="margin: 10px;"></div>
                       </template>
                       <div v-for="(url, i) in currMaterialInfo.imgList">
-                        <label>示例图{{ i + 1 }}</label>
+<!--                        <label>示例图{{ i + 1 }}</label>-->
                         <div class="demo-image__lazy" style="margin: 10px;">
                           <el-image :src="url" lazy :preview-src-list="currMaterialInfo.imgList" @load="loadImgSuccess"></el-image>
                         </div>
@@ -170,16 +176,23 @@
   import { getQuestion } from '@/api/matter/question'
   import { getVncDesktop, listAllVncDesktop } from '@/api/matter/vnc'
   import iFrame from '@/components/iFrame/index.vue'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: "Index",
     components: { iFrame },
+    computed: {
+      ...mapGetters([
+        'sidebar'
+      ])
+    },
     data() {
       return {
         // 审查事项名称
         matterName: undefined,
         // 左侧显示类型：true 部门树 false 搜索树
         stepViewFlag: true,
+        showMatterView: false,
         // 是否前置问题部分
         preQuestionPart: false,
         // 是否材料部分
@@ -283,8 +296,13 @@
           loadingInstance.close()
           const matterData = response.data
           this.currMatter = matterData
+          this.showMatterView = true
+          if (this.sidebar.opened) {
+            this.$store.dispatch('app/toggleSideBar')
+          }
           if (matterData.prefixQuestion === 'Y') {
             this.currMatterQuestion = (matterData.preQuestionList && matterData.preQuestionList.length > 0) ? matterData.preQuestionList[0] : {}
+            this.changePreQuestionViewHeight()
           } else {
             // 不跳转问题
             this.preQuestionPart = false
@@ -297,6 +315,23 @@
           }
         });
       },
+      /**
+       * 切换前置问题高度视图
+       */
+      changePreQuestionViewHeight() {
+        setTimeout(() => {
+          let qHeight = document.getElementsByClassName('matter-title-h')[0].clientHeight
+          let tHeight = document.getElementsByClassName('matter-title')[0].clientHeight
+          let height = (qHeight - 20) + (tHeight - 40) + 120
+          document.getElementsByClassName('pre-question-div')[0].style.height = 'calc(100% - ' + height + 'px)'
+        }, 100)
+      },
+      /**
+       * 切换视图显示
+       */
+      changeView() {
+        this.showMatterView = false
+      },
       /** 一次性告知单模板
        * {$year}：当前年
        * {$month}：当前月
@@ -349,6 +384,7 @@
           loadingInstance.close()
           const questionData = response.data
           this.currMatterQuestion = questionData ? questionData : {}
+          this.changePreQuestionViewHeight()
         });
       },
       /** 查询事项 **/
@@ -629,4 +665,10 @@
     height: 120px!important;
     overflow: hidden;
   }
+  .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+    background-color: #aad6ff;
+  }
+  .matter-title>.el-alert__content>.el-alert__title {
+    line-height: 24px !important;
+  }
 </style>

nasc-ui/src/views/matter/item/index.vue

@@ -170,8 +170,8 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="材料描述">
-                  <el-input v-model="domain.memo" type="textarea" placeholder="请输入材料描述" :autosize="{minRows: 3}"
+                <el-form-item label="审查要点">
+                  <el-input v-model="domain.memo" type="textarea" placeholder="请输入审查要点" :autosize="{minRows: 3}"
                     :style="{width: '100%'}"></el-input>
                 </el-form-item>
               </el-col>
@@ -370,8 +370,8 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="材料描述" :prop="prblemform.optionlist[index].materialListPro[indexp].memo">
-                      <el-input v-model="domainp.memo" type="textarea" placeholder="请输入材料描述" :autosize="{minRows: 3}"
+                    <el-form-item label="审查要点" :prop="prblemform.optionlist[index].materialListPro[indexp].memo">
+                      <el-input v-model="domainp.memo" type="textarea" placeholder="请输入审查要点" :autosize="{minRows: 3}"
                         :style="{width: '100%'}"></el-input>
                     </el-form-item>
                   </el-col>
@@ -1419,4 +1419,4 @@
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-</style>
+</style>