WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-03-09 11:20:47 +08:00
parent 7d60857822 db27a37831
commit 91c0b95310
3 changed files with 168 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+6
View File
@@ -1416,6 +1416,12 @@ module.exports = {
confirmToAcceptTheTask:'Confirm to accept the task ?',
confirmRejectTask:'Confirm Reject Task ?',
onlyDataStatusConfirmedSelected:'Only data with process status of task to be confirmed can be selected',
onlyDataStatusSubmittedCanBeSelected:'Only data with process status of result to be submitted can be selected',
operationWithoutPermission:'Operation without permission',
data:"'s data",
confirmApproval:'Confirm approval?',
confirmReturnForApproval:'Confirm return for approval ?',
onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected',
confirmResetProcess:'Confirm reset process?',
confirmUrging:'Confirm urging ?',
}
jero-web/src/common/lang/zh-cn.js
+6
View File
@@ -1515,8 +1515,14 @@ module.exports = {
confirmToAcceptTheTask:'确认接受任务?',
confirmRejectTask:'确认拒绝任务?',
onlyDataStatusConfirmedSelected:'只能选择流程状态为任务待确认的数据',
onlyDataStatusSubmittedCanBeSelected:'只能选择流程状态为结果待提交的数据',
operationWithoutPermission:'没有权限操作',
data:"的数据",
compliancereport:'生成合规报告',
todocenter:'待办中心',
confirmApproval:'确认通过审批？',
confirmReturnForApproval:'确认退回审批？',
onlyDataStatusResultReviewedCanBeSelected:'只能选择流程状态为结果待审查的数据',
confirmResetProcess:'确认重置流程?',
confirmUrging:'确认催办',
}
jero-web/src/views/projectManagement/components/certificationList/index.vue
+156 -20
View File
@@ -117,7 +117,7 @@
<a-popconfirm overlayClassName="popconfirm" placement="bottomRight">
<template slot="title" id="popconfirm">
<div style="height:320px;overflow:scroll;overflow-x: auto;">
<div>
<!-- 添加-->
<div @click="handleAdd"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
@@ -200,13 +200,15 @@
</div>
<!-- 审批通过-->
<div @click="ApprovedClick" v-if="roleSwitchingCode == 2" class="operator-text">
<div @click="ApprovedClick('rzgcssc_tg',$t('confirmApproval'))" v-if="roleSwitchingCode == 2"
class="operator-text">
<a-icon type="check-circle"/>
{{ $t('Approved') }}
</div>
<!-- 审批退回-->
<div @click="returnedForApprovalClick" v-if="roleSwitchingCode == 2" class="operator-text">
<div @click="ApprovedClick('rzgcssc_th',$t('confirmReturnForApproval'))" v-if="roleSwitchingCode == 2"
class="operator-text">
<a-icon type="close-circle"/>
{{ $t('returnedForApproval') }}
</div>
@@ -350,6 +352,7 @@
<uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
<TaskListModel @TaskListModelList="transferListForm" ref="TaskListModelRef"/>
<referenceDeliverablesList ref="referenceDeliverablesListRef" @referenceDeliverablesListForm="transferListForm"/>
<SelectedBy ref="SelectedByRef" :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy>
<a-modal
:title="listTitle"
:width="500"
@@ -432,6 +435,7 @@
import batSetting from './components/batSetting'
import modifyHistory from './components/modifyHistoryList'
import TaskListModel from '../TaskListModel'
import SelectedBy from '@/components/SelectedBy/index'
import referenceDeliverablesList from './components/referenceDeliverablesList'
import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
import moment from 'moment'
@@ -449,7 +453,8 @@
modifyHistory,
uploadFile,
TaskListModel,
referenceDeliverablesList
referenceDeliverablesList,
SelectedBy
},
data() {
return {
@@ -491,7 +496,8 @@
deleteOne: '/project/projectCertificationInventoryEO/delete',
AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit',
saveBatch: '/project/projectCertificationInventoryEO/saveBatch'
saveBatch: '/project/projectCertificationInventoryEO/saveBatch',
questionUrl:'',
},
dataSource: [],
roleSwitchingCode: '',
@@ -703,11 +709,17 @@
},
onChange(page, pageSize) {
this.pageNo = page
if (this.roleSwitchingCode == 2) {
this.preservationClick()
}
this.replacePage()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
if (this.roleSwitchingCode == 2) {
this.preservationClick()
}
this.replacePage()
},
searchQuery() {
@@ -844,9 +856,33 @@
this.$message.warning(this.$t('selectLeastOne'))
}
},
//流程重置
processResetClick() {
let _this = this
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.$confirm({
content: _this.$t('confirmResetProcess'),
onOk() {
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
postAction(_this.url.deleteBatch, {
ids: idList.join(','),
projectLibraryId: _this.$route.query.id
}).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = []
_this.getList()
} else {
_this.$message.warning(res.message)
}
})
}
})
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
//添加
handleAdd() {
this.$refs.addModelRef.addModel()
},
@@ -894,16 +930,43 @@
this.formInline = {}
this.visible = false
},
//撤回
withdrawClick() {
},
//催办
questionClick() {
let _this = this
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.$confirm({
content: _this.$t('confirmUrging'),
onOk() {
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
postAction(_this.url.questionUrl, {
ids: idList.join(','),
projectLibraryId: _this.$route.query.id
}).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = []
_this.getList()
} else {
_this.$message.warning(res.message)
}
})
}
})
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
transferListForm() {
this.pageNo = 1
this.getList()
this.selectedRowKeys = []
},
batSettingForm() {
this.pageNo = 1
@@ -913,6 +976,7 @@
addModelForm() {
this.pageNo = 1
this.getList()
this.selectedRowKeys = []
},
edit(item) {
this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item)))
@@ -1037,19 +1101,36 @@
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
//审批通过
ApprovedClick() {
},
//审批退回
returnedForApprovalClick() {
},
//转办
turnToDoClick() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.$refs.SelectedByRef.getPush()
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
SelectedByForm(userIds) {
let ids = JSON.parse(JSON.stringify(this.selectedRowKeys))
let query = {
userIds: userIds,
'projectLibraryId': this.$route.query.id,
'ids': ids.join(',')
}
postAction('/problemKnowledgeBase/problemKnowledgeBaseEO/forward', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.$refs.SelectedByRef.visible = false
this.$refs.SelectedByRef.submitLoading = false
this.getList()
} else {
this.$message.warning(this.$t('operationFailed'))
this.$refs.SelectedByRef.submitLoading = false
}
})
},
clickButtonToUpload(item, index) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
@@ -1175,7 +1256,7 @@
}
let data = ''
if (notConditions && notConditions.length > 0) {
data = this.$t('operationWithoutPermission')+this.$t('inspectionItems') + '"' + notConditions.join('、') + '"'+this.$t('data')
data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
}
if (ids && ids.length > 0) {
this.submitTask(value, prompt, ids, notConditions, data)
@@ -1184,13 +1265,18 @@
}
},
//提交
//责任人提交
submitClick(value, prompt) {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let ids = []
let notConditions = []
if (this.roleSwitchingCode == 20) {
this.submitClickJC(value, prompt)
return
}
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed') {
if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
ids.push(this.selectedRowKeysList[i].id)
} else {
notConditions.push(this.selectedRowKeysList[i].inspectionItem)
@@ -1198,7 +1284,57 @@
}
let data = ''
if (notConditions && notConditions.length > 0) {
data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusConfirmedSelected')
data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected')
}
if (ids && ids.length > 0) {
this.submitTask(value, prompt, ids, notConditions, data)
} else {
this.failedMessage(data)
}
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
//接口人提交
submitClickJC(value, prompt) {
let ids = []
let notConditions = []
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if ((this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') &&
this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
ids.push(this.selectedRowKeysList[i].id)
} else {
notConditions.push(this.selectedRowKeysList[i].inspectionItem)
}
}
let data = ''
if (notConditions && notConditions.length > 0) {
data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
}
if (ids && ids.length > 0) {
this.submitTask(value, prompt, ids, notConditions, data)
} else {
this.failedMessage(data)
}
},
//审批通过/退回
ApprovedClick(value, prompt) {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let ids = []
let notConditions = []
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed') {
ids.push(this.selectedRowKeysList[i].id)
} else {
notConditions.push(this.selectedRowKeysList[i].inspectionItem)
}
}
let data = ''
if (notConditions && notConditions.length > 0) {
data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusResultReviewedCanBeSelected')
}
if (ids && ids.length > 0) {
this.submitTask(value, prompt, ids, notConditions, data)