Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
# Conflicts: # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js
This commit is contained in:
zyx.net
+2
-2
@@ -15,8 +15,8 @@ public enum ProjectRoleEnum {
|
||||
VIEWER("Viewer","13","Viewer"),
|
||||
BRAND_ADMINISTRATOR("品牌管理员","14","BrandAdministrator"),
|
||||
//法规清单使用
|
||||
INTERFACE_PERSON1("工程接口人","20","Interface person"),
|
||||
PERSON_LIABLE1("责任人","21","Person liable"),
|
||||
INTERFACE_PERSON1("工程接口人","30","Interface person"),
|
||||
PERSON_LIABLE1("责任人","31","Person liable"),
|
||||
// 项目库-认证清单使用。
|
||||
INTERFACE_PERSON("接口人","20","Interface person"),
|
||||
PERSON_LIABLE("责任人","21","Person liable"),
|
||||
|
||||
+7
@@ -227,4 +227,11 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
|
||||
public Result<?> resetFlow(@RequestBody JSONObject json) {
|
||||
return this.projectCertificationInventoryEOService.resetFlow(json);
|
||||
}
|
||||
|
||||
@AutoLog(value = "项目库-认证清单表-转办")
|
||||
@ApiOperation(value="项目库-认证清单表-转办", notes="项目库-认证清单表-转办")
|
||||
@PostMapping(value = "/transferTask")
|
||||
public Result<?> transferTask(@RequestBody JSONObject json) {
|
||||
return this.projectCertificationInventoryEOService.transferTask(json);
|
||||
}
|
||||
}
|
||||
|
||||
+7
@@ -142,4 +142,11 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
|
||||
* @return
|
||||
*/
|
||||
Result<?> resetFlow(JSONObject json);
|
||||
|
||||
/**
|
||||
* 转办任务
|
||||
* @param json
|
||||
* @return
|
||||
*/
|
||||
Result<?> transferTask(JSONObject json);
|
||||
}
|
||||
|
||||
+53
@@ -1257,4 +1257,57 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
return Result.OK("流程重置成功！");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<?> transferTask(JSONObject json) {
|
||||
String ids = json.getString("ids");
|
||||
if(StringUtils.isEmpty(ids)){
|
||||
throw new JeroBootException("至少选择一条数据进行操作！");
|
||||
}
|
||||
|
||||
String projectLibraryId = json.getString("projectLibraryId");
|
||||
String transferUserId = json.getString("transferUserId");
|
||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.getBaseMapper().selectById(projectLibraryId);
|
||||
if(ObjectUtils.isEmpty(projectLibraryBase)){
|
||||
throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
|
||||
}
|
||||
|
||||
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
List<String> idList = Arrays.asList(ids.split(","));
|
||||
|
||||
// 流程状态为 任务待确认、待提交、 审查退回 。 能转办
|
||||
List<String> flowStatusList = new ArrayList<>();
|
||||
flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue());
|
||||
flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue());
|
||||
flowStatusList.add(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
|
||||
|
||||
QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
|
||||
queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
|
||||
queryWrapper.lambda().in(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId());
|
||||
List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
|
||||
|
||||
if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
|
||||
throw new JeroBootException("至少选择一条数据流程状态为'任务待确认 或 结果待提交 或 审查退回'的数据进行转办操作！");
|
||||
}
|
||||
|
||||
projectCertificationInventoryEOList.forEach(certificationInventory -> {
|
||||
certificationInventory.setDutyPerson(transferUserId);
|
||||
});
|
||||
this.updateBatchById(projectCertificationInventoryEOList);
|
||||
|
||||
QueryWrapper<ProcessInfoDetailEO> detailQueryWrap = new QueryWrapper<>();
|
||||
detailQueryWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryId);
|
||||
detailQueryWrap.lambda().eq(ProcessInfoDetailEO::getUserId,currentUser.getId());
|
||||
detailQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,idList);
|
||||
List<ProcessInfoDetailEO> processInfoDetailEOList = this.processInfoDetailEOService.list(detailQueryWrap);
|
||||
if(CollectionUtils.isNotEmpty(processInfoDetailEOList)){
|
||||
processInfoDetailEOList.forEach(detail -> {
|
||||
detail.setUserId(transferUserId);
|
||||
});
|
||||
this.processInfoDetailEOService.updateBatchById(processInfoDetailEOList);
|
||||
}
|
||||
|
||||
return Result.OK("转办成功！");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1424,6 +1424,8 @@ module.exports = {
|
||||
onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected',
|
||||
confirmResetProcess:'Confirm reset process?',
|
||||
confirmUrging:'Confirm urging ?',
|
||||
confirmWithdrawal:'Confirm withdrawal ?',
|
||||
onlyListCheckedCanRecalled:'Only the data whose process status is list to be checked can be recalled',
|
||||
statusthetasistobeconfirmed:'You can withdraw the list only when the status of the list is to be checked or the status of the task is to be confirmed',
|
||||
confirmreturn:'Confirm return ?',
|
||||
}
|
||||
@@ -1527,4 +1527,7 @@ module.exports = {
|
||||
confirmUrging:'确认催办',
|
||||
statusthetasistobeconfirmed:'只有清单待校核状态或任务确认状态为待确认时才可以进行撤回',
|
||||
confirmreturn:'确认退回？',
|
||||
confirmUrging:'确认催办?',
|
||||
confirmWithdrawal:'确认撤回?',
|
||||
onlyListCheckedCanRecalled:'只能撤回流程状态为清单待校核的数据',
|
||||
}
|
||||
@@ -288,7 +288,8 @@
|
||||
}}
|
||||
</a-button>
|
||||
<span v-else>
|
||||
<span v-if="record.deliveryResult">
|
||||
<span class="viewFile"
|
||||
@click="viewFileClick(record.deliveryResult)" v-if="record.deliveryResult">
|
||||
{{$t('viewFile')}}
|
||||
</span>
|
||||
<span v-else>--</span>
|
||||
@@ -353,6 +354,7 @@
|
||||
<TaskListModel @TaskListModelList="transferListForm" ref="TaskListModelRef"/>
|
||||
<referenceDeliverablesList ref="referenceDeliverablesListRef" @referenceDeliverablesListForm="transferListForm"/>
|
||||
<SelectedBy ref="SelectedByRef" :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy>
|
||||
<viewFileModel ref="viewFileModelRef"/>
|
||||
<a-modal
|
||||
:title="listTitle"
|
||||
:width="500"
|
||||
@@ -428,6 +430,7 @@
|
||||
<script>
|
||||
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
|
||||
import certificationDirectory from '../certificationDirectory'
|
||||
import viewFileModel from '@/components/viewFileModel/index'
|
||||
import ImportFile from '@/components/ImportFile/index'
|
||||
import transferList from './components/transferList'
|
||||
import uploadFile from '@/components/uploadFile/file'
|
||||
@@ -454,7 +457,8 @@
|
||||
uploadFile,
|
||||
TaskListModel,
|
||||
referenceDeliverablesList,
|
||||
SelectedBy
|
||||
SelectedBy,
|
||||
viewFileModel
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -645,7 +649,9 @@
|
||||
selectedRowKeys: [],
|
||||
selectedRowKeysList: [],
|
||||
isDisplayNum: 2,
|
||||
long: ''
|
||||
long: '',
|
||||
toDoIds: [],
|
||||
toDoNotConditions: []
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -933,9 +939,53 @@
|
||||
|
||||
//撤回
|
||||
withdrawClick() {
|
||||
|
||||
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 == 'List to be checked') {
|
||||
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('onlyListCheckedCanRecalled')
|
||||
}
|
||||
if (ids && ids.length > 0) {
|
||||
this.withdrawData(ids, notConditions, data)
|
||||
} else {
|
||||
this.failedMessage(data)
|
||||
}
|
||||
} else {
|
||||
this.$message.warning(this.$t('selectLeastOne'))
|
||||
}
|
||||
},
|
||||
withdrawData(ids, notConditions, data) {
|
||||
let _this = this
|
||||
this.$confirm({
|
||||
content: _this.$t('confirmWithdrawal'),
|
||||
onOk() {
|
||||
postAction('/project/projectCertificationInventoryEO/resetFlow', {
|
||||
ids: ids.join(','),
|
||||
projectLibraryId: _this.$route.query.id
|
||||
}).then((res) => {
|
||||
if (res.success) {
|
||||
_this.$message.success(_this.$t('OperationSuccessful'))
|
||||
_this.selectedRowKeys = []
|
||||
_this.selectedRowKeysList = []
|
||||
_this.getList()
|
||||
if (notConditions && notConditions.length > 0) {
|
||||
_this.failedMessage(data)
|
||||
}
|
||||
} else {
|
||||
_this.$message.warning(res.message)
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
//催办
|
||||
questionClick() {
|
||||
let _this = this
|
||||
@@ -1105,25 +1155,50 @@
|
||||
//转办
|
||||
turnToDoClick() {
|
||||
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
|
||||
if (this.roleSwitchingCode == 20) {
|
||||
this.turnToDoClickJC()
|
||||
return
|
||||
}
|
||||
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(',')
|
||||
turnToDoClickJC() {
|
||||
this.toDoIds = []
|
||||
this.toDoNotConditions = []
|
||||
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
|
||||
if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
|
||||
this.toDoIds.push(this.selectedRowKeysList[i].id)
|
||||
} else {
|
||||
this.toDoNotConditions.push(this.selectedRowKeysList[i].inspectionItem)
|
||||
}
|
||||
}
|
||||
postAction('/problemKnowledgeBase/problemKnowledgeBaseEO/forward', query).then((res) => {
|
||||
this.toDoData = ''
|
||||
if (this.toDoNotConditions && this.toDoNotConditions.length > 0) {
|
||||
this.toDoData = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + this.toDoNotConditions.join('、') + '"' + this.$t('data')
|
||||
}
|
||||
if (this.toDoIds && this.toDoIds.length > 0) {
|
||||
this.$refs.SelectedByRef.getPush()
|
||||
} else {
|
||||
this.failedMessage(this.toDoData)
|
||||
}
|
||||
},
|
||||
SelectedByForm(userIds) {
|
||||
let query = {
|
||||
transferUserId: userIds,
|
||||
'projectLibraryId': this.$route.query.id,
|
||||
'ids': this.toDoIds.join(',')
|
||||
}
|
||||
postAction('/project/projectCertificationInventoryEO/transferTask', query).then((res) => {
|
||||
if (res.success) {
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
this.$refs.SelectedByRef.visible = false
|
||||
this.$refs.SelectedByRef.submitLoading = false
|
||||
this.getList()
|
||||
if (this.toDoNotConditions && this.toDoNotConditions.length > 0) {
|
||||
this.failedMessage(this.toDoData)
|
||||
}
|
||||
} else {
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
this.$refs.SelectedByRef.submitLoading = false
|
||||
@@ -1380,6 +1455,10 @@
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
viewFileClick(item) {
|
||||
this.$refs.viewFileModelRef.clickButtonToUpload(item)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1726,6 +1805,10 @@
|
||||
background: #ddf3f4;
|
||||
}
|
||||
|
||||
.viewFile {
|
||||
color: #00B3BE;
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
<style lang="less">
|
||||
.box-input .ant-select-selection {
|
||||
|
||||
@@ -3,10 +3,12 @@
|
||||
:title="$t('batSetting')"
|
||||
:width="900"
|
||||
:visible="visible"
|
||||
:confirm-loading="confirmLoading"
|
||||
:maskClosable="false"
|
||||
@ok="handleOk"
|
||||
@cancel="handleCancel"
|
||||
>
|
||||
<a-form-model class="formAdd">
|
||||
<a-form-model class="formAdd" v-model="formInline" :rules="rules" ref="ruleForm">
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
@@ -14,7 +16,9 @@
|
||||
<span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel-multi">
|
||||
<j-multi-select-tag class="box-input"
|
||||
<j-dict-select-tag class="box-input"
|
||||
v-model="formInline.dutyTerritory"
|
||||
@input="handleInput('dutyTerritory')"
|
||||
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
|
||||
:type="'select'"
|
||||
:triggerChange="false" :dictCode="'duty_territory'"/>
|
||||
@@ -33,6 +37,8 @@
|
||||
</div>
|
||||
<a-form-model-item class="itemModel-multi">
|
||||
<j-multi-select-tag class="box-input"
|
||||
v-model="formInline.deliverable"
|
||||
@input="handleInput('deliverable')"
|
||||
:placeholder="$t('PleaseSelect')+$t('Deliverables')"
|
||||
:type="'select'"
|
||||
:triggerChange="false"/>
|
||||
@@ -50,14 +56,22 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { postAction } from '../../../api/manage'
|
||||
|
||||
export default {
|
||||
name: 'batSetting',
|
||||
props: ['url'],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
confirmLoading: false,
|
||||
formInline: {},
|
||||
rules: {},
|
||||
ids: [],
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
||||
},
|
||||
methods: {
|
||||
edit(data) {
|
||||
@@ -67,10 +81,79 @@ export default {
|
||||
this.formInline = {}
|
||||
})
|
||||
},
|
||||
handleOk() {
|
||||
if (this.formInline.dutyTerritory) {
|
||||
this.handleOnTwo()
|
||||
} else {
|
||||
this.handleOkOne()
|
||||
}
|
||||
},
|
||||
handleOkOne() {
|
||||
let ids = JSON.parse(JSON.stringify(this.ids))
|
||||
let formInline = JSON.parse(JSON.stringify(this.formInline))
|
||||
Object.keys(formInline).forEach(res => {
|
||||
if (formInline[res] instanceof Array) {
|
||||
formInline[res] = formInline[res].join(',')
|
||||
}
|
||||
})
|
||||
let query = {
|
||||
ids: ids.join(','),
|
||||
...formInline
|
||||
}
|
||||
this.confirmLoading = true
|
||||
postAction(this.url.setBatch, query).then((res) => {
|
||||
if (res.success) {
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
this.visible = false
|
||||
this.confirmLoading = false
|
||||
this.$emit('batSettingList')
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
this.confirmLoading = false
|
||||
}
|
||||
})
|
||||
},
|
||||
handleOnTwo() {
|
||||
let _this = this
|
||||
this.$confirm({
|
||||
content: _this.$t('areResponsibilityAreaInformationBatch'),
|
||||
onOk() {
|
||||
let ids = JSON.parse(JSON.stringify(_this.ids))
|
||||
let formInline = JSON.parse(JSON.stringify(_this.formInline))
|
||||
Object.keys(formInline).forEach(res => {
|
||||
if (formInline[res] instanceof Array) {
|
||||
formInline[res] = formInline[res].join(',')
|
||||
}
|
||||
})
|
||||
let query = {
|
||||
ids: ids.join(','),
|
||||
...formInline
|
||||
}
|
||||
_this.confirmLoading = true
|
||||
postAction(_this.url.setBatch, query).then((res) => {
|
||||
if (res.success) {
|
||||
_this.$message.success(_this.$t('OperationSuccessful'))
|
||||
_this.visible = false
|
||||
_this.confirmLoading = false
|
||||
_this.$emit('batSettingList')
|
||||
} else {
|
||||
_this.$message.warning(res.message)
|
||||
_this.confirmLoading = false
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
handleCancel() {
|
||||
this.formInline = {}
|
||||
this.visible = false
|
||||
},
|
||||
handleInput(value) {
|
||||
this.$nextTick(() => {
|
||||
this.formInline = { ...this.formInline }
|
||||
this.$refs.ruleForm.validateField([value])
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
+5
-1
@@ -219,7 +219,7 @@
|
||||
<transfer-list ref="transferListRef"></transfer-list>
|
||||
<addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
|
||||
<edit-model :url="url" ref="editModelRef" @editModelList="editModelList"></edit-model>
|
||||
<bat-setting :url="url" ref="batSettingRef"></bat-setting>
|
||||
<bat-setting :url="url" ref="batSettingRef" @batSettingList="batSettingList"></bat-setting>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -265,6 +265,7 @@ export default {
|
||||
copyInfo: '/authDummy/authDummyInventoryInfoEO/copyInfoByIds',//复制
|
||||
deleteBatch: '/authDummy/authDummyInventoryInfoEO/deleteBatch',//批量删除
|
||||
editModel: '/authDummy/authDummyInventoryInfoEO/edit',//编辑
|
||||
setBatch: '/authDummy/authDummyInventoryInfoEO/setBatch',//批量设置
|
||||
},
|
||||
queryParam: {},
|
||||
orderByField: '',
|
||||
@@ -521,6 +522,9 @@ export default {
|
||||
editModelList() {
|
||||
this.getList()
|
||||
},
|
||||
batSettingList() {
|
||||
this.getList()
|
||||
},
|
||||
tableOnChange(pagination, filters, sorter) {
|
||||
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
|
||||
if(sorter.columnKey == 'shi4Yong4Fan4Wei2_dictText'){
|
||||
|
||||
Reference in New Issue
Block a user