Merge remote-tracking branch 'origin/develop' into develop

src/common/axios/index.js

@@ -447,5 +447,18 @@ export default {
       }
       exeFun.call(this, err)
     })
+  },
+
+  /**
+   * @description: delete方法
+   * @author: chenxiaoxi
+   * @date: 2018-09-14 09:55:30
+   */
+  postDelete (url, param, thenFun, exeFun) {
+    _axios.post(api() + url, {}).then(res => {
+      thenFun.call(this, res.data)
+    }).catch(err => {
+      exeFun.call(this, err)
+    })
   }
 }

src/components/navMenu/index.vue

@@ -334,67 +334,66 @@ export default {
         //     }
           ]
         },
-        // {
-        //   title: '个人中心',
-        //   path: '/personal',
-        //   'icon-class': 'ucenter',
-        //   menuId: 'ZY9RFA4M35',
-        //   children: [
-        //     {
-        //       title: '我的消息',
-        //       path: '/dynamics',
-        //       menuId: 'JCEV4AEV32'
-        //     },
-        //     {
-        //       title: '我的企标',
-        //       path: '/MyEnterpriseStandard',
-        //       menuId: 'LKU3W23UMEHDM9VLDHGK'
-        //     },
-        //     {
-        //       title: '我的收藏',
-        //       path: '/collection',
-        //       menuId: 'JY5LKL2HPD'
-        //     },
-        //
-        //     {
-        //       title: '我的浏览',
-        //       path: '/browsing',
-        //       menuId: 'HAEY2A4LMX'
-        //     },
-        //     {
-        //       title: '已收分享',
-        //       path: '/push',
-        //       menuId: '9F8T7DPYHE'
-        //     },
-        //     {
-        //       title: '已发分享',
-        //       path: '/forward',
-        //       menuId: 'K45Y9TGKZV2K4XP4CETD'
-        //     },
-        //     {
-        //       title: '我的问答',
-        //       path: '/questionsAndAnswers',
-        //       menuId: '8VKLZATQQG4NQHXV9UDS'
-        //     },
-        //     {
-        //       title: '我的板块',
-        //       path: '/plate',
-        //       menuId: 'TUYHX8JBWV'
-        //     }
-        //     // {
-        //     //   title: '个人信息',
-        //     //   path: '/info',
-        //     //   menuId: '8K7FDHG89G'
-        //     // }
-        //   ]
-        // },
         {
-          title: '搜索中心',
+          title: '个人中心',
-          path: '/advancedSearch',
+          path: '/personal',
-          'icon-class': 'search',
+          'icon-class': 'ucenter',
-          menuId: 'K9BAYUPZBC',
+          menuId: 'ZY9RFA4M35',
-          isChildren: true // 判断没有子菜单
+          children: [
+            // {
+            //   title: '我的消息',
+            //   path: '/dynamics',
+            //   menuId: 'JCEV4AEV32'
+            // },
+            // {
+            //   title: '我的企标',
+            //   path: '/MyEnterpriseStandard',
+            //   menuId: 'LKU3W23UMEHDM9VLDHGK'
+            // },
+            {
+              title: '我的收藏',
+              path: '/collection',
+              menuId: 'JY5LKL2HPD'
+            },
+            // {
+            //   title: '我的浏览',
+            //   path: '/browsing',
+            //   menuId: 'HAEY2A4LMX'
+            // },
+            // {
+            //   title: '已收分享',
+            //   path: '/push',
+            //   menuId: '9F8T7DPYHE'
+            // },
+            // {
+            //   title: '已发分享',
+            //   path: '/forward',
+            //   menuId: 'K45Y9TGKZV2K4XP4CETD'
+            // },
+            // {
+            //   title: '我的问答',
+            //   path: '/questionsAndAnswers',
+            //   menuId: '8VKLZATQQG4NQHXV9UDS'
+            // },
+            // {
+            //   title: '我的板块',
+            //   path: '/plate',
+            //   menuId: 'TUYHX8JBWV'
+            // }
+            // {
+            //   title: '个人信息',
+            //   path: '/info',
+            //   menuId: '8K7FDHG89G'
+            // }
+          ]
         },
+              {
+                  title: '搜索中心',
+                  path: '/advancedSearch',
+                  'icon-class': 'search',
+                  menuId: 'K9BAYUPZBC',
+                  isChildren: true // 判断没有子菜单
+              },
         // {
         //   title: '标准比对库',
         //   path: '/standardComparisonLibrary',

src/pages/personal/pages/my-collection/components/CollectionStandard.vue

@@ -6,7 +6,7 @@
         <div class="search-area">
           <el-form :inline="true" class="label-input-form" @keyup.enter.native="selectStandardBtn">
             <el-form-item label="标准法规标题" class="search-item search-item-last">
-              <el-input v-model="search.collectionStandard"
+              <el-input v-model="search.name"
                         placeholder="请输入标准法规信息"
                         clearable
                         :maxlength="100"
@@ -18,15 +18,21 @@
                 icon="el-icon-search"
                 type="primary"
                 class="common-button-primary"
-                round
+                size="mini"
                 @click="selectStandardBtn">
               </el-button>
               <el-button
                 class="common-button-default"
                 icon="el-icon-refresh-left"
-                round
+                size="mini"
                 @click="resetSelect"></el-button>
-              <el-button class="common-button-default" round @click="cancleCollectBatch" v-btn-permission="'YEG2HVV27R'"><i class="iconfont">&#xe602;</i>取消收藏</el-button>
+<!--              <el-button-->
+<!--                      class="common-button-default"-->
+<!--                      size="mini"-->
+<!--                      @click="cancleCollectBatch">-->
+<!--&lt;!&ndash;                <i class="iconfont">&#xe602;</i>&ndash;&gt;-->
+<!--                取消收藏-->
+<!--              </el-button>-->
             </el-form-item>
           </el-form>
         </div>
@@ -40,62 +46,31 @@
           <div class="card domBtn">
             <el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col>
             <el-row>
-              <div @click="detailsStandard(item)">
+              <div>
                 <el-col :span="5" :offset="1" >
                   <i class="el-icon-collection-tag" style="position: relative; left: -15px" />
                   所属板块：{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }}
                 </el-col>
                 <el-col :span="6">
                   <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">
-                    <div class="left-contents">标题：{{ item.collectTitle }}</div>
+                    <div class="left-contents">标题：{{ item.name }}</div>
                   </el-tooltip>
                   <div v-else>
-                    <div class="left-contents">标题：{{ item.collectTitle }}</div>
+                    <div class="left-contents">标题：{{ item.name }}</div>
                   </div>
                 </el-col>
-                <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
+                <el-col :span="4" :offset="3">创建时间：{{getDate(item.createTime)}}</el-col>
               </div>
               <el-col :span="4">
                 <el-button size="mini" @click="cancelStandard(item.id)" style="margin-top: -5px; border: 1px dashed #dcdee2" v-btn-permission="'GSMRLL6A4Y'">取消收藏</el-button>
