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

add

Browse Source
This commit is contained in:
zmj 2024-05-28 16:20:30 +08:00
parent b24685f763
commit 53ac55f3d6
16 changed files with 143 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/generateForm/index.vue
View File

@ -6,7 +6,10 @@
<el-input v-model="formData[item.value].value" clearable :placeholder="'请输入' + item.label" />
</el-form-item>
<el-form-item :label="item.label" v-if="item.type == 1">
<el-date-picker class="flex-1 !flex" v-model="formData[item.value].value" clearable type="date"
<el-date-picker class="flex-1 !flex" v-model="formData[item.value].value" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" :placeholder="'请选择' + item.label" v-if="type == 1">
</el-date-picker>
<el-date-picker v-else class="flex-1 !flex" v-model="formData[item.value].value" clearable type="date"
value-format="YYYY-MM-DD" :placeholder="'请选择' + item.label">
</el-date-picker>
</el-form-item>
@ -52,6 +55,9 @@ const props = defineProps({
formData: {
type: Object,
required: true
},
type: {
type: Number,
}
})

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

@ -43,7 +43,7 @@
</p>
</el-descriptions-item>
<el-descriptions-item label="审批节点" label-align="left" align="left"
v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id">
v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id && formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)">
<div class="flex" style="position: relative;">
<el-radio-group v-model="form.check_node">
<el-radio :label="1">审批结束</el-radio>

10
src/views/oa_Initiate/edit.vue
View File

@ -5,7 +5,7 @@
<template #header>
审批内容
</template>
<generateForm :config="formData.data" :form-data="formData.extends"></generateForm>
<generateForm :config="formData.data" :form-data="formData.extends" :type="type"></generateForm>
</el-card>
<oaFlow :form-data="formData" :flow_cate="formData.id"></oaFlow>
</popup>
@ -17,6 +17,14 @@ import generateForm from './../../components/generateForm/index.vue'
import Popup from "@/components/popup/index.vue";
import { apiOaoaApproveAdd } from "@/api/oa_Initiate"
defineProps({
type: {
type: Number,
}
})
const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>();

10
src/views/oa_Initiate/index.vue
View File

