Skip to content

M
mes-ui
Commit 94f57139 authored by 全洪江's avatar 全洪江
Browse files
Options

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

parents d3fbe43a 63593189
Show whitespace changes
Inline Side-by-side
Showing with 614 additions and 618 deletions
src/api/mes/md/saleUnit.js 0 → 100644
View file @ 94f57139
import request from '@/utils/request'
// 查询销售单位转换列表
export function listUnit(query) {
return request({
url: '/md/unit/list',
method: 'get',
params: query
})
}
// 查询销售单位转换详细
export function getUnit(itemId) {
return request({
url: '/md/unit/' + itemId,
method: 'get'
})
}
// 新增销售单位转换
export function addUnit(data) {
return request({
url: '/md/unit',
method: 'post',
data: data
})
}
// 修改销售单位转换
export function updateUnit(data) {
return request({
url: '/md/unit',
method: 'put',
data: data
})
}
// 删除销售单位转换
export function delUnit(itemId) {
return request({
url: '/md/unit/' + itemId,
method: 'delete'
})
}
src/components/FactorySelect/index.vue
View file @ 94f57139
......@@ -103,7 +103,7 @@
import { listFactory } from "@/api/mes/md/factory";
export default {
name: "MdBrandSelectSingle",
name: "MdFactorySelectSingle",
components: {},
dicts: ['sys_yes_no'],
data() {
......
src/components/SizeGroupSelect/index.vue
View file @ 94f57139
......@@ -107,7 +107,7 @@
import { listGroup } from "@/api/mes/md/sizeGroup";
export default {
name: "MdBrandSelectSingle",
name: "MdSizeGroupSelectSingle",
components: {},
dicts: ['size_type'],
data() {
......
src/components/colorSelect/index.vue
View file @ 94f57139
......@@ -35,9 +35,12 @@
</el-form>
<el-table v-loading="loading" :data="colorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="颜色编码" width = "120" align="center" key="colorCode" prop="colorCode" v-if="columns[0].visible" >
<el-table-column label="颜色编码" width = "200" align="center" key="colorCode" prop="colorCode" v-if="columns[0].visible" >
<template slot-scope="scope">
<el-color-picker :value="scope.row.colorCode"></el-color-picker>
</template>
</el-table-column>
<el-table-column label="颜色名称" min-width="120" align="left" key="colorName" prop="colorName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="颜色名称" align="left" key="colorName" prop="colorName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
</el-table>
<pagination
......
src/views/mes/md/brand/brandContactIndex.vue
View file @ 94f57139
......@@ -483,7 +483,7 @@ export default {
position: null,
mailbox: null,
remark: null,
enableFlag: null,
enableFlag: "Y",
createBy: null,
createTime: null,
updateBy: null,
......
src/views/mes/md/brand/brandIndex.vue
View file @ 94f57139
<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,36 +174,31 @@
<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>
</template>
<script>
import {
<script>
import {
listBrand,
getBrand,
delBrand,
addBrand,
updateBrand,
} from "@/api/mes/md/brand";
import { genCode } from "@/api/system/autocode/rule";
export default {
} from "@/api/mes/md/brand";
import { genCode } from "@/api/system/autocode/rule";
export default {
name: "Brand",
dicts: ["sys_yes_no"],
data() {
......@@ -569,7 +374,7 @@
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
.catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
......@@ -592,6 +397,5 @@
}
},
},
};
</script>
\ No newline at end of file
};
</script>
\ No newline at end of file
src/views/mes/md/color/index.vue
View file @ 94f57139
......@@ -72,7 +72,11 @@
<el-table v-loading="loading" :data="colorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="颜色主键id" align="center" prop="colorId" />
<el-table-column label="颜色编码" align="center" prop="colorCode" />
<el-table-column label="颜色编码" align="center" prop="colorCode" >
<template slot-scope="scope">
<el-color-picker :value="scope.row.colorCode"></el-color-picker>
</template>
</el-table-column>
<el-table-column label="颜色名称" align="center" prop="colorName" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
......@@ -106,7 +110,8 @@
<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="颜色编码" prop="colorCode">
<el-input v-model="form.colorCode" placeholder="请输入颜色编码" />
<!-- <el-input v-model="form.colorCode" placeholder="请输入颜色编码" />-->
<el-color-picker v-model="form.colorCode"></el-color-picker>
</el-form-item>
<el-form-item label="颜色名称" prop="colorName">
<el-input v-model="form.colorName" placeholder="请输入颜色名称" />
......
src/views/mes/md/product/components/backFaceColor.vue
View file @ 94f57139
......@@ -30,12 +30,17 @@
<el-table v-loading="loading" :data="faceColorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="排序号" align="center" prop="sortOrder" />
<el-table-column label="颜色" align="center" prop="colorName" />
<el-table-column label="颜色编码" align="center" prop="colorCode">
<template slot-scope="scope">
<el-color-picker :value="scope.row.colorCode"></el-color-picker>
</template>
</el-table-column>
<el-table-column label="颜色名称" align="center" prop="colorName" />
<el-table-column label="覆盖率(单位%)" align="center" prop="coverageRate" :show-overflow-tooltip="true" />
<el-table-column label="创建人" align="center" prop="createBy" />
<!-- <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" />
<el-table-column label="修改时间" align="center" prop="updateTime" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="optType !='view'">
<template slot-scope="scope">
<el-button
......@@ -68,9 +73,12 @@
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="排序号" prop="sortOrder">
<el-input v-model="form.sortOrder" placeholder="请输入排序号" />
<el-input v-model="form.sortOrder" type="number" placeholder="请输入排序号" />
</el-form-item>
<el-form-item label="颜色编码" prop="colorCode">
<el-input v-model="form.colorCode" readonly placeholder="请输入颜色" />
</el-form-item>
<el-form-item label="颜色" prop="colorName">
<el-form-item label="颜色名称" prop="colorName">
<el-input v-model="form.colorName" readonly placeholder="请输入颜色" />
</el-form-item>
<el-form-item label="覆盖率(单位%)" prop="coverageRate">
......@@ -122,6 +130,7 @@ export default {
colorId: null,
mdFaceColorId: null,
colorName: null,
colorCode: null,
face: 'back',
coverageRate: null,
sortOrder: null,
......@@ -165,6 +174,7 @@ export default {
colorId: null,
mdFaceColorId: null,
colorName: null,
colorCode: null,
coverageRate: null,
sortOrder: null,
face: "back",
......@@ -236,6 +246,7 @@ export default {
//this.form.itemId = element.itemId;
this.form.colorId = element.colorId;
this.form.colorName = element.colorName;
this.form.colorCode = element.colorCode;
this.form.face = 'back';
var retFlag = false;
addFaceColor(this.form).then(response => {
......
src/views/mes/md/product/components/faceColor.vue
View file @ 94f57139
......@@ -30,12 +30,17 @@
<el-table v-loading="loading" :data="faceColorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="排序号" align="center" prop="sortOrder" />
<el-table-column label="颜色" align="center" prop="colorName" />
<el-table-column label="颜色编码" align="center" prop="colorCode">
<template slot-scope="scope">
<el-color-picker :value="scope.row.colorCode"></el-color-picker>
</template>
</el-table-column>
<el-table-column label="颜色名称" align="center" prop="colorName" />
<el-table-column label="覆盖率(单位%)" align="center" prop="coverageRate" :show-overflow-tooltip="true" />
<el-table-column label="创建人" align="center" prop="createBy" />
<!-- <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" />
<el-table-column label="修改时间" align="center" prop="updateTime" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="optType !='view'">
<template slot-scope="scope">
<el-button
......@@ -68,9 +73,12 @@
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="排序号" prop="sortOrder">
<el-input v-model="form.sortOrder" placeholder="请输入排序号" />
<el-input v-model="form.sortOrder" type="number" placeholder="请输入排序号" />
</el-form-item>
<el-form-item label="颜色编码" prop="colorCode">
<el-input v-model="form.colorCode" readonly placeholder="请输入颜色" />
</el-form-item>
<el-form-item label="颜色" prop="colorName">
<el-form-item label="颜色名称" prop="colorName">
<el-input v-model="form.colorName" readonly placeholder="请输入颜色" />
</el-form-item>
<el-form-item label="覆盖率(单位%)" prop="coverageRate">
......@@ -122,6 +130,7 @@ export default {
colorId: null,
mdFaceColorId: null,
colorName: null,
colorCode: null,
face: 'front',
coverageRate: null,
sortOrder: null,
......@@ -165,6 +174,7 @@ export default {
colorId: null,
mdFaceColorId: null,
colorName: null,
colorCode: null,
coverageRate: null,
sortOrder: null,
face: "front",
......@@ -236,6 +246,7 @@ export default {
//this.form.itemId = element.itemId;
this.form.colorId = element.colorId;
this.form.colorName = element.colorName;
this.form.colorCode = element.colorCode;
this.form.face = 'front';
var retFlag = false;
addFaceColor(this.form).then(response => {
......
src/views/mes/md/product/components/factory.vue
View file @ 94f57139
......@@ -51,25 +51,25 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="产品工厂id" align="center" prop="productFactoryId" />
<el-table-column label="产品id" align="center" prop="itemId" />-->
<el-table-column
<!-- <el-table-column
label="工厂id"
align="center"
prop="factoryId"
width="100"
/>
<el-table-column
/>-->
<!-- <el-table-column
label="工厂编码"
align="center"
prop="factoryCode"
width="100"
/>
/>-->
<el-table-column
label="工厂名称"
align="center"
prop="factoryName"
width="120"
/>
<el-table-column
<!-- <el-table-column
label="创建人"
align="center"
prop="createBy"
......@@ -92,7 +92,7 @@
align="center"
prop="updateTime"
width="180"
/>
/>-->
<el-table-column label="操作" align="center" width="90">
<template slot-scope="scope">
<el-button
......
src/views/mes/md/product/components/saleUnit.vue 0 → 100644
View file @ 94f57139
<!--采购信息-->
<template>
<div class="app-container">
<!-- 添加或修改销售单位转换对话框 -->
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="8">
<el-form-item label="销售单位" label-width="100px" prop="saleUnit">
<el-input v-model="form.saleUnit" placeholder="请输入销售单位" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="销售换算值" label-width="100px" prop="saleConversionValue">
<el-input v-model="form.saleConversionValue" type="number" :precision="2" placeholder="请输入销售换算值" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script>
import { getUnit } from "@/api/mes/md/saleUnit";
export default {
name: "Unit",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 销售单位转换表格数据
unitList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
itemId: this.itemId,
saleUnit: null,
saleConversionValue: null
},
// 表单参数
form: {
itemId: '',
saleUnit: '',
saleConversionValue: ''
},
// 表单校验
rules: {
itemId: [
{ required: true, message: "产品ID不能为空", trigger: "blur" }
], }
};
},
props: {
optType: undefined,
itemId: {
type: Number | undefined,
default: undefined,
},
},
created() {
this.getSaleUnit();
},
methods: {
//获取基本信息表单数据
async getSaleUnitFormData() {
await this.submitForm();
return this.form;
},
getSaleUnit() {
getUnit(this.itemId).then((res) => {
Object.assign(this.form, res.data);
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
itemId: this.itemId,
saleUnit: null,
saleConversionValue: null
};
this.resetForm("form");
},
/** 提交按钮 */
async submitForm() {
return await this.$refs["form"].validate();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
}
};
</script>
src/views/mes/md/product/index.vue
View file @ 94f57139
......@@ -507,7 +507,7 @@
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" v-if="form.itemId != null">
<el-tabs type="border-card" v-if="form.itemId != null && form.itemOrProduct == 'PRODUCT'">
<el-tab-pane label="基本信息">
<BaseInfo
ref="baseInfo"
......@@ -518,8 +518,8 @@
<el-tab-pane label="产品特性">
<SpecProperty :optType="optType" :itemId="form.itemId"></SpecProperty>
</el-tab-pane>
<el-tab-pane label="采购信息">
<Purchase :optType="optType" :itemId="form.itemId"></Purchase>
<el-tab-pane label="销售单位转换">
<SaleUnit ref="saleUnit" :optType="optType" :itemId="form.itemId"></SaleUnit>
</el-tab-pane>
<el-tab-pane label="工厂信息">
<Factory :optType="optType" :itemId="form.itemId"></Factory>
......@@ -618,7 +618,7 @@ import {
import BaseInfo from "./components/baseInfo.vue";
import SpecProperty from "./components/specProperty.vue";
import Purchase from "./components/purchase.vue";
import SaleUnit from "./components/saleUnit.vue";
import Factory from "./components/factory.vue";
import Customer from "./components/customer.vue";
import Look from "./components/look.vue";
......@@ -642,7 +642,7 @@ export default {
Treeselect,
BaseInfo,
SpecProperty,
Purchase,
SaleUnit,
Factory,
Customer,
Look,
......@@ -879,15 +879,19 @@ export default {
lookData.itemId = this.form.itemId;
//产品参数配置保存 publishedConf
const publishedConfData = await this.$refs[
"publishedConf"
].getPublishedConfData();
const publishedConfData = await this.$refs["publishedConf"].getPublishedConfData();
publishedConfData.itemId = this.form.itemId;
//销售单位转换保存
const saleUnit = await this.$refs["saleUnit"].getSaleUnitFormData();
saleUnit.itemId = this.form.itemId;
const params = {
...this.form,
baseInfo: baseInfoData,
look: lookData,
publishedConf: publishedConfData,
saleUnit: saleUnit
};
updateMdItem(params).then((response) => {
this.$modal.msgSuccess("修改成功");
......
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