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] 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;