zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

Browse Source
This commit is contained in:
dzc committed 2025-07-01 09:25:34 +08:00
2 parents 5f48f0a8a0 75a07d9094
commit 7ec0a41069
4 files changed
+183 -104
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/integrated/feedback/form.vue
+19 -17
View File
@@ -1,29 +1,23 @@
<template>
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
<el-dialog :title="readonly ? '详情' : (form.id ? '编辑' : '新增')" v-model="visible"
:close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="12" class="mb20">
<el-col :span="24" class="mb20">
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题"/>
<el-input v-model="form.title" placeholder="请输入标题" :disabled="readonly"/>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="图片" prop="picUrl">
<upload-img v-model="form.picUrl"></upload-img>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="描述" prop="description">
<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入描述"></editor>
<upload-img v-model="form.picUrl" :disabled="readonly"></upload-img>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态）">
<el-select v-model="form.status" placeholder="请选择状态）" :disabled="readonly">
<el-option :value="item.value" :label="item.label" v-for="(item, index) in maintenance_status" :key="index"></el-option>
</el-select>
</el-form-item>
@@ -31,24 +25,29 @@
<el-col :span="12" class="mb20">
<el-form-item label="上报人" prop="userId">
<el-input v-model="form.userId" placeholder="请输入上报人"/>
<el-input v-model="form.createBy" placeholder="请输入上报人" :disabled="readonly"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="反馈类型" prop="type">
<el-select v-model="form.type" placeholder="请选择反馈类型">
<el-select v-model="form.type" placeholder="请选择反馈类型" :disabled="readonly">
<el-option :value="item.value" :label="item.label" v-for="(item, index) in feedback_type" :key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="描述" prop="description">
<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入描述" :readonly="readonly"></editor>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
<el-button @click="visible = false">{{ readonly ? '关闭' : '取消' }}</el-button>
<el-button v-if="!readonly" type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
@@ -65,6 +64,7 @@ const emit = defineEmits(['refresh']);
const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
const readonly = ref(false)
// 定义字典
const { maintenance_status,feedback_type } = useDict('maintenance_status','feedback_type')
@@ -78,6 +78,8 @@ const form = reactive({
status: '',
userId: '',
type: '',
createBy: '',
createTime: '',
});
// 定义校验规则
@@ -88,10 +90,10 @@ const dataRules = ref({
})
// 打开弹窗
const openDialog = (id: string) => {
const openDialog = (id: string, isReadonly = false) => {
visible.value = true
form.id = ''
readonly.value = isReadonly
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
src/views/integrated/feedback/index.vue
+24 -7
View File
@@ -47,23 +47,24 @@
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="title" label="标题" show-overflow-tooltip/>
<el-table-column prop="picUrl" label="图片" show-overflow-tooltip/>
<el-table-column prop="sort" label="排序" show-overflow-tooltip/>
<el-table-column prop="status" label="状态（0未处理，1已处理）" show-overflow-tooltip>
<el-table-column prop="status" label="状态" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="maintenance_status" :value="scope.row.status"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="userId" label="上报人" show-overflow-tooltip/>
<el-table-column prop="createBy" label="上报人" show-overflow-tooltip/>
<el-table-column prop="type" label="反馈类型" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="feedback_type" :value="scope.row.type"></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="150">
<el-table-column prop="sort" label="排序" show-overflow-tooltip/>
<el-table-column label="操作" width="200">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'integrated_feedback_edit'"
@click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
<el-button icon="view" text type="primary" v-auth="'integrated_feedback_edit'"
@click="formDialogRef.openDialog(scope.row.id, true)">详情</el-button>
<el-button icon="delete" text type="primary" v-auth="'integrated_feedback_del'" @click="handleDelete([scope.row.id])">删除</el-button>
<el-button icon="Check" text type="success" v-if="scope.row.status != 1" @click="handleProcessed(scope.row)">已处理</el-button>
</template>
</el-table-column>
</el-table>
@@ -78,7 +79,7 @@
<script setup lang="ts" name="systemFeedback">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/integrated/feedback";
import { fetchList, delObjs, putObj } from "/@/api/integrated/feedback";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
@@ -147,4 +148,20 @@ const handleDelete = async (ids: string[]) => {
useMessage().error(err.msg);
}
};
// 添加已处理操作
const handleProcessed = async (row: any) => {
try {
await useMessageBox().confirm('确定将该反馈标记为已处理吗？');
} catch {
return;
}
try {
await putObj({ ...row, status: 1 });
useMessage().success('已处理');
getDataList();
} catch (err: any) {
useMessage().error(err.msg);
}
};
</script>
src/views/wallet/wallet-recharge-apply/index.vue
+91 -56
View File
@@ -1,8 +1,7 @@
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-form v-show="showSearch" ref="queryRef" :inline="true" :model="state.queryForm"
@keyup.enter="getDataList">
<el-form v-show="showSearch" ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row>
<el-form-item style="width: 300px" label="用户" prop="userIds">
<select-user v-model="state.queryForm.userIds" placeholder="用户" />
@@ -11,51 +10,60 @@
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
</el-form-item>
<el-form-item style="width: 200px" label="充值类型" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz_recharge"
placeholder="充值类型" />
<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz_recharge" placeholder="充值类型" />
</el-form-item>
<el-form-item style="width: 450px" label="创建时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" />
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" />
<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
}}</el-button>
<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
</el-form-item>
</el-row>
</el-form>
<el-row>
<div class="mb8" style="width: 100%">
<el-button v-if="false" icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()"
v-auth="'wallet_walletRechargeApply_add'">
导 入（发票）
</el-button>
<el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef1.show()"
v-auth="'wallet_walletRechargeApply_add'">
<el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()" v-auth="'wallet_walletRechargeApply_add'">
导 入
</el-button>
<el-button v-if="false" plain :disabled="multiple" icon="Delete" type="primary"
v-auth="'wallet_walletRechargeApply_del'" @click="handleDelete(selectObjs)">
<el-button
v-if="false"
plain
:disabled="multiple"
icon="Delete"
type="primary"
v-auth="'wallet_walletRechargeApply_del'"
@click="handleDelete(selectObjs)"
>
删除
</el-button>
<div class="flex justify-between items-center">
<el-tabs class="flex-1" v-model="activeName" @tab-click="handleClickTabItem">
<el-tab-pane v-for="v in tabItems" :key="v.id" :label="v.label" :name="v.value" />
</el-tabs>
<right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletRechargeApply_export'"
@exportExcel="exportExcel" class="ml10 mr20" style="float: right"
@queryTable="getDataList" />
<right-toolbar
v-model:showSearch="showSearch"
:export="'wallet_walletRechargeApply_export'"
@exportExcel="exportExcel"
class="ml10 mr20"
style="float: right"
@queryTable="getDataList"
/>
</div>
</div>
</el-row>
<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
@sort-change="sortChangeHandle">
<el-table
:data="state.dataList"
v-loading="state.loading"
border
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle"
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="80" />
<el-table-column prop="username" label="申请人" />
@@ -107,54 +115,86 @@
</div>
</template>
</el-table-column>
<el-table-column label="操作" v-auths="[
'wallet_walletRechargeApply_view',
'wallet_walletRechargeApply_apply',
'wallet_walletRechargeApply_edit',
'wallet_walletRechargeApply_del',
'wallet_walletRechargeApply_check',
]" width="300" fixed="right">
<el-table-column
label="操作"
v-auths="[
'wallet_walletRechargeApply_view',
'wallet_walletRechargeApply_apply',
'wallet_walletRechargeApply_edit',
'wallet_walletRechargeApply_del',
'wallet_walletRechargeApply_check',
]"
width="300"
fixed="right"
>
<template #default="{ row }">
<el-button v-if="row.importTime" icon="Document" text type="primary"
v-auth="'wallet_walletRechargeApply_view'" @click="doInfo(row)">
<el-button
v-if="row.importTime"
icon="Document"
text
type="primary"
v-auth="'wallet_walletRechargeApply_view'"
@click="doInfo(row)"
>
数据
</el-button>
<el-button v-if="row.importTime && !row.processId" icon="Connection" text type="primary"
v-auth="'wallet_walletRechargeApply_apply'" @click="doApply(row)">
<el-button
v-if="row.importTime && !row.processId"
icon="Connection"
text
type="primary"
v-auth="'wallet_walletRechargeApply_apply'"
@click="doApply(row)"
>
申请
</el-button>
<el-button v-if="!row.processId" icon="edit-pen" text type="primary"
v-auth="'wallet_walletRechargeApply_edit'" @click="formDialogRef.openDialog(row.id)">
<el-button
v-if="!row.processId"
icon="edit-pen"
text
type="primary"
v-auth="'wallet_walletRechargeApply_edit'"
@click="formDialogRef.openDialog(row.id)"
>
编辑
</el-button>
<el-button v-if="row.isCheckUser && row.processStatus == '1'" type="primary" size="small" link
icon="VideoPlay" @click="deal(row)" v-auth="'wallet_walletRechargeApply_check'">
<el-button
v-if="row.isCheckUser && row.processStatus == '1'"
type="primary"
size="small"
link
icon="VideoPlay"
@click="deal(row)"
v-auth="'wallet_walletRechargeApply_check'"
>
开始处理
</el-button>
<el-button
v-if="row.userId == userInfos?.user?.userId && [null, '1'].includes(row.processStatus)"
icon="delete" text type="primary" v-auth="'wallet_walletRechargeApply_del'"
@click="handleDelete([row.id])">
icon="delete"
text
type="primary"
v-auth="'wallet_walletRechargeApply_del'"
@click="handleDelete([row.id])"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
v-bind="state.pagination" />
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</div>
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
<upload-excel ref="uploadExcelRef" title="充值导入" url="/wallet/wallet-recharge-apply/read-excel"
temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx" @refreshDataList="getDataList(false)" />
<upload-excel ref="uploadExcelRef1" title="充值导入" url="/wallet/wallet-recharge-apply/read-excel"
temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx" @refreshDataList="getDataList(false)" />
<upload-excel1 ref="uploadExcelRef1" title="充值导入" url="/wallet/wallet-recharge-apply/read-excel"
temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx" @refreshDataList="getDataList(false)" />
<upload-excel
ref="uploadExcelRef"
title="充值导入"
url="/wallet/wallet-recharge-apply/read-excel"
temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx"
@refreshDataList="getDataList(false)"
/>
<!-- 审批抽屉 -->
<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
@@ -170,12 +210,7 @@ import { ElLoading, ElMessage } from "element-plus"
import ProcessDrawer from "/@/components/processDrawer/index.vue"
import { getDicts } from "/@/api/admin/dict"
import { useUserInfo } from "/@/stores/userInfo"
// ----------------------------------------------------------------
import UploadExcel1 from "/@/components/Upload/Excel.vue"
import { displayPrice } from "/@/utils/formatMoney"
const uploadExcelRef1 = ref()
// ----------------------------------------------------------------
const { push } = useRouter()
src/views/wallet/wallet-recharge-invoice/print-dialog.vue
+49 -24
View File
@@ -6,8 +6,7 @@
<div class="flex justify-between items-end mb-1">
<div></div>
<div>
{{ formatDate(new Date(receiptData.time), "YYYY年 mm月 dd日") || " 年 月 日".replace(/ /g, "&nbsp;&nbsp;")
}}
{{ formatDate(new Date(receiptData.time), "YYYY年 mm月 dd日") || " 年 月 日".replace(/ /g, "&nbsp;&nbsp;") }}
</div>
<span>
<span>No. </span>
@@ -20,8 +19,12 @@
<tr>
<td class="border border-gray-600 px-2 w-3/12 h-[0.75cm]">交款单位（或个人）</td>
<td class="border border-gray-600 px-2 w-9/12 h-[0.75cm] text-sm text-blue-800" colspan="4">
<input type="text" v-model="receiptData.deptOrUser"
class="caret-red-600 w-full h-full bg-transparent text-center" ref="deptOrUserInput" />
<input
type="text"
v-model="receiptData.deptOrUser"
class="caret-red-600 w-full h-full bg-transparent text-center"
ref="deptOrUserInput"
/>
</td>
</tr>
<tr>
@@ -58,10 +61,15 @@
<td class="border border-gray-600 px-2 w-1/6 h-[0.75cm]">收款单位<br />（盖章）</td>
<td class="border border-gray-600 px-2 text-left w-1/6 h-[0.75cm] text-sm text-blue-800">
<!-- <input type="text" v-model="receiptData.payeeDept" class="w-full h-full bg-transparent" /> -->
<img v-if="receiptData.picUrl" class="w-[2.5cm] h-[2.5cm] absolute -top-2 left-[140px]"
:class="{ stamping: isStamping }" draggable="false"
<img
v-if="receiptData.picUrl || isStamping"
class="w-[2.5cm] h-[2.5cm] absolute -top-2 left-[140px]"
:class="{ stamping: isStamping }"
draggable="false"
style="-webkit-user-drag: none; user-select: none; pointer-events: none"
oncontextmenu="return false" src="/@/assets/receiptStamp.png" />
oncontextmenu="return false"
src="/@/assets/receiptStamp.png"
/>
</td>
<td class="border border-gray-600 px-2 w-1/6 h-[0.75cm]">开票人<br />（签名）</td>
<td class="border border-gray-600 px-2 text-left w-1/6 h-[0.75cm] text-sm text-blue-800">
@@ -71,15 +79,16 @@
<td class="border border-gray-600 px-2 text-left align-text-top w-1/3 h-[0.75cm]">
<div class="flex">
<span class="whitespace-nowrap">备注：</span>
<textarea v-model="receiptData.remark"
class="flex-1 text-sm text-blue-800 w-full h-full my-1 bg-transparent resize-none overflow-y-hidden" />
<textarea
v-model="receiptData.remark"
class="flex-1 text-sm text-blue-800 w-full h-full my-1 bg-transparent resize-none overflow-y-hidden"
/>
</div>
</td>
</tr>
</table>
<div class="flex items-center absolute bottom-0 top-0 right-0">
<span class="text-gray-500 text-sm whitespace-nowrap"
style="writing-mode: vertical-rl; letter-spacing: 0.2em">
<span class="text-gray-500 text-sm whitespace-nowrap" style="writing-mode: vertical-rl; letter-spacing: 0.2em">
{{ "第一联 存根联".replace(/ /g, "&nbsp;&nbsp;&nbsp;&nbsp;") }}
</span>
</div>
@@ -87,20 +96,39 @@
</div>
<div class="h-6">
<el-progress :percentage="progressPercent" v-if="progressPercent > 30" :stroke-width="6" status="success"
striped striped-flow :duration="20" />
<el-progress
:percentage="progressPercent"
v-if="progressPercent > 30"
:stroke-width="6"
status="success"
striped
striped-flow
:duration="20"
/>
</div>
<template #footer>
<el-button @click="handleClose" :disabled="loading">关闭</el-button>
<el-button v-if="!receiptData.picUrl" v-auth="'wallet_walletRechargeApply_receiptStamp'" type="primary"
@click="stampReceipt" :disabled="loading">
<el-button
v-if="!receiptData.picUrl"
v-auth="'wallet_walletRechargeApply_receiptStamp'"
type="primary"
@click="stampReceipt"
:disabled="loading"
>
盖章
</el-button>
<el-button v-if="receiptData.picUrl" v-auth="'wallet_walletRechargeApply_back'" type="primary"
@click="backInvoice" :disabled="loadingBack">作废</el-button>
<el-button v-auth="'wallet_walletRechargeApply_receiptSave'" type="primary" @click="saveReceipt"
:disabled="loading">保存</el-button>
<el-button
v-if="receiptData.picUrl"
v-auth="'wallet_walletRechargeApply_back'"
type="primary"
plain
@click="backInvoice"
:disabled="loadingBack"
>
作废
</el-button>
<el-button v-auth="'wallet_walletRechargeApply_receiptSave'" type="primary" @click="saveReceipt" :disabled="loading">保存</el-button>
<el-button v-if="receiptData.picUrl" type="primary" @click="handlePrint" :disabled="loading">打印</el-button>
</template>
</el-dialog>
@@ -196,7 +224,7 @@ const backInvoice = async () => {
emit("refresh")
useMessage().success("作废成功")
} catch (error: any) {
console.error(error);
console.error(error)
useMessage().error(error.msg)
} finally {
loadingBack.value = false
@@ -230,10 +258,7 @@ const genImageUpload = async (): Promise<string | void> => {
}
},
})
if (code == 0) {
useMessage().success("盖章成功")
return data.url
}
if (code == 0) return data.url
useMessage().error(data.msg || "上传失败")
} catch (error) {
useMessage().error(error as string)