From 19c9ba17db622e8402e1917ec14112b258fa647c Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Sat, 8 Apr 2023 21:39:32 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 516e25d9
---
 .../details/otherStandardDetails/index.vue    | 413 ++++++++----------
 1 file changed, 182 insertions(+), 231 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 3b4484898..e31d8de91 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -750,77 +750,53 @@
 >
 <div class="search-area">
   <div class="left">
-    <!--<el-form ref="ruleForm" :model="standardForm" class="label-input-form" inline>-->
-    <!--  <el-form-item class="search-item">-->
-    <!--    <el-input v-show="false" v-model="standItemSearch.orgName" size="small" style="height: 32px"/>-->
-    <!--    <el-input v-show="false" v-model="standItemSearch.responsibleUnit" size="small" style="height: 32px"/>-->
-    <!--    <el-popover-->
-    <!--        :value="false"-->
-    <!--        placement="bottom"-->
-    <!--        popper-class="user-dept-popper"-->
-    <!--        trigger="click"-->
-    <!--    >-->
-    <!--    </el-popover>-->
-    <!--  </el-form-item>-->
-
-
-    <!--  <el-form-item class="search-item">-->
-    <!--    <el-input v-model="standItemSearch.itemsName" clearable maxlength="100" placeholder="根据条款名称查找"-->
-    <!--              size="small"></el-input>-->
-    <!--  </el-form-item>-->
-      <!--            新车实施日期-->
-      <!--<el-form-item class="search-item">-->
-      <!--  <div class="block">-->
-      <!--    <el-date-picker-->
-      <!--        v-model="standItemSearch.XCXSSRQ"-->
-      <!--        placeholder="新车实施日期"-->
-      <!--        type="date"-->
-      <!--        value-format="yyyy-MM-dd">-->
-      <!--    </el-date-picker>-->
-      <!--  </div>-->
-      <!--</el-form-item>-->
-      <!--&lt;!&ndash;            //在产车实施日期&ndash;&gt;-->
-      <!--<el-form-item class="search-item">-->
-      <!--  <div class="block">-->
-      <!--    <el-date-picker-->
-      <!--        v-model="standItemSearch.ZCCSSRQ"-->
-      <!--        placeholder="在产车实施日期"-->
-      <!--        type="date"-->
-      <!--        value-format="yyyy-MM-dd">-->
-      <!--    </el-date-picker>-->
-      <!--  </div>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item class="search-item btn-box">-->
-      <!--  <el-button-->
-      <!--      :loading="searching"-->
-      <!--      class="common-button-primary"-->
-      <!--      size="mini"-->
-      <!--      type="primary"-->
-      <!--      @click="searchSarStandItems">-->
-      <!--    查询-->
-      <!--  </el-button>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item class="search-item btn-box">-->
-      <!--  <el-button-->
-      <!--      class="common-button-default"-->
-      <!--      size="mini"-->
-      <!--      @click="clearAllSearch">-->
-      <!--    清空-->
-      <!--  </el-button>-->
-      <!--</el-form-item>-->
-    <!--</el-form>-->
-    <el-form ref="ruleForm" class="label-input-form" inline>
+    <el-form ref="ruleForm" :model="standardForm" class="label-input-form" inline>
       <el-form-item class="search-item">
-        <el-input v-model="clauseName" maxlength="100" placeholder="根据条款名称查找"
+        <el-input v-show="false" v-model="standItemSearch.orgName" size="small" style="height: 32px"/>
+        <el-input v-show="false" v-model="standItemSearch.responsibleUnit" size="small" style="height: 32px"/>
+        <el-popover
+            :value="false"
+            placement="bottom"
+            popper-class="user-dept-popper"
+            trigger="click"
+        >
+        </el-popover>
+      </el-form-item>
+
+
+      <el-form-item class="search-item">
+        <el-input v-model="standItemSearch.itemsName" clearable maxlength="100" placeholder="根据条款名称查找"
                   size="small"></el-input>
       </el-form-item>
+      <!--            新车实施日期-->
+      <el-form-item class="search-item">
+        <div class="block">
+          <el-date-picker
+              v-model="standItemSearch.XCXSSRQ"
+              placeholder="新车实施日期"
+              type="date"
+              value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </div>
+      </el-form-item>
+      <!--            //在产车实施日期-->
+      <el-form-item class="search-item">
+        <div class="block">
+          <el-date-picker
+              v-model="standItemSearch.ZCCSSRQ"
+              placeholder="在产车实施日期"
+              type="date"
+              value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </div>
+      </el-form-item>
       <el-form-item class="search-item btn-box">
         <el-button
             :loading="searching"
             class="common-button-primary"
             size="mini"
             type="primary"
