Skip to content

P
pda-ui
Commit b9ae5e9d authored by jzc's avatar jzc
Browse files
Options

新增品牌及品牌联系人功能

parent d379c011
Hide whitespace changes
Inline Side-by-side
Showing with 507 additions and 28 deletions
src/api/mes/md/brand.js
View file @ b9ae5e9d
import request from '@/utils/request'
// 查询生产用途列表
// 查询品牌列表
export function listBrand(query) {
return request({
url: '/mes/md/brand/list',
......@@ -9,7 +9,7 @@ export function listBrand(query) {
})
}
// 查询所有有效生产用途
// 查询所有品牌
export function listAllBrand() {
return request({
url: '/mes/md/brand/listAll',
......@@ -18,7 +18,7 @@ export function listAllBrand() {
}
// 查询生产用途详细
// 查询品牌详细
export function getBrand(brandId) {
return request({
url: '/mes/md/brand/' + brandId,
......@@ -26,7 +26,7 @@ export function getBrand(brandId) {
})
}
// 新增生产用途
// 新增品牌
export function addBrand(data) {
return request({
url: '/mes/md/brand',
......@@ -35,7 +35,7 @@ export function addBrand(data) {
})
}
// 修改生产用途
// 修改品牌
export function updateBrand(data) {
return request({
url: '/mes/md/brand',
......@@ -44,7 +44,7 @@ export function updateBrand(data) {
})
}
// 删除生产用途
// 删除品牌
export function delBrand(brandId) {
return request({
url: '/mes/md/brand/' + brandId,
......
src/api/mes/md/brandcontact.js 0 → 100644
View file @ b9ae5e9d
import request from '@/utils/request'
// 查询品牌联系人列表
export function listContact(query) {
return request({
url: '/md/contact/list',
method: 'get',
params: query
})
}
// 查询品牌联系人详细
export function getContact(brandContactId) {
return request({
url: '/md/contact/' + brandContactId,
method: 'get'
})
}
// 新增品牌联系人
export function addContact(data) {
return request({
url: '/md/contact',
method: 'post',
data: data
})
}
// 修改品牌联系人
export function updateContact(data) {
return request({
url: '/md/contact',
method: 'put',
data: data
})
}
// 删除品牌联系人
export function delContact(brandContactId) {
return request({
url: '/md/contact/' + brandContactId,
method: 'delete'
})
}
// 查询品牌列表（不传参查所有）
export function listBrand(query) {
return request({
url: '/md/contact/listBrand',
method: 'get',
params: query
})
}
src/views/mes/md/brand/index.vue
View file @ b9ae5e9d
......@@ -24,22 +24,29 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="集团" prop="group">
<el-form-item label="集团" prop="groupName">
<el-input
v-model="queryParams.group"
v-model="queryParams.groupName"
placeholder="请输入集团"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-input
v-model="queryParams.enableFlag"
placeholder="请输入是否启用"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-select
v-model="queryParams.enableFlag"
placeholder="是否启用"
clearable
style="width: 215px"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
......@@ -132,7 +139,7 @@
<el-table-column
label="集团"
align="center"
prop="group"
prop="groupName"
:show-overflow-tooltip="true"
/>
<el-table-column
......@@ -278,8 +285,8 @@
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="集团" prop="group">
<el-input v-model="form.group" placeholder="请输入所属集团名称" />
<el-form-item label="集团" prop="groupName">
<el-input v-model="form.groupName" placeholder="请输入所属集团名称" />
</el-form-item>
</el-col>
<el-col :span="10">
......@@ -389,11 +396,12 @@ export default {
pageSize: 10,
brandCode: null,
brandName: null,
group: null,
groupName: null,
enableFlag: null,
},
// 表单参数
form: {},
brandList:[],
// 表单校验
rules: {
brandCode: [
......@@ -402,7 +410,7 @@ export default {
brandName: [
{ required: true, message: "品牌名称不能为空", trigger: "blur" },
],
group: [
groupName: [
{ required: true, message: "集团不能为空", trigger: "blur" },
],
enableFlag: [
......@@ -435,7 +443,7 @@ export default {
brandId: null,
brandCode: null,
brandName: null,
group: null,
groupName: null,
address: null,
salesContact: null,
devContact: null,
......@@ -465,7 +473,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.usageId);
this.ids = selection.map((item) => item.brandId);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
......@@ -494,7 +502,7 @@ export default {
getBrand(brandId).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改生产用途";
this.title = "修改品牌信息";
this.optType = "edit";
});
},
......@@ -519,12 +527,14 @@ export default {
});
},
/** 删除按钮操作 */
handleDelete(row) {
const usageIds = row.usageId || this.ids;
handleDelete() {
const brandIds = this.ids.join(',');
console.log(brandIds)
this.$modal
.confirm("是否确认删除生产用途？")
.confirm("是否确认删除品牌？")
.then(function () {
return delUsage(usageIds);
return delBrand(brandIds);
})
.then(() => {
this.getList();
......
src/views/mes/md/brandcontact/index.vue 0 → 100644
View file @ b9ae5e9d
<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="brandId">
<el-input
v-model="queryParams.brandId"
placeholder="请输入品牌id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="联系人" prop="contactName">
<el-input
v-model="queryParams.contactName"
placeholder="请输入联系人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="联系人(英文名)" prop="contactNameEn">
<el-input
v-model="queryParams.contactNameEn"
placeholder="请输入联系人(英文名)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="联系电话" prop="contactPhone">
<el-input
v-model="queryParams.contactPhone"
placeholder="请输入联系电话"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="办公区域" prop="officeArea">
<el-input
v-model="queryParams.officeArea"
placeholder="请输入办公区域"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="部门" prop="department">
<el-input
v-model="queryParams.department"
placeholder="请输入部门"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="职位" prop="position">
<el-input
v-model="queryParams.position"
placeholder="请输入职位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="邮箱地址" prop="mailbox">
<el-input
v-model="queryParams.mailbox"
placeholder="请输入邮箱地址"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-select
v-model="queryParams.enableFlag"
placeholder="是否启用"
clearable
style="width: 215px"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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="['md:contact: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="['md:contact: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="['md:contact: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="['md:contact:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="品牌id" align="center" prop="brandId" />
<el-table-column label="品牌名称" align="center" prop="brandName" />
<el-table-column label="联系人" align="center" prop="contactName" />
<el-table-column label="联系人(英文名)" align="center" prop="contactNameEn" />
<el-table-column label="联系电话" align="center" prop="contactPhone" />
<el-table-column label="办公区域" align="center" prop="officeArea" />
<el-table-column label="部门" align="center" prop="department" />
<el-table-column label="职位" align="center" prop="position" />
<el-table-column label="邮箱地址" align="center" prop="mailbox" />
<el-table-column label="备注" align="center" prop="remark" />
<!-- <el-table-column label="是否启用" align="center" prop="enableFlag" /> -->
<el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.enableFlag"
/>
</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="['md:contact:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:contact: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="品牌id" prop="brandId">
<el-input v-model="form.brandId" placeholder="请输入品牌id" />
</el-form-item> -->
<el-form-item label="品牌" prop="brandId">
<el-select v-model="form.brandId" placeholder="请选择品牌">
<el-option
v-for="item in mdBrands"
:key="item.brandId"
:label="item.brandName"
:value="item.brandId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="联系人" prop="contactName">
<el-input v-model="form.contactName" placeholder="请输入联系人" />
</el-form-item>
<el-form-item label="联系人(英文名)" prop="contactNameEn">
<el-input v-model="form.contactNameEn" placeholder="请输入联系人(英文名)" />
</el-form-item>
<el-form-item label="联系电话" prop="contactPhone">
<el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
</el-form-item>
<el-form-item label="办公区域" prop="officeArea">
<el-input v-model="form.officeArea" placeholder="请输入办公区域" />
</el-form-item>
<el-form-item label="部门" prop="department">
<el-input v-model="form.department" placeholder="请输入部门" />
</el-form-item>
<el-form-item label="职位" prop="position">
<el-input v-model="form.position" placeholder="请输入职位" />
</el-form-item>
<el-form-item label="邮箱地址" prop="mailbox">
<el-input v-model="form.mailbox" placeholder="请输入邮箱地址" />
</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="enableFlag">
<el-input v-model="form.enableFlag" placeholder="请输入是否启用(Y/N)" />
</el-form-item> -->
<el-form-item label="是否启用" prop="enableFlag">
<el-radio-group
v-model="form.enableFlag"
disabled
v-if="optType == 'view'"
>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
<el-radio-group v-model="form.enableFlag" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
</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 { listContact, listBrand, getContact, delContact, addContact, updateContact } from "@/api/mes/md/brandcontact";
export default {
name: "Contact",
dicts: ["sys_yes_no"],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 品牌联系人表格数据
contactList: [],
//品牌选项
mdBrands:[],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
brandId: null, contactName: null, contactNameEn: null, contactPhone: null, officeArea: null, department: null, position: null, mailbox: null, enableFlag: null, },
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询品牌联系人列表 */
getList() {
this.loading = true;
listContact(this.queryParams).then(response => {
this.contactList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 查询品牌列表 */
getBrandList() {
this.loading = true;
listBrand().then(response => {
this.mdBrands = response.data;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
brandContactId: null, brandId: null, contactName: null, contactNameEn: null, contactPhone: null, officeArea: null, department: null, position: null, mailbox: null, remark: null, enableFlag: null, createBy: null, createTime: null, updateBy: null, updateTime: 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.brandContactId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.getBrandList()
this.open = true;
this.title = "添加品牌联系人";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.getBrandList();
const brandContactId = row.brandContactId || this.ids
getContact(brandContactId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改品牌联系人";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.brandContactId != null) {
updateContact(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addContact(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const brandContactIds = row.brandContactId || this.ids;
this.$modal.confirm('是否确认删除品牌联系人编号为"' + brandContactIds + '"的数据项？').then(function() {
return delContact(brandContactIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('md/contact/export', {
...this.queryParams
}, `contact_${new Date().getTime()}.xlsx`)
}
}
};
</script>
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