QR/laws_chery_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into addTitleTranslation

Browse Source
This commit is contained in:
danshihao
2024-09-06 16:52:40 +08:00
parent 6752ac2524 e9671c7d96
commit 32101d0c56
32 changed files with 238 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/workCenter/NewProcess.vue
+1 -1
View File
@@ -37,7 +37,7 @@ export default {
path: '/workCenter/RegulatoryComplianceCheckProcess',
permission: 'workCenter:newProcess:regulatoryComplianceCheckProcess'
},
{ // 市场清单发布流程
{ // 市场法规清单发布流程
title: this.$t('workCenter.newProcess.marketListReleaseProcess'),
path: '/workCenter/MarketListReleaseProcess',
permission: 'workCenter:newProcess:marketListReleaseProcess'
src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
+4 -4
View File
@@ -130,8 +130,8 @@
<div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
<a-form :form="approvalInfoForm">
<!--备注-->
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('remarks')" :colon="formItemColon">
<a-textarea :placeholder="isLook ? '' : $t('pleaseEnter') + $t('remarks')"
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('handlingSuggestions')" :colon="formItemColon">
<a-textarea :placeholder="isLook ? '' : $t('pleaseEnter') + $t('handlingSuggestions')"
:maxLength="500"
:rows="4"
:disabled="isLook"
@@ -342,7 +342,7 @@ export default {
},
handleText: {
rules: [
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
{ required: false, message: this.$t('pleaseEnter') + this.$t('handlingSuggestions') }
],
validateTrigger: 'blur'
}
@@ -659,7 +659,7 @@ export default {
if (this.loading) return
this.validatorRules.handleText.rules[0].required = true
if (!this.approvalInfoForm.getFieldValue('handleText')) {
this.$message.warning(this.$t('pleaseEnterRemarks'))
this.$message.warning(this.$t('pleaseHandlingSuggestions'))
this.switchValue = 'base'
}
this.$nextTick(() => {
src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue
+1 -1
View File
@@ -225,7 +225,7 @@ export default {
dataIndex: 'newAuthImplDate',
scopedSlots: { customRender: 'text' }
},
{ // 适用国家/地区
{ // 适用市场
title: this.$t('workCenter.marketListReleaseProcess.applicableCountryRegion'),
align: 'center',
width: 180,
src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue
+4 -4
View File
@@ -75,8 +75,8 @@
<div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
<a-form :form="approvalInfoForm">
<!--备注-->
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('remarks')" :colon="formItemColon">
<a-textarea :placeholder="isLook ? '' : $t('pleaseEnter') + $t('remarks')"
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('handlingSuggestions')" :colon="formItemColon">
<a-textarea :placeholder="isLook ? '' : $t('pleaseEnter') + $t('handlingSuggestions')"
:maxLength="500"
:rows="4"
:disabled="isLook"
@@ -281,7 +281,7 @@ export default {
},
handleText: {
rules: [
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
{ required: false, message: this.$t('pleaseEnter') + this.$t('handlingSuggestions') }
],
validateTrigger: 'blur'
}
@@ -559,7 +559,7 @@ export default {
if (this.loading) return
this.validatorRules.handleText.rules[0].required = true
if (!this.approvalInfoForm.getFieldValue('handleText')) {
this.$message.warning(this.$t('pleaseEnterRemarks'))
this.$message.warning(this.$t('pleaseHandlingSuggestions'))
this.switchValue = 'base'
}
this.$nextTick(() => {
src/views/workCenter/processCenter/table/DoneList.vue
+1 -1
View File
@@ -215,7 +215,7 @@ export default {
case ProcessType.REGULATORY_COMPLIANCE_CHECK.value:
processKey = ProcessKey.REGULATORY_COMPLIANCE_CHECK.value
break
// 市场清单发布流程
// 市场法规清单发布流程
case ProcessType.MARKET_LIST_RELEASE.value:
processKey = ProcessKey.MARKET_LIST_RELEASE.value
break
src/views/workCenter/processCenter/table/DraftList.vue
+1 -1
View File
@@ -158,7 +158,7 @@ export default {
case '3':
path = '/workCenter/RegulatoryComplianceCheckProcess'
break
// 市场清单发布流程
// 市场法规清单发布流程
case '4':
path = '/workCenter/MarketListReleaseProcess'
break
src/views/workCenter/processCenter/table/MonitorList.vue
+1 -1
View File
@@ -195,7 +195,7 @@ export default {
case ProcessType.REGULATORY_COMPLIANCE_CHECK.value:
processKey = ProcessKey.REGULATORY_COMPLIANCE_CHECK.value
break
// 市场清单发布流程
// 市场法规清单发布流程
case ProcessType.MARKET_LIST_RELEASE.value:
processKey = ProcessKey.MARKET_LIST_RELEASE.value
break
src/views/workCenter/processCenter/table/SentList.vue
+1 -1
View File
@@ -202,7 +202,7 @@ export default {
case ProcessType.REGULATORY_COMPLIANCE_CHECK.value:
processKey = ProcessKey.REGULATORY_COMPLIANCE_CHECK.value
break
// 市场清单发布流程
// 市场法规清单发布流程
case ProcessType.MARKET_LIST_RELEASE.value:
processKey = ProcessKey.MARKET_LIST_RELEASE.value
break
src/views/workCenter/processCenter/table/TodoList.vue
+2 -2
View File
@@ -165,7 +165,7 @@ export default {
],
// 法规符合性排查流程
[ProcessType.REGULATORY_COMPLIANCE_CHECK.value]: [RegulatoryComplianceCheckNodes.initiated.value],
// 市场清单发布流程
// 市场法规清单发布流程
[ProcessType.MARKET_LIST_RELEASE.value]: [MarketListReleaseNodes.initiated.value]
},
disableMixinCreated: true
@@ -239,7 +239,7 @@ export default {
case '3':
path = '/workCenter/RegulatoryComplianceCheckProcess'
break
// 市场清单发布流程
// 市场法规清单发布流程
case '4':
path = '/workCenter/MarketListReleaseProcess'
break
src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue
+4 -4
View File
@@ -106,8 +106,8 @@
<div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
<a-form :form="approvalInfoForm">
<!--备注-->
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('remarks')" :colon="formItemColon">
<a-textarea :placeholder="isLook ? '' : $t('pleaseEnter') + $t('remarks')"
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('handlingSuggestions')" :colon="formItemColon">
<a-textarea :placeholder="isLook ? '' : $t('pleaseEnter') + $t('handlingSuggestions')"
:maxLength="500"
:rows="4"
:disabled="isLook"
@@ -391,7 +391,7 @@ export default {
},
handleText: {
rules: [
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
{ required: false, message: this.$t('pleaseEnter') + this.$t('handlingSuggestions') }
],
validateTrigger: 'blur'
}
@@ -748,7 +748,7 @@ export default {
if (this.loading) return
this.validatorRules.handleText.rules[0].required = true
if (!this.approvalInfoForm.getFieldValue('handleText')) {
this.$message.warning(this.$t('pleaseEnterRemarks'))
this.$message.warning(this.$t('pleaseHandlingSuggestions'))
this.switchValue = 'base'
}
this.$nextTick(() => {
src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
+4 -1
View File
@@ -7,7 +7,7 @@
<div class="form-flex-box">
<!-- 排查任务是否下发 -->
<div class="box-title-text form-flex-item">
<div class="title-text">
<div class="title-text title-text-long">
<span class="required">*</span>
<span class="title-text-text" :title="$t('workCenter.regulatoryComplianceCheckProcess.checkWhetherTheTaskIsDelivered')">
{{ $t('workCenter.regulatoryComplianceCheckProcess.checkWhetherTheTaskIsDelivered') }}
@@ -893,4 +893,7 @@ export default {
.form-add {
margin-top: 20px;
}
.title-text-long {
width: 140px !important;
}
</style>
src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue
+4 -4
View File
@@ -90,8 +90,8 @@
<div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
<a-form :form="approvalInfoForm">
<!--备注-->
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('remarks')" :colon="formItemColon">
<a-textarea :placeholder="(disabled) ? '' : ($t('pleaseEnter') + $t('remarks'))"
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('handlingSuggestions')" :colon="formItemColon">
<a-textarea :placeholder="(disabled) ? '' : ($t('pleaseEnter') + $t('handlingSuggestions'))"
:maxLength="500"
:rows="4"
:disabled="disabled"
@@ -231,7 +231,7 @@ export default {
validateTrigger: 'blur'
},
commitText: {
rules: [{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }],
rules: [{ required: false, message: this.$t('pleaseEnter') + this.$t('handlingSuggestions') }],
validateTrigger: 'blur'
}
},
@@ -740,7 +740,7 @@ export default {
})
// 驳回需要填写备注
if (!this.approvalInfoForm.getFieldValue('commitText')) {
this.$message.warn(this.$t('pleaseEnterRemarks'))
this.$message.warn(this.$t('pleaseHandlingSuggestions'))
return
}
this.loading = true