mkm/engineering_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新多个视图页面，包括审批流程显示方式、oa_Initiate修改、oa_flow_type编辑和索引页面修改。

Browse Source
This commit is contained in:
zmj 2024-05-28 14:20:48 +08:00
parent 9e789c498c
commit b24685f763
7 changed files with 83 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/views/oa_apply/index.vue
View File

@ -36,24 +36,31 @@
</template> </template>
新增 新增
</el-button> </el-button>
<el-button v-perms="['works.rlzy.oa_personal_quit/delete']" :disabled="!selectData.length" <!-- <el-button v-perms="['works.rlzy.oa_personal_quit/delete']" :disabled="!selectData.length"
@click="handleDelete(selectData)"> @click="handleDelete(selectData)">
删除 删除
</el-button> </el-button> -->
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
<el-table-column label="报销总金额" prop="total_amount" show-overflow-tooltip />
<el-table-column label="状态" prop="check_status_text" show-overflow-tooltip /> <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
<el-table-column label="报销人" prop="check_admin_users" show-overflow-tooltip /> <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
<el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip /> <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
<el-table-column label="报销保证编号" prop="" show-overflow-tooltip /> <template #default="{ row }">
{{ row.dept_name || '全公司' }}
</template>
</el-table-column>
<el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
<el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip /> <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
<el-table-column label="入账月份" prop="income_month" show-overflow-tooltip /> <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
<el-table-column label="录入时间" prop="create_time" show-overflow-tooltip /> <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="remark" show-overflow-tooltip /> <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
<el-table-column label="打款人" prop="" show-overflow-tooltip /> <template #default="{ row }">
<el-table-column label="打款确认时间" prop="" show-overflow-tooltip /> {{ row.check_admin_users || '审核结束' }}
</template>
</el-table-column>
<el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
<el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" link @click="handDetail(row.id)"> <el-button type="primary" link @click="handDetail(row.id)">

23
src/views/oa_copy_to_me/index.vue
View File

@ -21,18 +21,25 @@
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
<el-table-column label="报销总金额" prop="total_amount" show-overflow-tooltip />
<el-table-column label="状态" prop="check_status_text" show-overflow-tooltip /> <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
<el-table-column label="报销人" prop="check_admin_users" show-overflow-tooltip /> <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
<el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip /> <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
<el-table-column label="报销保证编号" prop="" show-overflow-tooltip /> <template #default="{ row }">
{{ row.dept_name || '全公司' }}
</template>
</el-table-column>
<el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
<el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip /> <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
<el-table-column label="入账月份" prop="income_month" show-overflow-tooltip /> <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
<el-table-column label="录入时间" prop="create_time" show-overflow-tooltip /> <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="remark" show-overflow-tooltip /> <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
<el-table-column label="打款人" prop="" show-overflow-tooltip /> <template #default="{ row }">
<el-table-column label="打款确认时间" prop="" show-overflow-tooltip /> {{ row.check_admin_users || '审核结束' }}
</template>
</el-table-column>
<el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
<el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" link @click="handDetail(row.id)"> <el-button type="primary" link @click="handDetail(row.id)">

12
src/views/oa_flow/edit.vue
View File