-<!--                <el-button size="mini" @click="writeStandardNotes(item,index1)" style="margin-top: -5px; border: 1px dashed #dcdee2">{{item.seeBtn}}</el-button>-->
               </el-col>
             </el-row>
           </div>
-          <div  :class="{ 'selected ': item.checked }" @click="handleCardClick(item,$event)">
-            <el-button size="mini" icon="el-icon-plus" @click="createStandardNote(item, index1)" style="border: 1px dashed #dcdee2"  v-show="item.check" v-btn-permission="'HD7HL2JY4Z'">添加笔记</el-button>
-            <div class="note" v-show="item.check" v-for="(note,index2) in item.noteList" :key="index2">
-              <div class="noteLeft">笔记{{index2 +1 }}: {{note.noteContentValue}}</div>
-              <div class="noteRight">
-                <el-button type="primary" size="mini" @click="viewStandardData(note)">查看此条笔记</el-button>
-                <el-button type="warning" size="mini" @click="noteStandardEdit(note ,index1)" v-btn-permission="'XLA4JQDS5A'">修改笔记</el-button>
-                <el-button type="danger" size="mini" @click="noteStandardDel(note ,index1)" v-btn-permission="'2RZ3EQRATU'">删除笔记</el-button>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
       <has-no-data pClass="content-detail" v-if="total === 0"></has-no-data>
       <loading :loading="loading">数据获取中</loading>
     </div>
-    <el-dialog
-      :title="standardTitle"
-      :visible.sync="standardModal"
-      :close-on-click-modal = false
-      width="450px"
-      :class="{ 'hide-modal-footer': modalType === 3 }"
-      @on-visible-change="noteChange">
-      <div style="margin-left: 20px">
-        <el-form ref="standardForm" :model="standardForm" :rules="standardFormRules">
-          <el-form-item prop="textarea">
-            <el-input type="textarea" v-model.trim="standardForm.textarea" maxlength="20000" show-word-limit :autosize="{minRows: 5,maxRows: 7}" :disabled="noteType" placeholder="书写笔记"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div slot="footer">
-        <el-button size="mini" @click="closeModal">取消</el-button>
-        <el-button size="mini" type="primary" @click="saveClass" :loading="isSubmit">确认</el-button>
-      </div>
-    </el-dialog>
     <pagination :total="total" :page="page" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
   </div>
 </template>
