diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index aacb86740..db44729ba 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -712,6 +712,8 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'Enclosure', // 认证 + theCurrent: 'The current status of this data is', + thisbuttonCompleted: 'This button can only be operated when the status is completed', Frozenstatus: 'Frozen status, can only be viewed', chinese: 'chinese', integerOrDecimal: 'integer Or Decimal', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 114ede240..a3f7909fb 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -723,6 +723,8 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + theCurrent: '此数据当前状态为', + thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮', Frozenstatus: '冻结状态,仅可以查看', chinese: '中文', integerOrDecimal: '整数或小数', diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 88e1fd3e8..2a88d9c89 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -65,6 +65,11 @@
@@ -314,6 +353,23 @@ export default { }, rules: {}, FreezeList: [], // 冻结字段 + visibleRoleSwitching: false, // 角色切换 + confirmLoadingRoleSwitching: false, + formInlineRoleSwitching: {}, + rulesRoleSwitching: { + roleSwitchingCode: [ + { + required: true, + message: this.$t('roleSwitching') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + }, + RoleType: [ // 控件类型 + {value:'homo', label: '认证工程师' }, + {value:'sdt', label: '工程接口人' }, + {value:'dre', label: '填写人' }, + ], } }, props: { @@ -326,6 +382,15 @@ export default { mounted() { }, methods:{ + handleCancelRoleSwitching() { + this.visibleRoleSwitching = false + }, + handleOkRoleSwitching() { + // + }, + roleSwitchingClick() { + this.visibleRoleSwitching = true + }, GetgetLoginUserType() { console.log('ooo') this.$refs.CollectionTabel.getLoginUserType() @@ -1191,11 +1256,33 @@ export default { } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 1ece5c2cd..6e6c302a9 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -192,7 +192,8 @@ historicalRow: {}, // 历史版本得数据 drawerVisible: false, drawerVisibleitem: false, - titleTag: '' + titleTag: '', + selectedRowKeysvalArray: [], } }, mounted() { @@ -208,20 +209,24 @@ window.open(newUrl.href, '_blank') }, deleteLib(val) { - let _this = this - this.$confirm({ - content: _this.$t('ConfirmDelete'), - onOk() { - getAction(_this.url.deleteBatch, { id: val.id }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.getlist() - } else { - _this.$message.warning(_this.$t('operationFailed')) - } - }) - } - }) + if(val.state === '已完成') { + let _this = this + this.$confirm({ + content: _this.$t('ConfirmDelete'), + onOk() { + getAction(_this.url.deleteBatch, { id: val.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getlist() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) + } else { + this.$message.warning(this.$t('thisbuttonCompleted')) + } }, handleTableChange() { @@ -253,9 +258,10 @@ this.pageNo = 1 this.getlist() }, - onSelectChange(val) { + onSelectChange(val,valArray) { this.selectedRowKeys = val this.selectedRowKeysArray = val.join(',') + this.selectedRowKeysvalArray = valArray }, edit(edit) { this.areaVisible = true @@ -271,9 +277,9 @@ let _this = this if(this.selectedRowKeys.length == 0){ this.$message.warning(_this.$t('pleaseSelectData')) - }else if(this.selectedRowKeys.length > 2){ + }else if(this.selectedRowKeys.length > 1){ this.$message.warning(_this.$t('OnlyOneSelected')) - } else { + } else if(this.selectedRowKeysvalArray[0].state === '已完成'){ axios({ url: `/jero-boot/params/manifest/changeExtension?id=${this.selectedRowKeys[0]}`, method: 'get', @@ -299,48 +305,61 @@ .catch((error) => { console.log(error) }) + } else { + this.$message.warning(_this.$t('thisbuttonCompleted')) } }, handleDel() { - let param = { - ids: this.selectedRowKeysArray - } - if (this.selectedRowKeys.length > 0) { - let _this = this - this.$confirm({ - content: _this.$t('ConfirmBatchDeletion'), - onOk() { - axios({ - url: `/jero-boot/params/manifest/deleteBatch`, - method: 'post', - data: param, - transformRequest: [function(data) { - let ret = '' - for (let it in data) { - ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' - } - return ret - }], - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token': _this.token - } - }) - .then((res) => { - if (res.data.success) { - _this.$message.success(res.data.message) - _this.getlist() - } else { - _this.$message.warning(res.data.message) + // 默认为0 可全部删除 + let flag = 1 + this.selectedRowKeysvalArray.forEach((item) => { + if(item.state !== '已完成'){ + flag = 0 + } + }) + if(flag) { + let param = { + ids: this.selectedRowKeysArray + } + if (this.selectedRowKeys.length > 0) { + let _this = this + this.$confirm({ + content: _this.$t('ConfirmBatchDeletion'), + onOk() { + axios({ + url: `/jero-boot/params/manifest/deleteBatch`, + method: 'post', + data: param, + transformRequest: [function(data) { + let ret = '' + for (let it in data) { + ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' + } + return ret + }], + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'X-Access-Token': _this.token } }) - .catch((error) => { - console.log(error) - }) - } - }) + .then((res) => { + if (res.data.success) { + _this.$message.success(res.data.message) + _this.getlist() + } else { + _this.$message.warning(res.data.message) + } + }) + .catch((error) => { + console.log(error) + }) + } + }) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } } else { - this.$message.warning(this.$t('selectLeastOne')) + this.$message.warning(this.$t('thisbuttonCompleted')) } }, handleCody() { diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index 41740661d..fe8580dcd 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -114,6 +114,7 @@