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

参数收集清单删除增加未收集状态情况

Browse Source
This commit is contained in:
zyx.net
2022-12-28 14:41:04 +08:00
parent 8f754abc57
commit 469265a730
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -752,7 +752,7 @@ module.exports = {
Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed',
NoConfigurationNotStart: 'No configuration added, unable to start collection, please check', NoConfigurationNotStart: 'No configuration added, unable to start collection, please check',
theCurrent: 'The current status of this data is', theCurrent: 'The current status of this data is',
thisbuttonCompleted: 'This button can only be operated when the status is completed', thisbuttonCompleted: 'You can operate this button only when the state is Completed or not Collected',
Frozenstatus: 'Frozen status, can only be viewed', Frozenstatus: 'Frozen status, can only be viewed',
chinese: 'Chinese', chinese: 'Chinese',
integerOrDecimal: 'Integer Or Decimal', integerOrDecimal: 'Integer Or Decimal',
jero-web/src/common/lang/zh-cn.js
+1 -1
View File
@@ -768,7 +768,7 @@ module.exports = {
Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置', Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置',
NoConfigurationNotStart: '未添加任何配置，无法开始收集，请检查', NoConfigurationNotStart: '未添加任何配置，无法开始收集，请检查',
theCurrent: '此数据当前状态为', theCurrent: '此数据当前状态为',
thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮', thisbuttonCompleted: '当状态为"已完成或未收集"时，才可操作此按钮',
Frozenstatus: '冻结状态,仅可以查看', Frozenstatus: '冻结状态,仅可以查看',
chinese: '中文', chinese: '中文',
integerOrDecimal: '整数或小数', integerOrDecimal: '整数或小数',
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+2 -2
View File
@@ -294,7 +294,7 @@
}) })
}, },
deleteLib(val) { deleteLib(val) {
if (val.state === '已完成' || val.state === 'Finished') { if (val.state === '已完成' || val.state === 'Finished' || val.state === '未收集' || val.state === 'Uncollected') {
let _this = this let _this = this
this.$confirm({ this.$confirm({
content: _this.$t('ConfirmDelete'), content: _this.$t('ConfirmDelete'),
@@ -389,7 +389,7 @@
// 默认为0 可全部删除 // 默认为0 可全部删除
let flag = 1 let flag = 1
this.selectedRowKeysvalArray.forEach((item) => { this.selectedRowKeysvalArray.forEach((item) => {
if (item.state !== '已完成' && item.state !== 'Finished') { if (item.state !== '已完成' && item.state !== 'Finished' && item.state !== '未收集' && item.state !== 'Uncollected') {
flag = 0 flag = 0
} }
}) })
jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+1 -1
View File
@@ -16,7 +16,7 @@
<span class="Required">*</span> <span class="Required">*</span>
<span class="title-text-text" :title="$t('title')">{{$t('title')}}</span> <span class="title-text-text" :title="$t('title')">{{$t('title')}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop='title'> <a-form-model-item class="itemModel" prop="title">
<a-input class="box-input" <a-input class="box-input"
:placeholder="$t('PleaseEnter')+$t('title')" :placeholder="$t('PleaseEnter')+$t('title')"
v-model='formData.title'/> v-model='formData.title'/>