法规符合性看板更换接口

jero-web/src/common/lang/en-us.js

@@ -1151,4 +1151,6 @@ module.exports = {
   CommentsCollectionResultsForReference:'Comments Collection Results For Reference',
   TechnicalEvaluationResultsForReference:'Technical Evaluation Results For Reference',
   ComplianceConfirmationRecord:'Compliance Confirmation Record',
+  Deriveconformanceresults:'Derive Conformance Results',
+  Regulatorycompliancekanban:'Regulatory Compliance Kanban',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1155,4 +1155,6 @@ module.exports = {
   CommentsCollectionResultsForReference:'意见收集结果参考',
   TechnicalEvaluationResultsForReference:'技术评估结果参考',
   ComplianceConfirmationRecord:'符合性确认记录',
+  Deriveconformanceresults:'导出符合性结果',
+  Regulatorycompliancekanban:'法规符合性看板',
 }

jero-web/src/views/regulationsKanban/components/addModel.vue

@@ -100,7 +100,7 @@ export default {
       columns: [
         {
           title: this.$t('areaOfResponsibility'),
-          dataIndex: 'areaOfResponsibility',
+          dataIndex: 'dutyTerritory',
           width: 120,
           align: 'center',
           ellipsis: true
@@ -109,28 +109,28 @@ export default {
           title: this.$t('RelatedItems'),
           align: 'center',
           width: 120,
-          dataIndex: 'RelatedItems',
+          dataIndex: 'projectName',
           ellipsis: true
         },
         {
           title: this.$t('designComplianceReview'),
           align: 'center',
           width: 250,
-          dataIndex: 'designComplianceReview',
+          dataIndex: 'designStatus',
           ellipsis: true
         },
         {
           title: this.$t('preHomeConfirmation'),
           align: 'center',
           width: 270,
-          dataIndex: 'preHomeConfirmation',
+          dataIndex: 'prehomoStatsu',
           ellipsis: true
         },
         {
           title: this.$t('verificationComplianceReview'),
           align: 'center',
           width: 270,
-          dataIndex: 'verificationComplianceReview',
+          dataIndex: 'verifyStatus',
           scopedSlots: { customRender: 'file' },
           ellipsis: true
         }
@@ -234,10 +234,20 @@ export default {
     },
     loadData() {
       let _this = this
+      let queryParam = JSON.parse(JSON.stringify(this.formData))
+      if(!this.formData.dutyTerritory){
+        this.formData.dutyTerritory = ''
+      }
+      if(!this.formData.projectNameId){
+        this.formData.projectNameId = ''
+      }
       let params = {
         id:this.paramsManifestId,
-        ...this.formData
+        dutyTerritory:this.formData.dutyTerritory,
+        projectName:this.formData.projectName,
+        projectNameId:this.formData.projectNameId,
       }
+
       getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => {
         if (res.success) {
           this.areaTable = res.result.records
@@ -247,7 +257,11 @@ export default {
     },
     //导出
     handleExportXls(){
-
+      let query = {
+        id:this.paramsManifestId,
+        ...this.formData
+      }
+      downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.$t('complianceResults')+'.xls', query, this.Deselect)
     },
     searchQuery() {
       this.loadData()

jero-web/src/views/regulationsKanban/index.vue

@@ -29,7 +29,7 @@
               <j-dict-select-tag class="box-input" v-model="queryParam.state"
                                  :placeholder="$t('PleaseSelect')+$t('status')"
                                  :type="'select'"
-                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+                                 :triggerChange="false" :dictCode="'state'"/>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -37,10 +37,21 @@
               <div class="title-text" :title="$t('technicalField')">
                 <span>{{ $t('technicalField') }}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.technologyTerritory"
+              <a-tree-select
-                                 :placeholder="$t('PleaseSelect')+$t('technicalField')"
+                tree-node-filter-prop="title"
-                                 :type="'select'"
+                v-model="queryParam.technologyTerritory"
-                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="CategoryTreeList"
+                tree-checkable
+                :placeholder="$t('PleaseSelect')+$t('technicalField')"
+              />
+<!--              <j-dict-select-tag class="box-input" v-model="queryParam.technologyTerritory"-->
+<!--                                 :placeholder="$t('PleaseSelect')+$t('technicalField')"-->
+<!--                                 :type="'select'"-->
+<!--                                 :triggerChange="false" :dictCode="'duty_territory'"/>-->
             </div>
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -56,6 +67,14 @@
         </a-row>
       </a-form>
     </div>
+    <div class="table-operator" style="overflow:hidden;margin-bottom: 20px">
+      <div style="float: right;margin-bottom: 0px;margin-left: 20px">
+        <div class="operator-text" @click="deriveconformanceresults()">
+          <a-icon type="solution"/>
+          {{ $t('Deriveconformanceresults') }}
+        </div>
+      </div>
+    </div>
     <div>
       <a-table
         ref="table"
@@ -105,6 +124,7 @@ import axios from 'axios'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 // import eventBUs from '../../../common/event'
 import Vue from 'vue'
+import moment from 'moment'
 
 export default {
   name: 'index',
@@ -118,6 +138,7 @@ export default {
       loading: false,
       toggleSearchStatus: false,
       selectedRowKeys: [],
+      CategoryTreeList:[],
       paramsManifestId:'',
       item:{},
       selectedRowKeysArray: '',
@@ -160,7 +181,8 @@ export default {
       dataSource: [],
       confirmLoading: false,
       url: {
-        list: 'project/lawsComplianceBoard/page'
+        list: 'project/lawsComplianceBoard/page',
+        getSysCategoryTree: '/sys/category/getSysCategoryTree',
       },
       total: 0,
       pageSize: 10,
@@ -209,6 +231,7 @@ export default {
   },
   mounted() {
     this.getList()
+    this.getSysCategoryTree()
   },
   methods: {
     handleCancel() {
@@ -233,13 +256,28 @@ export default {
         }
       })
     },
+    getSysCategoryTree() {
+      getAction(this.url.getSysCategoryTree, {}).then((res) => {
+        if (res.success) {
+          this.CategoryTreeList = res.result
+        } else {
+          this.CategoryTreeList = []
+        }
+      })
+    },
     handleToggleSearch() {
       this.toggleSearchStatus = !this.toggleSearchStatus
     },
     onSelectChange(value) {
-      this.selectedRowKeys = value
       this.selectedRowKeysArray = this.selectedRowKeys.join(',')
     },
+    deriveconformanceresults(){
+      let query = {
+        ...this.queryParam,
+        ids: this.selectedRowKeys.join(',')
+      }
+      downloadFile('/project/lawsComplianceBoard/exportComplianceResult', this.$t('complianceResults')+'.xls', query, this.Deselect)
+    },
     // 导出历史
     handlecody(e) {
       this.drawerVisible = true
@@ -309,20 +347,27 @@ export default {
       this.getList()
     },
     getList() {
+      if (this.queryParam.technologyTerritory) {
+        this.queryParam.technologyTerritory = this.queryParam.technologyTerritory.join(',')
+      }
+      let queryParam = JSON.parse(JSON.stringify(this.queryParam))
       let query = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         ...this.queryParamQuery,
         ...this.queryParam
       }
+
+      console.log(this.queryParam.technologyTerritory)
       this.loading = true
       getAction(this.url.list, query).then((res) => {
-        if (res.success) {
+        if (res) {
           if (res.result.current > 1 && res.result.records.length == 0) {
             this.pageNo = res.result.current - 1
             this.getList()
             return
           }
+          console.log(res.result)
           this.dataSource = res.result.records || []
 
           this.total = res.result.total