@ -257,11 +257,13 @@ const handleSubmit = async () => {
let data = { ...formData } let data = { ...formData }
data.department_ids = data.department_ids.join(",") data.department_ids = data.department_ids.join(",")
data.copy_uids = formData.copy_uids.map(item => item.id).join(',') data.copy_uids = formData.copy_uids.map(item => item.id).join(',')
data.flow_list.forEach(item => { if (data.flow_list) {
if (Array.isArray(item.flow_uids)) { data.flow_list?.forEach(item => {
item.flow_uids = item.flow_uids.map(item => item.id).join(',') if (Array.isArray(item.flow_uids)) {
} item.flow_uids = item.flow_uids.map(item => item.id).join(',')
}) }
})
}
mode.value == "edit" mode.value == "edit"
? await apiOaFlowEdit(data) ? await apiOaFlowEdit(data)
: await apiOaFlowAdd(data); : await apiOaFlowAdd(data);

23
src/views/oa_myDeal/index.vue
View File

@ -20,17 +20,26 @@
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="报销总金额" prop="total_amount" show-overflow-tooltip /> <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
<el-table-column label="状态" prop="check_status_text" show-overflow-tooltip /> <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
<el-table-column label="报销人" prop="check_admin_users" show-overflow-tooltip /> <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
<el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip /> <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
<el-table-column label="报销保证编号" prop="" show-overflow-tooltip /> <template #default="{ row }">
{{ row.dept_name || '全公司' }}
</template>
</el-table-column>
<el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
<el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip /> <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
<el-table-column label="入账月份" prop="income_month" show-overflow-tooltip /> <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
<el-table-column label="录入时间" prop="create_time" show-overflow-tooltip /> <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="remark" show-overflow-tooltip /> <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
<el-table-column label="打款人" prop="" show-overflow-tooltip /> <template #default="{ row }">
<el-table-column label="打款确认时间" prop="" show-overflow-tooltip /> {{ row.check_admin_users || '审核结束' }}
</template>
</el-table-column>
<el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
<el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" link @click="handDetail(row.id)"> <el-button type="primary" link @click="handDetail(row.id)">

35
src/views/oa_transfe/index.vue
View File

@ -27,24 +27,31 @@
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
<el-table-column label="报销总金额" prop="total_amount" show-overflow-tooltip />
<el-table-column label="状态" prop="check_status_text" show-overflow-tooltip /> <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
<el-table-column label="报销人" prop="check_admin_users" show-overflow-tooltip /> <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
<el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip /> <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
<el-table-column label="报销保证编号" prop="" show-overflow-tooltip /> <template #default="{ row }">
{{ row.dept_name || '全公司' }}
</template>
</el-table-column>
<el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
<el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip /> <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
<el-table-column label="入账月份" prop="income_month" show-overflow-tooltip /> <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
<el-table-column label="录入时间" prop="create_time" show-overflow-tooltip /> <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="remark" show-overflow-tooltip /> <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
<el-table-column label="打款人" prop="" show-overflow-tooltip /> <template #default="{ row }">
<el-table-column label="打款确认时间" prop="" show-overflow-tooltip /> {{ row.check_admin_users || '审核结束' }}
<el-table-column label="操作" width="120" fixed="right"> </template>
</el-table-column>
<el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
<el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button link @click="handDetail(row.id)"> <el-button link @click="handDetail(row.id)">
详情 详情
</el-button> </el-button>
<el-button type="primary" link @click="handPayment(row.id)" v-if="row.check_status != 2"> <el-button type="primary" link @click="handPayment(row.id)">
设置打款 设置打款
</el-button> </el-button>
</template> </template>
@ -100,11 +107,6 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
params: queryParams params: queryParams
}) })
// 编辑
const handDetail = async (id: any) => { const handDetail = async (id: any) => {
let res = await apiExpenseDetail({ id }) let res = await apiExpenseDetail({ id })
showDetail.value = true showDetail.value = true
@ -114,7 +116,8 @@ const handDetail = async (id: any) => {
} }
const handPayment = async (id: any) => { const handPayment = async (id: any) => {
let res = await apiExpensePayment({ id }) await feedback.confirm('确定设置打款吗？')
await apiExpensePayment({ id })
getLists() getLists()
} }

7
src/views/organization/department/edit.vue
View File

@ -89,6 +89,13 @@ const checkMobile = (rule: any, value: any, callback: any) => {
} }
} }
const formRules = { const formRules = {
org_id: [
{
required: true,
message: '请选择组织',
trigger: ['blur']
}
],
name: [ name: [
{ {
required: true, required: true,

4
src/views/permission/admin/edit.vue
View File

@ -53,9 +53,9 @@
</el-form-item> </el-form-item>
<!-- 确认密码输入框 --> <!-- 确认密码输入框 -->
<!-- <el-form-item label="确认密码" prop="password_confirm"> <el-form-item label="确认密码" prop="password_confirm" v-if="mode == 'add'">
<el-input v-model="formData.password_confirm" show-password clearable placeholder="请输入确认密码" /> <el-input v-model="formData.password_confirm" show-password clearable placeholder="请输入确认密码" />
</el-form-item> --> </el-form-item>
<!-- 管理员状态 --> <!-- 管理员状态 -->
<el-form-item label="管理员状态" v-if="formData.root != 1"> <el-form-item label="管理员状态" v-if="formData.root != 1">