-            @click="searchClause">
+            @click="searchSarStandItems">
           查询
         </el-button>
       </el-form-item>
@@ -828,7 +804,7 @@
         <el-button
             class="common-button-default"
             size="mini"
-            @click="clearClause">
+            @click="clearAllSearch">
           清空
         </el-button>
       </el-form-item>
@@ -836,17 +812,12 @@
   </div>
 </div>
 <div class="action-bar">
-  <!--<el-button class="common-button-default export-button" icon="export" size="mini"-->
-  <!--           @click="exportStandardItem"-->
-  <!--&gt;-->
-  <!--  导出-->
-  <!--</el-button>-->
   <el-button class="common-button-default export-button" icon="export" size="mini"
-             @click="exportItemInfo"
+             @click="exportStandardItem"
   >
     导出
   </el-button>
-  <el-button v-if="false"
+  <el-button
       v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
       class="common-button-primary"
       size="mini"
@@ -854,14 +825,14 @@
       @click="openRelatedTermsDrawer"
   >关联条款
   </el-button>
-  <!--<el-button-->
-  <!--    v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"-->
-  <!--    class="common-button-primary"-->
-  <!--    size="mini"-->
-  <!--    type="primary"-->
-  <!--    @click="editResolveList"-->
-  <!--&gt;编辑-->
-  <!--</el-button>-->
+  <el-button
+      v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
+      class="common-button-primary"
+      size="mini"
+      type="primary"
+      @click="editResolveList"
+  >编辑
+  </el-button>
   <el-upload
       :key="cfjgscUploadKey"
       style="display: inline-block;margin:0 5px;"
@@ -891,140 +862,139 @@
   <!--</el-button>-->
 </div>
 <div class="content">
