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 11:54:02 +08:00
parent a615236138
commit 9e789c498c
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/oa_apply/edit.vue
View File

@ -26,6 +26,11 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" class="mt-4">
<el-form-item label="附件" prop="income_month">
<uploadAnnex :form-data="formData"></uploadAnnex>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-col> <el-col>
@ -57,11 +62,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-col> </el-col>
<el-col :span="24" class="mt-4">
<el-form-item label="附件" prop="income_month">
<uploadAnnex :form-data="formData"></uploadAnnex>
</el-form-item>
</el-col>
</el-form> </el-form>
</el-card> </el-card>
<oaFlow :form-data="formData" type="5"></oaFlow> <oaFlow :form-data="formData" type="5"></oaFlow>
@ -96,7 +97,7 @@ const popupTitle = computed(() => {
// 表单数据 // 表单数据
const formData = reactive({ const formData = reactive({
"code": "xxx", "code": "",
"income_month": "", "income_month": "",
"expense_time": "", "expense_time": "",
"detail": [ "detail": [
@ -107,7 +108,7 @@ const formData = reactive({
} }
], ],
"annex": [], "annex": [],
"flow_id": 1 "flow_id": ''
}); });

2
src/views/oa_invoice_apply/detail.vue
View File

@ -210,7 +210,7 @@ const handCheck = async () => {
} }
// 显示 // 显示
const showActionList = reactive([4, 3, 2]) const showActionList = reactive([4, 3, 2, 10])
const showTextarea = () => { const showTextarea = () => {
if (showActionList.includes(formData.check_status)) return false; if (showActionList.includes(formData.check_status)) return false;

4
src/views/organization/department/index.vue
View File

@ -44,9 +44,9 @@
<el-table-column label="更新时间" prop="create_time" min-width="180" /> <el-table-column label="更新时间" prop="create_time" min-width="180" />
<el-table-column label="操作" width="160" fixed="right"> <el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button v-perms="['dept.dept/add']" type="primary" link @click="handleAdd(row.id)"> <!-- <el-button v-perms="['dept.dept/add']" type="primary" link @click="handleAdd(row.id)">
新增 新增
</el-button> </el-button> -->
<el-button v-perms="['dept.dept/edit']" type="primary" link @click="handleEdit(row)"> <el-button v-perms="['dept.dept/edit']" type="primary" link @click="handleEdit(row)">
编辑 编辑
</el-button> </el-button>

5
src/views/permission/admin/index.vue
View File

@ -56,7 +56,7 @@
编辑 编辑
</el-button> </el-button>
<el-button v-perms="['auth.admin/edit']" type="primary" link <el-button v-perms="['auth.admin/edit']" type="primary" link
@click="showDialog = true, form.id = row.id"> @click="showDialog = true, form.id = row.id, form.account = row.account">
修改密码 修改密码
</el-button> </el-button>
<el-button v-if="row.root != 1" v-perms="['auth.admin/delete']" type="danger" link <el-button v-if="row.root != 1" v-perms="['auth.admin/delete']" type="danger" link
@ -76,6 +76,9 @@
<!-- 修改密码 --> <!-- 修改密码 -->
<el-dialog v-model="showDialog" v-if="showDialog" width="550px" title="修改密码"> <el-dialog v-model="showDialog" v-if="showDialog" width="550px" title="修改密码">
<el-form class="mb-[-16px]" :model="form" label-width="100px"> <el-form class="mb-[-16px]" :model="form" label-width="100px">
<el-form-item label="账号">
<el-input v-model="form.account" readonly class="w-[280px]" />
</el-form-item>
<el-form-item label="密码"> <el-form-item label="密码">
<el-input v-model="form.password" class="w-[280px]" clearable type="password" /> <el-input v-model="form.password" class="w-[280px]" clearable type="password" />
</el-form-item> </el-form-item>