@@ -113,7 +88,7 @@ export default {
       loadDate: false,
       // 查询
       search: {
-        collectionStandard: ''
+        name: ''
       },
       // 分页
       total: 0,
@@ -121,108 +96,25 @@ export default {
       rows: 10,
       // 数据内容
       standardList: [],
-      //  对话框状态
-      standardModal: false,
-      //  对话框标题
-      standardTitle: '',
-      // 对话框内容
-      standardForm: {
-        textarea: '',
-        collectId: '',
-        id: ''
-      },
-      modalType: '',
-      // 是否读写
-      noteType: false,
-      // 计算
-      // 笔记规则
-      standardFormRules: {
-        textarea: [
-          {required: true, message: '笔记不能为空', trigger: 'blur'},
-          {type: 'string', max: 20000, message: '最多输入20000字符'}
-        ]
-      },
       checkAll: false, // 是否全选
       indeterminate: false, // 是否半选
-      isSubmit: false,
       selectedList: [],
       selectedAllInfoList: []
     }
   },
   methods: {
-    // 对话框关闭清除表单
-    noteChange (type) {
-      if (!type) {
-        this.$refs['standardForm'].resetFields()
-      }
-    },
     // 重置
     resetSelect () {
-      this.search.collectionStandard = ''
+      this.search.name = ''
       this.pageChange(1)
     },
-    // 笔记数字提示
-    descInput () {
-      if (this.standardForm.textarea.length > 20000) {
-        this.error('最多输入20000字')
-      }
-    },
-    error (msg) {
-      this.$Message.error(msg)
-    },
-    // 跳转
-    detailsStandard (item) {
-      console.log(item);
-      this.$http.get('lawss/sarMenu/judgeSarMenuByRole', {
-        sarId: item.collectResId,
-        sarType: item.collectType
-      }, {
-        _this: this
-      }, res => {
-        if (res.ok) {
-          if (item.collectType === 'BUSINESS_STAND') {
-            // if (this.$hasPermission('YJUHC32R7G')) {
-              let routeUrl = this.$router.resolve({
-                name: 'OtherBussStandardDetails',
-                params: {
-                  id: item.collectResId,
-                  pageType: item.collectType
-                }
-              })
-              window.open(routeUrl.href, '_blank')
-            // } else {
-            //   this.$message.warning('无权访问')
-            // }
-          } else {
-            // if (this.$hasPermission('SSA6WR4HV8')) {
-              let routeUrl = this.$router.resolve({
-                name: 'OtherStandardDetails',
-                params: {
-                  id: item.collectResId,
-                  pageType: item.collectType
-                }
-              })
-              window.open(routeUrl.href, '_blank')
-            // } else {
-            //   this.$message.warning('无权访问')
-            // }
-          }
-        } else {
-          this.$message.error(res.message)
-        }
-      }, e => {
-        this.$message.error('无权访问')
-      })
-    },
     // 分页
     pageChange (page) {
       this.page = page
-      this.saveNote = ''
       this.selectStandard()
     },
     pageSizeChange (pageSize) {
       this.rows = pageSize
-      this.saveNote = ''
       this.selectStandard()
     },
     // 搜索
@@ -232,36 +124,19 @@ export default {
     },
     // 查询、加载数据
     selectStandard () {
-      this.$http.get('person/personCollect/page', {
+      this.$http.get('sarPersonalCenter/sar-user-star/getList', {
-        pageNo: this.page,
+        current: this.page,
-        pageSize: this.$store.getters.userInfo.configContent,
+        size: this.$store.getters.userInfo.configContent,
-        modeType: 'STAND',
+        userId: this.$store.getters.userInfo.userId,
-        collectTitle: this.search.collectionStandard,
+        name: this.search.name
-        userId: this.$store.getters.userInfo.userId
       }, {
         _this: this,
         loading: 'loading'
       }, res => {
-        // for (let i = 0; i < res.data.list.length; i++) {
-        //   res.data.list[i].checked = false
-        //   res.data.list[i].check = false
-        //   res.data.list[i].seeBtn = '查看笔记'
-        // }
-        res.data.list.map((item, index) => {
-          item.checked = false
-        })
         this.standardList = []
-        this.standardList = res.data.list
+        this.standardList = res.data.records
-        this.total = res.data.count
+        this.total = res.data.total
         this.contentOpen = true
-        // if (this.saveNote !== '') {
-        //   this.standardList[this.saveNote].check = true
-        //   if (this.standardList[this.saveNote].check === true) {
-        //     this.standardList[this.saveNote].seeBtn = '关闭笔记'
-        //   } else {
-        //     this.standardList[this.saveNote].seeBtn = '查看笔记'
-        //   }
-        // }
       }, e => {})
     },
     //  取消收藏
@@ -273,130 +148,28 @@ export default {
         confirmButtonClass: 'common-button-primary',
         roundButton: true
       }).then(() => {
-        this.$http.put('person/personCollect/updateByUserId ', {
+        var json = {}
-          modeType: 'STAND',
+        json.userId = this.$store.getters.userInfo.userId
-          id: id
+        json.id = id
-        }, {
+        this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, {
-          _this: this
-        }, res => {
-          this.contentOpen = false
-          this.pageChange(1)
-        }, e => {
-        })
-      }).catch(() => {
-      })
-    },
-    // 查看笔记
-    writeStandardNotes (item, index) {
-      item.check = !item.check
-      if (item.check === true) {
-        item.seeBtn = '关闭笔记'
-      } else {
-        item.seeBtn = '查看笔记'
-      }
-      for (let i = 0; i < this.standardList.length; i++) {
-        if (i !== index) {
-          this.standardList[i].check = false
-          this.standardList[i].seeBtn = '查看笔记'
-        }
-      }
-    },
-    // 添加笔记
-    createStandardNote (item, index) {
-      this.standardModal = true
-      this.noteType = false
-      this.modalType = 1
-      this.standardTitle = '添加笔记'
-      this.standardForm.textarea = ''
-      this.standardForm = item
-      this.saveNote = index
-    },
-    // 查看此条笔记
-    viewStandardData (note) {
-      this.standardModal = true
-      this.standardTitle = '查看笔记'
-      this.standardForm.textarea = note.noteContentValue
-      this.noteType = true
-      this.modalType = 3
-    },
-    // 修改笔记
-    noteStandardEdit (note, index) {
-      this.standardModal = true
-      this.noteType = false
-      this.standardTitle = '修改笔记'
-      this.modalType = 2
-      this.standardForm.id = note.id
-      this.standardForm.textarea = note.noteContentValue
-      this.saveNote = index
-    },
-    // 删除笔记
-    noteStandardDel (note, index) {
-      this.saveNote = index
-      this.$confirm('确认删除该条数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        confirmButtonClass: 'common-button-primary',
-        roundButton: true
-      }).then(() => {
-        this.$http.post('lawss/utNoteInfo/deleteNote', {
-          ids: note.id
-        },
-        {
           _this: this
         }, res => {
           if (res.ok) {
-            this.selectStandard()
+            this.$message.success('已取消收藏')
-          } else {
+            this.contentOpen = false
+            this.pageChange(1)
           }
-        }).catch(() => {
+        }, e => {
         })
-      })
+      }).catch(() => {
-    },
-    closeModal () {
-      this.standardModal = false
-      this.$refs['standardForm'].resetFields()
-    },
-    // 保存笔记 （新增、编辑）
-    saveClass () {
-      this.$refs['standardForm'].validate((valid) => {
-        if (valid) {
-          this.standardModal = false
-          if (this.modalType === 1) {
-            let noteForm = {}
-            noteForm.noteContentValue = this.standardForm.textarea
-            noteForm.sourceType = 'COSTAND'
-            noteForm.noteName = this.standardForm.collectTitle
-            noteForm.sarId = this.standardForm.id
-            noteForm.forwardId = this.standardForm.collectResId
-            this.$http.post('lawss/utNoteInfo/saveNote', noteForm, {
-              _this: this,
-              loading: 'isSubmit'
-            }, res => {
-              this.selectStandard()
-            }, e => {
-            })
-          } else if (this.modalType === 2) {
-            let noteForm = {
-              id: this.standardForm.id,
-              noteContentValue: this.standardForm.textarea
-            }
-            this.$http.post('lawss/utNoteInfo/updateNote', noteForm, {
-              _this: this
-            }, res => {
-              this.selectStandard()
-            }, e => {
-            })
-          }
-        } else {
-          this.$message.error('请正确输入')
-        }
       })
     },
     getDate (date) {
       return date != null ? date.substring(0, date.indexOf(' ')) : ''
     },
     cancleCollectBatch () {
+      console.log(this.selectedList);
+      return
       if (this.selectedList.length === 0) {
         this.$confirm('请先选择数据进行取消收藏', '提示', {
           showCancelButton: false,

src/pages/personal/pages/my-collection/index.vue

@@ -17,19 +17,22 @@ export default {
   data () {
     return {
       active: 'CollectionStandard',
-      tabsList: [ {
+      tabsList: [
-        title: '已收藏的标准法规',
+        {
-        name: 'CollectionStandard'
+          title: '已收藏的标准法规',
-      }, {
+          name: 'CollectionStandard'
-        title: '已收藏的动态&资料 ',
+        },
-        name: 'CollectionDynamics'
+        // {
-      }, {
+        //   title: '已收藏的动态&资料 ',
-        title: '已收藏的政策',
+        //   name: 'CollectionDynamics'
-        name: 'CollectionLaws'
+        // }, {
-      }, {
+        //   title: '已收藏的政策',
-        title: '已收藏的标准拆分',
+        //   name: 'CollectionLaws'
-        name: 'CollectionBreak'
+        // }, {
-      }]
+        //   title: '已收藏的标准拆分',
+        //   name: 'CollectionBreak'
+        // }
+      ]
     }
   },
   methods: {

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -551,7 +551,7 @@
                     <el-collapse-item title="意见填写">
                         <div style="margin: 10px 0;">
                             <el-input
-                                    type="commentText"
+                                    type="textarea"
                                     :rows="3"
                                     resize="none"
                                     placeholder="请输入意见"

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -1,49 +1,50 @@
 <!-- 标准法规库 - 目标市场准入清单 -->
 <template>
   <div id="accessStandardsAndRegulations" class="v-class">
-      <el-tabs v-model="tabValue" style="height: 100%;">
+    <el-tabs v-model="tabValue" style="height: 100%;">
-          <el-tab-pane label="国家/地区清单" name="listOfCountries">
+      <el-tab-pane label="国家/地区清单" name="listOfCountries">
-              <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
+        <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-                  <list-of-countries v-if="tabValue === 'listOfCountries'"></list-of-countries>
+          <list-of-countries v-if="tabValue === 'listOfCountries'"></list-of-countries>
-              </div>
+        </div>
-          </el-tab-pane>
+      </el-tab-pane>
-          <el-tab-pane label="项目类清单" name="listProject">
+      <el-tab-pane label="项目类清单" name="listProject">
-              <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
+        <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-                  <list-project v-if="tabValue === 'listProject'"></list-project>
+          <list-project v-if="tabValue === 'listProject'"></list-project>
-              </div>
+        </div>
-          </el-tab-pane>
+      </el-tab-pane>
-          <el-tab-pane label="重点标准跟踪清单" name="listTracking">
+      <el-tab-pane label="重点标准跟踪清单" name="listTracking">
-              <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
+        <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-                  <list-tracking v-if="tabValue === 'listTracking'"></list-tracking>
+          <list-tracking v-if="tabValue === 'listTracking'"></list-tracking>
-              </div>
+        </div>
-          </el-tab-pane>
+      </el-tab-pane>
-          <el-tab-pane label="其他清单" name="listOther">
+      <el-tab-pane label="其他清单" name="listOther">
-              <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
+        <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-                  <list-other v-if="tabValue === 'listOther'"></list-other>
+          <list-other v-if="tabValue === 'listOther'"></list-other>
-              </div>
+        </div>
-          </el-tab-pane>
+      </el-tab-pane>
-      </el-tabs>
+    </el-tabs>
   </div>
 </template>
 
 <script>
-    import listOfCountries from "../accessStandardsAndRegulations/page/listOfCountries"
+import listOfCountries from "../accessStandardsAndRegulations/page/listOfCountries";
-    import listProject from "../accessStandardsAndRegulations/page/listProject"
+import listProject from "../accessStandardsAndRegulations/page/listProject";
-    import listTracking from "../accessStandardsAndRegulations/page/listTracking"
+import listTracking from "../accessStandardsAndRegulations/page/listTracking";
-    import listOther from "../accessStandardsAndRegulations/page/listOther"
+import listOther from "../accessStandardsAndRegulations/page/listOther";
+
 export default {
-  name: 'AccessStandardsAndRegulations',
+  name: "AccessStandardsAndRegulations",
-  data () {
+  data() {
     return {
-        tabValue: 'listOfCountries'
+      tabValue: "listOfCountries"
-    }
+    };
   },
   methods: {},
   components: {
-      listOfCountries,
+    listOfCountries,
-      listProject,
+    listProject,
-      listTracking,
+    listTracking,
-      listOther
+    listOther
   },
 
   props: {},
@@ -52,39 +53,45 @@ export default {
 
   watch: {},
 
-  mounted () {}
+  mounted() {
-}
+  }
+};
 </script>
 
 <style lang="less" scoped>
-  @import '~@/assets/styles/style';
+@import '~@/assets/styles/style';
-  @import '~@/assets/styles/mixins';
+@import '~@/assets/styles/mixins';
-  #accessStandardsAndRegulations {
+
-      height: 100%;
+#accessStandardsAndRegulations {
-      padding: 0 10px;
+  height: 100%;
-      background: #fff;
+  padding: 0 10px;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+
+  /deep/ .el-tabs {
+    flex: auto;
+    display: flex;
+    flex-direction: column;
+
+    /deep/ .el-tabs__header {
+      margin: 0 !important;
+    }
+
+    .el-tabs__content {
+      height: 100% !important;
+      flex: auto;
+      position: relative;
       display: flex;
       flex-direction: column;
-      /deep/.el-tabs{
+
-          flex: auto;
+      .el-tab-pane {
-          display: flex;
+        height: 100%;
-          flex-direction: column;
+        flex: auto;
-          /deep/ .el-tabs__header{
+        display: flex;
-              margin:0 !important;
+        flex-direction: column;
-          }
-          .el-tabs__content {
-              height: 100% !important;
-              flex: auto;
-              position: relative;
-              display: flex;
-              flex-direction: column;
-              .el-tab-pane {
-                  height: 100%;
-                  flex: auto;
-                  display: flex;
-                  flex-direction: column;
-              }
-          }
       }
+    }
   }
+}
 </style>

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -3,7 +3,7 @@
   <div id="listOfCountries" class="v-class">
     <div class="search-area">
       <div class="left">
-        <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" >
+        <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
           <el-form-item label="国家/地区" class="search-item search-item-last">
             <el-select
               v-model="sarSarAccessEOSearch.countryArea"
@@ -31,7 +31,7 @@
               type="primary"
               class="common-button-primary"
               size="small"
-              @click="searchSarAccessBtn">
+              @click="searchSarAccess">
               查询
             </el-button>
           </el-form-item>
@@ -39,7 +39,8 @@
             <el-button
               class="common-button-default"
               size="small"
-              @click="clearSearch">清空</el-button>
+              @click="clearSearch">清空
+            </el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -51,14 +52,16 @@
         size="mini"
         @click="openModal(null,'addOpt')"
         v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'"
-      ><i class="iconfont">&#xe84e;</i>新增</el-button>
+      ><i class="iconfont">&#xe84e;</i>新增
+      </el-button>
       <el-button
         class="common-button-default delete-button"
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
         v-btn-permission="'WPNW79T3DNUZPJFNMHGP'"
-      ><i class="iconfont">&#xe61b;</i>批量删除</el-button>
+      ><i class="iconfont">&#xe61b;</i>批量删除
+      </el-button>
     </div>
     <div class="container">
       <el-table
@@ -89,7 +92,7 @@
           width="260px"
         >
           <template slot-scope="scope">
-            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.accessContent }}</a>
+            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -97,8 +100,8 @@
           label="清单状态"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.state === '1'">未发布</span>
+            <span v-if="scope.row.detailedListState === '1'">未发布</span>
-            <span v-if="scope.row.state === '2'">已发布</span>
+            <span v-if="scope.row.detailedListState === '2'">已发布</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -106,7 +109,9 @@
           label="清单版本"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.detailedListVesion != null && scope.row.detailedListVesion !== ''">V{{ scope.row.detailedListVesion }}</span>
+            <span
+              v-if="scope.row.detailedListVesion != null && scope.row.detailedListVesion !== ''">{{ scope.row.detailedListVesion
+              }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -114,7 +119,9 @@
           label="适用领域"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">V{{ scope.row.applicationScope }}</span>
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -123,7 +130,7 @@
           sortable
           align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '' }}</div>
+            <div>{{ scope.row.updateTime ? scope.row.updateTime.split(" ")[0] : "" }}</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -137,9 +144,12 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'43UVH8AWGJLFDZT9WNTZ'">查看</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'43UVH8AWGJLFDZT9WNTZ'">查看
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'HYY8NGY2RYT3VEDRSK5V'">编辑</el-dropdown-item>
+                  </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'X9HP9YQL2BRKBFCDMZQT'">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'HYY8NGY2RYT3VEDRSK5V'">编辑
+                  </el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'X9HP9YQL2BRKBFCDMZQT'">删除
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -147,7 +157,8 @@
         </el-table-column>
       </el-table>
       <loading :loading="loading">数据获取中</loading>
-      <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+      <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
+                  @pageSizeChange="pageSizeChange"></pagination>
     </div>
   </div>
 </template>
@@ -155,7 +166,7 @@
 <script>
 export default {
   name: "listOfCountries",
-  data () {
+  data() {
     return {
       searching: false,
       total: 0,
@@ -163,10 +174,10 @@ export default {
       rows: 10,
       // 查询相关参数
       sarSarAccessEOSearch: {
-        countryArea: '',
+        countryArea: "",
-        detailedListName: '',
+        detailedListName: "",
         page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: this.$store.getters.userInfo.configContent
       },
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
@@ -174,171 +185,191 @@ export default {
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
-        country: '',
+        country: "",
-        applyArctic: '',
+        applyArctic: "",
-        energyKind: '',
+        energyKind: "",
-        accessContent: '',
+        accessContent: "",
-        region: ''
+        region: ""
       },
       drawerPage: 1, // 当前抽屉分页的页码
       drawerTotal: 0, // 抽屉分页的总条数
       sarAccessEORules: {
         region: [
-          {required: true, message: '区域不能为空', trigger: 'change'}
+          { required: true, message: "区域不能为空", trigger: "change" }
         ],
         country: [
-          {required: true, message: '国家不能为空', trigger: 'change'}
+          { required: true, message: "国家不能为空", trigger: "change" }
         ],
         accessContent: [
-          {required: true, message: '表格名称不能为空', trigger: 'blur'},
+          { required: true, message: "表格名称不能为空", trigger: "blur" },
-          {type: 'string', max: 100, message: '表格名称不能超过100个字符', trigger: 'blur'}
+          { type: "string", max: 100, message: "表格名称不能超过100个字符", trigger: "blur" }
         ]
       },
       countryOptions: [],
-      drawerCountryOptions: [], // 准入信息 国家下拉框
+      showModalTitle: "",
-      drawerCountryTwoOptions: [], // 数据搜索-多属性搜索国家下拉框
-      energyKindOptions: [],
-      categoryOptions: [],
-      applyArcticOptions: [],
-      applyAuthOptions: [], // 认证类型下拉框
-      // 区域
-      regionOptions: [
-        {
-          label: '国内',
-          value: 'INLAND'
-        },
-        {
-          label: '海外',
-          value: 'FOREIGN'
-        }
-      ],
-      showModalTitle: '',
       disabledFlag: false,
       showModalFlag: false,
       // 新增、编辑过程中数据搜索字段
       sarAccessInfoSearch: {
-        region: '', // 区域
+        region: "", // 区域
-        country: '', // 国家
+        country: "", // 国家
-        keywords: '', // 关键字
+        keywords: "", // 关键字
-        energyKind: '', // 能源种类
+        energyKind: "", // 能源种类
-        category: '', // 所属专业领域
+        category: "", // 所属专业领域
-        applyArctic: '', // 适用车型
+        applyArctic: "", // 适用车型
-        deadLine: '', // 截止时间
+        deadLine: "", // 截止时间
-        applyAuth: '' // 认证类型
+        applyAuth: "" // 认证类型
       },
       dataSourceOptions: [
-        {value: 'INLAND_STAND', label: '国内标准法规'},
+        { value: "INLAND_STAND", label: "国内标准法规" },
-        {value: 'FOREIGN_STAND', label: '海外标准法规'},
+        { value: "FOREIGN_STAND", label: "海外标准法规" },
-        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        { value: "FOREIGN_LAWS", label: "国内外政策" },
-        {value: 'BUSINESS', label: '企业标准 '}
+        { value: "BUSINESS", label: "企业标准 " }
       ],
       sarAccessInfoSearchList: [],
       selectedAccInfoSearchList: [],
       sarAccessInfoListArry: [],
       sarAccessInfoList: [],
-      importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=',
+      importExcelUrl: "/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=",
       importmodalFlag: false,
-      saveExportType: '',
+      saveExportType: "",
       seeModalFlag: false, // 查看抽屉显示隐藏
-      seeModalTitle: '', // 查看抽屉title
+      seeModalTitle: "", // 查看抽屉title
       seeSarAccessInfoList: [], // 查看抽屉内 table
       delLoading: false
-    }
+    };
   },
   methods: {
     // 更多
-    handleCommand (command) {
+    handleCommand(command) {
       switch (command[1]) {
-        case '查看':
+        case "查看":
-          this.showTable(command[0])
+          this.showTable(command[0]);
-          break
+          break;
-        case '编辑':
+        case "编辑":
-          this.editTable(command[0])
+          this.editTable(command[0]);
-          break
+          break;
-        case '删除':
+        case "删除":
-          this.deleteSarAccess('delOne', command[0].id)
+          this.deleteSarAccess("delOne", command[0].id);
-          break
+          break;
       }
     },
-    // 搜索
-    searchSarAccessBtn () {
-      this.page = 1
-      this.searchSarAccess()
-    },
     //分页查询
-    searchSarAccess (advanceSearch) {
+    searchSarAccess() {
+      this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+        sortKey: 1,
+        ...this.sarSarAccessEOSearch
+      }, {
+        _this: this
+      }, res => {
+        console.log(res.data.records);
+        this.sarAccessListDatas = res.data.records;
+        this.sarAccessListTotal = res.data.total
+      }, e => {
+
+      });
+    },
+    pageChange(page) {
+      this.sarSarAccessEOSearch.page = page;
+      this.searchSarAccess();
+    },
+    pageSizeChange(pageSize) {
+      this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchSarAccess();
+    },
+    clearSearch() {
+      this.sarSarAccessEOSearch = {
+        countryArea: "",
+        detailedListName: ""
+      };
+      this.searchSarAccess();
 
-    },
-    pageChange (page) {
-      this.sarSarAccessEOSearch.page = page
-      this.searchSarAccess()
-    },
-    pageSizeChange (pageSize) {
-      this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent
-      this.searchSarAccess()
-    },
-    clearSearch (search = true) {
-      // search 字段是为了处理高级查询时清空字段用的
-      this.sarSarAccessEOSearch.country = ''
-      this.sarSarAccessEOSearch.accessContent = ''
-      this.sarSarAccessEOSearch.applyArctic = ''
-      this.sarSarAccessEOSearch.energyKind = ''
-      this.sarSarAccessEOSearch.type = ''
-      this.sarSarAccessEOSearch.page = 1
-      search && this.searchSarAccess()
     },
     // 新增相关
-    openModal (row, optType) {
+    openModal(row, optType) {
       this.$router.push({
-        name: 'ListOfStandardsAndRegulationsDetails'
+        name: "ListOfStandardsAndRegulationsDetails"
-      })
+      });
     },
-    // 删除
+    // 批量删除
-    deleteSarAccess (flag, id) {
+    deleteSarAccess(flag, id) {
+      if (flag === "delOne") {
+        this.selectedList = [];
+        this.selectedList[0] = id;
+      }
+      if (!this.selectedList.length) {
+        this.$message.warning("请选择要删除的数据");
+      } else {
+        this.$confirm("确认删除选中数据？", "确认删除", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          confirmButtonClass: "common-button-primary",
+          roundButton: false,
+          type: "warning"
+        }).then(() => {
+          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
+          this.$http.postDelete(URL, {}, res => {
+            this.searchSarAccess();
+            this.selectedList = [];
+            this.$message.success('删除成功')
+          }, e => {
+          });
+        }).catch(() => {
+        });
+      }
     },
     // 表格选择框
-    selectOne (alldata, nowdata) {
+    selectOne(data) {
-      this.selectedList = []
+      this.selectedList = [];
-      for (let i = 0; i < alldata.length; i++) {
+      for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(alldata[i]['id'])
+        this.selectedList.push(data[i].id);
       }
     },
     // 点击 table查看按钮 事件
-    showTable (item) {
+    showTable(item) {
-      sessionStorage.setItem('accessRow', JSON.stringify(item))
+      sessionStorage.setItem("accessRow", JSON.stringify(item));
-      this.$store.commit('setDetailMap', this.$route.path)
+      this.$store.commit("setDetailMap", this.$route.path);
       this.$router.push({
-        name: 'AccessStandardDetails',
+        name: "AccessStandardDetails",
         params: {
           id: item.id
         }
-      })
+      });
     },
     // 点击 table编辑按钮 事件
-    editTable (item) {
+    editTable(item) {
-      sessionStorage.setItem('accessRow', JSON.stringify(item))
+      sessionStorage.setItem("accessRow", JSON.stringify(item));
       this.$router.push({
-        name: 'ListOfStandardsAndRegulationsDetails',
+        name: "ListOfStandardsAndRegulationsDetails",
         query: {
           id: item.id
         }
-      })
+      });
-    },
+    }
   },
-  mounted () {
+  mounted() {
     // 分页查询数据
-    this.searchSarAccess()
+    this.searchSarAccess();
-  },
+    // 从数据库中查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+    }, e => {
+    });
+  }
 };
 </script>
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
+
 #listOfCountries {
   height: 100%;
   display: flex;
   flex-direction: column;
