修改认证清单-studio和认证工程师点击更多，底部空白较大

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

@@ -1383,7 +1383,7 @@ module.exports = {
   allsubitemsitem:'Whether to delete all subitems under this item',
   contactTheFounder:'Contact author',
   certificationCategoryNumber: 'certification Category Number',
-  historicalrecord:'historical Record',
+  historicalrecord:'Historical Record',
   Referenceparametercolumn:'Reference Parameter Column',
   Updateparametercolumn:'Update The Parameter Column',
   columnfirst:'Reference the parameter column first',
@@ -1407,7 +1407,7 @@ module.exports = {
   nameOfManufacturer:'Name Of Manufacturer',
   regulationNo:'Regulation No',
   itemInformation:'Item Information',
-  modifyHistory:'Modify History',
+  modifyHistory:'Historical Record',
   returnToStudio:'Return to Studio',
   Approved:'Review and pass',
   returnedForApproval:'Returned For Approval',
@@ -1747,4 +1747,13 @@ module.exports = {
   pleasefillintherange:'Please fill in the range',
   databasereportingtime:'Synchronize the database reporting time',
   synchronizationtime:'Synchronization time',
+  listToBeReleased:'List to be released',
+  listToBeChecked:'List to be checked',
+  taskToBeConfirmed:'Task to be confirmed',
+  resultsToBeSubmitted:'Results to be submitted',
+  resultsToBeReviewed:'Results to be reviewed',
+  compliance:'Compliance',
+  nonCompliance:'Non-Compliance',
+  toBeTracked:'To be tracked',
+  NA:'NA',
 }

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

@@ -1509,7 +1509,7 @@ module.exports = {
   nameOfManufacturer:'生产企业名称',
   regulationNo:'法规编号',
   itemInformation:'条目信息',
-  modifyHistory:'修改历史',
+  modifyHistory:'历史记录',
   returnToStudio:'退回至Studio',
   Approved:'审查通过',
   returnedForApproval:'审批退回',
@@ -1849,4 +1849,13 @@ module.exports = {
   pleasefillintherange:'请填写范围',
   databasereportingtime:'同步上报库时间',
   synchronizationtime:'同步时间',
+  listToBeReleased:'清单待发布',
+  listToBeChecked:'清单待校核',
+  taskToBeConfirmed:'任务待确认',
+  resultsToBeSubmitted:'结果待提交',
+  resultsToBeReviewed:'结果待审查',
+  compliance:'符合',
+  nonCompliance:'不符合',
+  toBeTracked:'待追踪',
+  NA:'不涉及',
 }

jero-web/src/components/globalAdvancedQuery/index.vue

@@ -132,6 +132,16 @@
                   tree-checkable
                   :placeholder="$t('PleaseSelect')"
                 />
+                <a-tree-select
+                  v-else-if="item.type==='treeChoice'"
+                  tree-node-filter-prop="title"
+                  v-model="item.val"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  style="width: 100%"
+                  :tree-data="item.tree"
+                  :placeholder="$t('PleaseSelect')"
+                />
+
                 <PersonnelSelection
                   v-else-if="item.type == 'Personnel'"
                   :query="{db_field_name:'valueId',db_field_txt:'',subscript:index}"

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

@@ -92,7 +92,7 @@
           </div>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" v-if="this.code == '0'">
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -266,6 +266,11 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
+        <span slot="serialNumber" slot-scope="text,record">
+            <a class="textName" @click="standardClick(record)">
+                 {{ text }}
+              </a>
+        </span>
         <span slot="operation" slot-scope="text,record">
               <a class="text-operation"
                  v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
@@ -563,7 +568,7 @@
             type: 'date',
             value: 'endTime',
             text: this.$t('closingDate')
-          }
+          },
         ],
         disabled: false,
         queryParamQuery: {},
