修改禅道bug

法规符合性看板更改字段名
查看符合性结果跳转页面修改

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -139,6 +139,7 @@
         pageSize: 10,
         pageNo: 1,
         CategoryTreeList:[],
+        serialNumber:'',
         queryParam: {},
         gatherResultList:[
           {
@@ -224,6 +225,7 @@
       },
       searchReset() {
         this.queryParam = {}
+        this.serialNumber = ''
         this.pageNo = 1
         this.getList()
       },
@@ -243,9 +245,13 @@
             queryParam[val] = queryParam[val].join(',')
           }
         })
+        if(this.$route.query.serialNumber){
+          this.serialNumber = this.$route.query.serialNumber
+        }
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          serialNumber: this.serialNumber,
           ...queryParam
         }
         this.loading = true

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -174,6 +174,7 @@
         toggleSearchStatus: false,
         dataSource: [],
         selectedRowKeys: [],
+        serialNumber:'',
         total: 0,
         pageSize: 10,
         pageNo: 1,
@@ -316,9 +317,13 @@
             queryParam[val] = queryParam[val].join(',')
           }
         })
+        if(this.$route.query.serialNumber){
+          this.serialNumber = this.$route.query.serialNumber
+        }
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          serialNumber: this.serialNumber,
           ...queryParam
         }
         this.loading = true

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -115,11 +115,11 @@
                   <a-icon type="plus"/>
                   {{$t('addTo')}}
                 </div>
-                <!--     下发收集 -->
+<!--                &lt;!&ndash;     下发收集 &ndash;&gt;-->
-                <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">
+<!--                <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">-->
-                  <a-icon type="solution"/>
+<!--                  <a-icon type="solution"/>-->
-                  {{$t('distributionAndCollection')}}
+<!--                  {{$t('distributionAndCollection')}}-->
-                </div>
+<!--                </div>-->
                 <!--      冻结配置-->
                 <div @click="freezeConfiguration" class="operator-text-title">
                   <a-icon type="solution"/>
@@ -149,6 +149,11 @@
                 <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
               </div>
             </a-popconfirm>
+            <!--     下发收集 -->
+            <div @click="distributionAndCollectionJurisdiction" class="operator-text" v-if='currentPersonRole == "homo"'>
+              <a-icon type="solution"/>
+              {{$t('distributionAndCollection')}}
+            </div>
             <!--      分配填写人-->
             <div @click="assignedBy" class="operator-text" v-if='currentPersonRole == "sdt" '>
               <a-icon type="copy"/>
@@ -531,6 +536,11 @@
             text: this.$t('status'),
             options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           },
+          {
+            type: 'string',
+            value: 'paramsBatch',
+            text: this.$t('parameterBatch')
+          },
         ],
         selectedRowKeys: [],
         textLoading: false,

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

@@ -69,8 +69,8 @@
 <!--      />-->
 <!--    </div>-->
     <div class="table-operator" >
-      <a-button type="primary"  @click="handleExportXls()">{{ $t('CommentsCollectionResultsForReference') }}</a-button>
+      <a-button type="primary" v-if='this.opinionGather > 0'  @click="handlecomments()">{{ $t('CommentsCollectionResultsForReference') }}</a-button>
-      <a-button type="primary"  @click="handleExportXls()">{{ $t('TechnicalEvaluationResultsForReference') }}</a-button>
+      <a-button type="primary" v-if='this.technologyEvaluation > 0'  @click="handletechnical()">{{ $t('TechnicalEvaluationResultsForReference') }}</a-button>
     </div>
     <!--    <div class='drawer-bootom-button'>-->
     <!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
@@ -94,13 +94,15 @@ export default {
       title: this.$t('add'),
       total: 0,
       selectedRowKeysDate: {},
+      opinionGather:'',
+      technologyEvaluation:'',
       loading: false,
       editId: '',
       RelatedItemList:[],
       columns: [
         {
           title: this.$t('areaOfResponsibility'),
-          dataIndex: 'dutyTerritory',
+          dataIndex: 'dutyTerritory_dicText',
           width: 120,
           align: 'center',
           ellipsis: true
@@ -116,21 +118,21 @@ export default {
           title: this.$t('designComplianceReview'),
           align: 'center',
           width: 250,
-          dataIndex: 'designStatus',
+          dataIndex: 'designStatus_dicText',
           ellipsis: true
         },
         {
           title: this.$t('preHomeConfirmation'),
           align: 'center',
           width: 270,
-          dataIndex: 'prehomoStatsu',
+          dataIndex: 'prehomoStatus_dicText',
           ellipsis: true
         },
         {
           title: this.$t('verificationComplianceReview'),
           align: 'center',
           width: 270,
-          dataIndex: 'verifyStatus',
+          dataIndex: 'verifyStatus_dicText',
           scopedSlots: { customRender: 'file' },
           ellipsis: true
         }
@@ -226,6 +228,26 @@ export default {
       this.pageSize = pageSize
       this.loadData()
     },
+    // 法规意见收集列表
+    handlecomments(){
+      this.$router.push({
+        path: '/collectionOfRegulatoryOpinions',
+        query:{
+          serialNumber:this.item.serialNumber
+        }
+      })
+    },
+    // 法规技术评估列表
+    handletechnical(){
+
+      this.$router.push({
+        path: '/technologyAssessment',
+        query:{
+          serialNumber:this.item.serialNumber
+        }
+      })
+    },
+
     dowloadfile(item){
       let query = {
         id: item.exportFileId
@@ -250,8 +272,9 @@ export default {
 
       getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => {
         if (res.success) {
-          this.areaTable = res.result.records
+          this.areaTable = res.result.complianceResultList
-          this.total = res.result.total
+          this.opinionGather = res.result.opinionGather
+          this.technologyEvaluation = res.result.technologyEvaluation
         }
       })
     },

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

@@ -163,7 +163,7 @@ export default {
           type: '',
           value: ' state',
           text: this.$t('status'),
-          dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          dictCode: 'state'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
         },
         // {
         //   type: 'string',
@@ -171,10 +171,13 @@ export default {
         //   text: this.$t('category')
         // },
         {
-          type: '',
+          type: 'tree',
           value: 'technologyTerritory',
           text: this.$t('technicalField'),
-          dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          tree:this.CategoryTreeList
+          // value: 'technologyTerritory',
+          // text: this.$t('technicalField'),
+          // dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
         },
       ],
       visible: false,
@@ -202,7 +205,7 @@ export default {
         {
           title: this.$t('status'),
           align: 'center',
-          dataIndex: 'state'
+          dataIndex: 'state_dicText'
         },
         // {
         //   title: this.$t('category'),
@@ -212,7 +215,7 @@ export default {
         {
           title: this.$t('technicalField'),
           align: 'center',
-          dataIndex: 'technologyTerritory'
+          dataIndex: 'technologyTerritory_dicText'
         },
         {
           title: this.$t('RegulatoryProcessEvaluationResults'),
@@ -281,25 +284,13 @@ export default {
     // 导出历史
     handlecody(e) {
       this.drawerVisible = true
-      this.titleTag = e.standard + this.$t('ComplianceConfirmationRecord')
+      this.titleTag = e.serialNumber + this.$t('ComplianceConfirmationRecord')
       this.paramsManifestId = e.id
       this.item = {...e}
     },
     hideModal() {
       this.visible = false
     },
-    //编辑
-    edit(item) {
-      this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item)))
-    },
-    //删除
-    deleteLib(val) {
-      let newUrl = this.$router.resolve({
-        path: '/managementdetails',
-        query: val
-      })
-      window.open(newUrl.href, '_blank')
-    },
     //虚拟清单名称事件
     entryNameClick(item) {
       this.$router.push({
@@ -347,18 +338,21 @@ export default {
       this.getList()
     },
     getList() {
+      let territory = ''
       if (this.queryParam.technologyTerritory) {
-        this.queryParam.technologyTerritory = this.queryParam.technologyTerritory.join(',')
+        this.territory = this.queryParam.technologyTerritory.join(',')
       }
-      let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+      // let queryParam = JSON.parse(JSON.stringify(this.queryParam))
       let query = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         ...this.queryParamQuery,
-        ...this.queryParam
+        technologyTerritory: this.territory,
-      }
+        serialNumber:this.queryParam.serialNumber,
+        title:this.queryParam.title,
+        state:this.queryParam.state
 
-      console.log(this.queryParam.technologyTerritory)
+      }
       this.loading = true
       getAction(this.url.list, query).then((res) => {
         if (res) {