Skip to content

J
jiedao-app-operator-master
Commit 12505cbb authored by yujinyao's avatar yujinyao
Browse files
Options

跟进附件图片文件支持预览

parent 18ce98b4
Hide whitespace changes
Inline Side-by-side
Showing with 284 additions and 23 deletions
src/components/FileUpload/fileUpload.vue 0 → 100644
View file @ 12505cbb
<template>
<div class="upload-file">
<el-upload
multiple
:action="uploadFileUrl"
:before-upload="handleBeforeUpload"
:file-list="fileList"
:limit="limit"
:disabled="disabled"
:on-error="handleUploadError"
:on-exceed="handleExceed"
:on-success="handleUploadSuccess"
:show-file-list="false"
:headers="headers"
class="upload-file-uploader"
ref="upload"
>
<!-- 上传按钮 -->
<el-button size="mini" type="primary" :disabled="disabled">{{
$t("选取文件")
}}</el-button>
<!-- 上传提示 -->
<div class="el-upload__tip" slot="tip" v-if="showTip">
请上传
<template v-if="fileSize">
大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
</template>
<template v-if="fileType">
格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
</template>
的文件
</div>
</el-upload>
<!-- 文件列表 -->
<transition-group
class="upload-file-list el-upload-list el-upload-list--text"
name="el-fade-in-linear"
tag="ul"
>
<li
:key="index"
v-for="(file, index) in fileList"
>
<div class="imgItem" v-if="checkFileIsImage(file.url)">
<el-image
style="width: 200px; height: 100px"
:src="file.url"
:preview-src-list="[file.url]">
</el-image>
</div>
<div class="el-upload-list__item ele-upload-list__item-content" v-else>
<el-link :href="`${file.url}`" :underline="false" target="_blank">
<span class="el-icon-document"> {{ getFileName(file.name) }} </span>
</el-link>
<div class="ele-upload-list__item-content-action">
<el-link :underline="false" @click="handleDelete(index)" type="danger"
>删除</el-link
>
</div>
</div>
</li>
</transition-group>
</div>
</template>
<script>
import { getToken } from "@/utils/auth";
export default {
name: "FileUpload",
props: {
// 值
value: [String, Object, Array],
// 数量限制
limit: {
type: Number,
default: 5,
},
// 大小限制(MB)
fileSize: {
type: Number,
default: 5,
},
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => ["doc", "xls", "ppt", "txt", "pdf"],
},
disabled: {
type: Boolean,
default: false,
},
// 是否显示提示
isShowTip: {
type: Boolean,
default: true,
},
},
data() {
return {
number: 0,
uploadList: [],
baseUrl: process.env.VUE_APP_BASE_API,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 上传的文件服务器地址
headers: {
Authorization: "Bearer " + getToken(),
},
fileList: [],
};
},
watch: {
value: {
handler(val) {
if (val) {
let temp = 1;
// 首先将值转为数组
const list = Array.isArray(val) ? val : this.value.split(",");
// 然后将数组转为对象数组
this.fileList = list.map((item) => {
if (typeof item === "string") {
item = { name: item, url: item };
}
item.uid = item.uid || new Date().getTime() + temp++;
return item;
});
} else {
this.fileList = [];
return [];
}
},
deep: true,
immediate: true,
},
},
computed: {
// 是否显示提示
showTip() {
return this.isShowTip && (this.fileType || this.fileSize);
},
},
methods: {
// 上传前校检格式和大小
handleBeforeUpload(file) {
// 校检文件类型
if (this.fileType) {
let fileExtension = "";
if (file.name.lastIndexOf(".") > -1) {
fileExtension = file.name
.slice(file.name.lastIndexOf(".") + 1)
.toLowerCase();
}
const isTypeOk = this.fileType.some((type) => {
if (file.type.indexOf(type) > -1) return true;
if (fileExtension && fileExtension.indexOf(type) > -1) return true;
return false;
});
if (!isTypeOk) {
this.$modal.msgError(
`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`
);
return false;
}
}
// 校检文件大小
if (this.fileSize) {
const isLt = file.size / 1024 / 1024 < this.fileSize;
if (!isLt) {
this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
return false;
}
}
this.$modal.loading("正在上传文件，请稍候...");
this.number++;
return true;
},
// 文件个数超出
handleExceed() {
this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
},
// 上传失败
handleUploadError(err) {
this.$modal.msgError("上传文件失败，请重试");
this.$modal.closeLoading();
},
// 上传成功回调
handleUploadSuccess(res) {
// todo 接口返回值没有文件名
this.uploadList.push({ name: res.data, url: res.data });
if (this.uploadList.length === this.number) {
this.fileList = this.fileList.concat(this.uploadList);
this.uploadList = [];
this.number = 0;
this.$emit("input", this.listToString(this.fileList));
this.$modal.closeLoading();
}
},
// 删除文件
handleDelete(index) {
this.fileList.splice(index, 1);
this.$emit("input", this.listToString(this.fileList));
},
// 获取文件名称
getFileName(name) {
if (name.lastIndexOf("/") > -1) {
return name.slice(name.lastIndexOf("/") + 1);
} else {
return "";
}
},
// 对象转成指定字符串分隔
listToString(list, separator) {
let strs = "";
separator = separator || ",";
for (let i in list) {
strs += list[i].url + separator;
}
return strs != "" ? strs.substr(0, strs.length - 1) : "";
},
checkFileIsImage(filePath) {
const fileExtension = filePath.slice(filePath.lastIndexOf(".") + 1).toLowerCase()
const fileTypes = ['png', 'jpg', 'jpeg', 'gif']
if (fileTypes.includes(fileExtension)) {
return true
}
return false
}
},
};
</script>
<style scoped lang="scss">
.upload-file-uploader {
margin-bottom: 5px;
}
.upload-file-list .el-upload-list__item {
border: 1px solid #e4e7ed;
line-height: 2;
margin-bottom: 10px;
position: relative;
}
.upload-file-list .ele-upload-list__item-content {
display: flex;
justify-content: space-between;
align-items: center;
color: inherit;
}
.ele-upload-list__item-content-action .el-link {
margin-right: 10px;
}
</style>
src/views/ecw/customer/components/customerFollow.vue
View file @ 12505cbb
......@@ -72,16 +72,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="20">
<el-form-item :label="$t('目的')" prop="purpose">
<el-input type="textarea" :rows="2" v-model="form.purpose" :placeholder="$t('请输入目的')" maxlength="200" show-word-limit />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('下一步计划')" prop="nextPlan">
<el-input type="textarea" :rows="2" v-model="form.nextPlan" :placeholder="$t('请输入下一步计划')" />
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item :label="$t('跟进情况')">
<el-input rows="3" class="text_style" type="textarea" placeholder="" v-model="form.feedback" maxlength="500" show-word-limit />
......@@ -92,12 +87,17 @@
<FileUpload :limit="5" :isShowTip="false" v-model="form.attatchment" :fileType="fileType" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="13">
<el-form-item :label="$t('下次跟进时间')">
<el-date-picker v-model="form.nextTime" type="datetime" :placeholder="$t('请选择')" :picker-options="pickerOptions">
<el-date-picker v-model="form.nextTime" type="datetime" :placeholder="$t('请选择')">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item :label="$t('下一步计划')" prop="nextPlan">
<el-input type="textarea" :rows="3" v-model="form.nextPlan" :placeholder="$t('请输入下一步计划')" maxlength="500" show-word-limit />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('创建人')" prop="founder">
<el-select v-model="form.creatorName" disabled :placeholder="$t('请选择')">
......@@ -135,7 +135,7 @@
</div>
</el-dialog>
<customer-follow-select-offer ref="customerFollowSelectOffer" @select="selectOffer" />
<customer-follow-select-offer :customer-id="customerId" ref="customerFollowSelectOffer" @select="selectOffer" />
</div>
</template>
......@@ -166,7 +166,7 @@ import {
import {
parseTime
} from '@/utils/ruoyi'
import FileUpload from "@/components/FileUpload";
import FileUpload from "@/components/FileUpload/fileUpload";
import {formatDate} from "@/utils/index";
export default {
/**
......@@ -183,7 +183,8 @@ export default {
customerQuery: {
type: Boolean,
default: false
}
},
customerService: Number
},
components: {
FileUpload,
......@@ -280,9 +281,9 @@ export default {
customerId: this.customerId,
feedback: undefined,
followMethod: undefined,
followTime: undefined,
followTime: new Date().getTime(),
followType: undefined,
followUserId: undefined,
followUserId: this.customerService,
nextPlan: undefined,
nextTime: undefined,
number: undefined,
......
src/views/ecw/customer/components/customerFollowSelectOffer.vue
View file @ 12505cbb
......@@ -88,6 +88,9 @@ export default {
components: {
UserSelector
},
props: {
customerId: Number,
},
data() {
return {
offerId: null,
......@@ -138,7 +141,10 @@ export default {
this.handleQuery();
},
getOfferList() {
getOfferPage(this.queryParams).then(response => {
getOfferPage({
...this.queryParams,
customerId: this.customerId
}).then(response => {
this.offerList = response.data.list;
this.offerTotal = response.data.total;
});
......
src/views/ecw/customer/query.vue
View file @ 12505cbb
......@@ -70,7 +70,8 @@
<el-form-item :label="$t('报关方式：')">
<dict-selector
:type="DICT_TYPE.ECW_CUSTOMS_TYPE"
v-model="queryParams.customsType"
v-model="queryParams.customsTypes"
multiple
/>
</el-form-item>
<el-form-item :label="$t('控货')">
......@@ -108,7 +109,7 @@
<el-select
v-model="objectiveId"
multiple
:placeholder="$t('请根据目的国选择目的城市')"
:placeholder="$t('请选择目的城市')"
style="width: 200px"
clearable
@change="handleQuery"
......@@ -125,7 +126,7 @@
<el-select
v-model="destWarehouseId"
multiple
:placeholder="$t('请根据目的城市选择目的仓')"
:placeholder="$t('请选择目的仓')"
style="width: 200px"
clearable
@change="handleQuery"
......@@ -463,7 +464,7 @@
$t("搜索")
}}</el-button>
<el-button type="primary" @click="()=>{
followFrom = { pageNo:1,pageSize:10}; getCustomerFollowList();
followForm = { pageNo:1,pageSize:10}; getCustomerFollowList();
}">{{$t('重置')}}</el-button>
<el-button type="success" @click="customerFollowFn('follow')" v-hasPermi="['ecw:customer:follow-create']">{{$t('新增')}}</el-button>
<el-button type="warning" @click="handleExport" v-hasPermi="['ecw:customer:follow-export']">{{$t('导出')}}</el-button>
......@@ -553,8 +554,8 @@
</el-tab-pane>
<el-tab-pane name="empower" :label="$t('品牌授权')">
<el-table border style="width:100%" :data="brandAuthorizationList">
<el-table-column type="index" :prop="$t('序号')"></el-table-column>
<el-table-column :label="$t('中文标题')" prop="titleZh" ></el-table-column>
<el-table-column type="index" :prop="$t('序号')"></el-table-column>
<el-table-column :label="$t('中文标题')" prop="titleZh" ></el-table-column>
<el-table-column prop="titleEn" :label="$t('英文标题')"></el-table-column>
<el-table-column :label="$t('有无备案')">
<template v-slot="{row}">
......@@ -835,7 +836,7 @@
</div>
</el-dialog>
<customer-follow ref="customerFollow" v-if="customerFollowVisible" :id="id" :customer-id="id" @refresh="getCustomerFollowList" />
<customer-follow ref="customerFollow" v-if="customerFollowVisible" :id="id" :customer-id="id" :customer-service="customer.customerService" @refresh="getCustomerFollowList" />
</div>
</template>
......@@ -993,19 +994,19 @@ export default {
handler() {
this.AddressTown = [];
this.destWarehouseId = "";
this.findBycityCode()
if (
this.objectiveId != "" &&
this.destCountryId != "" &&
this.destWarehouseId == ""
) {
//获取当前城市值id，获取该城市下区域
this.findBycityCode()
} else if (
this.destCountryId == "" &&
this.objectiveId == "" &&
this.destWarehouseId == ""
) {
this.getAddressCity()
this.getAddressTown()
} else if (
this.destCountryId != "" &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment