Skip to content

M
mes-ui
Commit 33b9b37b authored by 何远江's avatar 何远江
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents d308b2ff 4c8fc934
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 275 deletions
src/views/mes/md/brand/brandIndex.vue
View file @ 33b9b37b
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="品牌编码" prop="brandCode">
<el-input
v-model="queryParams.brandCode"
placeholder="请输入品牌编码"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.brandCode" placeholder="请输入品牌编码" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="品牌名称" prop="brandName">
<el-input
v-model="queryParams.brandName"
placeholder="请输入品牌名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.brandName" placeholder="请输入品牌名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="集团" prop="groupName">
<el-input
v-model="queryParams.groupName"
placeholder="请输入集团"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.groupName" 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 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-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="['mes:md:brand:add']"
>新增</el-button
>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['mes:md:brand: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="['mes:md:brand:edit']"
>修改</el-button
>
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['mes:md:brand: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="['mes:md:brand:remove']"
>删除</el-button
>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['mes:md:brand: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="['mes:md:brand:export']"
>导出</el-button
>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['mes:md:brand:export']">导出</el-button>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="brandList"
@selection-change="handleSelectionChange"
>
<el-table v-loading="loading" :data="brandList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="品牌编码" align="center" prop="brandCode">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:md:brand:query']"
>{{ scope.row.brandCode }}</el-button
>
<el-button type="text" @click="handleView(scope.row)" v-hasPermi="['mes:md:brand:query']">{{ scope.row.brandCode
}}</el-button>
</template>
</el-table-column>
<el-table-column
label="品牌名称"
align="center"
prop="brandName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="集团"
align="center"
prop="groupName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="地址"
align="center"
prop="address"
:show-overflow-tooltip="true"
/>
<el-table-column
label="销售对接人"
align="center"
prop="salesContact"
:show-overflow-tooltip="true"
/>
<el-table-column
label="开发对接人"
align="center"
prop="devContact"
:show-overflow-tooltip="true"
/>
<el-table-column
label="品牌背景"
align="center"
prop="background"
:show-overflow-tooltip="true"
/>
<el-table-column
label="经营范围"
align="center"
prop="scope"
:show-overflow-tooltip="true"
/>
<el-table-column
label="潜力项目"
align="center"
prop="potentialProject"
:show-overflow-tooltip="true"
/>
<el-table-column
label="廉洁规定"
align="center"
prop="integrityRegulations"
:show-overflow-tooltip="true"
/>
<el-table-column label="品牌名称" align="center" prop="brandName" :show-overflow-tooltip="true" />
<el-table-column label="集团" align="center" prop="groupName" :show-overflow-tooltip="true" />
<el-table-column label="地址" align="center" prop="address" :show-overflow-tooltip="true" />
<el-table-column label="销售对接人" align="center" prop="salesContact" :show-overflow-tooltip="true" />
<el-table-column label="开发对接人" align="center" prop="devContact" :show-overflow-tooltip="true" />
<el-table-column label="品牌背景" align="center" prop="background" :show-overflow-tooltip="true" />
<el-table-column label="经营范围" align="center" prop="scope" :show-overflow-tooltip="true" />
<el-table-column label="潜力项目" align="center" prop="potentialProject" :show-overflow-tooltip="true" />
<el-table-column label="廉洁规定" align="center" prop="integrityRegulations" :show-overflow-tooltip="true" />
<el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.enableFlag"
/>
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag" />
</template>
</el-table-column>
<el-table-column
label="备注"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<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="['mes:md:brand:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:md:brand:remove']"
>删除</el-button
>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:brand:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['mes:md:brand: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"
/>
<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="960px" append-to-body>
......@@ -243,13 +88,8 @@
</el-col>
<el-col :span="3">
<el-form-item label-width="80">
<el-switch
v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)"
v-if="optType != 'view'"
>
<el-switch v-model="autoGenFlag" active-color="#13ce66" active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
</el-form-item>
</el-col>
......@@ -260,25 +100,13 @@
</el-col>
<el-col :span="6">
<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 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 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-col>
......@@ -286,28 +114,19 @@
<el-row>
<el-col :span="8">
<el-form-item label="集团" prop="groupName">
<el-input
v-model="form.groupName"
placeholder="请输入所属集团名称"
/>
<el-input v-model="form.groupName" placeholder="请输入所属集团名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="销售对接人" prop="salesContact">
<el-input
v-model="form.salesContact"
placeholder="请输入销售对接人"
/>
<el-input v-model="form.salesContact" placeholder="请输入销售对接人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开发对接人" prop="devContact">
<el-input
v-model="form.devContact"
placeholder="请输入开发对接人"
/>
<el-input v-model="form.devContact" placeholder="请输入开发对接人" />
</el-form-item>
</el-col>
</el-row>
......@@ -323,10 +142,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="品牌背景" prop="background">
<el-input
v-model="form.background"
placeholder="请输入品牌背景"
/>
<el-input v-model="form.background" placeholder="请输入品牌背景" />
</el-form-item>
</el-col>
</el-row>
......@@ -342,10 +158,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="潜力项目" prop="potentialProject">
<el-input
v-model="form.potentialProject"
placeholder="请输入潜力项目"
/>
<el-input v-model="form.potentialProject" placeholder="请输入潜力项目" />
</el-form-item>
</el-col>
</el-row>
......@@ -353,10 +166,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="廉洁规定" prop="integrityRegulations">
<el-input
v-model="form.integrityRegulations"
placeholder="请输入廉洁规定"
/>
<el-input v-model="form.integrityRegulations" placeholder="请输入廉洁规定" />
</el-form-item>
</el-col>
</el-row>
......@@ -364,25 +174,21 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
/>
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType == 'view'"
>返回</el-button
>
<el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
<el-button type="primary" @click="submitForm" v-else>确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
......@@ -556,10 +362,8 @@ export default {
});
},
/** 删除按钮操作 */
handleDelete() {
const brandIds = this.ids.join(",");
console.log(brandIds);
handleDelete(row) {
const brandIds = row.brandId || this.ids;
this.$modal
.confirm("是否确认删除品牌？")
.then(function () {
......@@ -569,7 +373,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
.catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
......@@ -593,4 +397,4 @@ export default {
},
},
};
</script>
</script>
\ No newline at end of file
src/views/mes/md/quantity/index.vue → src/views/mes/md/brand/quantity.vue
View file @ 33b9b37b
......@@ -130,7 +130,7 @@
@pagination="getList"
/>
<!-- 添加或修改【请填写功能名称】对话框 -->
<!-- 添加或修改订单信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
......@@ -274,7 +274,7 @@
// 表单重置
reset() {
this.form = {
brandOrderQuantityId: null, brandId: null, time: null, region: null, orderQuantity: null, enableFlag: null, remark: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
brandOrderQuantityId: null, brandId: null, brandName: null , time: null, region: null, orderQuantity: null, enableFlag: null, remark: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
......@@ -297,7 +297,7 @@
handleAdd() {
this.reset();
this.open = true;
this.title = "添加【请填写功能名称】";
this.title = "添加订单量信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
......
src/views/mes/md/visit/index.vue → src/views/mes/md/brand/visit.vue
View file @ 33b9b37b
......@@ -296,7 +296,7 @@ export default {
// 表单重置
reset() {
this.form = {
brandVisitId: null, brandId: null, contactName: null, visitPerson: null, visitTime: null, visitSummary: null, enableFlag: null, remark: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
brandVisitId: null, brandId: null, brandName:null, contactName: null, visitPerson: null, visitTime: null, visitSummary: null, enableFlag: null, remark: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
......@@ -319,7 +319,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加【请填写功能名称】";
this.title = "添加品牌访问信息";
this.optType = "add";
},
/** 修改按钮操作 */
......@@ -329,7 +329,7 @@ export default {
getVisit(brandVisitId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改【请填写功能名称】";
this.title = "修改品牌访问信息";
this.optType = "edit";
});
},
......@@ -357,7 +357,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const brandVisitIds = row.brandVisitId || this.ids;
this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + brandVisitIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除品牌访问编号为"' + brandVisitIds + '"的数据项？').then(function() {
return delVisit(brandVisitIds);
}).then(() => {
this.getList();
......
src/views/mes/md/product/components/backFaceColor.vue
View file @ 33b9b37b
......@@ -249,6 +249,11 @@ export default {
this.form.colorCode = element.colorCode;
this.form.face = 'back';
var retFlag = false;
const idx = this.faceColorList.findIndex(itm => itm.colorId == element.colorId)
if (idx > -1) {
this.$modal.msgError("新增颜色失败，颜色已存在");
return
}
addFaceColor(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.getList();
......
src/views/mes/md/product/components/faceColor.vue
View file @ 33b9b37b
......@@ -249,6 +249,11 @@ export default {
this.form.colorCode = element.colorCode;
this.form.face = 'front';
var retFlag = false;
const idx = this.faceColorList.findIndex(itm => itm.colorId == element.colorId)
if (idx > -1) {
this.$modal.msgError("新增颜色失败，颜色已存在");
return
}
addFaceColor(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.getList();
......
src/views/mes/md/product/index.vue
View file @ 33b9b37b
......@@ -351,6 +351,7 @@
<el-col :span="12">
<el-form-item label="单位" prop="unitOfMeasure">
<el-select
v-model="form.unitOfMeasure"
disabled
v-if="optType == 'view'"
......@@ -367,6 +368,7 @@
<el-select
v-model="form.unitOfMeasure"
placeholder="请选择单位"
filterable
v-else
>
<el-option
......
src/views/mes/md/workunit/index.vue
View file @ 33b9b37b
<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="工作单元编码" prop="workunitCode">
<el-form-item label="工作单元编码" label-width="100px" prop="workunitCode">
<el-input
v-model="queryParams.workunitCode"
placeholder="请输入工作单元编码"
......@@ -9,7 +9,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作单元名称" prop="workunitName">
<el-form-item label="工作单元名称" label-width="100px" prop="workunitName">
<el-input
v-model="queryParams.workunitName"
placeholder="请输入工作单元名称"
......@@ -82,8 +82,16 @@
<el-table v-loading="loading" :data="workunitList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="工作单元ID" align="center" prop="workunitId" />-->
<el-table-column label="工作站ID" align="center" prop="workstationId" />
<el-table-column label="工作单元编码" align="center" prop="workunitCode" />
<el-table-column label="工作单元编码" align="center" prop="workunitCode" >
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:md:workunit:query']"
>{{scope.row.workunitCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="工作站" align="center" prop="workstationName" />
<el-table-column label="工作单元名称" align="center" prop="workunitName" />
<el-table-column label="是否启用" align="center" prop="enableFlag" >
<template slot-scope="scope">
......@@ -120,21 +128,21 @@
/>
<!-- 添加或修改工作单元对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="工作站" prop="workstation">
<el-input v-model="form.workstation" placeholder="请输入工作站" >
<el-form-item label="工作站" label-width="100px" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请输入工作站" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input>
</el-form-item>
<WorkstationSelect ref="workstationSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
<el-form-item label="工作单元编码" prop="workunitCode">
<el-form-item label="工作单元编码" label-width="100px" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="请输入工作单元编码" />
</el-form-item>
<el-form-item label="工作单元名称" prop="workunitName">
<el-form-item label="工作单元名称" label-width="100px" prop="workunitName">
<el-input v-model="form.workunitName" placeholder="请输入工作单元名称" />
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-form-item label="是否启用" label-width="100px" prop="enableFlag">
<el-select v-model="form.enableFlag" placeholder="请选择是或否">
<el-option
v-for="dict in dict.type.sys_yes_no"
......@@ -144,12 +152,13 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-form-item label="备注" label-width="100px" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
<el-button type="primary" @click="submitForm" v-else>确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......@@ -166,6 +175,7 @@ export default {
dicts:['sys_yes_no'],
data() {
return {
optType: undefined,
// 遮罩层
loading: true,
// 选中数组
......@@ -189,6 +199,7 @@ export default {
pageNum: 1,
pageSize: 10,
workstationId: null,
workstationName: null,
workunitCode: null,
workunitName: null,
enableFlag: null,
......@@ -196,6 +207,7 @@ export default {
// 表单参数
form: {
workstationId: '',
workstationName: '',
workunitCode: '',
workstation: '',
workunitName: '',
......@@ -228,6 +240,7 @@ export default {
reset() {
this.form = {
workstationId: '',
workstationName: '',
workunitCode: '',
workstation: '',
workunitName: '',
......@@ -267,6 +280,17 @@ export default {
this.title = "修改工作单元";
});
},
// 查询明细按钮操作
handleView(row){
this.reset();
const workunitId = row.workunitId || this.ids
getWorkunit(workunitId).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看工作单元";
this.optType = "view";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
......@@ -311,7 +335,7 @@ export default {
console.log(row, 'rowwwwwww')
if(row != undefined && row != null){
this.form.workstationId = row.workstationId;
this.form.workstation = row.workstationName;
this.form.workstationName = row.workstationName;
}
},
}
......
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