修改禅道已知bug

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

@@ -1090,4 +1090,6 @@ module.exports = {
   newRequestCommentListTemplate:'New request for comment list template',
   NewReleasedStandardTemplate:'New released standard template',
   pleaseSelectStandard:'Please select a standard',
+  theResponsiblePersonEmpty:'The responsible person of cannot be empty',
+  theDeadlineEmpty:'The deadline of cannot be empty',
 }

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

@@ -1094,4 +1094,6 @@ module.exports = {
   newRequestCommentListTemplate:'新征求意见清单模板',
   NewReleasedStandardTemplate:'新发布标准模板',
   pleaseSelectStandard:'请选择标准',
+  theResponsiblePersonEmpty:'的责任人不能为空',
+  theDeadlineEmpty:'的截止时间不能为空',
 }

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

@@ -413,6 +413,7 @@
           }
         }
         console.debug('---高级查询参数--->', { params, matchType })
+        this.visible = false
         this.$emit(this.callback, params, matchType)
       },
       handleCancel() {

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

@@ -55,7 +55,7 @@
       >
         <div slot="standardInformation" slot-scope="text,result" class="box-left">
           <div class="content">
-            <a class="box-content-a" :title="result.serialNumber">{{result.serialNumber}}</a>
+            <a class="box-content-a" @click="standardClick(result)" :title="result.serialNumber">{{result.serialNumber}}</a>
             <a class="box-content-buttom" :title="result.title">{{result.title}}</a>
           </div>
         </div>
@@ -414,7 +414,16 @@
       },
       TaskListModelList() {
         this.getList()
-      }
+      },
+      standardClick(row){
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id:row.id
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
     }
   }
 </script>

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

@@ -184,6 +184,11 @@
                  {{text}}
               </span>
         </span>
+        <span slot="standard" slot-scope="text,record" :title="text">
+              <a class="textName" @click="standardClick(record)">
+                 {{text}}
+              </a>
+        </span>
         <span slot="designDeliverableTemplateName" slot-scope="text,record">
           <span>{{ record.designDeliverableTypeName }}</span><br v-if="record.designDeliverableTypeName">
            <a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
@@ -409,7 +414,7 @@
             dataIndex: 'serialNumber',
             width: 180,
             fixed: 'left',
-            scopedSlots: { customRender: 'titleName' }
+            scopedSlots: { customRender: 'standard' }
           },
           {
             title: this.$t('title'),
@@ -1656,27 +1661,45 @@
                 && dataSource[i].designInitiatorId == this.userInfo().id) ||
                 (dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId
                   && dataSource[i].designInitiatorId == this.userInfo().id)){
-                if(!dataSource[i].designDutyId || !dataSource[i].designDueDate){
+                if(!dataSource[i].designDutyId && !dataSource[i].designDueDate){
                   this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
                   continue
+                }else if(!dataSource[i].designDutyId){
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>)
+                  continue
+                }else if(!dataSource[i].designDueDate){
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>)
+                  continue
                 }
               }
               if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
                 && dataSource[i].prehomoInitiatorId == this.userInfo().id) ||
                 (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId
                   && dataSource[i].prehomoInitiatorId == this.userInfo().id)){
-                if(!dataSource[i].prehomoDutyId || !dataSource[i].prehomoDueDate){
+                if(!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate){
                   this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
                   continue
+                }else if(!dataSource[i].prehomoDutyId){
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
+                  continue
+                }else if(!dataSource[i].prehomoDueDate){
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>)
+                  continue
                 }
               }
               if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId
                 && dataSource[i].verifyInitiatorId == this.userInfo().id) ||
                 (dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId
                   && dataSource[i].verifyInitiatorId == this.userInfo().id)){
-                if(!dataSource[i].verifyDutyId || !dataSource[i].verifyDueDate){
+                if(!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate){
                   this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
                   continue
+                }else if(!dataSource[i].verifyDutyId){
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
+                  continue
+                }else if(!dataSource[i].verifyDueDate){
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>)
+                  continue
                 }
               }
             }
@@ -1905,7 +1928,16 @@
             this.$message.warning(this.$t('reportNotUploaded'))
           }
         }
-      }
+      },
+      standardClick(row){
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id:row.id
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
     }
   }
 </script>