@ -7,7 +7,8 @@
<div v-for="(item, index) in lists.filter(e => e.children.length > 0)" :key="index" class="tit">
{{ item.name }}
<div class="tit-content">
<div v-for="(e, i) in item.children" :key="i" class="tit-li" @click="handleEdit(e.id)">{{ e.title }}
<div v-for="(e, i) in item.children" :key="i" class="tit-li" @click="handleEdit(e.id, item.value)">{{
e.title }}
</div>
</div>
</div>
@ -53,7 +54,7 @@
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :deptList="deptList" :dict-data="dictData" @success="getLists"
@close="showEdit = false" />
:type="type" @close="showEdit = false" />
<detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
@close="showDetail = false, getLists()" />
@ -76,7 +77,7 @@ const showEdit = ref(false)
const detailRef = ref(null)
// 是否显示编辑框
const showDetail = ref(false)
const type = ref(1)
// 查询条件
const queryParams = reactive({
@ -85,7 +86,8 @@ const queryParams = reactive({
// 编辑
const handleEdit = async (id: any) => {
const handleEdit = async (id: any, cate) => {
type.value = cate
let res = await apiOaFlowTypeDetail({ id })
showEdit.value = true
await nextTick()

30
src/views/oa_arrival/detail.vue
View File

@ -37,17 +37,9 @@
<el-descriptions-item label="地址" label-align="left" align="left">
{{ formData.invoice_address }}
</el-descriptions-item>
<el-descriptions-item label="开票人" label-align="left" align="left">
{{}}
{{ formData.open_admin_name }}
</el-descriptions-item>
<el-descriptions-item label="未到账金额" label-align="left" align="left">
{{}}
</el-descriptions-item>
<el-descriptions-item label="已到账金额" label-align="left" align="left">
{{}}
</el-descriptions-item>
<el-descriptions-item label="备注" label-align="left" align="left">
{{ formData.remark }}
</el-descriptions-item>
@ -56,17 +48,31 @@
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card v-if="formData.code">
<template #header>开票信息</template>
<el-descriptions :column="3" border>
<el-descriptions-item label="发票号码" label-align="left" align="left">
{{ formData.code }}
</el-descriptions-item>
<el-descriptions-item label="开具时间" label-align="left" align="left">
{{ formData.open_time }}
</el-descriptions-item>
<el-descriptions-item label="快递单号" label-align="left" align="left">
{{ formData.delivery }}
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card>
<template #header> 到账信息 </template>
<el-descriptions :column="3" border>
<el-descriptions-item label="到账状态" label-align="left" align="left">
<!-- {{ formData.invoice_account }} -->
{{ formData.is_cash_text }}
</el-descriptions-item>
<el-descriptions-item label="未到账金额(元)" label-align="left" align="left">
<!-- {{ formData.invoice_banking }} -->
{{ (+formData.amount) - (+formData.enter_amount) }}
</el-descriptions-item>
<el-descriptions-item label="已到账金额(元)" label-align="left" align="left">
<!-- {{ formData.invoice_address }} -->
{{ formData.enter_amount }}
</el-descriptions-item>
</el-descriptions>

27
src/views/oa_arrival/edit.vue
View File

@ -37,17 +37,9 @@
<el-descriptions-item label="地址" label-align="left" align="left">
{{ formData.invoice_address }}
</el-descriptions-item>
<el-descriptions-item label="开票人" label-align="left" align="left">
{{}}
{{ formData.open_admin_name }}
</el-descriptions-item>
<el-descriptions-item label="未到账金额" label-align="left" align="left">
{{}}
</el-descriptions-item>
<el-descriptions-item label="已到账金额" label-align="left" align="left">
{{}}
</el-descriptions-item>
<el-descriptions-item label="备注" label-align="left" align="left">
{{ formData.remark }}
</el-descriptions-item>
@ -60,16 +52,19 @@
<template #header> 到账信息 </template>
<el-descriptions :column="3" border>
<el-descriptions-item label="到账状态" label-align="left" align="left">
<!-- {{ formData.invoice_account }} -->
{{ formData.is_cash_text }}
</el-descriptions-item>
<el-descriptions-item label="未到账金额(元)" label-align="left" align="left">
<!-- {{ formData.invoice_banking }} -->
{{ (+formData.amount) - (+formData.enter_amount) }}
</el-descriptions-item>
<el-descriptions-item label="已到账金额(元)" label-align="left" align="left">
<!-- {{ formData.invoice_address }} -->
{{ formData.enter_amount }}
</el-descriptions-item>
</el-descriptions>
<el-table :data="detail" class="mt-4">
<template #empty>
数据为空，点击 <el-button @click="handAdd">添加</el-button>
</template>
<el-table-column label="到账金额">
<template #default="{ row }">
<el-input v-model="row.amount" clearable placeholder="请输入报销金额" />
@ -89,17 +84,17 @@
</el-table-column>
<el-table-column label="操作" prop="lead_admin_name">
<template #default="{ row, $index }">
<el-button type="primary" @click="handAdd">添加选项</el-button>
<el-button @click="handDel($index)">删除</el-button>
<el-button type="primary" @click="handAdd">添加选项</el-button>
</template>
</el-table-column>
</el-table>
<el-form-item>
<div class="mt-4 mb-4">
<span style="float:right">
<el-button type="primary" @click="submit">确定</el-button>
<el-button @click="close">取消</el-button>
<el-button type="primary" @click="submit">确定</el-button>
</span>
</el-form-item>
</div>
</el-card>
</popup>
</div>

31
src/views/oa_arrival/index.vue
View File

@ -29,17 +29,17 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="id" prop="invoice_title" show-overflow-tooltip />
<el-table-column label="到账状态" prop="amount" show-overflow-tooltip />
<el-table-column label="到账金额" prop="invoice_type_text" show-overflow-tooltip />
<el-table-column label="最新到账时间" prop="check_status_text" 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="create_time" show-overflow-tooltip />
<el-table-column label="申请开票人" prop="check_admin_users" show-overflow-tooltip />
<el-table-column label="申请时间" prop="open_admin_name" show-overflow-tooltip />
<el-table-column label="发票号码" prop="open_time" show-overflow-tooltip />
<el-table-column label="开票时间" prop="code" show-overflow-tooltip />
<el-table-column label="id" prop="id" show-overflow-tooltip />
<el-table-column label="到账状态" prop="is_cash_text" show-overflow-tooltip />
<el-table-column label="到账金额" prop="enter_amount" show-overflow-tooltip />
<el-table-column label="最新到账时间" prop="enter_amount" show-overflow-tooltip />
<el-table-column label="发票抬头" prop="invoice_title" show-overflow-tooltip />
<el-table-column label="发票金额" prop="amount" show-overflow-tooltip />
<el-table-column label="开票类型" prop="type_text" show-overflow-tooltip />
<el-table-column label="申请开票人" prop="user_name" show-overflow-tooltip />
<el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="发票号码" prop="code" show-overflow-tooltip />
<el-table-column label="开票时间" prop="open_time" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
<template #default="{ row }">
<el-button type="primary" link @click="handEdit(row.id)">
@ -56,8 +56,7 @@
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" @success="getLists, showEdit = false" @close="showEdit = false" />
<edit-popup v-if="showEdit" ref="editRef" @success="getLists(), showEdit = false" @close="showEdit = false" />
<detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
@close="showDetail = false, getLists()" />
</div>
@ -116,12 +115,6 @@ const handDetail = async (id: any) => {
detailRef.value?.setFormData(res)
}
const form = reactive({
"id": '',
"code": "",
"open_time": "",
"delivery": ""
})
getLists()

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

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-card>
<template #header>
@ -11,8 +10,8 @@
<el-col :span="8">
<el-form-item label="所属分类" prop="type">
<el-select v-model="formData.type" clearable placeholder="请选择所属分类" class="flex-1">
<el-option v-for="item in dictData.oa_approve_cate" :key="item.value"
:label="item.name" :value="parseInt(item.value)" />
<el-option v-for="item in dictData.oa_approve_cate" :key="item.value" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
@ -33,8 +32,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="应用部门">
<el-select v-model="formData.department_ids" multiple placeholder="请选择应用部门"
class="flex-1">
<el-select v-model="formData.department_ids" multiple placeholder="请选择应用部门" class="flex-1">
<el-option :label="item.name" :value="parseInt(item.id)" v-for="item in deptList">
</el-option>
</el-select>
@ -82,7 +80,7 @@
</el-form>
</popup>
<el-dialog v-if="showDialog" v-model="showDialog" title="预览审批内容" width="70%">
<generateForm :config="formData.data" :form-data="previewObj"></generateForm>
<generateForm :config="formData.data" :form-data="previewObj" :type="formData.type"></generateForm>
</el-dialog>
</div>
</template>

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

@ -114,7 +114,7 @@ const popupTitle = computed(() => {
// 表单数据
const formData = reactive({
"amount": 0,
"amount": '',
"type": "",
"invoice_subject": "",
"invoice_type": '',

13
src/views/oa_invoice_apply/index.vue
View File

@ -43,15 +43,22 @@
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="开票抬头" prop="invoice_title" show-overflow-tooltip />
<el-table-column label="开票金额(元)" prop="amount" show-overflow-tooltip />
<el-table-column label="开票类型" prop="invoice_type_text" show-overflow-tooltip />
<el-table-column label="发票状态" prop="check_status_text" 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>
<template #default="{ row }">
{{ row.dept_name || '全公司' }}
</template>
</el-table-column>
<el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
<template #default="{ row }">
{{ row.check_admin_users || '审核结束' }}
</template>
</el-table-column>
<el-table-column label="开票人" prop="open_admin_name" show-overflow-tooltip />
<el-table-column label="开票时间" prop="open_time" show-overflow-tooltip />
<el-table-column label="发票号码" prop="code" show-overflow-tooltip />

12
src/views/oa_invoice_copy/index.vue
View File

@ -27,9 +27,17 @@
<el-table-column label="开票类型" prop="invoice_type_text" show-overflow-tooltip />
<el-table-column label="发票状态" prop="check_status_text" 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>
<template #default="{ row }">
{{ row.dept_name || '全公司' }}
</template>
</el-table-column>
<el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
<template #default="{ row }">
{{ row.check_admin_users || '审核结束' }}
</template>
</el-table-column>
<el-table-column label="开票人" prop="open_admin_name" show-overflow-tooltip />
<el-table-column label="开票时间" prop="open_time" show-overflow-tooltip />
<el-table-column label="发票号码" prop="code" show-overflow-tooltip />

13
src/views/oa_invoice_deal/index.vue
View File

@ -18,15 +18,22 @@
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="开票抬头" prop="invoice_title" show-overflow-tooltip />
<el-table-column label="开票金额(元)" prop="amount" show-overflow-tooltip />
<el-table-column label="开票类型" prop="invoice_type_text" show-overflow-tooltip />
<el-table-column label="发票状态" prop="check_status_text" 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>
<template #default="{ row }">
{{ row.dept_name || '全公司' }}
</template>
</el-table-column>
<el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
<template #default="{ row }">
{{ row.check_admin_users || '审核结束' }}
</template>
</el-table-column>
<el-table-column label="开票人" prop="open_admin_name" show-overflow-tooltip />
<el-table-column label="开票时间" prop="open_time" show-overflow-tooltip />
<el-table-column label="发票号码" prop="code" show-overflow-tooltip />

14
src/views/oa_invoice_invoice/detail.vue
View File

@ -45,6 +45,20 @@
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card v-if="formData.code">
<template #header>开票信息</template>
<el-descriptions :column="3" border>
<el-descriptions-item label="发票号码" label-align="left" align="left">
{{ formData.code }}
</el-descriptions-item>
<el-descriptions-item label="开具时间" label-align="left" align="left">
{{ formData.open_time }}
</el-descriptions-item>
<el-descriptions-item label="快递单号" label-align="left" align="left">
{{ formData.delivery }}
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card>
<template #header>审批流程</template>
<el-descriptions :column="3" border>

38
src/views/oa_invoice_invoice/index.vue
View File

@ -21,27 +21,34 @@
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="开票抬头" prop="invoice_title" show-overflow-tooltip />
<el-table-column label="开票金额(元)" prop="amount" show-overflow-tooltip />
<el-table-column label="开票类型" prop="invoice_type_text" show-overflow-tooltip />
<el-table-column label="发票状态" prop="check_status_text" 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>
<template #default="{ row }">
{{ row.dept_name || '全公司' }}
</template>
</el-table-column>
<el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip />
<el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
<template #default="{ row }">
{{ row.check_admin_users || '审核结束' }}
</template>
</el-table-column>
<el-table-column label="开票人" prop="open_admin_name" show-overflow-tooltip />
<el-table-column label="开票时间" prop="open_time" show-overflow-tooltip />
<el-table-column label="发票号码" prop="code" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
<el-table-column label="操作" width="300" fixed="right">
<template #default="{ row }">
<el-button type="primary" link @click="handDetail(row.id)">
详情
</el-button>
<el-button type="primary" link @click="form.id = row.id, showDialog = true">
<el-button type="primary" link @click="openInvoice(row)">
开具发票
</el-button>
<el-button type="primary" link @click="handVoid(row.id)">
<el-button type="primary" link @click="handVoid(row.id)" v-if="row.check_status == 5">
发票作废
</el-button>
</template>
@ -121,16 +128,23 @@ const handDetail = async (id: any) => {
detailRef.value?.setFormData(res)
}
const form = reactive({
"id": '',
"code": "",
"open_time": "",
"delivery": ""
const openInvoice = (row) => {
form.value = row
showDialog.value = true
}
let form = ref({
// "id": '',
// "code": "",
// "open_time": "",
// "delivery": ""
})
const submit = async () => {
await apiInvliceInvoice({ ...form })
let { id, code, open_time, delivery } = form.value
await apiInvliceInvoice({ id, code, open_time, delivery })
showDialog.value = false
getLists()

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

@ -51,7 +51,8 @@
<el-button link @click="handDetail(row.id)">
详情
</el-button>
<el-button type="primary" link @click="handPayment(row.id)">
<el-button type="primary" link @click="handPayment(row.id)"
v-if="row.check_status_text != '已打款'">
设置打款
</el-button>
</template>

2
src/views/oa_work/components/reciveReport.vue
View File

@ -28,7 +28,7 @@
<!-- <el-table-column label="附件（个）" prop="remark" show-overflow-tooltip /> -->
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['works.rcbg.oa_work/edit']" type="primary" link @click="handleEdit(row)">
<el-button type="primary" link @click="handleEdit(row)">
查看
</el-button>
<el-button v-perms="['works.rcbg.oa_work/delete']" type="danger" link @click="handleDelete(row.id)">