海外标准

src/pages/details/otherStandardDetails/index.vue

@@ -19,7 +19,7 @@
             <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
             <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
             <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>
-            <el-button class="relation-btn" @click="comparisonDialogOpen">标准分解单</el-button>
+            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>
           </div>
         </div>
         <div class="basic-information-content">
@@ -335,7 +335,7 @@
                 :loading="searching"
                 icon="el-icon-search"
                 type="primary"
-                round
+                size="mini"
                 class="common-button-primary"
                 @click="searchSarStandItems">
               </el-button>
@@ -345,28 +345,17 @@
                 class="common-button-default"
                 icon="el-icon-refresh-left"
                 @click="clearAllSearch"
-                round>
+                size="mini">
               </el-button>
             </el-form-item>
           </el-form>
         </div>
       </div>
       <div class="action-bar">
-        <!--<el-button-->
+        <el-button class="common-button-default export-button" icon="export"  size="mini"
-        <!--  round-->
-        <!--  type="primary"-->
-        <!--  class="common-button-primary add-button"-->
-        <!--  :loading="searching"-->
-        <!--  icon="add"-->
-        <!--  @click="addItemModal"-->
-        <!--  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '84a37ea1e1' : '3D87NJR8N3'">新增</el-button>-->
-        <!--<el-button class="common-button-default" :loading="searching" @click="uploadImportModal">模板下载</el-button>-->
-        <!--<el-button class="common-button-default in-button" :loading="searching" icon="in" @click="addImportModal(2)" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '9ca97b05b2' : '6JM97X9W9C'">导入</el-button>-->
-        <el-button class="common-button-default export-button" icon="export"
                    @click="exportStandardItem" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">导出</el-button>
-        <!--<el-button class="common-button-default delete-button" icon="delete" @click="deleteStandItem(2)" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '8ac1820c42' : 'LRQHPT8E2Y'">删除</el-button>-->
         <el-button
-          round
+          size="mini"
           type="primary"
           class="common-button-primary"
           @click="openRelatedTermsDrawer"
@@ -702,11 +691,11 @@
       <div class="action-bar">
         <el-button type="primary"
                    class="common-button-primary add-button"
-                   round
+                   size="mini"
                    :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'PVBSWCJQ9X4RVBM9RK7L' : 'NJ3YL4SVEJADWH7ESHDX'"
                    @click="addknowledge(1)"><i class="iconfont">&#xe84e;</i>新增</el-button>
         <el-button class="common-button-default delete-button"
-                   round
+                   size="mini"
                    :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'"
                    @click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
       </div>
@@ -798,7 +787,7 @@
         </el-formItem>
       </el-form>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button type="primary" round class="common-button-primary" :loading="AddKnowSubLoading" icon="el-icon-check" @click="AddKnowSub">确定</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary" :loading="AddKnowSubLoading" icon="el-icon-check" @click="AddKnowSub">确定</el-button>
         <el-button class="common-button-default" icon="el-icon-close" @click="AddKnowClose">取消</el-button>
       </div>
     </el-dialog>
@@ -838,23 +827,19 @@
                     icon="el-icon-search"
                     type="primary"
                     class="common-button-primary"
-                    round
+                    size="mini"
                     @click="getComparison()">
             </el-button>
             <el-button
                     class="common-button-default"
                     icon="el-icon-refresh-left"
-                    round
+                    size="mini"
                     @click="clearComparison()"></el-button>
-            <el-button type="primary" class="common-button-primary" round @click="addComparison"><i class="iconfont">&#xe84e;</i>新增</el-button>
+            <el-button type="primary" class="common-button-primary" size="mini" @click="addComparison"><i class="iconfont">&#xe84e;</i>新增</el-button>
           </el-form-item>
         </el-form>
       </div>
       <div class="action-bar">
-<!--        <el-button type="primary"-->
-<!--                   class="common-button-primary add-button"-->
-<!--                   round-->
-<!--                   @click="addComparison"><i class="iconfont">&#xe84e;</i>新增</el-button>-->
         <div class="myRadio">
           <template>
             <el-radio-group v-for="(item, index) in comparisonList" :key="index" v-model="comparisonId">
@@ -864,7 +849,7 @@
           </template>
         </div>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="comparisonSub">确定</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="comparisonSub">确定</el-button>
           <el-button class="common-button-default" icon="el-icon-close" @click="comparisonClose">取消</el-button>
         </div>
       </div>
