diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 625954e6d..a2d24c0b9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1805,4 +1805,6 @@ module.exports = { confirmSupplementarySubmission:'Confirm Supplementary Submission ?', onlyProcessStatusOfApprovedCanBeSelected:'Only data with a process status of approved can be selected', andTheOperatorCurrentData:' And the operator is the responsible person for the current data', + upgradeInstructions:'Upgrade Instructions', + upgradeOrNot:'Upgrade or not', } \ 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 829a4533c..7376d26c3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1907,4 +1907,6 @@ module.exports = { confirmSupplementarySubmission:'确认补充提交?', onlyProcessStatusOfApprovedCanBeSelected:'只能选择流程状态为审查通过的数据', andTheOperatorCurrentData:',并且登录人为当前数据的责任人', + upgradeInstructions:'升版说明', + upgradeOrNot:'是否升版', } \ 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 e7f3d88f2..007427c79 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -128,6 +128,20 @@ + +
+
+ * + {{$t('VersionNumber')}} +
+ + + +
+
@@ -150,6 +164,7 @@
+ @@ -160,6 +175,7 @@ import VueDraggableResizable from 'vue-draggable-resizable' import tableDragResize from '@/mixins/tableDragResize' import setCreator from '@/components/setCreator/index' + import releaseForm from '../../virtualAuthenticationList/components/releaseForm' import { mapGetters } from 'vuex' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' @@ -167,7 +183,8 @@ name: 'index', components: { VueDraggableResizable, - setCreator + setCreator, + releaseForm }, mixins: [tableDragResize, ResizeHeader, ResizeColumnProvide], data() { @@ -189,6 +206,18 @@ trigger: 'blur' } ], + versionNum:[ + { + required: true, + message: this.$t('VersionNumber') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('VersionNumber') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ], useExplain: [ { required: true, @@ -225,17 +254,24 @@ ellipsis: true, scopedSlots: { customRender: 'VirtualListName' } }, + { + title: this.$t('VersionNumber'), + align: 'left', + width: '10%', + ellipsis: true, + dataIndex: 'versionNum' + }, { title: this.$t('listStatus'), align: 'left', - width: '20%', + width: '15%', ellipsis: true, dataIndex: 'state_dictText' }, { title: this.$t('creater'), align: 'left', - width: '20%', + width: '15%', ellipsis: true, dataIndex: 'createBy' }, @@ -362,17 +398,40 @@ } item.id = val.id let _this = this - this.$confirm({ - content: content, - onOk() { - postAction(_this.url.urlWithdraw, item).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.getList() - } else { - _this.$message.warning(res.message) - } - }) + if (item.state == 1){ + this.$refs.releaseFormRef.getData(val.id) + }else{ + this.$confirm({ + content: content, + onOk() { + postAction(_this.url.urlWithdraw, item).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } + }) + } + }, + releaseFormData(id, val) { + let _this = this + let item = { + state: 1, + id: id, + ...val + } + postAction(_this.url.urlWithdraw, item).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + _this.$refs.releaseFormRef.confirmLoading = false + _this.$refs.releaseFormRef.visible = false + } else { + _this.$message.warning(res.message) + _this.$refs.releaseFormRef.confirmLoading = false } }) }, diff --git a/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue b/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue new file mode 100644 index 000000000..724b58b64 --- /dev/null +++ b/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue @@ -0,0 +1,201 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index b837edcc1..9ec008852 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -42,7 +42,7 @@ {{$t('BatchDelete')}}
- +
+ +
+
+ * + {{$t('VersionNumber')}} +
+ + + +
+
@@ -144,11 +158,13 @@ {{$t('submit')}}
+