diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c9f3d1ae1..bda2000ac 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -741,4 +741,5 @@ module.exports = { record:'record', replyToComments:'Reply to comments', noComment:'No comment', + theReceived:'The final version can be made only when the list confirmation status and task confirmation status of all data are received', } \ 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 7ea56f0ad..3cef04242 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -746,4 +746,5 @@ module.exports = { record:'记录', replyToComments:'回复评论', noComment:'暂无评论', + theReceived:'所有数据的清单确认状态和任务确认状态都为接受才可以定版', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 5e08d107f..e1cdaba08 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -58,8 +58,8 @@ - - + + @@ -72,6 +72,7 @@ import updateLog from '@/components/UpdateLog/index' import historicalVersionList from '../components/historicalVersionList' import commentList from '../components/commentList' + export default { name: 'ProjectDetails', components: { @@ -123,9 +124,9 @@ historicalVersionClick() { this.$refs.historicalVersionListRef.getList() }, - commentClick(){ + commentClick() { this.$refs.commentListRef.getData() - }, + } } } diff --git a/jero-web/src/views/projectManagement/components/fixedPlateForm.vue b/jero-web/src/views/projectManagement/components/fixedPlateForm.vue new file mode 100644 index 000000000..26fc25c51 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/fixedPlateForm.vue @@ -0,0 +1,133 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/historicalVersionList.vue b/jero-web/src/views/projectManagement/components/historicalVersionList.vue index 372d5d7ae..4066ed627 100644 --- a/jero-web/src/views/projectManagement/components/historicalVersionList.vue +++ b/jero-web/src/views/projectManagement/components/historicalVersionList.vue @@ -20,17 +20,6 @@ {{$t('See')}} -
- -
@@ -38,16 +27,15 @@ import { getAction, postAction, } from '@/api/manage' export default { name: 'historicalVersionList', - props:['url'], data(){ return{ visible:false, confirmLoading:false, dataSource:[], loading:false, - pageNo: 1, - pageSize: 10, - total: 0, + url:{ + list:'project/projectHistoryVersionsEO/list', + }, columns: [ { title: this.$t('versionName'), @@ -76,7 +64,6 @@ methods:{ getList(){ this.visible = true - this.pageNo = 1 this.historicalList() }, handleOk() { @@ -85,26 +72,14 @@ handleCancel() { this.visible = false }, - onChange(page, pageSize) { - this.pageNo = page - this.historicalList() - }, - SizeChange(page, pageSize) { - this.pageNo = 1 - this.pageSize = pageSize - this.historicalList() - }, historicalList(){ let query = { - pageNo: this.pageNo, - pageSize: this.pageSize, - documentId: this.$route.query.id + projectLibraryId: this.$route.query.id } this.loading = true - getAction(this.url.historicalVersionUrl, query).then((res) => { + getAction(this.url.list, query).then((res) => { if (res.success) { - this.dataSource = res.result.records - this.total = res.result.total + this.dataSource = res.result || [] this.loading = false } else { this.loading = false diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index ccd2f2397..2ed47eb30 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -58,7 +58,7 @@ {{ $t('alteration') }} -
+
{{ $t('fixedPlate') }}
@@ -184,6 +184,7 @@ + 0) { + let isTrue + for (let i = 0; i < this.dataSource.length; i++) { + if (this.dataSource[i].taskAffirmStatus == 'rejected' && this.dataSource[i].inventoryAffirmStatus == 'rejected') { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.$t('theReceived')) + return + } + } + if (isTrue) { + this.$refs.fixedPlateRef.getData() + } + } + }, handleAdd() { this.$refs.addModelRef.addModel() },