diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b21fcc4a4..76c71c7fe 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -639,11 +639,12 @@ module.exports = { China:'China', onlyOnefileUploaded:'only one file can be uploaded', typeCannotUploaded:'this type of file cannot be uploaded', - confirmWithdraw:'confirm Withdraw', + confirmWithdraw:'confirm Withdraw ?', OperationDetails:'Operation details', OperationTime:'Operation time', oneTableAdded:'only one table can be added', addATable:'please add a table', pleaseUploadSplitFile:'please upload split file', - + release:'release', + confirmRelease:'confirm Release ?', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index b3359a562..484087d08 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -649,5 +649,6 @@ module.exports = { oneTableAdded:'只能添加一个表格', addATable:'请添加一个表格', pleaseUploadSplitFile:'请上传拆分文件', - + release:'发布', + confirmRelease:'确认发布?', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index 07338ef7d..0123b8f2d 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -7,8 +7,8 @@
{{$t('VirtualListName')}}
- + @@ -57,12 +57,14 @@ {{$t('edit')}} - {{$t('withdraw')}} - {{$t('maintenanceList')}} - - {{!record.subscribeFlag || record.subscribeFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}} + + {{record.state == 2 ? $t('release') : $t('withdraw')}} - {{$t('deleteLib')}} + {{$t('maintenanceList')}} + + {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}} + + {{$t('deleteLib')}} @@ -229,12 +231,21 @@ this.visible = true }, //撤回 - withdraw(item) { + withdraw(val) { + let item = JSON.parse(JSON.stringify(val)) + let content = '' + if (item.state == 2) { + content = this.$t('confirmRelease') + item.state = 1 + } else { + item.state = 2 + content = this.$t('confirmWithdraw') + } let _this = this this.$confirm({ - content: _this.$t('confirmWithdraw'), + content: content, onOk() { - getAction(_this.url.urlWithdraw, { id: item.id }).then((res) => { + postAction(_this.url.edit, item).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.getList() @@ -262,10 +273,10 @@ subscribe(val) { let _this = this this.$confirm({ - content: val.subscribeFlag == 0 || !val.subscribeFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'), + content: val.readFlag == 0 || !val.readFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'), onOk() { let url = '' - if (val.subscribeFlag == 0 || !val.subscribeFlag) { + if (val.readFlag == 0 || !val.readFlag) { url = 'dummy/dummyInventoryBaseEO/read' } else { url = 'dummy/dummyInventoryBaseEO/cancelRead'