Compare commits

...

3 Commits

Author SHA1 Message Date
PQZ
e7f735ecb9 Merge branch 'master' of http://122.51.230.86:3000/dianliang/dl_vue 2025-03-18 14:38:23 +08:00
PQZ
4bf3874070 1111 2025-03-18 14:38:20 +08:00
PQZ
35a28260d2 1 2025-03-18 11:28:31 +08:00
4 changed files with 459 additions and 165 deletions

View File

@ -15,6 +15,7 @@
:headers="headers"
:file-list="fileList"
:on-preview="handlePictureCardPreview"
:disabled="disabled"
:class="{hide: this.fileList.length >= this.limit}"
>
<i class="el-icon-plus"></i>
@ -59,6 +60,10 @@ export default {
type: Number,
default: 5,
},
disabled: {
type: Boolean,
default: false,
},
// , ['png', 'jpg', 'jpeg']
fileType: {
type: Array,

View File

@ -14,6 +14,17 @@ export function formatDate(cellValue) {
var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
}
/**
* 表格时间格式化
*/
export function formatDateDay(cellValue) {
if (cellValue == null || cellValue == "") return "";
var date = new Date(cellValue)
var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
return year + '-' + month + '-' + day
}
/**
* @param {number} time

View File

@ -0,0 +1,272 @@
<template>
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="80%" append-to-body>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="审核时间" prop="startEndTime">
<el-date-picker
v-model="startEndTime"
clearable
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="类型" prop="identityType">
<el-select v-model="queryParams.identityType" placeholder="请选择通告主身份类型" clearable>
<el-option
v-for="dict in dict.type.dl_identity_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="通告主" prop="nickname">
<el-input
v-model="queryParams.nickname"
placeholder="请输入通告主昵称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="applyList" >
<el-table-column label="通告主昵称" align="center" prop="nickname"/>
<el-table-column label="身份类型" align="center" prop="identityType">
<template slot-scope="scope">
<dict-tag :options="dict.type.dl_identity_type" :value="scope.row.identityType"/>
</template>
</el-table-column>
<el-table-column label="申请描述" align="center" prop="content"/>
<el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="审核状态" align="center" prop="approvalStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.dl_approval_status" :value="scope.row.approvalStatus"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="detail(scope.row)"
>审核详情
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改通告主认证申请对话框 -->
<el-dialog title="查看详情" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" label-width="80px">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>申请信息</span>
</div>
<el-row>
<el-col :span="12">
<el-form-item label="通告主" prop="nickname">
<el-input :disabled="true" v-model="form.nickname" placeholder="请输入申请者昵称"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份类型" prop="identityType">
<el-select :disabled="true" v-model="form.identityType" placeholder="请选择申请认证的通告主身份类型">
<el-option
v-for="dict in dict.type.dl_identity_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="申请描述">
<el-input :disabled="true" type="textarea" v-model="form.content" placeholder="请输入申请描述"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input :disabled="true" type="textarea" v-model="form.remark" placeholder="请输入内容"/>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="附件" prop="images">
<ImageUpload v-model="form.images" :disabled="true"></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>审核信息</span>
</div>
<el-row>
<el-col :span="12">
<el-form-item label="审核状态" prop="identityType">
<el-select :disabled="true" v-model="form.approvalStatus" placeholder="待审核">
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审核备注" prop="approvalRemark">
<el-input :disabled="true" v-model="form.approvalRemark" type="textarea" placeholder="请输入内容"/>
</el-form-item>
</el-col>
</el-row>
</el-card>
</el-form>
</el-dialog>
</div>
</el-dialog>
</template>
<script>
import {listApply, getApply,} from "@/api/member/apply";
import {formatDateDay} from "@/utils/index";
export default {
name: "applyForm",
dicts: ['dl_identity_type','dl_approval_status'],
data(){
return{
//
dialogTitle: "审核历史",
//
dialogVisible: false,
open:false,
statusOptions: [{
value: '0',
label: '待审核'
}, {
value: '1',
label: '通过'
}, {
value: '2',
label: '不通过'
}],
//
queryParams: {
pageNum: 9,
pageSize: 10,
approvalStatus:10,
nickname: null,
identityType: null,
},
//
startEndTime: [],
//
loading: true,
//
showSearch: true,
//
total: 0,
//
applyList: [],
//
form: {},
}
},
methods: {
initForm(){
this.dialogVisible = true;
this.getList()
},
/** 查询通告主认证申请列表 */
getList() {
this.loading = true;
console.log(this.startEndTime, "startEndTime")
if (this.startEndTime.length > 0) {
this.queryParams.startTime = formatDateDay(this.startEndTime[0])
this.queryParams.endTime = formatDateDay(this.startEndTime[1])
} else {
this.queryParams.startTime = null
this.queryParams.endTime = null
}
listApply(this.queryParams).then(response => {
this.applyList = response.data.records;
this.total = response.data.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.startEndTime = []
this.resetForm("queryForm");
this.handleQuery();
},
/** 详情 */
detail(row) {
this.reset();
const id = row.id || this.ids
getApply(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "审核";
});
},
//
reset() {
this.form = {
id: null,
userId: null,
nickname: null,
identityType: null,
content: null,
remark: null,
images: null,
approvalStatus: null,
approvalUserId: null,
approvalTime: null,
approvalRemark: null,
creator: null,
createTime: null,
updater: null,
updateTime: null,
delFlag: null
};
this.resetForm("form");
},
}
}
</script>
<style scoped>
</style>

