Skip to content

M
mes-ui
Commit 573cd23a authored by jzc's avatar jzc
Browse files
Options

Merge branch 'feature/jzc/brand/0.0.1' into dev

parents e64d1b03 b5dd0e25
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1025 additions and 44 deletions
src/api/mes/md/brand.js
View file @ 573cd23a
import request from '@/utils/request' import request from '@/utils/request'
// 查询生产用途列表 // 查询品牌列表
export function listBrand(query) { export function listBrand(query) {
return request({ return request({
url: '/mes/md/brand/list', url: '/mes/md/brand/list',
...@@ -9,7 +9,7 @@ export function listBrand(query) { ...@@ -9,7 +9,7 @@ export function listBrand(query) {
}) })
} }
// 查询所有有效生产用途 // 查询所有品牌
export function listAllBrand() { export function listAllBrand() {
return request({ return request({
url: '/mes/md/brand/listAll', url: '/mes/md/brand/listAll',
...@@ -18,7 +18,7 @@ export function listAllBrand() { ...@@ -18,7 +18,7 @@ export function listAllBrand() {
} }
// 查询生产用途详细 // 查询品牌详细
export function getBrand(brandId) { export function getBrand(brandId) {
return request({ return request({
url: '/mes/md/brand/' + brandId, url: '/mes/md/brand/' + brandId,
...@@ -26,7 +26,7 @@ export function getBrand(brandId) { ...@@ -26,7 +26,7 @@ export function getBrand(brandId) {
}) })
} }
// 新增生产用途 // 新增品牌
export function addBrand(data) { export function addBrand(data) {
return request({ return request({
url: '/mes/md/brand', url: '/mes/md/brand',
...@@ -35,7 +35,7 @@ export function addBrand(data) { ...@@ -35,7 +35,7 @@ export function addBrand(data) {
}) })
} }
// 修改生产用途 // 修改品牌
export function updateBrand(data) { export function updateBrand(data) {
return request({ return request({
url: '/mes/md/brand', url: '/mes/md/brand',
...@@ -44,7 +44,7 @@ export function updateBrand(data) { ...@@ -44,7 +44,7 @@ export function updateBrand(data) {
}) })
} }
// 删除生产用途 // 删除品牌
export function delBrand(brandId) { export function delBrand(brandId) {
return request({ return request({
url: '/mes/md/brand/' + brandId, url: '/mes/md/brand/' + brandId,
......
src/api/mes/md/brandcontact.js 0 → 100644
View file @ 573cd23a
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/components/brandSelect/single.vue 0 → 100644
View file @ 573cd23a
<template>
<el-dialog
title="品牌选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal="false"
width="80%"
center
>
<el-row :gutter="20">
<!--品牌数据-->
<el-col :span="20" :xs="20">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="品牌编码" prop="brandCode">
<el-input
v-model="queryParams.brandCode"
placeholder="请输入品牌编码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品牌名称" prop="brandName">
<el-input
v-model="queryParams.brandName"
placeholder="请输入品牌名称"
clearable
style="width: 240px"
@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="brandList"
@current-change="handleCurrent"
@row-dblclick="handleRowDbClick"
>
<el-table-column width="50" align="center">
<template v-slot="scope">
<el-radio
v-model="selectedBrandId"
:label="scope.row.brandId"
@change="handleRowChange(scope.row)"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column
label="品牌编码"
width="120"
align="center"
key="brandCode"
prop="brandCode"
v-if="columns[0].visible"
>
</el-table-column>
<el-table-column
label="品牌名称"
min-width="120"
align="center"
key="brandName"
prop="brandName"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="集团"
width="120"
align="center"
key="groupName"
prop="groupName"
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
label="地址"
align="center"
key="address"
prop="address"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
/> -->
<el-table-column
label="销售对接人"
align="center"
key="salesContact"
prop="salesContact"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="开发对接人"
align="center"
key="devContact"
prop="devContact"
v-if="columns[4].visible"
:show-overflow-tooltip="true"
></el-table-column>
<!-- <el-table-column
label="品牌背景"
align="center"
key="background"
prop="background"
v-if="columns[4].visible"
:show-overflow-tooltip="true"
></el-table-column> -->
<el-table-column
label="经营范围"
align="center"
key="scope"
prop="scope"
v-if="columns[5].visible"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
label="潜力项目"
align="center"
key="potentialProject"
prop="potentialProject"
v-if="columns[6].visible"
:show-overflow-tooltip="true"
></el-table-column>
<!-- <el-table-column
label="廉洁规定"
align="center"
key="integrityRegulations"
prop="integrityRegulations"
v-if="columns[4].visible"
:show-overflow-tooltip="true"
></el-table-column> -->
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag = false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listBrand } from "@/api/mes/md/brand";
export default {
name: "MdBrandSelectSingle",
components: {},
data() {
return {
showFlag: false,
// 选中数组
selectedBrandId: undefined,
selectedRows: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 品牌表格数据
brandList: [],
// // 品牌名称
// brandName: undefined,
defaultProps: {
children: "children",
label: "label",
},
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
brandCode: null,
brandName: null,
brandId: null,
},
// 列信息
columns: [
{ key: 0, label: `品牌编码`, visible: true },
{ key: 1, label: `品牌名称`, visible: true },
{ key: 2, label: `集团`, visible: true },
// { key: 3, label: `地址`, visible: true },
{ key: 3, label: `销售对接人`, visible: true },
{ key: 4, label: `开发对接人`, visible: true },
// { key: 6, label: `品牌背景`, visible: true },
{ key: 5, label: `经营范围`, visible: true },
{ key: 6, label: `潜力项目`, visible: true },
// { key: 6, label: `廉洁规定`, visible: true },
],
};
},
// watch: {
// // 根据名称筛选分类树
// itemTypeName(val) {
// this.$refs.tree.filter(val);
// },
// },
created() {
console.log("日志:已进入brandSingle页面的列表查询方法"); // 在created钩子函数中输出日志
this.getList();
},
methods: {
// /** 查询物料编码列表 */
// getList() {
// this.loading = true;
// listMdItem(this.queryParams).then((response) => {
// this.itemList = response.rows;
// this.total = response.total;
// this.loading = false;
// });
// },
/** 查询品牌列表 */
getList() {
this.loading = true;
listBrand(this.queryParams).then((response) => {
this.brandList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row) {
if (row) {
this.selectedRows = row;
}
},
// 单选选中数据
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
//双击选中
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
}
},
//确定选中
confirmSelect() {
if (this.selectedBrandId == null || this.selectedBrandId == 0) {
this.$notify({
title: "提示",
type: "warning",
message: "请至少选择一条数据!",
});
return;
}
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
},
},
};
</script>
\ No newline at end of file
src/views/mes/md/brand/index.vue
View file @ 573cd23a
...@@ -24,21 +24,28 @@ ...@@ -24,21 +24,28 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="集团" prop="group"> <el-form-item label="集团" prop="groupName">
<el-input <el-input
v-model="queryParams.group" v-model="queryParams.groupName"
placeholder="请输入集团" placeholder="请输入集团"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="enableFlag"> <el-form-item label="是否启用" prop="enableFlag">
<el-input <el-select
v-model="queryParams.enableFlag" v-model="queryParams.enableFlag"
placeholder="请输入是否启用" placeholder="是否启用"
clearable clearable
@keyup.enter.native="handleQuery" 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-form-item> <el-form-item>
<el-button <el-button
...@@ -132,7 +139,7 @@ ...@@ -132,7 +139,7 @@
<el-table-column <el-table-column
label="集团" label="集团"
align="center" align="center"
prop="group" prop="groupName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
...@@ -154,7 +161,7 @@ ...@@ -154,7 +161,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="背景" label="品牌背景"
align="center" align="center"
prop="background" prop="background"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
...@@ -166,7 +173,7 @@ ...@@ -166,7 +173,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="品牌名称" label="潜力项目"
align="center" align="center"
prop="potentialProject" prop="potentialProject"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
...@@ -277,35 +284,55 @@ ...@@ -277,35 +284,55 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="7"> <el-col :span="8">
<el-form-item label="集团" prop="group"> <el-form-item label="集团" prop="groupName">
<el-input v-model="form.group" placeholder="请输入所属集团名称" /> <el-input
v-model="form.groupName"
placeholder="请输入所属集团名称"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10">
<el-form-item label="地址" prop="address"> <el-col :span="8">
<el-input v-model="form.address" placeholder="请输入地址" /> <el-form-item label="销售对接人" prop="salesContact">
<el-input
v-model="form.salesContact"
placeholder="请输入销售对接人"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7">
<el-form-item label="销售对接人" prop="salesContact"> <el-col :span="8">
<el-input v-model="form.salesContact" placeholder="请输入销售对接人" /> <el-form-item label="开发对接人" prop="devContact">
<el-input
v-model="form.devContact"
placeholder="请输入开发对接人"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="7"> <el-col :span="24">
<el-form-item label="开发对接人" prop="devContact"> <el-form-item label="地址" prop="address">
<el-input v-model="form.devContact" placeholder="请输入开发对接人" /> <el-input v-model="form.address" placeholder="请输入地址" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> </el-row>
<el-form-item label="背景" prop="background">
<el-input v-model="form.background" placeholder="请输入品牌背景" /> <el-row>
<el-col :span="24">
<el-form-item label="品牌背景" prop="background">
<el-input
v-model="form.background"
placeholder="请输入品牌背景"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7"> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="经营范围" prop="scope"> <el-form-item label="经营范围" prop="scope">
<el-input v-model="form.scope" placeholder="请输入经营范围" /> <el-input v-model="form.scope" placeholder="请输入经营范围" />
</el-form-item> </el-form-item>
...@@ -313,14 +340,23 @@ ...@@ -313,14 +340,23 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="7"> <el-col :span="24">
<el-form-item label="潜力项目" prop="potentialProject"> <el-form-item label="潜力项目" prop="potentialProject">
<el-input v-model="form.potentialProject" placeholder="请输入潜力项目" /> <el-input
v-model="form.potentialProject"
placeholder="请输入潜力项目"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="廉洁规定" prop="integrityRegulations"> <el-form-item label="廉洁规定" prop="integrityRegulations">
<el-input v-model="form.integrityRegulations" placeholder="请输入廉洁规定" /> <el-input
v-model="form.integrityRegulations"
placeholder="请输入廉洁规定"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -389,11 +425,12 @@ export default { ...@@ -389,11 +425,12 @@ export default {
pageSize: 10, pageSize: 10,
brandCode: null, brandCode: null,
brandName: null, brandName: null,
group: null, groupName: null,
enableFlag: null, enableFlag: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
brandList: [],
// 表单校验 // 表单校验
rules: { rules: {
brandCode: [ brandCode: [
...@@ -402,7 +439,7 @@ export default { ...@@ -402,7 +439,7 @@ export default {
brandName: [ brandName: [
{ required: true, message: "品牌名称不能为空", trigger: "blur" }, { required: true, message: "品牌名称不能为空", trigger: "blur" },
], ],
group: [ groupName: [
{ required: true, message: "集团不能为空", trigger: "blur" }, { required: true, message: "集团不能为空", trigger: "blur" },
], ],
enableFlag: [ enableFlag: [
...@@ -435,7 +472,7 @@ export default { ...@@ -435,7 +472,7 @@ export default {
brandId: null, brandId: null,
brandCode: null, brandCode: null,
brandName: null, brandName: null,
group: null, groupName: null,
address: null, address: null,
salesContact: null, salesContact: null,
devContact: null, devContact: null,
...@@ -465,7 +502,7 @@ export default { ...@@ -465,7 +502,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map((item) => item.usageId); this.ids = selection.map((item) => item.brandId);
this.single = selection.length !== 1; this.single = selection.length !== 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
...@@ -494,7 +531,7 @@ export default { ...@@ -494,7 +531,7 @@ export default {
getBrand(brandId).then((response) => { getBrand(brandId).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改生产用途"; this.title = "修改品牌信息";
this.optType = "edit"; this.optType = "edit";
}); });
}, },
...@@ -519,12 +556,14 @@ export default { ...@@ -519,12 +556,14 @@ export default {
}); });
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete() {
const usageIds = row.usageId || this.ids; const brandIds = this.ids.join(",");
console.log(brandIds);
this.$modal this.$modal
.confirm("是否确认删除生产用途？") .confirm("是否确认删除品牌？")
.then(function () { .then(function () {
return delUsage(usageIds); return delBrand(brandIds);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
......
src/views/mes/md/brandcontact/index.vue 0 → 100644
View file @ 573cd23a
This diff is collapsed.
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