diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 90fdb2d38..b7a8e7be0 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -78,17 +78,17 @@
-
+
{{$t('submit')}}
-
+
{{$t('newlyAdded')}}
-
+
{{$t('templateDownload')}}
@@ -98,20 +98,20 @@ {{$t('export')}}
-
-
{{$t('BatchDelete')}}
-
@@ -133,10 +133,10 @@ :loading="loading" > - + {{$t('edit')}} - + {{$t('delete')}} @@ -346,7 +346,8 @@ orderByField: '', total: 0, pageNo: 1, - pageSize: 10 + pageSize: 10, + staFlag:'', } }, computed: { @@ -540,6 +541,9 @@ return } this.dataSource = res.result.records || [] + if(this.dataSource.length != 0 && this.dataSource[0].state == '1'){ + this.staFlag = '1' + } this.total = res.result.total this.loading = false } else { diff --git a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue index 1ba72f7a2..e00bcc754 100644 --- a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue +++ b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue @@ -303,10 +303,35 @@ export default { }).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false + // this.$message.success(this.$t('OperationSuccessful')) + if(res.result.flag == 'YES'){ + let _this = this + this.$confirm({ + content: _this.$t('AlreadyExists'), + onOk() { + geteAction('/project/projectRxswinEO/addBatch', { + ids: this.selectedRowKeys.join(','), + flag:'YES', + projectId: this.projectId, + }).then((res) => { + if (res.success) { + _this.$message.success(this.$t('OperationSuccessful')) + _this.$emit('transferListFormHomo') + } else { + _this.$message.warning(res.message) + } + }) + }, + onCancel() { + _this.$emit('transferListFormHomo') + } + }) + }else{ + this.visible = false + this.$message.success(this.$t('OperationSuccessful')) + this.$emit('transferListFormHomo') + } this.selectedRowKeys = [] - this.$emit('transferListFormHomo') } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false