View File

@ -1,38 +1,38 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="申请者用户id" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入申请者用户id"
<el-form-item label="审核时间" prop="startEndTime">
<el-date-picker
v-model="startEndTime"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="申请者昵称" prop="nickname">
<el-input
v-model="queryParams.nickname"
placeholder="请输入申请者昵称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核人id" prop="approvalUserId">
<el-input
v-model="queryParams.approvalUserId"
placeholder="请输入审核人id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核时间" prop="approvalTime">
<el-date-picker clearable
v-model="queryParams.approvalTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择审核时间">
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="类型" prop="identityType">
<el-select v-model="queryParams.identityType" placeholder="请选择通告主身份类型" clearable>
<el-option
v-for="dict in dict.type.dl_identity_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="通告主" prop="nickname">
<el-input
v-model="queryParams.nickname"
placeholder="请输入通告主昵称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -40,68 +40,39 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['member:apply:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['member:apply:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['member:apply:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['member:apply:export']"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['member:apply:export']"
>导出</el-button>
@click="openHis"
>审核历史
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="唯一主键" align="center" prop="id" />
<el-table-column label="申请者用户id" align="center" prop="userId" />
<el-table-column label="申请者昵称" align="center" prop="nickname" />
<el-table-column label="申请认证的通告主身份类型" align="center" prop="identityType" />
<el-table-column label="申请描述" align="center" prop="content" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="图片附件地址,可多个" align="center" prop="images" />
<el-table-column label="审核状态(数据字典dl_approval_status)" align="center" prop="approvalStatus" />
<el-table-column label="审核人id" align="center" prop="approvalUserId" />
<el-table-column label="审核时间" align="center" prop="approvalTime" width="180">
<el-table v-loading="loading" :data="applyList">
<el-table-column label="通告主昵称" align="center" prop="nickname"/>
<el-table-column label="身份类型" align="center" prop="identityType">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.approvalTime, '{y}-{m}-{d}') }}</span>
<dict-tag :options="dict.type.dl_identity_type" :value="scope.row.identityType"/>
</template>
</el-table-column>
<el-table-column label="审核备注" align="center" prop="approvalRemark" />
<el-table-column label="申请描述" align="center" prop="content"/>
<el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -110,18 +81,11 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['member:apply:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['member:apply:remove']"
>删除</el-button>
>审核
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -129,59 +93,110 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改通告主认证申请对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="申请者用户id" prop="userId">
<el-input v-model="form.userId" placeholder="请输入申请者用户id" />
</el-form-item>
<el-form-item label="申请者昵称" prop="nickname">
<el-input v-model="form.nickname" placeholder="请输入申请者昵称" />
</el-form-item>
<el-form-item label="申请描述">
<editor v-model="form.content" :min-height="192"/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="图片附件地址,可多个" prop="images">
<el-input v-model="form.images" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="审核人id" prop="approvalUserId">
<el-input v-model="form.approvalUserId" placeholder="请输入审核人id" />
</el-form-item>
<el-form-item label="审核时间" prop="approvalTime">
<el-date-picker clearable
v-model="form.approvalTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择审核时间">
</el-date-picker>
</el-form-item>
<el-form-item label="审核备注" prop="approvalRemark">
<el-input v-model="form.approvalRemark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>申请信息</span>
</div>
<el-row>
<el-col :span="12">
<el-form-item label="通告主" prop="nickname">
<el-input :disabled="true" v-model="form.nickname" placeholder="请输入申请者昵称"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份类型" prop="identityType">
<el-select :disabled="true" v-model="form.identityType" placeholder="请选择申请认证的通告主身份类型">
<el-option
v-for="dict in dict.type.dl_identity_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="申请描述">
<el-input :disabled="true" type="textarea" v-model="form.content" placeholder="请输入申请描述"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input :disabled="true" type="textarea" v-model="form.remark" placeholder="请输入内容"/>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="附件" prop="images">
<ImageUpload v-model="form.images" :disabled="true"></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>审核信息</span>
</div>
<el-row>
<el-col :span="12">
<el-form-item label="审核状态" prop="identityType">
<el-select v-model="form.approvalStatus" placeholder="待审核">
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审核备注" prop="approvalRemark">
<el-input v-model="form.approvalRemark" type="textarea" placeholder="请输入内容"/>
</el-form-item>
</el-col>
</el-row>
</el-card>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<ApplyForm ref="formRef" />
</div>
</template>
<script>
import { listApply, getApply, delApply, addApply, updateApply } from "@/api/member/apply";
import {listApply, getApply, delApply, addApply, updateApply} from "@/api/member/apply";
import {formatDateDay} from "@/utils/index";
import ApplyForm from '@/views/member/apply/form/applyForm.vue';
export default {
name: "Apply",
dicts: ['dl_identity_type'],
components: {
ApplyForm
},
data() {
return {
//
loading: true,
//
ids: [],
statusOptions: [{
value: '0',
label: '待审核'
}, {
value: '1',
label: '通过'
}, {
value: '2',
label: '不通过'
}],
//
single: true,
//
@ -192,6 +207,8 @@ export default {
total: 0,
//
applyList: [],
//
startEndTime: [],
//
title: "",
//
@ -200,31 +217,36 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
userId: null,
approvalStatus: 0,
nickname: null,
identityType: null,
content: null,
remark: null,
images: null,
approvalStatus: null,
approvalUserId: null,
approvalTime: null,
approvalRemark: null,
},
//
form: {},
//
rules: {
}
rules: {}
};
},
created() {
this.getList();
},
methods: {
/**查看历史*/
openHis(){
this.$refs["formRef"].initForm()
},
/** 查询通告主认证申请列表 */
getList() {
this.loading = true;
console.log(this.startEndTime, "startEndTime")
if (this.startEndTime.length > 0) {
this.queryParams.startTime = formatDateDay(this.startEndTime[0])
this.queryParams.endTime = formatDateDay(this.startEndTime[1])
} else {
this.queryParams.startTime = null
this.queryParams.endTime = null
}
listApply(this.queryParams).then(response => {
this.applyList = response.data.records;
this.total = response.data.total;
@ -236,6 +258,11 @@ export default {
this.open = false;
this.reset();
},
/**查看审核历史*/
checkHis() {
},
//
reset() {
this.form = {
@ -265,67 +292,46 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.startEndTime = []
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加通告主认证申请";
},
/** 修改按钮操作 */
/** 审核按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getApply(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改通告主认证申请";
this.title = "审核";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateApply(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess("审批成功");
this.open = false;
this.getList();
});
} else {
addApply(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
this.$modal.msgError("出现错误");
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除通告主认证申请编号为"' + ids + '"的数据项?').then(function() {
return delApply(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('member/apply/export', {
...this.queryParams
}, `apply_${new Date().getTime()}.xlsx`)
}
// handleExport() {
// this.download('member/apply/export', {
// ...this.queryParams
// }, `apply_${new Date().getTime()}.xlsx`)
// }
}
};
</script>