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

修改禅道bug

Browse Source
This commit is contained in:
qq787203167
2022-05-06 10:22:54 +08:00
parent 2dd8ee0995
commit 6ddebe8d7a
8 changed files with 198 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -755,4 +755,5 @@ module.exports = {
standardInformation:'standardInformation',
VirtualList:'VirtualList',
importTemplate:'import template',
verificationConfirmationDeadline:'Verification compliance confirmation deadline',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -760,4 +760,5 @@ module.exports = {
Characters:'个字符',
standardInformation:'标准信息',
importTemplate:'导入模板',
verificationConfirmationDeadline:'验证符合性确认截止时间',
}
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+15 -17
View File
@@ -74,15 +74,14 @@
:title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input class="box-input"
:disabled="true"
v-model="formInline.shi4Yong4Fan4Wei2_dictText"/>
<!-- <j-multi-select-tag class="box-input" v-model="formInline.shi4Yong4Fan4Wei2"-->
<!-- :disabled="true"-->
<!-- @input="handleInput('shi4Yong4Fan4Wei2')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'apply_scope'"/>-->
<!-- <a-input class="box-input"-->
<!-- :disabled="true"-->
<!-- v-model="formInline.shi4Yong4Fan4Wei2_dictText"/>-->
<j-multi-select-tag class="box-input" v-model="formInline.shi4Yong4Fan4Wei2"
@input="handleInput('shi4Yong4Fan4Wei2')"
:placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
:type="'select'"
:triggerChange="false" :dictCode="'apply_scope'"/>
</a-form-model-item>
</div>
</a-col>
@@ -248,14 +247,13 @@
:title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel" prop="region">
<a-input class="box-input"
:disabled="true"
v-model="formInline.region_dictText"/>
<!-- <j-multi-select-tag class="box-input" v-model="formInline.region"-->
<!-- :disabled="true"-->
<!-- :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'region'"/>-->
<!-- <a-input class="box-input"-->
<!-- :disabled="true"-->
<!-- v-model="formInline.region_dictText"/>-->
<j-multi-select-tag class="box-input" v-model="formInline.region"
:placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</a-form-model-item>
</div>
</a-col>
jero-web/src/views/projectManagement/ProjectDetails/index.vue
+5 -5
View File
@@ -39,14 +39,14 @@
<a-icon type="container"/>
{{$t('taskList')}}
</div>
<div class="Virtual-detail-left-text" :title="$t('TaskParameterCollection')" @click="textClick(3,'认证参数收集')">
<a-icon type="container"/>
{{$t('TaskParameterCollection')}}
</div>
<div class="Virtual-detail-left-text" :title="$t('nonConformance')" @click="textClick(4,'未符合项')">
<div class="Virtual-detail-left-text" :title="$t('nonConformance')" @click="textClick(3,'未符合项')">
<a-icon type="container"/>
{{$t('nonConformance')}}
</div>
<div class="Virtual-detail-left-text" :title="$t('TaskParameterCollection')" @click="textClick(4,'认证参数收集')">
<a-icon type="container"/>
{{$t('TaskParameterCollection')}}
</div>
</div>
<div class="Virtual-detail-right">
<ProjectDetailsName v-if="textTitle === '项目详情'"/>
jero-web/src/views/projectManagement/components/addModel.vue
+32 -17
View File
@@ -98,23 +98,6 @@
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('IPDInformation')">{{$t('IPDInformation')}}</span>
</div>
<a-form-model-item class="itemModel" prop="ipdInfo">
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.ipdInfo"
: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">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -130,6 +113,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">
@@ -145,6 +130,21 @@
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('IPDInformation')">{{$t('IPDInformation')}}</span>
</div>
<a-form-model-item class="itemModel" prop="ipdInfo">
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.ipdInfo"
: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">
<a-col :span="12">
@@ -204,18 +204,33 @@
{
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')
},
{
max: 300,
message: this.$t('IPDInformation') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
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')
},
{
max: 300,
message: this.$t('dehicleDevelopmentPlan') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
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')
},
{
max: 300,
message: this.$t('certificationProgram') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
projectNameId: [
jero-web/src/views/projectManagement/components/listEditModel.vue
+28 -9
View File
@@ -251,6 +251,25 @@
</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('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel" prop="region">
<!-- <a-input class="box-input"-->
<!-- :disabled="true"-->
<!-- v-model="formInline.region_dictText"/>-->
<j-multi-select-tag class="box-input" v-model="formInline.region"
:placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
@@ -760,15 +779,15 @@
},
editModel(item) {
this.visible = true
this.regulatoryEngineerList= []
this.engineeringInterfacePersonList= []
this.certificationEngineerList= []
this.designInitiatorList= []
this.designDutyList= []
this.prehomoInitiatorList= []
this.verifyInitiatorList= []
this.verifyDutyList= []
this.prehomoDutyList= []
this.regulatoryEngineerList = []
this.engineeringInterfacePersonList = []
this.certificationEngineerList = []
this.designInitiatorList = []
this.designDutyList = []
this.prehomoInitiatorList = []
this.verifyInitiatorList = []
this.verifyDutyList = []
this.prehomoDutyList = []
if (item.dutyTerritory) {
this.queryPersonByProject(item)
} else {
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+12 -7
View File
@@ -322,6 +322,12 @@
// align: 'center',
// dataIndex: 'taskReleaseStatus'
// },
{
title: this.$t('zoneOfApplication'),
align: 'center',
ellipsis: true,
dataIndex: 'region_dictText'
},
{
title: this.$t('correspondingStandard'),
align: 'center',
@@ -346,12 +352,6 @@
ellipsis: true,
dataIndex: 'implementTime'
},
{
title: 'WVTA ID',
align: 'center',
dataIndex: 'wvtaId',
ellipsis: true
},
{
title: this.$t('certificationType'),
align: 'center',
@@ -364,7 +364,12 @@
ellipsis: true,
dataIndex: 'attestationRank_dictText'
},
//
{
title: 'WVTA ID',
align: 'center',
dataIndex: 'wvtaId',
ellipsis: true
},
{
title: this.$t('areaOfResponsibility'),
align: 'center',
jero-web/src/views/projectManagement/components/settingList.vue
+104 -35
View File
@@ -13,10 +13,11 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('confirmationOfRegulationsList')">
{{$t('confirmationOfRegulationsList')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" prop="listConfirmation">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('confirmationOfRegulationsList')"
@change="dateChange({db_field_name:'listConfirmation'})"
@@ -30,10 +31,11 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('regulatoryTaskConfirmation')">
{{$t('regulatoryTaskConfirmation')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" prop="legalTaskConfirmation">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('regulatoryTaskConfirmation')"
@change="dateChange({db_field_name:'legalTaskConfirmation'})"
@@ -47,10 +49,11 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('confirmationOfDesignConformity')">
{{$t('confirmationOfDesignConformity')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" prop="designDeadline">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('confirmationOfDesignConformity')"
@change="dateChange({db_field_name:'designDeadline'})"
@@ -64,10 +67,11 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('PrehomoConfirmation')">
{{$t('PrehomoConfirmation')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" prop="prehomoDeadline">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('PrehomoConfirmation')"
@change="dateChange({db_field_name:'prehomoDeadline'})"
@@ -81,10 +85,11 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('certificationStart')">
{{$t('certificationStart')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" prop="attestationStartTime">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('certificationStart')"
@change="dateChange({db_field_name:'attestationStartTime'})"
@@ -98,10 +103,11 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('certificationEnd')">
{{$t('certificationEnd')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" prop="attestationEndTime">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('certificationEnd')"
@change="dateChange({db_field_name:'attestationEndTime'})"
@@ -115,12 +121,13 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('deadlineForConfirmationOfDesignCompliance')">
{{$t('deadlineForConfirmationOfDesignCompliance')}}</span>
<span class="Required">*</span>
<span class="title-text-text" :title="$t('verificationConfirmationDeadline')">
{{$t('verificationConfirmationDeadline')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" prop="verifyDeadline">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('deadlineForConfirmationOfDesignCompliance')"
:placeholder="$t('PleaseSelect')+$t('verificationConfirmationDeadline')"
@change="dateChange({db_field_name:'verifyDeadline'})"
format="YYYY-MM-DD"
v-model="formInline.verifyDeadline"
@@ -146,7 +153,57 @@
visible: false,
confirmLoading: false,
formInline: {},
rules: {},
rules: {
listConfirmation: [
{
required: true,
message: this.$t('confirmationOfRegulationsList') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
legalTaskConfirmation: [
{
required: true,
message: this.$t('regulatoryTaskConfirmation') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
designDeadline: [
{
required: true,
message: this.$t('confirmationOfDesignConformity') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
prehomoDeadline: [
{
required: true,
message: this.$t('PrehomoConfirmation') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
attestationStartTime: [
{
required: true,
message: this.$t('certificationStart') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
attestationEndTime: [
{
required: true,
message: this.$t('certificationEnd') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
verifyDeadline: [
{
required: true,
message: this.$t('verificationConfirmationDeadline') + this.$t('cannotEmpty'),
trigger: 'change'
}
]
},
ids: []
}
},
@@ -155,6 +212,9 @@
methods: {
edit() {
this.visible = true
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate()
})
this.settingQueryForm()
},
settingQueryForm() {
@@ -167,29 +227,33 @@
})
},
handleOk() {
let query = {
...this.formInline,
projectId: this.$route.query.id
}
let url = ''
let Action
if (this.formInline.id) {
url = this.url.editSettingUrl
Action = putAction
} else {
url = this.url.addSettingUrl
Action = postAction
}
this.confirmLoading = true
Action(url, query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.confirmLoading = false
this.$emit('settingListForm')
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
this.$refs.ruleForm.validate(valid => {
if (valid) {
let query = {
...this.formInline,
projectId: this.$route.query.id
}
let url = ''
let Action
if (this.formInline.id) {
url = this.url.editSettingUrl
Action = putAction
} else {
url = this.url.addSettingUrl
Action = postAction
}
this.confirmLoading = true
Action(url, query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.confirmLoading = false
this.$emit('settingListForm')
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
}
})
}
})
},
@@ -260,7 +324,7 @@
}
.title-text {
width: 174px;
width: 194px;
text-align: right;
display: inline-block;
font-weight: 500;
@@ -292,4 +356,9 @@
.formAdd {
margin-bottom: 40px;
}
.Required {
color: red;
margin-right: 3px;
}
</style>