fix 81324;法规合规评估流程法规工程师审批节点加两个批量选人的按钮
This commit is contained in:
@@ -431,5 +431,8 @@ module.exports = {
|
|||||||
pleaseSelectResponsibleUnitContactPerson: '请选择责任单位联络人',
|
pleaseSelectResponsibleUnitContactPerson: '请选择责任单位联络人',
|
||||||
atLeastOneData:'至少需要保留一条数据',
|
atLeastOneData:'至少需要保留一条数据',
|
||||||
pleaseSelectDesignEngineer: '请选择设计工程师',
|
pleaseSelectDesignEngineer: '请选择设计工程师',
|
||||||
|
batchSelectDesignEngineer: '批量选择设计工程师',
|
||||||
|
batchSelectCCPersonnel:'批量选择抄送人员',
|
||||||
|
noProjectData: '不立项数据不能选择设计工程师'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -169,6 +169,7 @@ export default {
|
|||||||
}
|
}
|
||||||
return item
|
return item
|
||||||
})
|
})
|
||||||
|
this.$message.success(this.$t('operationSuccessful'))
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* 不涉及
|
* 不涉及
|
||||||
@@ -185,6 +186,7 @@ export default {
|
|||||||
record.moduleOwner_dictText = null
|
record.moduleOwner_dictText = null
|
||||||
}
|
}
|
||||||
this.$set(this.dataSource, index, record)
|
this.$set(this.dataSource, index, record)
|
||||||
|
this.$message.success(this.$t('operationSuccessful'))
|
||||||
},
|
},
|
||||||
onSelectChange (selectedRowKeys) {
|
onSelectChange (selectedRowKeys) {
|
||||||
this.selectedRowKeys = selectedRowKeys
|
this.selectedRowKeys = selectedRowKeys
|
||||||
|
|||||||
+1
@@ -145,6 +145,7 @@ export default {
|
|||||||
modalFormOk (record) {
|
modalFormOk (record) {
|
||||||
const index = this.dataSource.findIndex(tt => tt.id === record.id)
|
const index = this.dataSource.findIndex(tt => tt.id === record.id)
|
||||||
this.$set(this.dataSource, index, record)
|
this.$set(this.dataSource, index, record)
|
||||||
|
this.$message.success(this.$t('operationSuccessful'))
|
||||||
},
|
},
|
||||||
handleTableChange (pagination) {
|
handleTableChange (pagination) {
|
||||||
this.ipagination = pagination
|
this.ipagination = pagination
|
||||||
|
|||||||
@@ -225,6 +225,7 @@ export default {
|
|||||||
}
|
}
|
||||||
return item
|
return item
|
||||||
})
|
})
|
||||||
|
this.$message.success(this.$t('operationSuccessful'))
|
||||||
},
|
},
|
||||||
handleDelete (rowKey) {
|
handleDelete (rowKey) {
|
||||||
this.$confirm({
|
this.$confirm({
|
||||||
@@ -235,6 +236,7 @@ export default {
|
|||||||
this.dataSource[index] = null
|
this.dataSource[index] = null
|
||||||
this.dataSource = this.dataSource.filter(tt => !!tt)
|
this.dataSource = this.dataSource.filter(tt => !!tt)
|
||||||
this.selectedRowKeys = []
|
this.selectedRowKeys = []
|
||||||
|
this.$message.success(this.$t('deleteSucceeded'))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -261,6 +263,7 @@ export default {
|
|||||||
}).filter(tt => !!tt)
|
}).filter(tt => !!tt)
|
||||||
this.dataSource = JSON.parse(JSON.stringify(data))
|
this.dataSource = JSON.parse(JSON.stringify(data))
|
||||||
this.selectedRowKeys = []
|
this.selectedRowKeys = []
|
||||||
|
this.$message.success(this.$t('deleteSucceeded'))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -139,6 +139,7 @@ export default {
|
|||||||
onOk: () => {
|
onOk: () => {
|
||||||
this.dataSource = []
|
this.dataSource = []
|
||||||
this.$emit('standard:change', this.dataSource[0])
|
this.$emit('standard:change', this.dataSource[0])
|
||||||
|
this.$message.success(this.$t('deleteSucceeded'))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -156,6 +157,7 @@ export default {
|
|||||||
this.$set(this.dataSource, 0, data)
|
this.$set(this.dataSource, 0, data)
|
||||||
}
|
}
|
||||||
this.$emit('standard:change', this.dataSource[0])
|
this.$emit('standard:change', this.dataSource[0])
|
||||||
|
this.$message.success(this.$t('operationSuccessful'))
|
||||||
},
|
},
|
||||||
handleSourceChange (value, record) {
|
handleSourceChange (value, record) {
|
||||||
const splitInfoId = record.decompositionOrderSourceVOList.find(tt => tt.value === value).sarFileSplitInfoId
|
const splitInfoId = record.decompositionOrderSourceVOList.find(tt => tt.value === value).sarFileSplitInfoId
|
||||||
|
|||||||
@@ -168,6 +168,7 @@ export default {
|
|||||||
}
|
}
|
||||||
return item
|
return item
|
||||||
})
|
})
|
||||||
|
this.$message.success(this.$t('operationSuccessful'))
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* 不涉及
|
* 不涉及
|
||||||
@@ -183,6 +184,7 @@ export default {
|
|||||||
record.designEngineer_dictText = undefined
|
record.designEngineer_dictText = undefined
|
||||||
}
|
}
|
||||||
this.$set(this.dataSource, index, record)
|
this.$set(this.dataSource, index, record)
|
||||||
|
this.$message.success(this.$t('operationSuccessful'))
|
||||||
},
|
},
|
||||||
onSelectChange (selectedRowKeys) {
|
onSelectChange (selectedRowKeys) {
|
||||||
this.selectedRowKeys = selectedRowKeys
|
this.selectedRowKeys = selectedRowKeys
|
||||||
|
|||||||
+64
-3
@@ -3,7 +3,24 @@
|
|||||||
<!--项目归档-->
|
<!--项目归档-->
|
||||||
<div class="process-part-title">{{ $t('workCenter.standardCompliance.projectFiling') }}</div>
|
<div class="process-part-title">{{ $t('workCenter.standardCompliance.projectFiling') }}</div>
|
||||||
<div>
|
<div>
|
||||||
<j-table :columns="columns" :data-source="dataSource" :pagination="ipagination" :scroll="{x: '100%'}" @change="handleTableChange">
|
<div class="table-operator">
|
||||||
|
<!--批量选择设计工程师-->
|
||||||
|
<a-button type="primary" @click="handleSelectPerson('designEngineer')">
|
||||||
|
{{ $t('workCenter.standardCompliance.batchSelectDesignEngineer') }}
|
||||||
|
</a-button>
|
||||||
|
<!--批量选择抄送人员-->
|
||||||
|
<a-button type="primary" @click="handleSelectPerson('carbonCopyPersonnels')">
|
||||||
|
{{ $t('workCenter.standardCompliance.batchSelectCCPersonnel') }}
|
||||||
|
</a-button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<j-table rowKey="id"
|
||||||
|
:columns="columns"
|
||||||
|
:data-source="dataSource"
|
||||||
|
:pagination="ipagination"
|
||||||
|
:scroll="{x: '100%'}"
|
||||||
|
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
||||||
|
@change="handleTableChange">
|
||||||
|
|
||||||
<!--评估详情(下方列表)-->
|
<!--评估详情(下方列表)-->
|
||||||
<template v-slot:evaluateDetail="{text, record}">
|
<template v-slot:evaluateDetail="{text, record}">
|
||||||
@@ -72,6 +89,8 @@
|
|||||||
|
|
||||||
<!--条文内容-->
|
<!--条文内容-->
|
||||||
<split-clause-detail ref="clauseDetail" />
|
<split-clause-detail ref="clauseDetail" />
|
||||||
|
<!--批量选择人员-->
|
||||||
|
<user-select-modal ref="userSelectModal" :type="batchSelectType" @listChange="handleBatchSelected" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -82,10 +101,11 @@ import DepartLeaderDetailModal from '../modules/DepartLeaderDetailModal'
|
|||||||
import SplitClauseDetail from '../../../documentTool/documentSplit/modules/SplitClauseDetail'
|
import SplitClauseDetail from '../../../documentTool/documentSplit/modules/SplitClauseDetail'
|
||||||
import { YesOrNoEnum } from '../../../../enums/commonEnums'
|
import { YesOrNoEnum } from '../../../../enums/commonEnums'
|
||||||
import { queryStandardComplianceEvaluateDetail } from '../../../../api/workCenter'
|
import { queryStandardComplianceEvaluateDetail } from '../../../../api/workCenter'
|
||||||
|
import UserSelectModal from '../../../../components/selection/UserSelectModal'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'RegulatoryEngineerApproval',
|
name: 'RegulatoryEngineerApproval',
|
||||||
components: { SplitClauseDetail, DepartLeaderDetailModal, UserSelection, JTable },
|
components: { UserSelectModal, SplitClauseDetail, DepartLeaderDetailModal, UserSelection, JTable },
|
||||||
props: {
|
props: {
|
||||||
// 回显的数据
|
// 回显的数据
|
||||||
displayDataSource: {
|
displayDataSource: {
|
||||||
@@ -214,7 +234,10 @@ export default {
|
|||||||
total: 0
|
total: 0
|
||||||
},
|
},
|
||||||
termNumber: null,
|
termNumber: null,
|
||||||
termName: null
|
termName: null,
|
||||||
|
selectedRowKeys: [],
|
||||||
|
batchSelectField: null,
|
||||||
|
batchSelectType: 'radio'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@@ -281,6 +304,44 @@ export default {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return this.dataSource
|
return this.dataSource
|
||||||
|
},
|
||||||
|
onSelectChange (selectedRowKeys) {
|
||||||
|
this.selectedRowKeys = selectedRowKeys
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* 批量选人
|
||||||
|
* @param fieldName
|
||||||
|
*/
|
||||||
|
handleSelectPerson (fieldName) {
|
||||||
|
// 请选择要分发的数据
|
||||||
|
if (!this.selectedRowKeys || this.selectedRowKeys.length === 0) {
|
||||||
|
this.$message.warning(this.$t('pleaseSelectDistributeData'))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (fieldName === 'designEngineer') {
|
||||||
|
console.log(this.selectedRowKeys)
|
||||||
|
console.log(this.dataSource.some(tt => this.selectedRowKeys.includes(tt.id)))
|
||||||
|
if (this.dataSource.some(tt => this.selectedRowKeys.includes(tt.id) && tt.projectApprovalFlag !== this.yesValue)) {
|
||||||
|
this.$message.warning(this.$t('workCenter.standardCompliance.noProjectData'))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.batchSelectType = 'radio'
|
||||||
|
} else {
|
||||||
|
this.batchSelectType = 'checkbox'
|
||||||
|
}
|
||||||
|
this.batchSelectField = fieldName
|
||||||
|
this.$refs.userSelectModal.open()
|
||||||
|
},
|
||||||
|
handleBatchSelected (list) {
|
||||||
|
const data = JSON.parse(JSON.stringify(this.dataSource))
|
||||||
|
this.dataSource = data.map(item => {
|
||||||
|
if (this.selectedRowKeys.includes(item.id)) {
|
||||||
|
item[this.batchSelectField] = list.map(tt => tt.id).join(',')
|
||||||
|
item[this.batchSelectField + '_dictText'] = list.map(tt => tt.realname + '(' + tt.username + ')').join(',')
|
||||||
|
}
|
||||||
|
return item
|
||||||
|
})
|
||||||
|
this.$message.success(this.$t('operationSuccessful'))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user