Merge branch 'develop' into 'test'

Develop

See merge request !75

src/pages/localTool/standAutoSplit/index.vue

@@ -77,6 +77,15 @@
                 show-overflow-tooltip
                 align="center">
             </el-table-column>
+            <el-table-column
+                prop="splitStatus"
+                label="拆分状态"
+                align="center">
+              <template slot-scope="scope">
+                <div>{{ scope.row.splitStatus == '0' ? '编辑中' : (scope.row.splitStatus == '1' ? '审核中' : '已完成' +
+                    '') }}</div>
+              </template>
+            </el-table-column>
             <el-table-column
                 prop="creationTime"
                 label="拆分时间"

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

@@ -1108,66 +1108,6 @@ export default {
           }
         ]
         // 国内外政策可查字段
-      }else if (val === 'FOREIGN_LAWS'){
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'SYCLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '政策编号',
-            value: 'LAWS_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'LAWS_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'LAWS_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '个性化标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '维护工程师',
-            value: 'ZCGCS',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
-        // 标准法规清单可查字段
-      }else {
-        this.twoOptions=[
-          {
-            label: '清单名称',
-            value: 'ACCESS_CONTENT',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '国家地区',
-            value: 'COUNTRY',
-            type: 'SEL_OPTION',
-            disabled: false
-          }
-        ]
       }
     },
     /**
@@ -1382,14 +1322,7 @@ export default {
         }
       })
     },
-    // 查询数据搜索 table 数据
+    pageInfo() {
-    selectLawsStands () {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
-        this.sarAccessInfoSearch.standType = ''
-      } else {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
-      }
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1426,12 +1359,18 @@ export default {
       }, e => {
       })
     },
-    selectBtn() {
+    // 查询数据搜索 table 数据
+    selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.pageInfo()
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.pageInfo()
       }
+
+    },
+    selectPage() {
       StandardsInfoPage(this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1468,6 +1407,15 @@ export default {
       }, e => {
       })
     },
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.selectPage()
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.selectPage()
+      }
+    },
     // 数据搜索table判断checked状态
     selectable (row) {
       return row.isRelateAccess === '1'

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -1076,66 +1076,6 @@ export default {
           }
         ]
         // 国内外政策可查字段
-      }else if (val === 'FOREIGN_LAWS'){
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'SYCLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '政策编号',
-            value: 'LAWS_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'LAWS_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'LAWS_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '个性化标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '维护工程师',
-            value: 'ZCGCS',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
-        // 标准法规清单可查字段
-      }else {
-        this.twoOptions=[
-          {
-            label: '清单名称',
-            value: 'ACCESS_CONTENT',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '国家地区',
-            value: 'COUNTRY',
-            type: 'SEL_OPTION',
-            disabled: false
-          }
-        ]
       }
     },
     /**
@@ -1350,14 +1290,7 @@ export default {
         }
       })
     },
-    // 查询数据搜索 table 数据
+    pageInfo() {
-    selectLawsStands () {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
-        this.sarAccessInfoSearch.standType = ''
-      } else {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
-      }
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1394,13 +1327,17 @@ export default {
       }, e => {
       })
     },
-    // 高级检索查询按钮
+    // 查询数据搜索 table 数据
-    selectBtn() {
+    selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.pageInfo()
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.pageInfo()
       }
+    },
+    selectPage() {
       StandardsInfoPage(this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1437,6 +1374,16 @@ export default {
       }, e => {
       })
     },
+    // 高级检索查询按钮
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.selectPage()
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.selectPage()
+      }
+    },
     // 数据搜索table判断checked状态
     selectable (row) {
       return row.isRelateAccess === '1'

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -1076,66 +1076,6 @@ export default {
           }
         ]
         // 国内外政策可查字段
-      }else if (val === 'FOREIGN_LAWS'){
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'SYCLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '政策编号',
-            value: 'LAWS_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'LAWS_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'LAWS_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '个性化标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '维护工程师',
-            value: 'ZCGCS',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
-        // 标准法规清单可查字段
-      }else {
-        this.twoOptions=[
-          {
-            label: '清单名称',
-            value: 'ACCESS_CONTENT',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '国家地区',
-            value: 'COUNTRY',
-            type: 'SEL_OPTION',
-            disabled: false
-          }
-        ]
       }
     },
     /**
@@ -1350,13 +1290,7 @@ export default {
       })
     },
     // 查询数据搜索 table 数据
-    selectLawsStands () {
+    pageInfo() {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
-        this.sarAccessInfoSearch.standType = ''
-      } else {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
-      }
       StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1393,13 +1327,17 @@ export default {
       }, e => {
       })
     },
-    /** 高级查询查询按钮*/
+    selectLawsStands () {
-    selectBtn() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.pageInfo()
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.pageInfo()
       }
+    },
+    /** 高级查询查询按钮*/
+    selectPage() {
       StandardsInfoPage(this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1436,6 +1374,15 @@ export default {
       }, e => {
       })
     },
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.selectPage()
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.selectPage()
+      }
+    },
     // 数据搜索table判断checked状态
     selectable (row) {
       return row.isRelateAccess === '1'

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -239,7 +239,7 @@
                       </el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑</el-dropdown-item>
 <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
-                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">删除</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>