From 6ecf657da7e46a05f1899312fcec2953a70a5acd Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Sun, 14 Nov 2021 16:09:16 +0800
Subject: [PATCH 1/5] commit

---
 src/components/navMenu/index.vue              |   5 +
 .../enterpriseStandardPlan/index.vue          | 157 ++++++++++++++++++
 src/router/index.js                           |  11 ++
 3 files changed, 173 insertions(+)
 create mode 100644 src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 2dbb1d6ed..30f4df6e7 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -193,6 +193,11 @@ export default {
               title: '合规评估', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
               path: '/standInvolveProject',
               menuId: '8a9c87fe06244fb9d55e78fb281f625b'
+            },
+            {
+              title: '企标制修订计划',
+              path: '/enterpriseStandardPlan',
+              // menuId: '8a9c87fe06244fb9d55e78fb281f625b'
             }
             // {
             //   title: '动态信息',
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
new file mode 100644
index 000000000..80085724a
--- /dev/null
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -0,0 +1,157 @@
+<template>
+    <div id="enterpriseStandardPlan">
+        <div class="action-bar">
+            <el-button type="primary"
+                       class="common-button-primary add-button"
+                       size="mini"
+                       @click=""><i class="el-icon-plus"></i>新增
+            </el-button>
+            <el-button class="common-button-default in-button"
+                       size="mini"
+                       @click=""><i class="iconfont">&#xe6de;</i>导入
+            </el-button>
+            <el-button class="common-button-default export-button"
+                       size="mini"
+                       @click=""><i class="iconfont">&#xe6e9;</i>导出
+            </el-button>
+            <el-button class="common-button-default"
+                       size="mini" @click=""><i class="iconfont">&#xe669;</i>下载
+            </el-button>
+            <el-button class="common-button-default"
+                       size="mini"
+                       @click=""><i class="iconfont">&#xe611;</i>删除
+            </el-button>
+        </div>
+        <div class="content">
+            <div class="table-wrap">
+                <el-table
+                        ref="multipleTable"
+                        :data="data"
+                        tooltip-effect="dark"
+                        border
+                        style="width: 100%; flex: auto;"
+                        class="drag-table"
+                        height="100%"
+                        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}">
+                    <el-table-column
+                            label="计划状态"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="standName"
+                            label="计划类型"
+                            width="350">
+                    </el-table-column>
+                    <el-table-column
+                            prop="issueTime"
+                            width="150"
+                            label="企标类别">
+                    </el-table-column>
+                    <el-table-column
+                            prop="SSRQ"
+                            width="150"
+                            label="企业编号">
+                    </el-table-column>
+                    <el-table-column
+                            prop="XCXSSRQ"
+                            width="150"
+                            label="代替企标编号">
+                    </el-table-column>
+                    <el-table-column
+                            prop="ZCCSSRQ"
+                            width="150"
+                            label="企标名称">
+                    </el-table-column>
+                    <el-table-column
+                            prop="textStatus"
+                            width="120"
+                            label="英文名称">
+                    </el-table-column>
+                    <el-table-column
+                            prop="textStatus"
+                            label="主要起草人">
+                    </el-table-column>
+<!--                    <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="100">-->
+                    <el-table-column fixed="right" label="操作" align="center" width="60">
+                        <template slot-scope="scope">
+                            <div @click.stop style="display: inline-block">
+                                <el-dropdown trigger="click" @command="handleCommand">
+                                    <i class="iconfont">&#xe61e;</i>
+                                    <el-dropdown-menu slot="dropdown">
+                                        <el-dropdown-item :command="[scope.row, '编辑']">
+                                            编辑
+                                        </el-dropdown-item>
+                                        <el-dropdown-item :command="[scope.row, '删除']">
+                                            删除
+                                        </el-dropdown-item>
+                                    </el-dropdown-menu>
+                                </el-dropdown>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <pagination :page="form.page" :total="total"
+                        @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "enterpriseStandardPlan",
+        components: {},
+        data() {
+            return {
+                form: {
+                    page: 1,
+                    pageSize: '',
+                },
+                total: 0,
+
+                data: []
+            }
+        },
+        props: {},
+        watch: {},
+        methods: {
+            pageChange () {},
+            pageSizeChange () {},
+            handleCommand () {},
+            getData () {
+                this.$http.get('esRevisePlan/es-revise-plan/getAllPlans', {}, {
+                    _this: this
+                }, res => {
+                    if (res.ok) {
+                        this.data = res.data
+                    }
+                })
+            },
+        },
+        computed: {},
+        mounted() {
+            this.getData()
+        },
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/mixins';
+    @import '~@/assets/styles/style';
+    #enterpriseStandardPlan {
+        height: 100%;
+        .content {
+            height: calc(~'100% - 53px');
+            .table-wrap {
+                height: calc(~'100% - 56px');
+            }
+            .pagination {
+                position: static;
+                /deep/ .pagination-slot {
+                    padding: 0;
+                }
+            }
+        }
+    }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index a0c80586b..d279f17dc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1857,6 +1857,17 @@ const routes = [
           requireAuth: true,
           title: '工作组',
         }
