审批流程显示方式更新,多个视图页面及组件修改。
This commit is contained in:
parent
ff803fa78d
commit
def0c35f4e
@ -22,7 +22,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="报销项目" show-overflow-tooltip prop="cate_id">
|
<el-table-column label="报销项目" show-overflow-tooltip prop="cate_id">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<dict-value :options="dictData.oa_approve_cate" :value="row.cate_id" />
|
{{ cateIdToText(row.cate_id) }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="备注信息" show-overflow-tooltip prop="remark">
|
<el-table-column label="备注信息" show-overflow-tooltip prop="remark">
|
||||||
@ -131,14 +131,6 @@ const userStore = useUserStore().userInfo;
|
|||||||
const showBackDialog = ref(false)
|
const showBackDialog = ref(false)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
defineProps({
|
|
||||||
dictData: {
|
|
||||||
type: Object as PropType<Record<string, any[]>>,
|
|
||||||
default: () => ({})
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
// 表单数据
|
// 表单数据
|
||||||
const formData = reactive({
|
const formData = reactive({
|
||||||
id: 0,
|
id: 0,
|
||||||
@ -184,6 +176,17 @@ const submituser = (e) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const cateIdToText = (id) => {
|
||||||
|
// 1-交通费 2-住宿费 3-餐补费 4-招待费 5-汽油费 6-其他费
|
||||||
|
if (id == 1) return '交通费';
|
||||||
|
if (id == 2) return '住宿费';
|
||||||
|
if (id == 3) return '餐补费';
|
||||||
|
if (id == 4) return '招待费';
|
||||||
|
if (id == 5) return '汽油费';
|
||||||
|
if (id == 6) return '其他费';
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
//打开弹窗
|
//打开弹窗
|
||||||
const open = () => {
|
const open = () => {
|
||||||
popupRef.value?.open()
|
popupRef.value?.open()
|
||||||
|
@ -43,9 +43,12 @@
|
|||||||
<el-table-column label="报销项目" show-overflow-tooltip>
|
<el-table-column label="报销项目" show-overflow-tooltip>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<el-select v-model="row.cate_id" placeholder="请选择报销项目" class="flex-1">
|
<el-select v-model="row.cate_id" placeholder="请选择报销项目" class="flex-1">
|
||||||
<el-option :label="item.name" :value="item.value"
|
<el-option label="交通费" :value="1"></el-option>
|
||||||
v-for="item in dictData.oa_approve_cate">
|
<el-option label="住宿费" :value="2"></el-option>
|
||||||
</el-option>
|
<el-option label="餐补费" :value="3"></el-option>
|
||||||
|
<el-option label="招待费" :value="4"></el-option>
|
||||||
|
<el-option label="汽油费" :value="5"></el-option>
|
||||||
|
<el-option label="其他费" :value="6"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@ -83,13 +86,6 @@ const mode = ref("add");
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
defineProps({
|
|
||||||
dictData: {
|
|
||||||
type: Object as PropType<Record<string, any[]>>,
|
|
||||||
default: () => ({})
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
// 弹窗标题
|
// 弹窗标题
|
||||||
const popupTitle = computed(() => {
|
const popupTitle = computed(() => {
|
||||||
return "新增审批"
|
return "新增审批"
|
||||||
|
@ -74,16 +74,14 @@
|
|||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
<edit-popup v-if="showEdit" ref="editRef" :deptList="deptList" :dict-data="dictData" @success="getLists"
|
<edit-popup v-if="showEdit" ref="editRef" :deptList="deptList" @success="getLists" @close="showEdit = false" />
|
||||||
@close="showEdit = false" />
|
<detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
|
||||||
<detailPopup v-if="showDetail" ref="detailRef" :dict-data="dictData" @success="showDetail = false, getLists()"
|
|
||||||
@close="showDetail = false, getLists()" />
|
@close="showDetail = false, getLists()" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup name="oaPersonalQuitLists">
|
<script lang="ts" setup name="oaPersonalQuitLists">
|
||||||
import { usePaging } from '@/hooks/usePaging'
|
import { usePaging } from '@/hooks/usePaging'
|
||||||
import { useDictData } from '@/hooks/useDictOptions'
|
|
||||||
import { apiExpenseList, apiExpenseDetail } from '@/api/oa_financial'
|
import { apiExpenseList, apiExpenseDetail } from '@/api/oa_financial'
|
||||||
import { timeFormat } from '@/utils/util'
|
import { timeFormat } from '@/utils/util'
|
||||||
import feedback from '@/utils/feedback'
|
import feedback from '@/utils/feedback'
|
||||||
@ -114,7 +112,6 @@ const handleSelectionChange = (val: any[]) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 获取字典数据
|
// 获取字典数据
|
||||||
const { dictData } = useDictData('oa_approve_cate')
|
|
||||||
|
|
||||||
// 分页相关
|
// 分页相关
|
||||||
const { pager, getLists, resetParams, resetPage } = usePaging({
|
const { pager, getLists, resetParams, resetPage } = usePaging({
|
||||||
|
Loading…
x
Reference in New Issue
Block a user