Skip to content

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

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

parents 58b02ad5 edc8bf37
Hide whitespace changes
Inline Side-by-side
Showing with 639 additions and 144 deletions
src/components/SizeGroupSelect/index.vue 0 → 100644
View file @ 18fc74c9
<template>
<el-dialog
title="尺码组选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal="false"
width="80%"
center
>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<el-form-item label="尺码组编码" prop="sizeGroupCode">
<el-input
v-model="queryParams.sizeGroupCode"
placeholder="请输入尺码组编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="尺码组名称" prop="sizeGroupName">
<el-input
v-model="queryParams.sizeGroupName"
placeholder="请输入尺码组名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="尺码组类型" prop="sizeType">
<el-select
v-model="queryParams.sizeType"
placeholder="请选择尺码组类型"
clearable
>
<el-option label="请选择字典生成" value="" />
</el-select>
</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>
<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="selectedGroupId"
:label="scope.row.sizeGroupId"
@change="handleRowChange(scope.row)"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column label="尺码组id" align="center" prop="sizeGroupId" />
<el-table-column label="尺码组编码" align="center" prop="sizeGroupCode" />
<el-table-column label="尺码组名称" align="center" prop="sizeGroupName" />
<el-table-column label="尺码组类型" align="center" prop="sizeType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.size_type" :value="scope.row.sizeType"/>
</template>
</el-table-column>
<el-table-column label="是否启用" align="center" prop="enableFlag" />
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<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 { listGroup } from "@/api/mes/md/sizeGroup";
export default {
name: "MdBrandSelectSingle",
components: {},
dicts: ['size_type'],
data() {
return {
showFlag: false,
// 选中数组
selectedGroupId: undefined,
selectedRows: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 尺码组表格数据
brandList: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
sizeGroupCode: null,
sizeGroupName: null,
sizeType: null,
enableFlag: null,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询尺码组列表 */
getList() {
this.loading = true;
listGroup(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.selectedGroupId == null || this.selectedGroupId == 0) {
this.$notify({
title: "提示",
type: "warning",
message: "请至少选择一条数据!",
});
return;
}
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
},
},
};
</script>
src/views/mes/md/product/components/baseInfo.vue
View file @ 18fc74c9
......@@ -27,17 +27,38 @@
<el-col :span="8">
<el-form-item label="品牌" prop="brandId">
<el-input v-model="form.brandName" disabled placeholder="请选择品牌">
<el-button icon="el-icon-search" slot="append" @click="openBrandSelected"/>
<el-input
v-model="form.brandName"
disabled
placeholder="请选择品牌"
>
<el-button
icon="el-icon-search"
slot="append"
@click="openBrandSelected"
/>
</el-input>
<BrandSelect ref="BrandSelectRef" @onSelected="onBrandSelected" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="尺码组id" prop="sizeGroupId">
<el-input v-model="form.sizeGroupId" placeholder="请输入尺码组id" />
<el-input
v-model="form.sizeGroupName"
disabled
placeholder="请输入尺码组"
>
<el-button
icon="el-icon-search"
slot="append"
@click="openSizeGroupSelect"
/>
</el-input>
<SizeGroupSelect
ref="SizeGroupSelectRef"
@onSelected="onSizeGroupSelect"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="版面" prop="layout">
......@@ -83,12 +104,12 @@
<script>
import { getInfo } from "@/api/mes/md/baseInfo";
import BrandSelect from '@/components/brandSelect/single.vue'
import BrandSelect from "@/components/brandSelect/single.vue";
import SizeGroupSelect from "@/components/SizeGroupSelect/index.vue";
export default {
name: "BaseInfo",
dicts: ["product_layout"],
components: { BrandSelect },
components: { BrandSelect, SizeGroupSelect },
data() {
return {
// 遮罩层
......@@ -120,8 +141,9 @@ export default {
expirationDateStart: "",
expirationDateEnd: "",
brandId: "",
brandName: '',
brandName: "",
sizeGroupId: "",
sizeGroupName: "",
layout: "",
},
// 表单校验
......@@ -136,7 +158,7 @@ export default {
optType: undefined,
itemId: {
type: Number | undefined,
default: undefined
default: undefined,
},
},
created() {
......@@ -164,14 +186,16 @@ export default {
reset() {
this.form = {
itemId: this.itemId,
productNo: null,
productEnglishName: null,
unitOfMeasure: null,
expirationDateStart: null,
expirationDateEnd: null,
brandId: null,
sizeGroupId: null,
layout: null,
productNo: "",
productEnglishName: "",
unitOfMeasure: "",
expirationDateStart: "",
expirationDateEnd: "",
brandId: "",
brandName: "",
sizeGroupId: "",
sizeGroupName: "",
layout: "",
};
this.resetForm("form");
},
......@@ -179,15 +203,24 @@ export default {
async submitForm() {
return await this.$refs["form"].validate();
},
openSizeGroupSelect() {
this.$refs["SizeGroupSelectRef"].showFlag = true;
},
onSizeGroupSelect(row) {
if (row != undefined && row != null) {
this.form.sizeGroupId = row.sizeGroupId;
this.form.sizeGroupName = row.sizeGroupName;
}
},
openBrandSelected() {
this.$refs['BrandSelectRef'].showFlag = true
this.$refs["BrandSelectRef"].showFlag = true;
},
onBrandSelected(row) {
if (row != undefined && row!=null) {
this.form.brandId = row.brandId
this.form.brandName = row.brandName
if (row != undefined && row != null) {
this.form.brandId = row.brandId;
this.form.brandName = row.brandName;
}
}
},
},
};
</script>
src/views/mes/md/product/index.vue
View file @ 18fc74c9
......@@ -27,7 +27,14 @@
</el-col>
<!--物料数据-->
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="物料编码" prop="itemCode">
<el-input
v-model="queryParams.itemCode"
......@@ -47,8 +54,16 @@
/>
</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>
......@@ -61,7 +76,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['mes:md:faceColor:add']"
>新增</el-button>
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
......@@ -72,7 +88,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes:md:faceColor:edit']"
>修改</el-button>
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
......@@ -83,9 +100,10 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:md:faceColor:remove']"
>删除</el-button>
>删除</el-button
>
</el-col>
<!-- <el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="info"
plain
......@@ -105,43 +123,120 @@
v-hasPermi="['mes:md:mditem:export']"
>导出</el-button>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
:columns="columns"
></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="itemList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="itemList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="物料编码" width = "120" align="center" key="itemCode" prop="itemCode" v-if="columns[0].visible" >
<el-table-column
label="物料编码"
width="120"
align="center"
key="itemCode"
prop="itemCode"
v-if="columns[0].visible"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:md:mditem:query']"
>{{scope.row.itemCode}}</el-button>
>{{ scope.row.itemCode }}</el-button
>
</template>
</el-table-column>
<el-table-column label="物料名称" min-width="120" align="left" key="itemName" prop="itemName" 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="物料名称"
min-width="120"
align="left"
key="itemName"
prop="itemName"
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>
<el-table-column label="物料/产品" align="center" key="itemOrProduct" prop="itemOrProduct" v-if="columns[4].visible" :show-overflow-tooltip="true" >
<el-table-column
label="物料/产品"
align="center"
key="itemOrProduct"
prop="itemOrProduct"
v-if="columns[4].visible"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct"/>
<dict-tag
:options="dict.type.mes_item_product"
:value="scope.row.itemOrProduct"
/>
</template>
</el-table-column>
<el-table-column label="所属分类" align="center" key="itemTypeName" prop="itemTypeName" v-if="columns[5].visible" width="120" />
<el-table-column label="是否启用" align="center" key="enableFlag" v-if="columns[6].visible">
<el-table-column
label="所属分类"
align="center"
key="itemTypeName"
prop="itemTypeName"
v-if="columns[5].visible"
width="120"
/>
<el-table-column
label="是否启用"
align="center"
key="enableFlag"
v-if="columns[6].visible"
>
<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" key="safeStockFlag" v-if="columns[7].visible">
<el-table-column
label="设置安全库存"
align="center"
key="safeStockFlag"
v-if="columns[7].visible"
>
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.safeStockFlag"/>
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.safeStockFlag"
/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[8].visible" width="160">
<el-table-column
label="创建时间"
align="center"
prop="createTime"
v-if="columns[8].visible"
width="160"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
......@@ -159,20 +254,22 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:mditem:edit']"
>修改</el-button>
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:md:mditem:remove']"
>删除</el-button>
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
......@@ -187,38 +284,77 @@
<el-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" maxlength="64" v-if="optType == 'view'"/>
<el-input v-model="form.itemCode" placeholder="请输入物料编码" maxlength="64" v-else/>
<el-input
v-model="form.itemCode"
readonly="readonly"
maxlength="64"
v-if="optType == 'view'"
/>
<el-input
v-model="form.itemCode"
placeholder="请输入物料编码"
maxlength="64"
v-else
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
<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>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料名称" prop="itemName">
<el-input v-model="form.itemName" maxlength="255" readonly="readonly" v-if="optType=='view'" />
<el-input v-model="form.itemName" placeholder="请输入物料名称" maxlength="255" v-else/>
<el-input
v-model="form.itemName"
maxlength="255"
readonly="readonly"
v-if="optType == 'view'"
/>
<el-input
v-model="form.itemName"
placeholder="请输入物料名称"
maxlength="255"
v-else
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="规格型号" prop="specification">
<el-input v-model="form.specification" type="textarea" maxlength="500" readonly="readonly" v-if="optType=='view'" />
<el-input v-model="form.specification" type="textarea" placeholder="请输入规格型号" maxlength="500" v-else/>
<el-input
v-model="form.specification"
type="textarea"
maxlength="500"
readonly="readonly"
v-if="optType == 'view'"
/>
<el-input
v-model="form.specification"
type="textarea"
placeholder="请输入规格型号"
maxlength="500"
v-else
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单位" prop="unitOfMeasure">
<el-select v-model="form.unitOfMeasure" disabled v-if="optType=='view'">
<el-select
v-model="form.unitOfMeasure"
disabled
v-if="optType == 'view'"
>
<el-option
v-for="item in measureOptions"
:key="item.measureCode"
......@@ -228,7 +364,11 @@
></el-option>
</el-select>
<el-select v-model="form.unitOfMeasure" placeholder="请选择单位" v-else>
<el-select
v-model="form.unitOfMeasure"
placeholder="请选择单位"
v-else
>
<el-option
v-for="item in measureOptions"
:key="item.measureCode"
......@@ -240,39 +380,63 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料/产品分类" prop="itemTypeId">
<treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true" disabled v-if="optType=='view'" />
<treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true" placeholder="请选择所属分类" v-else :disable-branch-nodes="true"/>
<el-form-item label="物料/产品分类" prop="itemTypeId">
<treeselect
v-model="form.itemTypeId"
:options="itemTypeOptions"
:show-count="true"
disabled
v-if="optType == 'view'"
/>
<treeselect
v-model="form.itemTypeId"
:options="itemTypeOptions"
:show-count="true"
placeholder="请选择所属分类"
v-else
:disable-branch-nodes="true"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否启用">
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
<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>
>{{ 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>
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安全库存">
<el-radio-group v-model="form.safeStockFlag" disabled v-if="optType=='view'">
<el-radio-group
v-model="form.safeStockFlag"
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>
>{{ dict.label }}</el-radio
>
</el-radio-group>
<el-radio-group v-model="form.safeStockFlag" v-else>
......@@ -280,7 +444,8 @@
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-col>
......@@ -288,29 +453,67 @@
<el-row v-if="form.safeStockFlag == 'Y'">
<el-col :span="12">
<el-form-item label="最小库存量">
<el-input-number v-model="form.minStock" :percision="2" :step="1" disabled v-if="optType=='view'" />
<el-input-number v-model="form.minStock" :percision="2" :step="1" placeholder="请输入最小安全库存量" v-else />
<el-input-number
v-model="form.minStock"
:percision="2"
:step="1"
disabled
v-if="optType == 'view'"
/>
<el-input-number
v-model="form.minStock"
:percision="2"
:step="1"
placeholder="请输入最小安全库存量"
v-else
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最大库存量">
<el-input-number v-model="form.maxStock" :percision="2" :step="1" disabled v-if="optType=='view'" />
<el-input-number v-model="form.maxStock" :percision="2" :step="1" placeholder="请输入最大安全库存量" v-else/>
<el-input-number
v-model="form.maxStock"
:percision="2"
:step="1"
disabled
v-if="optType == 'view'"
/>
<el-input-number
v-model="form.maxStock"
:percision="2"
:step="1"
placeholder="请输入最大安全库存量"
v-else
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" readonly v-if="optType=='view'"></el-input>
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" v-else></el-input>
<el-input
v-model="form.remark"
type="textarea"
readonly
v-if="optType == 'view'"
></el-input>
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
v-else
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" v-if="form.itemId != null">
<el-tab-pane label="基本信息">
<BaseInfo ref="baseInfo" :optType="optType" :itemId="form.itemId"></BaseInfo>
<BaseInfo
ref="baseInfo"
:optType="optType"
:itemId="form.itemId"
></BaseInfo>
</el-tab-pane>
<el-tab-pane label="产品特性">
<SpecProperty :optType="optType" :itemId="form.itemId"></SpecProperty>
......@@ -321,20 +524,27 @@
<el-tab-pane label="工厂信息">
<Factory :optType="optType" :itemId="form.itemId"></Factory>
</el-tab-pane>
<!-- <el-tab-pane label="客户信息">
<!-- <el-tab-pane label="客户信息">
<Customer :optType="optType" :itemId="form.itemId"></Customer>
</el-tab-pane>-->
<el-tab-pane label="产品外观">
<Look ref="look" :optType="optType" :itemId="form.itemId"></Look>
</el-tab-pane>
<el-tab-pane label="排版参数">
<PublishedConf ref="publishedConf" :optType="optType" :itemId="form.itemId"></PublishedConf>
<PublishedConf
ref="publishedConf"
:optType="optType"
:itemId="form.itemId"
></PublishedConf>
</el-tab-pane>
<el-tab-pane label="正面颜色">
<FaceColor :optType="optType" :itemId="form.itemId"></FaceColor>
</el-tab-pane>
<el-tab-pane label="反面颜色">
<BackFaceColor :optType="optType" :itemId="form.itemId"></BackFaceColor>
<BackFaceColor
:optType="optType"
:itemId="form.itemId"
></BackFaceColor>
</el-tab-pane>
<el-tab-pane label="客户loss">
<CustomerLoss :optType="optType" :itemId="form.itemId"></CustomerLoss>
......@@ -344,7 +554,9 @@
</el-tab-pane>
</el-tabs>
<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>
......@@ -352,7 +564,12 @@
<!-- 物料导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog
:title="upload.title"
:visible.sync="upload.open"
width="400px"
append-to-body
>
<el-upload
ref="upload"
:limit="1"
......@@ -369,10 +586,17 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
<el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板</el-link
>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
......@@ -384,7 +608,13 @@
</template>
<script>
import { listMdItem, getMdItem, delMdItem, addMdItem, updateMdItem} from "@/api/mes/md/mdItem";
import {
listMdItem,
getMdItem,
delMdItem,
addMdItem,
updateMdItem,
} from "@/api/mes/md/mdItem";
import BaseInfo from "./components/baseInfo.vue";
import SpecProperty from "./components/specProperty.vue";
......@@ -397,9 +627,9 @@ import FaceColor from "./components/faceColor.vue";
import BackFaceColor from "./components/backFaceColor.vue";
import CustomerLoss from "./components/customerLoss.vue";
import ItemBom from "./components/itembom.vue";
import SOPTab from "./components/sop.vue"
import { listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {genCode} from "@/api/system/autocode/rule"
import SOPTab from "./components/sop.vue";
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";
......@@ -407,8 +637,22 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "MdItem",
dicts: ['sys_yes_no','mes_item_product'],
components: { Treeselect,BaseInfo,SpecProperty,Purchase,Factory,Customer,Look,PublishedConf,FaceColor,BackFaceColor,CustomerLoss,ItemBom,SOPTab },
dicts: ["sys_yes_no", "mes_item_product"],
components: {
Treeselect,
BaseInfo,
SpecProperty,
Purchase,
Factory,
Customer,
Look,
PublishedConf,
FaceColor,
BackFaceColor,
CustomerLoss,
ItemBom,
SOPTab,
},
data() {
return {
// 遮罩层
......@@ -445,7 +689,7 @@ export default {
form: {},
defaultProps: {
children: "children",
label: "label"
label: "label",
},
// 用户导入参数
upload: {
......@@ -460,7 +704,7 @@ export default {
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/mes/md/mditem/importData"
url: process.env.VUE_APP_BASE_API + "/mes/md/mditem/importData",
},
// 查询参数
queryParams: {
......@@ -468,7 +712,7 @@ export default {
pageSize: 10,
itemCode: undefined,
itemName: undefined,
itemTypeId: 0
itemTypeId: 0,
},
// 列信息
columns: [
......@@ -480,31 +724,35 @@ export default {
{ key: 5, label: `物料分类`, visible: true },
{ key: 6, label: `是否启用`, visible: true },
{ key: 7, label: `是否设置安全库存`, visible: true },
{ key: 8, label: `创建时间`, visible: true }
{ key: 8, label: `创建时间`, visible: true },
],
// 表单校验
rules: {
itemCode: [
{ required: true, message: "物料/产品编码不能为空", trigger: "blur" },
{ max: 64, message: '物料/产品编码长度必须小于64个字符', trigger: 'blur' }
{
max: 64,
message: "物料/产品编码长度必须小于64个字符",
trigger: "blur",
},
],
itemName: [
{ required: true, message: "物料/产品名称不能为空", trigger: "blur" }
{ required: true, message: "物料/产品名称不能为空", trigger: "blur" },
],
unitOfMeasure: [
{ required: true, message: "单位不能为空",trigger: "blur"}
{ required: true, message: "单位不能为空", trigger: "blur" },
],
itemTypeId: [
{ required: true, message: "物料分类不能为空", trigger: "blur" },
]
}
],
},
};
},
watch: {
// 根据名称筛选分类树
itemTypeName(val) {
this.$refs.tree.filter(val);
}
},
},
created() {
this.getList();
......@@ -515,21 +763,20 @@ export default {
/** 查询物料编码列表 */
getList() {
this.loading = true;
listMdItem(this.queryParams).then(response => {
this.itemList = response.rows;
this.total = response.total;
this.loading = false;
}
);
listMdItem(this.queryParams).then((response) => {
this.itemList = response.rows;
this.total = response.total;
this.loading = false;
});
},
getUnits(){
listAllUnitmeasure().then(response =>{
getUnits() {
listAllUnitmeasure().then((response) => {
this.measureOptions = response.data;
});
},
/** 查询分类下拉树结构 */
getTreeselect() {
treeselect().then(response => {
treeselect().then((response) => {
this.itemTypeOptions = response.data;
});
},
......@@ -558,12 +805,12 @@ export default {
specification: undefined,
unitOfMeasrue: undefined,
itemOrProduct: undefined,
enableFlag: 'Y',
safeStockFlag: 'N',
enableFlag: "Y",
safeStockFlag: "N",
minStock: 0,
maxStock: 0,
optType: undefined,
remark: undefined
remark: undefined,
};
this.autoGenFlag = false;
this.resetForm("form");
......@@ -580,16 +827,16 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.itemId);
this.ids = selection.map((item) => item.itemId);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
// 查询明细按钮操作
handleView(row){
handleView(row) {
this.reset();
this.getTreeselect();
const itemId = row.itemId || this.ids;
getMdItem(itemId).then(response => {
getMdItem(itemId).then((response) => {
this.form = response.data;
this.open = true;
this.title = "查看物料/产品";
......@@ -600,7 +847,7 @@ export default {
handleAdd() {
this.reset();
this.getTreeselect();
if(this.queryParams.itemTypeId != 0){
if (this.queryParams.itemTypeId != 0) {
this.form.itemTypeId = this.queryParams.itemTypeId;
}
this.optType = "add";
......@@ -612,7 +859,7 @@ export default {
this.reset();
this.getTreeselect();
const itemId = row.itemId || this.ids;
getMdItem(itemId).then(response => {
getMdItem(itemId).then((response) => {
this.form = response.data;
this.open = true;
this.optType = "edit";
......@@ -620,34 +867,36 @@ export default {
});
},
/** 提交按钮 */
submitForm: function() {
submitForm: function () {
this.$refs["form"].validate(async (valid) => {
if (valid) {
if (this.form.itemId != undefined) {
//基本信息保存
const baseInfoData = await this.$refs['baseInfo'].getBaseInfoData()
const baseInfoData = await this.$refs["baseInfo"].getBaseInfoData();
baseInfoData.itemId = this.form.itemId;
//产品外观保存
const lookData = await this.$refs['look'].getLookFormData()
const lookData = await this.$refs["look"].getLookFormData();
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 params = {
...this.form,
baseInfo:baseInfoData,
look:lookData,
publishedConf:publishedConfData
}
updateMdItem(params).then(response => {
baseInfo: baseInfoData,
look: lookData,
publishedConf: publishedConfData,
};
updateMdItem(params).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
debugger;
addMdItem(this.form).then(response => {
addMdItem(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
......@@ -659,18 +908,26 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const itemIds = row.itemId || this.ids;
this.$modal.confirm('确认删除数据项？').then(function() {
return delMdItem(itemIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
this.$modal
.confirm("确认删除数据项？")
.then(function () {
return delMdItem(itemIds);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/md/mditem/export', {
...this.queryParams
}, `user_${new Date().getTime()}.xlsx`)
this.download(
"mes/md/mditem/export",
{
...this.queryParams,
},
`user_${new Date().getTime()}.xlsx`
);
},
/** 导入按钮操作 */
handleImport() {
......@@ -679,8 +936,11 @@ export default {
},
/** 下载模板操作 */
importTemplate() {
this.download('mes/md/mditem/importTemplate', {
}, `md_item_${new Date().getTime()}.xlsx`)
this.download(
"mes/md/mditem/importTemplate",
{},
`md_item_${new Date().getTime()}.xlsx`
);
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
......@@ -691,7 +951,13 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
);
this.getList();
},
// 提交上传文件
......@@ -699,16 +965,16 @@ export default {
this.$refs.upload.submit();
},
//自动生成物料编码
handleAutoGenChange(autoGenFlag){
handleAutoGenChange(autoGenFlag) {
debugger;
if(autoGenFlag){
genCode('ITEM_CODE').then(response =>{
if (autoGenFlag) {
genCode("ITEM_CODE").then((response) => {
this.form.itemCode = response;
});
}else{
} else {
this.form.itemCode = null;
}
}
}
},
},
};
</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