Merge remote-tracking branch 'origin/master'

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

@@ -685,4 +685,5 @@ module.exports = {
   deadlineForConfirmationOfDesignCompliance:'Deadline for confirmation of design compliance',
   prehomoConfirmationDeadline:'Prehomo confirmation deadline',
   verificationComplianceConfirmationDeadline:'Verification compliance confirmation deadline',
+  pleaseEnterTheCorrectWebAddress:'Please enter the correct web address',
 }

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

@@ -689,4 +689,5 @@ module.exports = {
   deadlineForConfirmationOfDesignCompliance:'设计符合性确认截止时间',
   prehomoConfirmationDeadline:'PreHomo确认截止时间',
   verificationComplianceConfirmationDeadline:'验证符合性确认截止时间',
+  pleaseEnterTheCorrectWebAddress:'请输入正确的网址',
 }

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

@@ -6,57 +6,57 @@
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('entryName')">{{$t('entryName')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
         >{{queryForm.projectName}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
         >{{queryForm.targetMarket_dictText}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
         >{{queryForm.projectStatus_dictText}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('IPDInformation')">{{$t('IPDInformation')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right text-field-right-color" @click="urlClick(queryForm.ipdInfo)"
         >{{queryForm.ipdInfo}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
         >{{queryForm.digitalPlatform_dictText}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('ModelPlatform')">{{$t('ModelPlatform')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
         >{{queryForm.vehiclePlatform_dictText}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
         >{{queryForm.studioEngineerName}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
         >{{queryForm.certificationEngineerName}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right text-field-right-color"  @click="urlClick(queryForm.vehicleDevelopmentPlan)"
         >{{queryForm.vehicleDevelopmentPlan}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right text-field-right-color"  @click="urlClick(queryForm.attestationPlan)"
         >{{queryForm.attestationPlan}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('ListOfRelevantPersonnel')">{{$t('ListOfRelevantPersonnel')}}</span>
-        <span class="text-field-right text-field-right-color"
+        <span class="text-field-right"
         >
           <a-button type="primary" class="button-text"
                     @click="ListOfRelevantPersonnelClick">
@@ -195,6 +195,11 @@
       ListOfRelevantPersonnelClick(){
           this.$refs.listOfRelevantPersonnelRef.getData()
       },
+      urlClick(val){
+          if (val){
+            window.open(val)
+          }
+      },
     }
   }
 </script>
@@ -334,4 +339,8 @@
     }
 
   }
+  .text-field-right-color{
+    color: #00B3BE!important;
+    cursor: pointer;
+  }
 </style>

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

@@ -105,6 +105,8 @@
                          :placeholder="$t('PleaseEnter')+$t('IPDInformation')"/>
               </a-form-model-item>
             </div>
+            <!--            ^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?$
+            -->
           </a-col>
         </a-row>
         <a-row :gutter="24">
@@ -192,7 +194,26 @@
         formInline: {},
         confirmLoading: false,
         visible: false,
-        rules: {},
+        rules: {
+          ipdInfo: [
+            {
+              pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
+              message: this.$t('pleaseEnterTheCorrectWebAddress')
+            }
+          ],
+          vehicleDevelopmentPlan: [
+            {
+              pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
+              message: this.$t('pleaseEnterTheCorrectWebAddress')
+            }
+          ],
+          attestationPlan: [
+            {
+              pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
+              message: this.$t('pleaseEnterTheCorrectWebAddress')
+            }
+          ]
+        },
         disabled: false,
         projectNameList: [],
         title: ''

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

@@ -123,8 +123,16 @@
         :columns="columns"
       >
         <span slot="operation" slot-scope="text,record">
-              <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
+              <a class="text-operation"
-              <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+                 v-if="(record.inventoryAffirmStatus == 'List to confirm' && (record.roleCode == 1 || record.roleCode == 2 || record.roleCode == 4)) || record.roleCode == 0"
+                 @click="edit(record)">
+                {{$t('edit')}}
+              </a>
+              <a class="text-operation"
+                 v-if="(record.inventoryAffirmStatus == 'Not started' || record.inventoryAffirmStatus == 'rejected') && record.roleCode == 0"
+                 @click="deleteLib(record)">
+                {{$t('deleteLib')}}
+              </a>
         </span>
         <span slot="titleName" slot-scope="text,record" :title="text">
                   {{text && text.length > 20 ? text.slice(0,19)+'...':text}}