WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对接项目库

Browse Source
This commit is contained in:
sunFlower
2022-10-18 10:01:17 +08:00
parent 1f33d84d1a
commit 2dd540a03a
6 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1323,4 +1323,5 @@ module.exports = {
projectVersion:'Project Version',
softwareVersion:'Software version',
versionStatistics:'Version statistics',
addSubproject:'Add Subproject',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1424,4 +1424,5 @@ module.exports = {
projectVersion:'项目版本',
softwareVersion:'软件版本',
versionStatistics:'版本统计',
addSubproject:'添加子项目',
}
jero-web/src/views/projectManagement/components/ProjectDetails.vue
+2 -2
View File
@@ -24,7 +24,7 @@
>{{queryForm.targetMarket_dictText}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('VersionNumber')">{{$t('VersionNumber')}}</span>
<span class="text-field-left" :title="$t('projectVersion')">{{$t('projectVersion')}}</span>
<span class="text-field-right" :title="queryForm.VersionNumber"
>{{queryForm.VersionNumber}}</span>
</div>
@@ -95,7 +95,7 @@
>{{queryForm.certificationEngineerName}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('ListOfRelevantPersonnel')">{{$t('ListOfRelevantPersonnel')}}</span>
<span class="text-field-left" style="float: left;margin-top: 3px" :title="$t('ListOfRelevantPersonnel')">{{$t('ListOfRelevantPersonnel')}}</span>
<span class="text-field-right"
>
<a-button type="primary" v-has="'projectRelatedPersonnel:page'"
jero-web/src/views/projectManagement/components/addModel.vue
+42 -11
View File
@@ -69,6 +69,22 @@
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('projectVersion')">{{$t('projectVersion')}}</span>
</div>
<a-form-model-item class="itemModel" prop="projectVersion">
<a-input class="box-input"
:disabled="true"
v-model="formInline.projectVersion"
:placeholder="$t('PleaseEnter')+$t('projectVersion')"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -85,8 +101,6 @@
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -103,6 +117,8 @@
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -119,8 +135,6 @@
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -134,6 +148,8 @@
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -147,8 +163,6 @@
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -164,6 +178,8 @@
<!-- ^(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">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -178,8 +194,6 @@
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -194,6 +208,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('softwareVersion')">{{$t('softwareVersion')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'softwareVersion'">
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.softwareVersion"
:placeholder="$t('PleaseEnter')+$t('softwareVersion')"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
@@ -257,10 +287,10 @@
trigger: 'blur'
}
],
explanation:[
explanation: [
{
max: 300,
message: this.$t('explain') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
max: 500,
message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
@@ -371,6 +401,7 @@
this.getNameList()
this.formInline.studioEngineerName = this.userInfo().username
this.formInline.studioEngineer = this.userInfo().id
this.formInline.projectVersion = '00'
this.formInline = { ...this.formInline }
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate()
jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue
+3 -1
View File
@@ -1,6 +1,6 @@
<template>
<a-drawer
:title="$t('changeExtension')"
:title="$t('addSubproject')"
:maskClosable="false"
:width="600"
placement="right"
@@ -106,6 +106,7 @@
if (value.versionLast.slice(0, 1) == '0') {
let num = value.versionLast.slice(1, 2)
let numIndex = parseInt(num) + 1
numIndex = numIndex + ''
if (numIndex.length == 1) {
this.formInline.projectVersion = '0' + numIndex
} else {
@@ -113,6 +114,7 @@
}
} else {
let index = parseInt(value.versionLast) + 1
index = index + ''
if (index.length == 1) {
this.formInline.projectVersion = '0' + index
} else {
jero-web/src/views/projectManagement/projectLibrary/index.vue
+1 -1
View File
@@ -130,7 +130,7 @@
<span slot="operation" slot-scope="text,record">
<!-- <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>-->
<a class="text-operation" @click="changeExtensionClick(record)">
{{$t('changeExtension')}}
{{$t('addSubproject')}}
</a>
<a class="text-operation"
v-has="'projectLibraryBase:delete'"