fix : 修复细节

This commit is contained in:
2024-05-12 15:35:40 +08:00
parent 8bdafdd087
commit d139b016a2
5 changed files with 30 additions and 62 deletions

View File

@@ -78,7 +78,7 @@ const processDiagramViewer = ref(false)
const typeOption = ref([
{
label: "需求征集",
value: '需求征集'
value: '00'
}
])
const companyOption = ref([

View File

@@ -56,17 +56,14 @@
</el-col>
</el-row>
</div>
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">-->
<div class="approval-record">
<baseTitle title="审批记录"></baseTitle>
<div class="process">
<operation-render v-if="processDiagramViewer" :operation-list="processInstanceData.operationList"
:state="'4'"/>
:state="processInstanceData.state"/>
<process-diagram-viewer v-if="processDiagramViewer"/>
</div>
</div>
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
<div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
<el-button @click="handleReject">驳回</el-button>
@@ -86,7 +83,6 @@ const form = ref();
const processStore = useProcessStore()
const processInstanceData = ref({})
const processDiagramViewer = ref(false)
const processTree = ref()
const formData = ref({})
const auditOpinion = ref('')
@@ -123,7 +119,7 @@ const tableConfig = reactive({
const handleSubmit = () => {
let approve = {
taskId: processInstanceData.value.taskId,
auditOpinion : auditOpinion.value,
auditOpinion: auditOpinion.value,
formData: formData.value
}
agreeTask(approve).then(res => {
@@ -133,7 +129,7 @@ const handleSubmit = () => {
const handleReject = () => {
let approve = {
taskId: processInstanceData.value.taskId,
auditOpinion : auditOpinion.value,
auditOpinion: auditOpinion.value,
}
rejectTask(approve).then(res => {
console.log(res)

View File

@@ -5,6 +5,7 @@
<script setup lang="jsx">
import Tag from '@/components/Tag.vue'
import fvSelect from '@/fvcomponents/fvSelect/index.vue'
const router = useRouter()
const searchConfig = reactive([
@@ -22,22 +23,16 @@ const searchConfig = reactive([
{
label: '征集类型',
prop: 'collectType',
component: 'el-input',
component: shallowRef(fvSelect),
props: {
placeholder: '请输入名称查询',
placeholder: '请选择征集类型',
clearable: true,
filterable: true,
checkStrictly: true
cacheKey: 'todo_type'
}
}
])
const tableIns = ref()
const auths = {
edit: ['admin:role:edit'],
add: ['admin:role:add'],
export: ['admin:role:export'],
}
const tableConfig = reactive({
columns: [
{
@@ -86,8 +81,8 @@ const tableConfig = reactive({
let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
if (row.state === '3' || row.state === '2') {
btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
btn.push({label: '删除', func: () => handleDel(row), type: 'danger'})
}else if (row.state === '4'){
btn.push({label: '删除', func: () => handleDelete(row), type: 'danger'})
} else if (row.state === '4') {
btn.push({label: '上报', func: () => handleReport(row), type: 'primary'})
}
return (
@@ -111,8 +106,8 @@ const tableConfig = reactive({
],
api: '/workflow/mosr/requirement',
btns: [
{name: '新增', key: 'add', auth: auths.add, color: '#DED0B2'},
{name: '导出', key: 'add', auth: auths.add, type: ''},
{name: '新增', key: 'add', color: '#DED0B2'},
{name: '导出', key: 'add', type: ''},
],
params: {}
})