+
   .container {
     display: flex;
     flex-direction: column;
@@ -348,32 +379,39 @@ export default {
     //height: calc(~'100% - 105px - 56px') !important;
     .pagination {
       position: static;
+
       /deep/ .pagination-slot {
         padding: 0;
       }
     }
   }
-  .el-divider{
+
-    .el-divider__text{
+  .el-divider {
+    .el-divider__text {
       font-size: 16px;
       color: #0c91e5;
     }
   }
-  .standards-drawer-table-one{
+
+  .standards-drawer-table-one {
     position: relative;
     height: 350px;
-    .pagination{
+
+    .pagination {
       bottom: 0;
     }
   }
-  .standards-drawer-table{
+
+  .standards-drawer-table {
     margin-top: 10px;
   }
-  .see-drawer{
+
-    .searchAngNewBtn{
+  .see-drawer {
+    .searchAngNewBtn {
       float: right;
     }
-    .el-divider{
+
+    .el-divider {
       clear: both;
     }
   }

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -12,7 +12,7 @@
           </el-form-item>
           <el-form-item label="清单名称" class="search-item search-item-last">
             <el-input
-              v-model="sarSarAccessEOSearch.ListName"
+              v-model="sarSarAccessEOSearch.detailedListName"
               placeholder="请输入清单名称"
             ></el-input>
           </el-form-item>
@@ -22,7 +22,7 @@
               type="primary"
               class="common-button-primary"
               size="small"
-              @click="searchSarAccessBtn">
+              @click="searchSarAccess">
               查询
             </el-button>
           </el-form-item>
@@ -80,7 +80,7 @@
           width="260px"
         >
           <template slot-scope="scope">
-            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.accessContent }}</a>
+            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -88,8 +88,8 @@
           label="清单状态"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.state === '1'">未发布</span>
+            <span v-if="scope.row.detailedListState === '1'">未发布</span>
-            <span v-if="scope.row.state === '2'">已发布</span>
+            <span v-if="scope.row.detailedListState === '2'">已发布</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -97,7 +97,7 @@
           label="清单版本"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.detailedListVesion != null && scope.row.detailedListVesion !== ''">V{{ scope.row.detailedListVesion }}</span>
+            <span v-if="scope.row.detailedListVesion != null && scope.row.detailedListVesion !== ''">{{ scope.row.detailedListVesion }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -105,7 +105,7 @@
           label="适用领域"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">V{{ scope.row.applicationScope }}</span>
+            <span v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -154,15 +154,10 @@ export default {
       rows: 10,
       // 查询相关参数
       sarSarAccessEOSearch: {
-        ListName: '',
+        detailedList: '',
-        country: '',
+        detailedListName: '',
-        accessContent: '',
-        energyKind: '',
-        applyArctic: '',
-        region: '',
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
-        validFlag: 0
       },
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
@@ -256,13 +251,18 @@ export default {
           break
       }
     },
-    // 搜索
-    searchSarAccessBtn () {
-      this.page = 1
-      this.searchSarAccess()
-    },
     //分页查询
-    searchSarAccess (advanceSearch) {
+    searchSarAccess () {
+      this.$http.get('sarLawsDetailedList/sar-laws-detailed-list/getAllStand',{
+        ...this.sarSarAccessEOSearch,
+        sortKey: 3,
+      }, {
+        _this: this
+      }, res =>{
+        this.sarAccessListDatas = res.data.records
+        this.sarAccessListTotal = res.data.total
+      }, e => {
+      })
 
     },
     pageChange (page) {
@@ -291,14 +291,38 @@ export default {
     },
     // 删除
     deleteSarAccess (flag, id) {
-    },
+      if (flag === 'delOne') {
-    // 表格选择框
+        this.selectedList = [];
-    selectOne (alldata, nowdata) {
+        this.selectedList[0] = id;
-      this.selectedList = []
+      }
-      for (let i = 0; i < alldata.length; i++) {
+      if(this.selectedList.length === 0) {
-        this.selectedList.push(alldata[i]['id'])
+        this.$message.warning('请选择要删除的数据')
+      } else {
+        this.$confirm('确认删除这些数据？', '提示', {
+          confirmButtonText: '确认',
+          confirmButtonClass: 'common-button-primary',
+          cancelButtonText: '取消',
+          type:'warning'
+        }).then (() => {
+          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
+          this.$http.postDelete(URL, {}, res => {
+            this.searchSarAccess();
+            this.selectedList = [];
+            this.$message.success('删除成功')
+          }, e => {
+          });
+        }).catch(() => {
+
+        })
       }
     },
+    // 表格选择框
+       selectOne(data) {
+        this.selectedList = []
+         for(let i = 0; i < data.length; i++) {
+           this.selectedList.push(data[i].id)
+         }
+       },
     // 点击 table查看按钮 事件
     showTable (item) {
       sessionStorage.setItem('accessRow', JSON.stringify(item))

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -3,7 +3,7 @@
   <div id="listOfCountries" class="v-class">
     <div class="search-area">
       <div class="left">
-        <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" >
+        <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
           <el-form-item label="项目名称" class="search-item search-item-last">
             <el-input
               v-model="sarSarAccessEOSearch.projectName"
@@ -22,7 +22,7 @@
               type="primary"
               class="common-button-primary"
               size="small"
-              @click="searchSarAccessBtn">
+              @click="searchSarAccess">
               查询
             </el-button>
           </el-form-item>
@@ -30,7 +30,8 @@
             <el-button
               class="common-button-default"
               size="small"
-              @click="clearSearch">清空</el-button>
+              @click="clearSearch">清空
+            </el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -42,14 +43,16 @@
         size="mini"
         @click="openModal(null,'addOpt')"
         v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'"
-      ><i class="iconfont">&#xe84e;</i>新增</el-button>
+      ><i class="iconfont">&#xe84e;</i>新增
+      </el-button>
       <el-button
         class="common-button-default delete-button"
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
         v-btn-permission="'WPNW79T3DNUZPJFNMHGP'"
-      ><i class="iconfont">&#xe61b;</i>批量删除</el-button>
+      ><i class="iconfont">&#xe61b;</i>批量删除
+      </el-button>
     </div>
     <div class="container">
       <el-table
@@ -80,7 +83,7 @@
           width="260px"
         >
           <template slot-scope="scope">
-            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.accessContent }}</a>
+            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -88,8 +91,8 @@
           label="清单状态"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.state === '1'">未发布</span>
+            <span v-if="scope.row.detailedListState === '1'">未发布</span>
-            <span v-if="scope.row.state === '2'">已发布</span>
+            <span v-if="scope.row.detailedListState === '2'">已发布</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -97,7 +100,9 @@
           label="清单版本"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.detailedListVesion != null && scope.row.detailedListVesion !== ''">V{{ scope.row.detailedListVesion }}</span>
+            <span
+              v-if="scope.row.detailedListVesion != null && scope.row.detailedListVesion !== ''">{{ scope.row.detailedListVesion
+              }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -105,7 +110,9 @@
           label="适用领域"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">V{{ scope.row.applicationScope }}</span>
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -114,7 +121,7 @@
           sortable
           align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '' }}</div>
+            <div>{{ scope.row.updateTime ? scope.row.updateTime.split(" ")[0] : "" }}</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -128,9 +135,12 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'43UVH8AWGJLFDZT9WNTZ'">查看</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'43UVH8AWGJLFDZT9WNTZ'">查看
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'HYY8NGY2RYT3VEDRSK5V'">编辑</el-dropdown-item>
+                  </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'X9HP9YQL2BRKBFCDMZQT'">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'HYY8NGY2RYT3VEDRSK5V'">编辑
+                  </el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'X9HP9YQL2BRKBFCDMZQT'">删除
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -138,7 +148,8 @@
         </el-table-column>
       </el-table>
       <loading :loading="loading">数据获取中</loading>
-      <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+      <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
+                  @pageSizeChange="pageSizeChange"></pagination>
     </div>
   </div>
 </template>
@@ -146,7 +157,7 @@
 <script>
 export default {
   name: "listProject",
-  data () {
+  data() {
     return {
       searching: false,
       total: 0,
@@ -154,10 +165,10 @@ export default {
       rows: 10,
       // 查询相关参数
       sarSarAccessEOSearch: {
-        projectName: '',
+        projectName: "",
-        detailedListName: '',
+        detailedListName: "",
         page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: this.$store.getters.userInfo.configContent
       },
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
@@ -165,24 +176,24 @@ export default {
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
-        country: '',
+        country: "",
-        applyArctic: '',
+        applyArctic: "",
-        energyKind: '',
+        energyKind: "",
-        accessContent: '',
+        accessContent: "",
-        region: ''
+        region: ""
       },
       drawerPage: 1, // 当前抽屉分页的页码
       drawerTotal: 0, // 抽屉分页的总条数
       sarAccessEORules: {
         region: [
-          {required: true, message: '区域不能为空', trigger: 'change'}
+          { required: true, message: "区域不能为空", trigger: "change" }
         ],
         country: [
-          {required: true, message: '国家不能为空', trigger: 'change'}
+          { required: true, message: "国家不能为空", trigger: "change" }
         ],
         accessContent: [
-          {required: true, message: '表格名称不能为空', trigger: 'blur'},
+          { required: true, message: "表格名称不能为空", trigger: "blur" },
-          {type: 'string', max: 100, message: '表格名称不能超过100个字符', trigger: 'blur'}
+          { type: "string", max: 100, message: "表格名称不能超过100个字符", trigger: "blur" }
         ]
       },
       countryOptions: [],
@@ -195,141 +206,172 @@ export default {
       // 区域
       regionOptions: [
         {
-          label: '国内',
+          label: "国内",
-          value: 'INLAND'
+          value: "INLAND"
         },
         {
-          label: '海外',
+          label: "海外",
-          value: 'FOREIGN'
+          value: "FOREIGN"
         }
       ],
-      showModalTitle: '',
+      showModalTitle: "",
       disabledFlag: false,
       showModalFlag: false,
       // 新增、编辑过程中数据搜索字段
       sarAccessInfoSearch: {
-        region: '', // 区域
+        region: "", // 区域
-        country: '', // 国家
+        country: "", // 国家
-        keywords: '', // 关键字
+        keywords: "", // 关键字
-        energyKind: '', // 能源种类
+        energyKind: "", // 能源种类
-        category: '', // 所属专业领域
+        category: "", // 所属专业领域
-        applyArctic: '', // 适用车型
+        applyArctic: "", // 适用车型
-        deadLine: '', // 截止时间
+        deadLine: "", // 截止时间
-        applyAuth: '' // 认证类型
+        applyAuth: "" // 认证类型
       },
       dataSourceOptions: [
-        {value: 'INLAND_STAND', label: '国内标准法规'},
+        { value: "INLAND_STAND", label: "国内标准法规" },
-        {value: 'FOREIGN_STAND', label: '海外标准法规'},
+        { value: "FOREIGN_STAND", label: "海外标准法规" },
-        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        { value: "FOREIGN_LAWS", label: "国内外政策" },
-        {value: 'BUSINESS', label: '企业标准 '}
+        { value: "BUSINESS", label: "企业标准 " }
       ],
       sarAccessInfoSearchList: [],
       selectedAccInfoSearchList: [],
       sarAccessInfoListArry: [],
       sarAccessInfoList: [],
-      importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=',
+      importExcelUrl: "/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=",
       importmodalFlag: false,
-      saveExportType: '',
+      saveExportType: "",
       seeModalFlag: false, // 查看抽屉显示隐藏
-      seeModalTitle: '', // 查看抽屉title
+      seeModalTitle: "", // 查看抽屉title
       seeSarAccessInfoList: [], // 查看抽屉内 table
       delLoading: false
-    }
+    };
   },
   methods: {
     // 更多
-    handleCommand (command) {
+    handleCommand(command) {
       switch (command[1]) {
-        case '查看':
+        case "查看":
-          this.showTable(command[0])
+          this.showTable(command[0]);
-          break
+          break;
-        case '编辑':
+        case "编辑":
-          this.editTable(command[0])
+          this.editTable(command[0]);
-          break
+          break;
-        case '删除':
+        case "删除":
-          this.deleteSarAccess('delOne', command[0].id)
+          this.deleteSarAccess("delOne", command[0].id);
-          break
+          break;
       }
     },
-    // 搜索
-    searchSarAccessBtn () {
-      this.page = 1
-      this.searchSarAccess()
-    },
     //分页查询
-    searchSarAccess (advanceSearch) {
+    searchSarAccess() {
+      this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+        ...this.sarSarAccessEOSearch,
+        sortKey: 2
+      }, {
+        _this: this
+      }, res => {
+        this.sarAccessListDatas = res.data.records;
+        this.sarAccessListTotal = res.data.total
+      }, e => {
+      });
 
     },
-    pageChange (page) {
+    pageChange(page) {
-      this.sarSarAccessEOSearch.page = page
+      this.sarSarAccessEOSearch.page = page;
-      this.searchSarAccess()
+      this.searchSarAccess();
     },
-    pageSizeChange (pageSize) {
+    pageSizeChange(pageSize) {
-      this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent
+      this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchSarAccess()
+      this.searchSarAccess();
     },
-    clearSearch (search = true) {
+    //清空
-      // search 字段是为了处理高级查询时清空字段用的
+    clearSearch() {
-      this.sarSarAccessEOSearch.country = ''
+      this.sarSarAccessEOSearch = {
-      this.sarSarAccessEOSearch.accessContent = ''
+        projectName: "",
-      this.sarSarAccessEOSearch.applyArctic = ''
+        detailedListName: "",
-      this.sarSarAccessEOSearch.energyKind = ''
+      };
-      this.sarSarAccessEOSearch.type = ''
+      this.searchSarAccess();
-      this.sarSarAccessEOSearch.page = 1
+
-      search && this.searchSarAccess()
     },
     // 新增相关
-    openModal (row, optType) {
+    openModal(row, optType) {
       this.$router.push({
-        name: 'ListOfStandardsAndRegulationsDetails'
+        name: "ListOfStandardsAndRegulationsDetails"
-      })
+      });
     },
     // 删除
-    deleteSarAccess (flag, id) {
+    deleteSarAccess(flag, id) {
+      if (flag === 'delOne') {
+        this.selectedList = [];
+        this.selectedList[0] = id;
+      }
+      if (this.selectedList === 0) {
+        this.$message.warning('请选择要删除的数据')
+      } else {
+        this.$confirm('确定删除这些数据？', '提示', {
+          confirmButtonText: '确定',
+          confirmButtonClass: 'common-button-primary',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
+          this.$http.postDelete(URL, {}, res => {
+            this.searchSarAccess();
+            this.selectedList = [];
+            this.$message.success('删除成功')
+          }, e => {
+          });
+        }).catch(() => {
+
+        })
+      }
+
     },
     // 表格选择框
-    selectOne (alldata, nowdata) {
+    selectOne(data) {
-      this.selectedList = []
+      this.selectedList = [];
-      for (let i = 0; i < alldata.length; i++) {
+      for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(alldata[i]['id'])
+        this.selectedList.push(data[i].id);
       }
     },
     // 点击 table查看按钮 事件
-    showTable (item) {
+    showTable(item) {
-      sessionStorage.setItem('accessRow', JSON.stringify(item))
+      sessionStorage.setItem("accessRow", JSON.stringify(item));
-      this.$store.commit('setDetailMap', this.$route.path)
+      this.$store.commit("setDetailMap", this.$route.path);
       this.$router.push({
-        name: 'AccessStandardDetails',
+        name: "AccessStandardDetails",
         params: {
           id: item.id
         }
-      })
+      });
     },
     // 点击 table编辑按钮 事件
-    editTable (item) {
+    editTable(item) {
-      sessionStorage.setItem('accessRow', JSON.stringify(item))
+      sessionStorage.setItem("accessRow", JSON.stringify(item));
       this.$router.push({
-        name: 'ListOfStandardsAndRegulationsDetails',
+        name: "ListOfStandardsAndRegulationsDetails",
         query: {
           id: item.id
         }
-      })
+      });
-    },
+    }
   },
-  mounted () {
+  mounted() {
     // 分页查询数据
-    this.searchSarAccess()
+    this.searchSarAccess();
-  },
+  }
 };
 </script>
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
+
 #listOfCountries {
   height: 100%;
   display: flex;
   flex-direction: column;
+
   .container {
     display: flex;
     flex-direction: column;
@@ -339,32 +381,39 @@ export default {
     //height: calc(~'100% - 105px - 56px') !important;
     .pagination {
       position: static;
+
       /deep/ .pagination-slot {
         padding: 0;
       }
     }
   }
-  .el-divider{
+
-    .el-divider__text{
+  .el-divider {
+    .el-divider__text {
       font-size: 16px;
       color: #0c91e5;
     }
   }
-  .standards-drawer-table-one{
+
+  .standards-drawer-table-one {
     position: relative;
     height: 350px;
-    .pagination{
+
+    .pagination {
       bottom: 0;
     }
   }
-  .standards-drawer-table{
+
+  .standards-drawer-table {
     margin-top: 10px;
   }
-  .see-drawer{
+
-    .searchAngNewBtn{
+  .see-drawer {
+    .searchAngNewBtn {
       float: right;
     }
-    .el-divider{
+
+    .el-divider {
       clear: both;
     }
   }

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -53,7 +53,7 @@
                 :on-success="uploadBackSuccess"
                 :before-upload="beforeUpload"
               >
-                <el-button class="common-button-default">
+                <el-button class="common-button-default" size="mini">
                   点击上传
                 </el-button>
               </el-upload>
@@ -140,19 +140,18 @@
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
-                icon="el-icon-search"
                 type="primary"
                 class="common-button-primary"
                 size="small"
                 @click="searchLawsStands">
+                查询
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
                 class="common-button-default"
-                icon="el-icon-refresh-left"
                 size="small"
-                @click="clearSearchLaws"></el-button>
+                @click="clearSearchLaws">清空</el-button>
             </el-form-item>
 <!--        多属性搜索，暂时不需要，已添加高级检索-->
 <!--            <el-form-item class="search-item" v-if="moreSearchBtn">