+      },
+        // 企标制修订计划
+      {
+        path: '/enterpriseStandardPlan',
+        name: 'enterpriseStandardPlan',
+        component: () =>
+            import('@/pages/regulatoryRepository/enterpriseStandardPlan/index'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订计划',
+        }
       },
       // 标准涉及项目
       {

From d69fe926b2d25f8f94cb984037321263aaae053e Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 14 Nov 2021 17:24:03 +0800
Subject: [PATCH 2/5] feat: There is no way the,

---
 src/pages/details/otherBussStandardDetails/index.vue |  2 --
 src/pages/details/otherLawsStandDetails/index.vue    |  5 ++---
 src/pages/details/otherStandardDetails/index.vue     | 11 +++++------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 134fb22ad..99d0348b9 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -2408,7 +2408,6 @@ export default {
       .modular-content{
         & > div{
           border-bottom: 1px solid #E5E5E5;
-          height: 44px;
           .modular-content-p-name{
             display: inline-block;
             width: 220px;
@@ -2437,7 +2436,6 @@ export default {
             position: relative;
             display: inline-block;
             width: calc(~'100% - 225px');
-            min-height: 50px;
             & > .files-title{
               width: calc(~'100% - 120px');
               min-height: 50px;
diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue
index b8c468097..fa27d9fbc 100644
--- a/src/pages/details/otherLawsStandDetails/index.vue
+++ b/src/pages/details/otherLawsStandDetails/index.vue
@@ -1486,8 +1486,8 @@ export default {
         return true
       }
       // 缺少文件
-      if (this.$hasPermission('43ae63abc1b64e6bd5cf3bb75b423bc2')) {
-        this.$http.get('lawss/sarBussStandFile/queryConvertAtt', {
+      if (this.$hasPermission('fd83032ae5f41a0021b00e93c88edbbg')) {
+        this.$http.get('lawss/sarLawsFile/queryConvertAtt', {
           attId: attId
         }, {
           _this: this
@@ -2343,7 +2343,6 @@ export default {
             position: relative;
             display: inline-block;
             width: calc(~'100% - 225px');
-            min-height: 50px;
             & > .files-title{
               width: calc(~'100% - 120px');
               min-height: 50px;
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 6a5a8b72f..6ed60b145 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -58,7 +58,7 @@
                       <p class="half files-title"
                       >
                         <label style=" margin-right: 102px;">{{ child.attrName }}</label>
-                        <template v-for="(file, fileIndex) in child1Func(child.value)">
+                        <template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)">
                           <span>
                           <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
                           <i
@@ -85,10 +85,10 @@
                                   icon="icon-separate"
                           >标准分解单
                           </el-button>
-                          <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+                          <el-button v-if="child.value && child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
                                      class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>
                         </template>
-                        <template v-if="!child.value && child.value.length === 0">-</template>
+                        <template else >-</template>
                       </p>
                     </template>
                     <p><label style=" margin-right: 150px;">中文名称</label><span>{{
@@ -3111,7 +3111,7 @@
             }
           })
         })
-
+        console.log(displayLocation)
         displayLocation.forEach(location => {
           // 动态属性字段-FBGBJBD 单独添加至基础信息
           const list = displayLocation.filter ( item => item.label === '过程稿件');
@@ -3169,6 +3169,7 @@
           location.half = half
           location.showAll = false
         })
+        console.log(displayLocation)
 
         this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
           id: this.$route.params.id
@@ -3533,7 +3534,6 @@
             border-bottom: 1px solid #E5E5E5;
             min-height: 43px;
             line-height: 43px;
-            height: 44px;
 
             .modular-content-p-name {
               display: inline-block;
@@ -3565,7 +3565,6 @@
               position: relative;
               display: inline-block;
               width: calc(~'100% - 225px');
-              min-height: 50px;
 
               & > .files-title {
                 width: calc(~'100% - 120px');

From bd66e9f92244c01faa04f5da358c7387073549d5 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 15 Nov 2021 10:31:09 +0800
Subject: [PATCH 3/5] commit

---
 .../components/workingGroup1/index.vue        | 197 +++++++++++++++---
 .../components/workingGroup2/index.vue        |  97 ++++++++-
 2 files changed, 263 insertions(+), 31 deletions(-)

diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
index bb4176af5..6b188da70 100644
--- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
@@ -577,21 +577,57 @@
                 :visible.sync="addDrawer2"
                 :before-close="addDrawerClose2">
             <div class="demo-drawer-content">
-                <div style="margin: 10px;">
-                    <el-select v-model="itemType" placeholder="请选择" @change="selectChange" class="">
-                        <el-option
-                                label="国内法规标准"
-                                value="INLAND">
-                        </el-option>
-                        <el-option
-                                label="海外法规标准"
-                                value="FOREIGN">
-                        </el-option>
-                        <el-option
-                                label="企业标准"
-                                value="3">
-                        </el-option>
-                    </el-select>
+                <div class="search-area">
+                    <div class="left">
+                        <el-form :modal="data1Form" :inline="true" class="label-input-form">
+                            <el-form-item label="数据来源" class="search-item search-item-last">
+                                <el-select v-model="itemType" placeholder="请选择" @change="selectChange" class="">
+                                    <el-option
+                                            label="国内法规标准"
+                                            value="INLAND">
+                                    </el-option>
+                                    <el-option
+                                            label="海外法规标准"
+                                            value="FOREIGN">
+                                    </el-option>
+                                    <el-option
+                                            label="企业标准"
+                                            value="3">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="标准号" class="search-item search-item-last">
+                                <el-input v-model="data1Form.standNumber"
+                                          placeholder="请输入标准号"
+                                          clearable
+                                          :maxlength="100"
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item label="标准名称" class="search-item search-item-last">
+                                <el-input v-model="data1Form.standName"
+                                          placeholder="请输入标准名称"
+                                          clearable
+                                          :maxlength="100"
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
+                                <el-button
+                                        type="primary"
+                                        size="mini"
+                                        class="common-button-primary"
+                                        @click="searchBtnClick">
+                                    查询
+                                </el-button>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
+                                <el-button
+                                        size="mini"
+                                        class="common-button-default"
+                                        @click="clearAllSearch">清空
+                                </el-button>
+                            </el-form-item>
+                        </el-form>
+                    </div>
                 </div>
                 <div class="drawerTable">
                     <el-table
@@ -607,6 +643,7 @@
                                 width="55">
                         </el-table-column>
                         <el-table-column
+                                v-if="itemType !== '3'"
                                 label="标准号"
                                 width="180"
                         >
@@ -624,6 +661,17 @@
                             </template>
                         </el-table-column>
                         <el-table-column
+                                v-else
+                                show-overflow-tooltip
+                                label="企标编号"
+                                width="120"
+                        >
+                            <template slot-scope="scope">
+                                <a style="color: #333333" @click="handlePreview(scope.row.id)" class="table-jump">{{ scope.row.standCode }}</a>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                v-if="itemType !== '3'"
                                 show-overflow-tooltip
                                 prop="standName"
                                 label="标准名称"
@@ -632,6 +680,76 @@
                                 <a @click="handlePreview(scope.row.id)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
                             </template>
                         </el-table-column>
+                        <el-table-column
+                                v-else
+                                show-overflow-tooltip
+                                prop="standName"
+                                label="中文名称"
+                        >
+                            <template slot-scope="scope">
+                                <a @click="handlePreview(scope.row.id)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                v-if="itemType === '3'"
+                                show-overflow-tooltip
+                                prop="standEnName"
+                                label="英文名称"
+                                width="350"
+                        >
+                            <template slot-scope="scope">
+                                <a style="color: #333333" @click="handlePreview(scope.row.id)" class="table-jump">{{ scope.row.standEnName }}</a>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="issueTime"
+                                label="发布日期"
+                                width="200"
+                                align="center">
+                            <template slot-scope="scope">
+                                {{ formatIssueDate(scope.row.issueTime) }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                v-if="itemType !== '3'"
+                                prop="SSRQ"
+                                label="实施日期"
+                                width="200"
+                                align="center">
+                            <template slot-scope="scope">
+                                <span>{{ formatText(scope.row.SSRQ) }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                v-else
+                                prop="putTime"
+                                label="实施日期"
+                                width="150"
+                        >
+                            <template slot-scope="scope">
+                                <span>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                v-if="itemType !== '3'"
+                                prop="XCXSSRQ"
+                                sortable="custom"
+                                width="150"
+                                label="新车型实施日期">
+                            <template slot-scope="scope">
+                                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                v-if="itemType !== '3'"
+                                prop="ZCCSSRQ"
+                                sortable="custom"
+                                width="150"
+                                label="在产车实施日期">
+                            <template slot-scope="scope">
+                                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                            </template>
+                        </el-table-column>
                     </el-table>
                     <pagination :page="page" :total="count" id="pagination"
                                 @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
@@ -693,6 +811,7 @@
 </template>
 
 <script>
+    import {formatText} from '@/components/CustomFormComponents/DatePickerGroupWithText'
     import G6 from '@antv/g6'
     export default {
         name: "workingGroup1",
@@ -700,13 +819,16 @@
             return {
                 standId:'',
                 ItemList: [],
+                data1Form: {
+                    standNumber: '',
+                    standName:''
+                },
                 itemType: 'INLAND',
                 page: 1,
                 pageSize: this.$store.getters.userInfo.configContent,
                 count: 0,
                 addDrawer2: false,
                 data1: [],
-
                 modalshowflag2: false,
                 nodeList2: [],
                 submitLoading: false,
@@ -769,6 +891,17 @@
             }
         },
         methods: {
+            formatIssueDate(str) {
+                const momentDate = this.$moment(str)
+                if (momentDate.isValid()) {
+                    return this.$moment(str).format('YYYY-MM-DD')
+                } else {
+                    return str
+                }
+            },
+            formatText(str) {
+                return formatText(str)
+            },
             ItemSubmit () {
                 if (this.ItemList.length > 0) {
                     this.submitLoading = true
@@ -806,6 +939,7 @@
             }, // 提交标准事件
             selectChange (val) {
                 this.itemType = val
+                this.page = 1
                 this.getItemData()
             }, // 切换数据来源事件
             handlePreview (val) {
@@ -841,11 +975,22 @@
             changeItem (val) {
                 this.ItemList = val
             }, // 标准选中change事件
+            clearAllSearch () {
+                this.data1Form.standName = ''
+                this.data1Form.standNumber = ''
+                this.getItemData()
+            }, // 清空
+            searchBtnClick () {
+                this.page = 1
+                this.getItemData()
+            }, // 查询
             getItemData () {
                 if (this.itemType === '3') {
                     this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', {
                         page: this.page,
-                        pageSize: this.pageSize
+                        pageSize: this.pageSize,
+                        standCode: this.data1Form.standNumber,
+                        standName: this.data1Form.standName
                     }, {
                         _this: this,
                     }, res => {
@@ -856,7 +1001,8 @@
                 } else {
                     this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
                         standType: this.itemType,
-                        standNumber: '',
+                        standNumber: this.data1Form.standNumber,
+                        standName: this.data1Form.standName,
                         page: this.page,
                         pageSize: this.pageSize
                     }, {
@@ -869,13 +1015,15 @@
                 }
             }, // 获取标准数据
             addItem2 () {
-                this.addDrawer2 = true
+                this.page = 1
+                this.data1Form.standNumber = ''
+                this.data1Form.standName = ''
                 this.getItemData()
+                this.addDrawer2 = true
             }, // 点击添加标准事件
             addDrawerClose2 () {
                 this.addDrawer2 = false
             }, // 关闭添加标准事件
-
             updateFile (item) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
             },
@@ -1708,18 +1856,19 @@
 
 <style lang="less" scoped>
     .workingGroup1{
+        height: 100%;
         #pagination {
             bottom: 57px !important;
         }
         .drawerTable {
             height: calc(~'100% - 126px');
         }
-        /deep/.el-form-item__content {
-            width: calc(~'100% - 120px');
-        }
-        height: 100%;
+        /*/deep/.el-form-item__content {*/
+        /*    width: calc(~'100% - 120px');*/
+        /*}*/
         /deep/.el-form-item__label {
             height: 100%;
+            line-height: 50px;
         }
         /deep/.el-form-item__content {
             line-height: 50px;
diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
index 600477777..cfc3274fb 100644
--- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
@@ -577,6 +577,42 @@
                 :visible.sync="addDrawer2"
                 :before-close="addDrawerClose2">
             <div class="demo-drawer-content">
+                <div class="search-area">
+                    <div class="left">
+                        <el-form :modal="data1Form" :inline="true" class="label-input-form">
+                            <el-form-item label="政策编号" class="search-item search-item-last">
+                                <el-input v-model="data1Form.lawsNumber"
+                                          placeholder="请输入政策编号"
+                                          clearable
+                                          :maxlength="100"
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item label="政策名称" class="search-item search-item-last">
+                                <el-input v-model="data1Form.numberName"
+                                          placeholder="请输入政策名称"
+                                          clearable
+                                          :maxlength="100"
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
+                                <el-button
+                                        type="primary"
+                                        size="mini"
+                                        class="common-button-primary"
+                                        @click="searchBtnClick">
+                                    查询
+                                </el-button>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
+                                <el-button
+                                        size="mini"
+                                        class="common-button-default"
+                                        @click="clearAllSearch">清空
+                                </el-button>
+                            </el-form-item>
+                        </el-form>
+                    </div>
+                </div>
                 <div class="drawerTable">
                     <el-table
                             :data="data1"
@@ -607,6 +643,34 @@
                                 <a @click="handlePreview(scope.row.id)" style="color: #333333" class="table-jump">{{ scope.row.lawsName }}</a>
                             </template>
                         </el-table-column>
+                        <el-table-column
+                                show-overflow-tooltip
+                                prop="lawsEnName"
+                                label="英文名称"
+                                width="350"
+                        >
+                            <template slot-scope="scope">
+                              <a style="color: #333333" @click="handlePreview(scope.row.id)" class="table-jump">{{ scope.row.lawsEnName }}</a>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="issueTime"
+                                label="发文日期"
+                                width="150"
+                        >
+                            <template slot-scope="scope">
+                                <span>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="XCXSSRQLAWS"
+                                label="新车实施日期"
+                                width="150"
+                        >
+                            <template slot-scope="scope">
+                               <span>{{scope.row.XCXSSRQLAWS ? scope.row.XCXSSRQLAWS.slice(0, 10) : ''}}</span>
+                            </template>
+                        </el-table-column>
                     </el-table>
                     <pagination :page="page" :total="count" id="pagination"
                                 @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
@@ -673,6 +737,10 @@
         name: "workingGroup2",
         data() {
             return {
+                data1Form: {
+                    numberName: '',
+                    lawsNumber: '',
+                },
                 standId:'',
                 ItemList: [],
                 page: 1,
@@ -799,10 +867,22 @@
             changeItem (val) {
                 this.ItemList = val
             }, // 标准选中change事件
+            searchBtnClick () {
+                this.page = 1
+                this.getItemData()
+            }, // 查询
+            clearAllSearch () {
+                this.data1Form.lawsNumber = ''
+                this.data1Form.numberName = ''
+                this.page = 1
+                this.getItemData()
+            }, // 清空
             getItemData () {
                 this.$http.get('lawss/sarLawsInfo/page', {
                     page: this.page,
-                    pageSize: this.pageSize
+                    pageSize: this.pageSize,
+                    lawsNumber: this.data1Form.lawsNumber,
+                    numberName: this.data1Form.numberName
                 }, {}, res => {
                     if (res.ok) {
                         this.data1 = res.data.list
@@ -812,13 +892,15 @@
                 })
             }, // 获取标准数据
             addItem2 () {
-                this.addDrawer2 = true
+                this.page = 1
+                this.data1Form.lawsNumber = ''
+                this.data1Form.numberName = ''
                 this.getItemData()
+                this.addDrawer2 = true
             }, // 点击添加标准事件
             addDrawerClose2 () {
                 this.addDrawer2 = false
             }, // 关闭添加标准事件
-
             updateFile (item) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
             },
@@ -1625,18 +1707,19 @@
 
 <style lang="less" scoped>
     .workingGroup2{
+        height: 100%;
         #pagination {
             bottom: 57px !important;
         }
         .drawerTable {
             height: calc(~'100% - 126px');
         }
-        /deep/.el-form-item__content {
-            width: calc(~'100% - 120px');
-        }
-        height: 100%;
+        /*/deep/.el-form-item__content {*/
+        /*    width: calc(~'100% - 120px');*/
+        /*}*/
         /deep/.el-form-item__label {
             height: 100%;
+            line-height: 50px;
         }
         /deep/.el-form-item__content {
             line-height: 50px;

From 3b9519be9f060c71e49afd20cee99df5fd2ad831 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 15 Nov 2021 10:49:29 +0800
Subject: [PATCH 4/5] feat: There is no way the,

---
 src/pages/details/otherBussStandardDetails/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 99d0348b9..a00765509 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -46,7 +46,7 @@
                       <p class="half files-title"
                       >
                         <label style=" margin-right: 102px;">{{ child.attrName }}</label>
-                        <template v-for="(file, fileIndex) in child1Func(child.value)">
+                        <template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)">
                           <span>
                             <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
                             <i
@@ -76,7 +76,7 @@
                                 <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
                                            class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>
                         </template>
-                        <template v-if="!child.value && child.value.length === 0">-</template>
+                        <template else >-</template>
                       </p>
                     </template>
                     <p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>

From a9d547a6783bfaab08d19fb99371bbe8e7adaf12 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 15 Nov 2021 11:01:30 +0800
Subject: [PATCH 5/5] feat: There is no way the,

---
 src/pages/details/otherBussStandardDetails/index.vue | 2 +-
 src/pages/details/otherStandardDetails/index.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index a00765509..066759cb2 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -76,7 +76,7 @@
                                 <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
                                            class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>
                         </template>
-                        <template else >-</template>
+                        <template v-if="child.value === null" >-</template>
                       </p>
                     </template>
                     <p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 6ed60b145..8557d1325 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -88,7 +88,7 @@
                           <el-button v-if="child.value && child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
                                      class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>
                         </template>
-                        <template else >-</template>
+                        <template v-if="child.value === null" >-</template>
                       </p>
                     </template>
                     <p><label style=" margin-right: 150px;">中文名称</label><span>{{