Commit a10cfdbc authored by jzc's avatar jzc

修改排版

parent b9ae5e9d
...@@ -32,21 +32,21 @@ ...@@ -32,21 +32,21 @@
@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-select <el-select
v-model="queryParams.enableFlag" v-model="queryParams.enableFlag"
placeholder="是否启用" placeholder="是否启用"
clearable clearable
style="width: 215px" style="width: 215px"
> >
<el-option <el-option
v-for="dict in dict.type.sys_yes_no" v-for="dict in dict.type.sys_yes_no"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
...@@ -161,7 +161,7 @@ ...@@ -161,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"
...@@ -173,7 +173,7 @@ ...@@ -173,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"
...@@ -284,35 +284,55 @@ ...@@ -284,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="groupName"> <el-form-item label="集团" prop="groupName">
<el-input v-model="form.groupName" 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>
...@@ -320,14 +340,23 @@ ...@@ -320,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>
...@@ -401,7 +430,7 @@ export default { ...@@ -401,7 +430,7 @@ export default {
}, },
// 表单参数 // 表单参数
form: {}, form: {},
brandList:[], brandList: [],
// 表单校验 // 表单校验
rules: { rules: {
brandCode: [ brandCode: [
...@@ -528,9 +557,9 @@ export default { ...@@ -528,9 +557,9 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete() { handleDelete() {
const brandIds = this.ids.join(','); const brandIds = this.ids.join(",");
console.log(brandIds) console.log(brandIds);
this.$modal this.$modal
.confirm("是否确认删除品牌?") .confirm("是否确认删除品牌?")
.then(function () { .then(function () {
......
<template>
<el-dialog title="物料产品选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
>
<el-row :gutter="20">
<!--品牌数据-->
<el-col :span="20" :xs="24">
<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="left" key="brandName" prop="brandName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="集团" align="left" key="specification" prop="specification" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="地址" align="center" key="unitOfMeasure" prop="unitOfMeasure" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="销售对接人" align="center" key="salesContact" prop="salesContact" v-if="columns[4].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[4].visible" :show-overflow-tooltip="true" ></el-table-column>
<el-table-column label="潜力项目" align="center" key="potentialProject" prop="potentialProject" v-if="columns[4].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";
import { listAllUnitmeasure } from "@/api/mes/md/unitmeasure";
import { genCode } from "@/api/system/autocode/rule";
import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/mes/md/itemtype";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "MdBrandSingle",
components: { Treeselect },
data() {
return {
showFlag: false,
// 选中数组
selectedBrandId: undefined,
selectedRows: undefined,
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 品牌表格数据
brandList: null,
// 品牌名称
brandName: undefined,
defaultProps: {
children: "children",
label: "label",
},
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
brandCode: undefined,
brandName: undefined,
brandId: 0,
},
// 列信息
columns: [
{ key: 0, label: `品牌编码`, visible: true },
{ key: 1, label: `品牌名称`, visible: true },
{ key: 2, label: `集团`, visible: true },
{ key: 3, label: `地址`, visible: true },
{ key: 4, label: `销售对接人`, visible: true },
{ key: 5, label: `开发对接人`, visible: true },
{ key: 6, label: `品牌背景`, visible: true },
{ key: 6, label: `经营范围`, visible: true },
{ key: 6, label: `潜力项目`, visible: true },
{ key: 6, label: `廉洁规定`, visible: true },
],
};
},
// watch: {
// // 根据名称筛选分类树
// itemTypeName(val) {
// this.$refs.tree.filter(val);
// },
// },
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;
});
},
// /** 查询分类下拉树结构 */
// getTreeselect() {
// treeselect().then((response) => {
// this.itemTypeOptions = response.data;
// });
// },
// 筛选节点
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.brandId = data.id;
this.handleQuery();
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row) {
if (row) {
this.selectedRows = row;
}
},
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
}
},
// 单选选中数据
handleRowChange(row) {
debugger;
if (row) {
this.selectedRows = row;
}
},
//确定选中
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
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