@@ -648,7 +653,8 @@
             align: 'left',
             dataIndex: 'serialNumber',
             width: 180,
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'serialNumber' }
           },
           {
             title: this.$t('areaOfResponsibility'),
@@ -753,7 +759,8 @@
         long: '',
         toDoIds: [],
         toDoNotConditions: [],
-        userInfoQuery: {}
+        userInfoQuery: {},
+        DeliverableTreeList:[],
       }
     },
     mounted() {
@@ -762,6 +769,7 @@
       this.loading = true
       this.userInfoQuery = this.userInfo()
       this.getProcessStatus()
+      this.getDeliverableTree()
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
@@ -804,6 +812,21 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      getDeliverableTree() {
+        getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+            this.fieldList.push({
+              type: 'treeChoice',
+              value: 'deliverableType',
+              text: this.$t('typeOfDeliverables'),
+              tree:this.DeliverableTreeList
+            })
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
       getProcessStatus() {
         getAction('/project/projectCertificationInventoryEO/getFlowStatusList', {}).then((res) => {
           if (res.success) {
@@ -1804,7 +1827,16 @@
 
       viewFileClick(item) {
         this.$refs.viewFileModelRef.clickButtonToUpload(item)
-      }
+      },
+      standardClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
     }
   }
 </script>

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

@@ -1115,7 +1115,109 @@
             value: 'engineeringInterfacePerson',
             valueName: 'engineeringInterfacePersonName',
             text: this.$t('engineeringInterfacePerson')
-          }
+          },
+          {
+            value: 'designFlowStatus',
+            text: this.$t('designComplianceReview')+this.$t('ProcessStatus'),
+            options:[
+              {
+                value: 'List to be released',
+                key: 'List to be released',
+                label: this.$t('listToBeReleased')
+              },
+              {
+                value: 'List to be checked',
+                key: 'List to be checked',
+                label: this.$t('listToBeChecked')
+              },
+              {
+                value: 'Task to be confirmed',
+                key: 'Task to be confirmed',
+                label: this.$t('taskToBeConfirmed')
+              },
+              {
+                value: 'Results to be submitted',
+                key: 'Results to be submitted',
+                label: this.$t('resultsToBeSubmitted')
+              },
+              {
+                value: 'Results to be reviewed',
+                key: 'Results to be reviewed',
+                label: this.$t('resultsToBeReviewed')
+              },
+              {
+                value: 'Compliance',
+                key: 'Compliance',
+                label: this.$t('compliance')
+              },
+              {
+                value: 'Non-Compliance',
+                key: 'Non-Compliance',
+                label: this.$t('nonCompliance')
+              },
+              {
+                value: 'To be tracked',
+                key: 'To be tracked',
+                label: this.$t('toBeTracked')
+              },
+              {
+                value: 'NA',
+                key: 'NA',
+                label: this.$t('NA')
+              }
+            ],
+          },
+          {
+            value: 'verifyFlowStatus',
+            text: this.$t('verificationAndConformityconfirmation')+this.$t('ProcessStatus'),
+            options:[
+              {
+                value: 'List to be released',
+                key: 'List to be released',
+                label: this.$t('listToBeReleased')
+              },
+              {
+                value: 'List to be checked',
+                key: 'List to be checked',
+                label: this.$t('listToBeChecked')
+              },
+              {
+                value: 'Task to be confirmed',
+                key: 'Task to be confirmed',
+                label: this.$t('taskToBeConfirmed')
+              },
+              {
+                value: 'Results to be submitted',
+                key: 'Results to be submitted',
+                label: this.$t('resultsToBeSubmitted')
+              },
+              {
+                value: 'Results to be reviewed',
+                key: 'Results to be reviewed',
+                label: this.$t('resultsToBeReviewed')
+              },
+              {
+                value: 'Compliance',
+                key: 'Compliance',
+                label: this.$t('compliance')
+              },
+              {
+                value: 'Non-Compliance',
+                key: 'Non-Compliance',
+                label: this.$t('nonCompliance')
+              },
+              {
+                value: 'To be tracked',
+                key: 'To be tracked',
+                label: this.$t('toBeTracked')
+              },
+              {
+                value: 'NA',
+                key: 'NA',
+                label: this.$t('NA')
+              }
+            ],
+          },
         ],
         listOptions: [
           {
@@ -1931,6 +2033,7 @@
       getList() {
         let roleCode = this.roleSwitchingCode
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        this.getRoleByUserId()
         Object.keys(queryParam).forEach(val => {
           if (queryParam[val] instanceof Array) {
             queryParam[val] = queryParam[val].join(',')
@@ -1949,7 +2052,6 @@
         }
         this.loading = true
         getAction(this.url.list, query).then((res) => {
-          this.getRoleByUserId()
           if (res.success) {
             this.dataSource = res.result || []
             this.loading = false
@@ -2399,8 +2501,11 @@
 
         }
         if (this.requestsNum == 0) {
-          this.$message.warning(_this.$t('theDataYouInitiate'))
-          // _this.promptInformation(_this.detailedWarningList)
+          if (_this.detailedWarningList && _this.detailedWarningList.length > 0){
+            _this.promptInformation(_this.detailedWarningList)
+          }else{
+            this.$message.warning(_this.$t('theDataYouInitiate'))
+          }
           this.JTextLoading = false
         }
       },

jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue

@@ -155,14 +155,11 @@
             ellipsis: true
           },
           {
-            title: this.$t('OperationTime'),
-            dataIndex: 'createTime',
+            title: this.$t('feedback'),
+            dataIndex: 'approvalOpinion',
             align: 'left',
             width: 200,
-            ellipsis: true,
-            customRender: function(t, r, index) {
-              return moment(t).format('YYYY-MM-DD HH:mm:ss')
-            }
+            ellipsis: true
           },
           {
             title: this.$t('resultofhandling'),
@@ -172,13 +169,6 @@
             ellipsis: true,
             scopedSlots: { customRender: 'resultofhandling' }
           },
-          {
-            title: this.$t('feedback'),
-            dataIndex: 'approvalOpinion',
-            align: 'left',
-            width: 200,
-            ellipsis: true
-          },
           {
             title: this.$t('enclosure'),
             dataIndex: 'approvalFile',
@@ -186,7 +176,17 @@
             width: 100,
             ellipsis: true,
             scopedSlots: { customRender: 'approvalFile' }
-          }
+          },
+          {
+            title: this.$t('OperationTime'),
+            dataIndex: 'createTime',
+            align: 'left',
+            width: 200,
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
+          },
         ]
       }
     },