@@ -909,7 +894,7 @@
         <p v-html="importForm.content"></p>
       </div>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button type="primary" round class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
+        <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
       </div>
     </el-dialog>
     <loading :loading="loading">数据获取中</loading>
@@ -933,8 +918,8 @@
         ></related-terms-select>
       </div>
       <div class="demo-drawer-footer">
-        <el-button class="common-button-primary" icon="el-icon-check" type="primary" :loading="btnLoading" @click="handleRelatedTermsDrawerSubmit">{{$t('m.submit')}}</el-button>
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading" @click="handleRelatedTermsDrawerSubmit">{{$t('m.submit')}}</el-button>
-        <el-button class="common-button-default" icon="el-icon-close" @click="handleRelatedTermsDrawerCancel">{{$t('m.cancel')}}</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleRelatedTermsDrawerCancel">{{$t('m.cancel')}}</el-button>
       </div>
     </el-drawer>
     <!--内容简介-->
@@ -2217,7 +2202,7 @@ export default {
         confirmButtonText: '确定',
         confirmButtonClass: 'common-button-primary',
         cancelButtonText: '取消',
-        roundButton: true,
+        roundButton: false,
         type: 'warning'
       }).then(() => {
         if (this.selectedItemList != null && this.selectedItemList.length > 0) {
@@ -2243,7 +2228,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning',
           confirmButtonClass: 'common-button-primary',
-          roundButton: true
+          roundButton: false
         }).then(() => {
           this.$http.post('lawss/sarStandItems/deleteStandItem', {
             id: ids,
@@ -2387,7 +2372,7 @@ export default {
      */
     getAddFormFieldList (isEdit) {
       return new Promise((resolve, reject) => {
-        this.$http.get('sarStandAttrDetails/sar-stand-attr-details/list', {}, {_this: this},
+        this.$http.get('lawss/sarStandAttrDetails/list', {}, {_this: this},
           res => {
             if (res.ok) {
               // const { data: { STAND: data } } = res

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2305,7 +2305,7 @@ export default {
             } else {
               this.importModalshowflag = true
               this.showUploadlist = true
-              this.importExcelUrl = '/api/lawss/sarStandardsInfo/importZipStandardsInfo?standType=INLAND&menuId=' + menuId
+              this.importExcelUrl = '/api/sarStandardsInfo/sar-standards-info/importZipStandardsInfo?standType=INLAND&menuId=' + menuId
             }
           } else {
             this.importModalshowflag = true
@@ -3582,8 +3582,7 @@ export default {
   },
   async mounted () {
     // 进入页面后查询树形结构目录
-    // await this.selectMenu()
+    await this.selectMenu()
-
     this.treeReload = true
     // 从数据库中查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -236,6 +236,69 @@
           <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
         </span>
       </el-dialog>
+      <table-tools-bar v-model="isAdvancedSearch">
+        <div slot="content">
+          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
+            <!--            标准号-->
+            <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">
+              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
+                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+            </el-form-item>
+            <!--            标准名称-->
+            <el-form-item :label="$t('m.standName')" class="serch-form-item">
+              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
+                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+            </el-form-item>
+            <!--            标准类别-->
+            <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">
+              <search-select
+                v-model="sarStandardsSearch.standSort"
+                :placeholder="$t('m.standardCategoryTips')"
+                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+                :options="standSortOptions"
+                clearable/>
+            </el-form-item>
+            <!--            标准状态-->
+            <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.standState" :placeholder="$t('m.lookupByStandardStatus')" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            代替标准号-->
+            <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">
+              <el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
+                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+            </el-form-item>
+            <!--            适用车型-->
+            <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
+              <search-select
+                v-model="sarStandardsSearch.applyArctic"
+                :placeholder="$t('m.searchAccordingToThApplicableModel')"
+                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+                :options="applyArcticOptions"
+                clearable/>
+            </el-form-item>
+            <!--            适用产品线（新增字段）-->
+            <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">
+              <search-select
+                v-model="sarStandardsSearch.category"
+                :placeholder="$t('m.searchByApplicableProductLine')"
+                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+                :options="categoryOptions"
+                clearable/>
+            </el-form-item>
+            <!--            关联模块（新增字段）-->
+            <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.standNature" :placeholder="$t('m.SearchByAssociatedModule')" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </div>
+      </table-tools-bar>
       <!-- 新增海外标准 -->
       <el-drawer
         :title="modalshowtitle"
@@ -850,6 +913,7 @@ import CustomDatePickWithText, {formatText} from '@/components/CustomFormCompone
 import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
 import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2'
+import { interfaceUrl } from "@/sysConfig";
 
 export default {
   name: 'foreignStandardsAndRegulations',
@@ -889,6 +953,27 @@ export default {
         collectTitle: '',
         collectType: ''
       },
+      sarStandardsSearch: {
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        standType: 'INLAND',
+        validFlag: '0',
+        menuId: '',
+        country: '',
+        standNumber: '',
+        standName: '',
+        standState: '',
+        standNature: '',
+        issueTime: '',
+        // applyArctic: '',
+        replaceStandNum: '',
+        // replaceStandNumCope: '',
+        // replaceStandNumList: [],
+        replacedStandNum: '',
+        synopsis: '', // 内容摘要
+        // category: '', // 所属类别
+        standSort: '' // 标准类别
+      }, // 分页查询过程中用到的对象
       loading: false,
       isCollapse: true,
       sideClose: false, // 边栏收展状态
@@ -1747,7 +1832,7 @@ export default {
     // 查询二级菜单
     selectMenu () {
       return new Promise((resolve, reject) => {
-        this.$http.get('sarMenu/sar-menu/selectMenuByRole', {sorDivide: 'FOREIGN_STAND'}, {
+        this.$http.get('lawss/sarMenu/selectMenuByRole', {sorDivide: 'FOREIGN_STAND'}, {
           _this: this
         }, res => {
           let treeNode = []
@@ -1924,8 +2009,11 @@ export default {
     exportTestItem () {
       if (this.saveExportType === 'apart') {
         if (this.selectedList != null && this.selectedList !== '') {
-          window.open('/api/lawss/sarStandardsInfo/exportStandardsInfoExcel?exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType)
+           const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
+             'exportType' + this.saveExportType  + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType
+          window.open(exportURL)
           this.$message.success('导出信息成功')
+
         }
       } else if (this.saveExportType === 'all') {
         let exportEOStr = JSON.stringify(this.SarExportSearchEo)
@@ -2067,7 +2155,7 @@ export default {
             type: 'warning',
             roundButton: false
           }).then(() => {
-            this.$http.post('lawss/sarStandardsInfo/deleteSarStandards', {ids: itemid}, {
+            this.$http.post('sarStandardsInfo/sar-standards-info/deleteSarStandards', {ids: itemid}, {
               _this: this,
               loading: 'delLoading'
             }, res => {
@@ -2099,7 +2187,7 @@ export default {
               roundButton: false,
               type: 'warning'
             }).then(() => {
-              this.$http.post('lawss/sarStandardsInfo/deleteSarStandards', {ids: this.selectedList.join(',')}, {
+              this.$http.post('sarStandardsInfo/sar-standards-info/deleteSarStandards', {ids: this.selectedList.join(',')}, {
                 _this: this
               }, res => {
                 this.getDomesticStandardTable(this.tableFlag)
@@ -2116,7 +2204,7 @@ export default {
     },
     // 模板下载
     uploadImportModal (flag) {
-      window.open('/api/lawss/sarStandardsInfo/exportTemplate?standType=FOREIGN')
+      window.open('/api/sarStandardsInfo/sar-standards-info/exportTemplate?standType=FOREIGN')
       // if (flag === 1) {
       // } else {
       //   window.open('/api/lawss/sarStandardsInfo/exportTemplate?fileName=标准条目导入模板.xlsx')
@@ -2163,7 +2251,7 @@ export default {
     validateStandNumber (standInfo) {
       return new Promise((resolve, reject) => {
         let obj = JSON.parse(JSON.stringify(standInfo))
-        this.$http.post('lawss/sarStandardsInfo/validateStandNumber', obj, {
+        this.$http.post('sarStandardsInfo/sar-standards-info/validateStandNumber', obj, {
           _this: this
         }, res => {
           if (res.ok) {
@@ -3678,4 +3766,23 @@ export default {
 ::v-deep .el-drawer{
   outline: none!important;
 }
+.label-input-form {
+  &.table-lattice{
+    /deep/.el-form-item__label {
+      width:100px;
+      height:30px;
+      border: 1px solid #DCDFE6;
+      border-right: none;
+      line-height:30px;
+      text-align: center;
+      margin-top: 6px;
+      background: #F9F9F9;
+    }
+    /deep/.el-input__inner {
+      height: 30px;
+      line-height: 30px;
+      border-radius: 0 !important;
+    }
+  }
+}
 </style>