Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev
caoyizhong 3 years ago
parent
commit
eaab098b4f
  1. 44
      src/api/wjnft/feedback.js
  2. 110
      src/views/wjnft/appcollectionlication/index.vue
  3. 397
      src/views/wjnft/feedback/index.vue

44
src/api/wjnft/feedback.js

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询意见反馈列表
export function listFeedback(query) {
return request({
url: '/wjnft/feedback/list',
method: 'get',
params: query
})
}
// 查询意见反馈详细
export function getFeedback(id) {
return request({
url: '/wjnft/feedback/' + id,
method: 'get'
})
}
// 新增意见反馈
export function addFeedback(data) {
return request({
url: '/wjnft/feedback',
method: 'post',
data: data
})
}
// 修改意见反馈
export function updateFeedback(data) {
return request({
url: '/wjnft/feedback',
method: 'put',
data: data
})
}
// 删除意见反馈
export function delFeedback(id) {
return request({
url: '/wjnft/feedback/' + id,
method: 'delete'
})
}

110
src/views/wjnft/appcollectionlication/index.vue

@ -55,6 +55,7 @@
<el-table v-loading="loading" :data="applicationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="50"> </el-table-column>
<el-table-column label="作品加入系列" align="center" prop="seriesId" />
<el-table-column label="作品名称" align="center" prop="collectionName" />
<el-table-column label="价格" align="center" prop="price" />
<el-table-column label="数量" align="center" prop="issueNumber" />
@ -90,6 +91,11 @@
</template>
</el-table-column>
<el-table-column label="开售时间" align="center" prop="timeSale" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.timeSale, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="申请人" align="center" prop="createdBy" />
<el-table-column label="申请时间" align="center" prop="createdTime" width="180">
<template slot-scope="scope">
@ -130,15 +136,15 @@
<!-- <el-form-item label="艺术家id" prop="artistId">-->
<!-- <el-input v-model="form.artistId" placeholder="请输入艺术家id" />-->
<!-- </el-form-item>-->
<el-form-item label="作品名称" prop="collectionName">
<el-input v-model="form.collectionName" placeholder="作品名称" disabled/>
</el-form-item>
<el-form-item label="价格" prop="price">
<el-input v-model="form.price" placeholder="价格" disabled/>
</el-form-item>
<el-form-item label="数量" prop="issueNumber">
<el-input v-model="form.issueNumber" placeholder="数量" disabled/>
</el-form-item>
<!-- <el-form-item label="作品名称" prop="collectionName">-->
<!-- <el-input v-model="form.collectionName" placeholder="作品名称" disabled/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="价格" prop="price">-->
<!-- <el-input v-model="form.price" placeholder="价格" disabled/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="数量" prop="issueNumber">-->
<!-- <el-input v-model="form.issueNumber" placeholder="数量" disabled/>-->
<!-- </el-form-item>-->
<el-form-item label="审核" prop="state">
<!-- <el-input v-model="form.state" placeholder="请输入申请状态1-同意,2-拒绝,3-待审核)" />-->
<el-select v-model="form.state" clearable placeholder="请选择审核是否通过"
@ -151,42 +157,41 @@
</el-select>
</el-form-item>
<el-form-item label="概念说明" prop="describes">
<el-input v-model="form.describes" type="textarea" placeholder="概念说明" disabled/>
</el-form-item>
<!-- <el-form-item label="概念说明" prop="describes">-->
<!-- <el-input v-model="form.describes" type="textarea" placeholder="概念说明" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="作品图片路径" prop="imagePath">-->
<!-- <el-input v-model="form.imagePath" placeholder="请输入作品图片路径" />-->
<!-- </el-form-item>-->
<el-form-item label="缩量图" prop="thumbnail" >
<!-- <el-input v-model="form.thumbnail" placeholder="请输入缩量图" />-->
<el-upload
ref="upload"
:action="action"
:headers="headers"
:limit="1"
:on-exceed="handleExceed"
list-type="picture-card"
:on-success="handleSuccess"
:auto-upload="false"
:before-upload="beforeUpload"
:file-list="imgList"
:disabled="true"
:multiple="false"
>
<!-- <el-form-item label="缩量图" prop="thumbnail" >-->
<!-- <el-upload-->
<!-- ref="upload"-->
<!-- :action="action"-->
<!-- :headers="headers"-->
<!-- :limit="1"-->
<!-- :on-exceed="handleExceed"-->
<!-- list-type="picture-card"-->
<!-- :on-success="handleSuccess"-->
<!-- :auto-upload="false"-->
<!-- :before-upload="beforeUpload"-->
<!-- :file-list="imgList"-->
<!-- :disabled="true"-->
<!-- :multiple="false"-->
<!-- >-->
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
:src="file.url" alt=""
>
<span class="el-upload-list__item-actions">
<span
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<!-- <i slot="default" class="el-icon-plus"></i>-->
<!-- <div slot="file" slot-scope="{file}">-->
<!-- <img-->
<!-- class="el-upload-list__item-thumbnail"-->
<!-- :src="file.url" alt=""-->
<!-- >-->
<!-- <span class="el-upload-list__item-actions">-->
<!-- <span-->
<!-- class="el-upload-list__item-preview"-->
<!-- @click="handlePictureCardPreview(file)"-->
<!-- >-->
<!-- <i class="el-icon-zoom-in"></i>-->
<!-- </span>-->
<!-- <span-->
<!-- v-if="!disabled"-->
<!-- class="el-upload-list__item-delete"-->
@ -201,13 +206,13 @@
<!-- >-->
<!-- <i class="el-icon-delete"></i>-->
<!-- </span>-->
</span>
</div>
</el-upload>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
</el-form-item>
<!-- </span>-->
<!-- </div>-->
<!-- </el-upload>-->
<!-- <el-dialog :visible.sync="dialogVisible">-->
<!-- <img width="100%" :src="dialogImageUrl" alt="">-->
<!-- </el-dialog>-->
<!-- </el-form-item>-->
<el-form-item label="申请人" prop="createdBy">
<el-input v-model="form.createdBy" placeholder="申请人" disabled/>
</el-form-item>
@ -238,8 +243,8 @@
<!-- placeholder="选择删除时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="预留A" prop="reservedA">-->
<!-- <el-input v-model="form.reservedA" placeholder="请输入预留A" />-->
<!-- <el-form-item label="预售时间" prop="timeSale">-->
<!-- <el-input v-model="form.timeSale" placeholder="预售时间" disabled/>-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
@ -287,6 +292,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
seriesId:null,
artistId: null,
collectionName: null,
price: null,
@ -300,7 +306,7 @@ export default {
updatedBy: null,
updatedTime: null,
deletedTime: null,
reservedA: null
timeSale: null
},
options: [{
value: '1',
@ -435,7 +441,7 @@ export default {
updatedBy: null,
updatedTime: null,
deletedTime: null,
reservedA: null
timeSale: null
};
this.resetForm("form");
},

397
src/views/wjnft/feedback/index.vue

@ -0,0 +1,397 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="手机" prop="phone">-->
<!-- <el-input-->
<!-- v-model="queryParams.phone"-->
<!-- placeholder="请输入手机"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="用户ID" prop="userId">-->
<!-- <el-input-->
<!-- v-model="queryParams.userId"-->
<!-- placeholder="请输入用户ID"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="上传附件" prop="picture">-->
<!-- <el-input-->
<!-- v-model="queryParams.picture"-->
<!-- placeholder="请输入上传附件"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="标题" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入标题"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="${comment}" prop="createdTime">-->
<!-- <el-date-picker clearable size="small"-->
<!-- v-model="queryParams.createdTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择${comment}">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="createdBy">-->
<!-- <el-input-->
<!-- v-model="queryParams.createdBy"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="updatedTime">-->
<!-- <el-date-picker clearable size="small"-->
<!-- v-model="queryParams.updatedTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择${comment}">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="updatedBy">-->
<!-- <el-input-->
<!-- v-model="queryParams.updatedBy"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="deletedTime">-->
<!-- <el-date-picker clearable size="small"-->
<!-- v-model="queryParams.deletedTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择${comment}">-->
<!-- </el-date-picker>-->
<!-- </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-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="['wjnft:feedback: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="['wjnft:feedback: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="['wjnft:feedback: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="['wjnft:feedback:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
<!-- </el-row>-->
<el-table v-loading="loading" :data="feedbackList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="${comment}" align="center" prop="id" />-->
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="手机" align="center" prop="phone" />
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="内容" align="center" prop="content" />
<!-- <el-table-column label="用户ID" align="center" prop="userId" />-->
<el-table-column label="附件图片" align="center" prop="picture" />
<el-table-column label="反馈时间" align="center" prop="createdTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="反馈人" align="center" prop="createdBy" />
<!-- <el-table-column label="${comment}" align="center" prop="updatedTime" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="${comment}" align="center" prop="updatedBy" />-->
<!-- <el-table-column label="${comment}" align="center" prop="deletedTime" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.deletedTime, '{y}-{m}-{d}') }}</span>-->
<!-- </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"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['wjnft:feedback:edit']"
>回复</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['wjnft:feedback:remove']"-->
<!-- >删除</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="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="内容">
<editor v-model="form.content" :min-height="192"/>
</el-form-item>
<!-- <el-form-item label="手机" prop="phone">-->
<!-- <el-input v-model="form.phone" placeholder="请输入手机" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="用户ID" prop="userId">-->
<!-- <el-input v-model="form.userId" placeholder="请输入用户ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="上传附件" prop="picture">-->
<!-- <el-input v-model="form.picture" placeholder="请输入上传附件" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="标题" prop="title">-->
<!-- <el-input v-model="form.title" placeholder="请输入标题" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="反馈时间" prop="createdTime">-->
<!-- <el-date-picker clearable size="small"-->
<!-- v-model="form.createdTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择${comment}">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="createdBy">-->
<!-- <el-input v-model="form.createdBy" placeholder="请输入${comment}" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="updatedTime">-->
<!-- <el-date-picker clearable size="small"-->
<!-- v-model="form.updatedTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择${comment}">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="updatedBy">-->
<!-- <el-input v-model="form.updatedBy" placeholder="请输入${comment}" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="deletedTime">-->
<!-- <el-date-picker clearable size="small"-->
<!-- v-model="form.deletedTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择${comment}">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</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>
</div>
</template>
<script>
import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback } from "@/api/wjnft/feedback";
export default {
name: "Feedback",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
feedbackList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
content: null,
phone: null,
userId: null,
picture: null,
title: null,
createdTime: null,
createdBy: null,
updatedTime: null,
updatedBy: null,
deletedTime: null
},
//
form: {},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询意见反馈列表 */
getList() {
this.loading = true;
listFeedback(this.queryParams).then(response => {
this.feedbackList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
content: null,
phone: null,
userId: null,
picture: null,
title: null,
createdTime: null,
createdBy: null,
updatedTime: null,
updatedBy: null,
deletedTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
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
getFeedback(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改意见反馈";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateFeedback(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addFeedback(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除意见反馈编号为"' + ids + '"的数据项?').then(function() {
return delFeedback(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('wjnft/feedback/export', {
...this.queryParams
}, `feedback_${new Date().getTime()}.xlsx`)
}
}
};
</script>
Loading…
Cancel
Save