-  <!--<el-table-->
-  <!--    ref="multipleTable"-->
-  <!--    :data="standItemList"-->
-  <!--    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
-  <!--     fontWeight: 'bold', height: '48px'}"-->
-  <!--    :height="tableHeight"-->
-  <!--    border-->
-  <!--    style="width: 100%"-->
-  <!--    tooltip-effect="dark"-->
-  <!--    @sort-change='sort'-->
-  <!--    @selection-change="selectAllStand">-->
-  <!--  <el-table-column-->
-  <!--      fixed="left"-->
-  <!--      type="selection"-->
-  <!--      width="60"-->
-  <!--  >-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="条款号"-->
-  <!--      prop="itemsNum"-->
-  <!--      show-overflow-tooltip-->
-  <!--      sortable="custom"-->
-  <!--      width="90"-->
-  <!--  >-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="条款名称"-->
-  <!--      min-width="300"-->
-  <!--      prop="itemsName"-->
-  <!--      show-overflow-tooltip-->
-  <!--  >-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      :resizable="false"-->
-  <!--      label="条款内容"-->
-  <!--      min-width="200"-->
-  <!--      prop="termsConditions"-->
-  <!--  >-->
-  <!--    <template slot-scope="scope">-->
-  <!--      &lt;!&ndash;              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">&ndash;&gt;-->
-  <!--      &lt;!&ndash;                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}&ndash;&gt;-->
-  <!--      &lt;!&ndash;              </div>&ndash;&gt;-->
-  <!--      <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"-->
-  <!--           @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
-  <!--        {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
-  <!--      </div>-->
-  <!--      &lt;!&ndash;              <el-tooltip placement="top">&ndash;&gt;-->
-  <!--      &lt;!&ndash;                <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>&ndash;&gt;-->
-  <!--      &lt;!&ndash;                <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">&ndash;&gt;-->
-  <!--      &lt;!&ndash;                  {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}&ndash;&gt;-->
-  <!--      &lt;!&ndash;                </div>&ndash;&gt;-->
-  <!--      &lt;!&ndash;              </el-tooltip>&ndash;&gt;-->
-  <!--    </template>-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="核心技术要求/变化点"-->
-  <!--      prop="readContent"-->
-  <!--      show-overflow-tooltip-->
-  <!--      width="170"-->
-  <!--  >-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="基于上一版本差异"-->
-  <!--      prop="comparedWithPrevious"-->
-  <!--      show-overflow-tooltip-->
-  <!--      width="170">-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="新车型实施日期(文本)"-->
-  <!--      prop="xccssrq"-->
-  <!--      width="180">-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="在产车实施日期(文本)"-->
-  <!--      prop="zccssrq"-->
-  <!--      width="170">-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="适用车型"-->
-  <!--      prop="applyArctic"-->
-  <!--      show-overflow-tooltip-->
-  <!--      width="90"-->
-  <!--  >-->
-  <!--    <template slot-scope="scope">-->
-  <!--      {{ filterApplyArctic(scope.row) }}-->
-  <!--    </template>-->
-  <!--  </el-table-column>-->
-  <!--  &lt;!&ndash;          <el-table-column&ndash;&gt;-->
-  <!--  &lt;!&ndash;              prop="responsibleUnit"&ndash;&gt;-->
-  <!--  &lt;!&ndash;              label="责任部门">&ndash;&gt;-->
-  <!--  &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-  <!--  <el-table-column-->
-  <!--      label="责任工程师"-->
-  <!--      prop="dutyEngineer"-->
-  <!--      width="100">-->
-  <!--  </el-table-column>-->
-  <!--  &lt;!&ndash;          <el-table-column&ndash;&gt;-->
-  <!--  &lt;!&ndash;            show-overflow-tooltip&ndash;&gt;-->
-  <!--  &lt;!&ndash;            label="符合性状态"&ndash;&gt;-->
-  <!--  &lt;!&ndash;            width="100">&ndash;&gt;-->
-  <!--  &lt;!&ndash;            <template slot-scope="scope">&ndash;&gt;-->
-  <!--  &lt;!&ndash;              {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}&ndash;&gt;-->
-  <!--  &lt;!&ndash;            </template>&ndash;&gt;-->
-  <!--  &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-  <!--  &lt;!&ndash;          <el-table-column&ndash;&gt;-->
-  <!--  &lt;!&ndash;            show-overflow-tooltip&ndash;&gt;-->
-  <!--  &lt;!&ndash;            prop="complianceState"&ndash;&gt;-->
-  <!--  &lt;!&ndash;            label="合规性分析"&ndash;&gt;-->
-  <!--  &lt;!&ndash;            width="100">&ndash;&gt;-->
-  <!--  &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-  <!--  <el-table-column align="center" fixed="right" label="操作" width="50">-->
-  <!--    <template slot-scope="scope">-->
-  <!--      <div @click.stop>-->
-  <!--        <el-dropdown trigger="click" @command="handleCommand">-->
-  <!--          <i class="iconfont">&#xe61e;</i>-->
-  <!--          <el-dropdown-menu slot="dropdown">-->
-  <!--            <el-dropdown-item :command="[scope.row, '查看']" :disabled="scope.row.enable==='0'">查看-->
-  <!--            </el-dropdown-item>-->
-  <!--            &lt;!&ndash;<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>&ndash;&gt;-->
-  <!--            &lt;!&ndash;<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>&ndash;&gt;-->
-  <!--          </el-dropdown-menu>-->
-  <!--        </el-dropdown>-->
-  <!--      </div>-->
-  <!--    </template>-->
-  <!--  </el-table-column>-->
-  <!--</el-table>-->
-  <ResolveTable ref="resolveTable"></ResolveTable>
-  <!--<loading :loading="tableLoading">数据加载中...</loading>-->
+  <el-table
+      ref="multipleTable"
+      :data="standItemList"
+      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+       fontWeight: 'bold', height: '48px'}"
+      :height="tableHeight"
+      border
+      style="width: 100%"
+      tooltip-effect="dark"
+      @sort-change='sort'
+      @selection-change="selectAllStand">
+    <el-table-column
+        fixed="left"
+        type="selection"
+        width="60"
+    >
+    </el-table-column>
+    <el-table-column
+        label="条款号"
+        prop="itemsNum"
+        show-overflow-tooltip
+        sortable="custom"
+        width="90"
+    >
+    </el-table-column>
+    <el-table-column
+        label="条款名称"
+        min-width="300"
+        prop="itemsName"
+        show-overflow-tooltip
+    >
+    </el-table-column>
+    <el-table-column
+        :resizable="false"
+        label="条款内容"
+        min-width="200"
+        prop="termsConditions"
+    >
+      <template slot-scope="scope">
+        <!--              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
+        <!--                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
+        <!--              </div>-->
+        <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"
+             @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
+          {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
+        </div>
+        <!--              <el-tooltip placement="top">-->
+        <!--                <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>-->
+        <!--                <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
+        <!--                  {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
+        <!--                </div>-->
+        <!--              </el-tooltip>-->
+      </template>
+    </el-table-column>
+    <el-table-column
+        label="核心技术要求/变化点"
+        prop="readContent"
+        show-overflow-tooltip
+        width="170"
+    >
+    </el-table-column>
+    <el-table-column
+        label="基于上一版本差异"
+        prop="comparedWithPrevious"
+        show-overflow-tooltip
+        width="170">
+    </el-table-column>
+    <el-table-column
+        label="新车型实施日期(文本)"
+        prop="xccssrq"
+        width="180">
+    </el-table-column>
+    <el-table-column
+        label="在产车实施日期(文本)"
+        prop="zccssrq"
+        width="170">
+    </el-table-column>
+    <el-table-column
+        label="适用车型"
+        prop="applyArctic"
+        show-overflow-tooltip
+        width="90"
+    >
+      <template slot-scope="scope">
+        {{ filterApplyArctic(scope.row) }}
+      </template>
+    </el-table-column>
+    <!--          <el-table-column-->
+    <!--              prop="responsibleUnit"-->
+    <!--              label="责任部门">-->
+    <!--          </el-table-column>-->
+    <el-table-column
+        label="责任工程师"
+        prop="dutyEngineer"
+        width="100">
+    </el-table-column>
+    <!--          <el-table-column-->
+    <!--            show-overflow-tooltip-->
+    <!--            label="符合性状态"-->
+    <!--            width="100">-->
+    <!--            <template slot-scope="scope">-->
+    <!--              {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}-->
+    <!--            </template>-->
+    <!--          </el-table-column>-->
+    <!--          <el-table-column-->
+    <!--            show-overflow-tooltip-->
+    <!--            prop="complianceState"-->
+    <!--            label="合规性分析"-->
+    <!--            width="100">-->
+    <!--          </el-table-column>-->
+    <el-table-column align="center" fixed="right" label="操作" width="50">
+      <template slot-scope="scope">
+        <div @click.stop>
+          <el-dropdown trigger="click" @command="handleCommand">
+            <i class="iconfont">&#xe61e;</i>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="[scope.row, '查看']" :disabled="scope.row.enable==='0'">查看
+              </el-dropdown-item>
+              <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>-->
+              <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>-->
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+      </template>
+    </el-table-column>
+  </el-table>
+  <loading :loading="tableLoading">数据加载中...</loading>
 </div>
-<!--<pagination-->
-<!--    :page="page7"-->
-<!--    :total="total7"-->
-<!--    @pageChange="pageChange7"-->
-<!--    @pageSizeChange="pageSizeChange7"></pagination>-->
+<pagination
+    :page="page7"
+    :total="total7"
+    @pageChange="pageChange7"
+    @pageSizeChange="pageSizeChange7"></pagination>
 <!--      <el-pagination-->
 <!--          @size-change="pageSizeChange"-->
 <!--          @current-change="pageChange"-->
@@ -1838,7 +1808,6 @@ import {dateFormat} from '@/common/date'
 import RelatedTermsSelect from './components/RelatedTermsSelect'
 import {getBusStandFileByAttId} from 'api/process'
 import {dicTypeData} from "api/unqualProcess";
-import ResolveTable from './components/ResolveTable.vue'
 
 
 export default {
@@ -1848,8 +1817,7 @@ export default {
     CustomSVPPS,
     CustomSelectArray,
     CustomOrg,
-    RelatedTermsSelect,
-    ResolveTable
+    RelatedTermsSelect
   },
   filters: {
     ellipsis(value) {
@@ -1869,7 +1837,6 @@ export default {
   },
   data() {
     return {
-      clauseName:"", // 条款名称
       cfjgscUploadKey:1,
       externalStatus: '',
       handleList: [],
@@ -3970,22 +3937,6 @@ export default {
     itemsTextDialog(itemsNum, text) {
       this.itemsTextDialogs = true
       this.itemsText = '<p>' + itemsNum + '</p>' + text.replace(/''/g, '\'')
-    },
-    exportItemInfo(){
-      this.$refs.resolveTable.exportItemInfo();
-    },
-    searchClause(){
-      let query = {}
-      query.clauseName = this.clauseName
-      this.$refs.resolveTable.getSplitItemsByPage(query)
-    },
-    clearClause(){
-      this.clauseName = ''
-      let query = {}
-      query.clauseName = this.clauseName
-      this.$refs.resolveTable.itemsPage = 1
-      this.$refs.resolveTable.itemsPageSize = this.$store.getters.userInfo.configContent
-      this.$refs.resolveTable.getSplitItemsByPage(query)
     }
   },
   computed: {