From 99aac7d0dad29629ab6beed723c112c733358fc1 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Thu, 19 Aug 2021 14:50:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=BB=A5=E5=8F=8A=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 100 +++++++++---------
 1 file changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 99e9ee793..398c2b577 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -425,7 +425,7 @@
     <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png">
     </div>
     <!--    <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
-    <!--查看标准条款列表-->
+    <!--查看分解单-->
     <el-drawer
         title="查看分解单"
         :wrapperClosable="false"
@@ -628,18 +628,18 @@
           @pageSizeChange="pageSizeChange7"></pagination>
 
 
-<!--      <el-pagination-->
-<!--          @size-change="pageSizeChange"-->
-<!--          @current-change="pageChange"-->
-<!--          :current-page="1"-->
-<!--          :page-sizes="[10, 20, 30, 50]"-->
-<!--          :page-size="100"-->
-<!--          layout="sizes, prev, pager, next, jumper"-->
-<!--          :total="standitemTotal">-->
-<!--      </el-pagination>-->
+      <!--      <el-pagination-->
+      <!--          @size-change="pageSizeChange"-->
+      <!--          @current-change="pageChange"-->
+      <!--          :current-page="1"-->
+      <!--          :page-sizes="[10, 20, 30, 50]"-->
+      <!--          :page-size="100"-->
+      <!--          layout="sizes, prev, pager, next, jumper"-->
+      <!--          :total="standitemTotal">-->
+      <!--      </el-pagination>-->
 
-<!--        <pagination :total="standitemTotal" @pageChange="pageChange"-->
-<!--                  @pageSizeChange="pageSizeChange"></pagination>-->
+      <!--        <pagination :total="standitemTotal" @pageChange="pageChange"-->
+      <!--                  @pageSizeChange="pageSizeChange"></pagination>-->
 
     </el-drawer>
     <!--新增标准条款-->
@@ -819,9 +819,9 @@
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="解读内容">解读内容</label>
           <span class="see-drawer-val"
-                :title="standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''">
+                :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
-              standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''
+              standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
             }}</span>
         </div>
 
@@ -852,51 +852,51 @@
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="责任工程师">责任工程师</label>
           <span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
-            {{standShowItemEO.dutyEngineer }}</span>
+            {{ standShowItemEO.dutyEngineer }}</span>
         </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="基于上一版本差异">基于上一版本差异</label>
           <span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
-            {{standShowItemEO.comparedWithPrevious }}</span>
+            {{ standShowItemEO.comparedWithPrevious }}</span>
         </div>
 
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="符合性状态">符合性状态</label>
           <span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
-            {{standShowItemEO.complianceRequire }}</span>
+            {{ standShowItemEO.complianceRequire }}</span>
         </div>
 
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="合规性分析">合规性分析</label>
           <span class="see-drawer-val" :title="standShowItemEO.complianceState">
-            {{standShowItemEO.complianceState }}</span>
+            {{ standShowItemEO.complianceState }}</span>
         </div>
-<!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="FO">FO</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
-<!--        </div>-->
-<!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
-<!--              standShowItemEO.dutyEngineerShow-->
-<!--            }}</span>-->
-<!--        </div>-->
-<!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
-<!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="FO">FO</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
+        <!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
+        <!--              standShowItemEO.dutyEngineerShow-->
+        <!--            }}</span>-->
+        <!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
+        <!--        </div>-->
 
-<!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
-<!--        </div>-->
-<!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
-<!--          <span class="see-drawer-val"-->
-<!--                :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
-<!--              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
-<!--            }}</span>-->
-<!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
+        <!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
+        <!--          <span class="see-drawer-val"-->
+        <!--                :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
+        <!--              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
+        <!--            }}</span>-->
+        <!--        </div>-->
       </div>
     </el-drawer>
     <!-- 更新LOG -->
@@ -1251,6 +1251,7 @@ export default {
       knowIdList: '',
       total7: 0,
       page7: 1,
+      pageSize7: this.$store.getters.userInfo.configContent,
       addForm: {
         title: '',
         content: '',
@@ -1772,7 +1773,7 @@ export default {
       this.page7 = page
       this.selectSarStandItems()
     },
-    pageSizeChange7(pageSize){
+    pageSizeChange7(pageSize) {
       this.pageSize7 = pageSize
       this.selectSarStandItems()
     },
@@ -2099,7 +2100,7 @@ export default {
       console.log("pageSize");
       console.log(pageSize);
       // this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
-      this.standItemSearch.pageSize =pageSize;
+      this.standItemSearch.pageSize = pageSize;
       this.selectSarStandItems()
       // 此处需要调用接口，修改个人配置
     },
@@ -2331,12 +2332,15 @@ export default {
     selectSarStandItems(id, flag) {
       this.standItemSearch.standId = this.sarStandardsInfoEO.id
       this.standItemSearch.fileType = this.fileType
-      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
+      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+        ...this.standItemSearch,
+        pageSize: this.pageSize7, page: this.page7,
+      }, {}, res => {
         this.selectedItemList = []
         if (res.ok) {
-          this.standItemList = res.data;
+          this.standItemList = res.data.list;
           console.log(res.data);
-          this.total7 = res.data.length // 分页需要
+          this.total7 = res.data.count // 分页需要
         }
       }, e => {
       })