Compare commits

..

No commits in common. "91cb2b50c8adc92709909b37a8bfb89dd1057a56" and "301c64543a44ddbc29524a705f014671e39bfab2" have entirely different histories.

3 changed files with 141 additions and 208 deletions

View File

@ -15,12 +15,4 @@ export function delPartnerSupplier(id) {
url: '/official/companymessage/' + id, url: '/official/companymessage/' + id,
method: 'delete' method: 'delete'
}) })
}
export function downFile(url) {
return request({
url: '/system/oss/download?imageUrl='+ url,
method: 'get',
responseType: 'blob',
})
} }

View File

@ -3,7 +3,12 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
<el-form-item label="公司名称(个人)" prop="companyName"> <el-form-item label="公司名称(个人)" prop="companyName">
<el-input v-model="queryParams.companyName" placeholder="请输入公司名称(个人)" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="queryParams.companyName"
placeholder="请输入公司名称(个人)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -14,36 +19,37 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['official:businessPartner:remove']">删除</el-button> <el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['official:businessPartner:remove']"
>删除</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="slideshowList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="slideshowList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键id" align="center" prop="id" v-if="false" /> <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
<el-table-column label="公司名称(个人)" width="130" align="center" prop="companyName" /> <el-table-column label="公司名称(个人)" width="130" align="center" prop="companyName" />
<el-table-column label="地址" width="230" align="center" prop="address" /> <el-table-column label="地址" width="230" align="center" prop="address" />
<el-table-column label="联系电话" width="110" align="center" prop="phoneNumber" /> <el-table-column label="联系电话" width="110" align="center" prop="phoneNumber" />
<el-table-column label="电子邮箱" width="180" align="center" prop="email" /> <el-table-column label="电子邮箱" width="180" align="center" prop="email" />
<el-table-column label="擅长方向" width="320" align="center" prop="fieldType" /> <el-table-column label="擅长方向" align="center" prop="fieldType" />
<el-table-column label="优势概念" width="320" align="center" prop="advantageConcept"> <el-table-column label="优势概念" align="center" prop="advantageConcept">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div class="multiple-line-content-show" style="cursor: pointer;" @click="dialogContent(row.advantageConcept, '优势概念')" v-html="row.advantageConcept"></div> <div class="multiple-line-content-show" style="cursor: pointer;" @click="dialogContent(row.advantageConcept, '优势概念')" v-html="row.advantageConcept"></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合作意向概述" width="320" align="center" prop="cooperationIntention"> <el-table-column label="合作意向概述" align="center" prop="cooperationIntention">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div class="multiple-line-content-show" style="cursor: pointer;" @click="dialogContent(row.cooperationIntention, '合作意向概述')" v-html="row.cooperationIntention"></div> <div class="multiple-line-content-show" style="cursor: pointer;" @click="dialogContent(row.cooperationIntention, '合作意向概述')" v-html="row.cooperationIntention"></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附件" width="400" align="center" prop="imageurl">
<template slot-scope="{ row }" v-if="row.imageurl">
<div class="line-content-show" style="cursor: pointer;" v-for="(url, index) in row.imageurl.split(',')" :key="'file'+ index" @click="handleDownFile(url)">
{{ getFileName(url) }}
</div>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@ -51,168 +57,141 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="100" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" width="100" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['official:businessPartner:remove']">删除</el-button> <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['official:businessPartner:remove']"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> <pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div> </div>
</template> </template>
<script> <script>
import { import { listPartnerSupplier, delPartnerSupplier } from "@/api/official/partnerSupplier";
listPartnerSupplier,
delPartnerSupplier,
downFile
} from '@/api/official/partnerSupplier'
export default { export default {
name: 'FeedBack', name: "FeedBack",
data() { data() {
return { return {
// loading // loading
buttonLoading: false, buttonLoading: false,
// //
loading: true, loading: true,
// //
ids: [], ids: [],
// //
single: true, single: true,
// //
multiple: true, multiple: true,
// //
showSearch: true, showSearch: true,
// //
total: 0, total: 0,
// //
slideshowList: [], slideshowList: [],
// //
open: false, open: false,
// //
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
propertiesType: 1, propertiesType: 1,
companyName: undefined companyName: undefined,
} },
} };
},
created() {
this.getList();
},
methods: {
/**
列表 */
getList() {
this.loading = true;
listPartnerSupplier(this.queryParams).then(response => {
this.slideshowList = response.rows;
this.total = response.total;
this.loading = false;
});
}, },
created() { //
this.getList() cancel() {
this.open = false;
this.reset();
}, },
methods: { //
// reset() {
getFileName(name) { this.form = {
// url id: undefined,
if (name.lastIndexOf('/') > -1) { captionName: undefined,
return name.slice(name.lastIndexOf('/') + 1) };
} else { this.resetForm("form");
return name },
} /** 搜索按钮操作 */
}, handleQuery() {
handleDownFile(url) { this.queryParams.pageNum = 1;
downFile(url).then(res => { this.getList();
// a },
const downLoadName = this.getFileName(url) /** 重置按钮操作 */
const a = document.createElement('a') resetQuery() {
a.href = URL.createObjectURL(res) this.resetForm("queryForm");
// adownload this.handleQuery();
a.setAttribute('download', downLoadName) },
document.body.appendChild(a) //
a.click() handleSelectionChange(selection) {
document.body.removeChild(a) this.ids = selection.map(item => item.id)
}) this.single = selection.length!==1
}, this.multiple = !selection.length
/** },
列表 */ /** 删除按钮操作 */
getList() { handleDelete(row) {
this.loading = true const ids = row.id || this.ids;
listPartnerSupplier(this.queryParams).then(response => { this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项?').then(() => {
this.slideshowList = response.rows this.loading = true;
this.total = response.total return delPartnerSupplier(ids);
this.loading = false }).then(() => {
}) this.loading = false;
}, this.getList();
// this.$modal.msgSuccess("删除成功");
cancel() { }).catch(() => {
this.open = false }).finally(() => {
this.reset() this.loading = false;
}, });
// },
reset() { dialogContent(feedContent, title) {
this.form = { this.$alert(feedContent, title, {
id: undefined, confirmButtonText: '确定',
captionName: undefined callback: action => {}
} });
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
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal
.confirm('是否确认删除编号为"' + ids + '"的数据项?')
.then(() => {
this.loading = true
return delPartnerSupplier(ids)
})
.then(() => {
this.loading = false
this.getList()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
.finally(() => {
this.loading = false
})
},
dialogContent(feedContent, title) {
this.$alert(feedContent, title, {
confirmButtonText: '确定',
callback: action => {}
})
}
} }
} }
};
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .multiple-line-content-show p { ::v-deep .multiple-line-content-show p {
margin: 0; margin: 0;
} }
.line-content-show { //
overflow: hidden; ::v-deep .el-dialog {
text-overflow: ellipsis; height: 92%;
display: -webkit-box; overflow: hidden;
-webkit-box-orient: vertical; }
-webkit-line-clamp: 1; ::v-deep .el-dialog__body {
white-space: pre-wrap; padding: 30px 20px 0;
text-align: left; height: 89%;
} overflow-y: auto;
// }
::v-deep .el-dialog {
height: 92%;
overflow: hidden;
}
::v-deep .el-dialog__body {
padding: 30px 20px 0;
height: 89%;
overflow-y: auto;
}
</style> </style>

View File

@ -60,13 +60,6 @@
<div class="multiple-line-content-show" style="cursor: pointer;" @click="dialogContent(row.cooperationIntention, '合作意向概述')" v-html="row.cooperationIntention"></div> <div class="multiple-line-content-show" style="cursor: pointer;" @click="dialogContent(row.cooperationIntention, '合作意向概述')" v-html="row.cooperationIntention"></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附件" width="400" align="center" prop="imageurl">
<template slot-scope="{ row }" v-if="row.imageurl">
<div class="line-content-show" style="cursor: pointer;" v-for="(url, index) in row.imageurl.split(',')" :key="'file'+ index" @click="handleDownFile(url)">
{{ getFileName(url) }}
</div>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@ -96,7 +89,7 @@
</template> </template>
<script> <script>
import { listPartnerSupplier, delPartnerSupplier, downFile } from "@/api/official/partnerSupplier"; import { listPartnerSupplier, delPartnerSupplier } from "@/api/official/partnerSupplier";
export default { export default {
name: "FeedBack", name: "FeedBack",
@ -133,28 +126,6 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
//
getFileName(name) {
// url
if (name.lastIndexOf('/') > -1) {
return name.slice(name.lastIndexOf('/') + 1)
} else {
return name
}
},
handleDownFile(url) {
downFile(url).then(res => {
// a
const downLoadName = this.getFileName(url)
const a = document.createElement('a')
a.href = URL.createObjectURL(res)
// adownload
a.setAttribute('download', downLoadName)
document.body.appendChild(a)
a.click()
document.body.removeChild(a)
})
},
/** /**
列表 */ 列表 */
getList() { getList() {
@ -223,15 +194,6 @@ export default {
::v-deep .multiple-line-content-show p { ::v-deep .multiple-line-content-show p {
margin: 0; margin: 0;
} }
.line-content-show {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
white-space: pre-wrap;
text-align: left;
}
// //
::v-deep .el-dialog { ::v-deep .el-dialog {
height: 92%; height: 92%;