Commit aaa3c055 authored by chenzj's avatar chenzj

物料主数据页面优化

parent 460808b3
...@@ -3,19 +3,6 @@ ...@@ -3,19 +3,6 @@
<div class="app-container"> <div class="app-container">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8">
<el-form-item label="产品代号" prop="productNo">
<el-input v-model="form.productNo" placeholder="请输入产品代号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="英文名称" prop="productEnglishName">
<el-input
v-model="form.productEnglishName"
placeholder="请输入英文名称"
/>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="品牌" prop="brandId"> <el-form-item label="品牌" prop="brandId">
<el-input <el-input
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <!-- <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="圆角" prop="fillet"> <el-form-item label="圆角" prop="fillet">
<el-radio-group v-model="form.fillet" > <el-radio-group v-model="form.fillet" >
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="角度(mm)" prop="angle"> <el-form-item label="角度(mm)" prop="angle">
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" /> <el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <!-- <el-col :span="8">
<el-form-item label="是否防霉" prop="isMould"> <el-form-item label="是否防霉" prop="isMould">
<el-radio-group v-model="form.isMould" > <el-radio-group v-model="form.isMould" >
<el-radio <el-radio
...@@ -129,17 +129,15 @@ ...@@ -129,17 +129,15 @@
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="体系认证" prop="certification"> <el-form-item label="系数" prop="coefficient">
<el-input v-model="form.certification" placeholder="请输入体系认证" /> <el-input v-model="form.coefficient" placeholder="请输入系数" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="样品形状" prop="shape"> <el-form-item label="角型" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状"> <el-select v-model="form.shape" placeholder="请选择角型">
<el-option <el-option
v-for="dict in dict.type.product_shape" v-for="dict in dict.type.product_shape"
:key="dict.value" :key="dict.value"
...@@ -149,36 +147,52 @@ ...@@ -149,36 +147,52 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="样品形状大小" prop="shapeSize">
<el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" />
</el-form-item>
</el-col>
</el-row> </el-row>
<!-- <el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="创建人" prop="createBy"> <el-form-item label="正面颜色" prop="frontColorName">
<el-input v-model="form.createBy" /> <el-input v-model="form.frontColorName" placeholder="请输入正面颜色" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="创建日期" prop="createTime"> <el-form-item label="反面颜色" prop="oppositeColorName">
<el-input v-model="form.createTime" /> <el-input v-model="form.oppositeColorName" placeholder="请输入反面颜色" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :md="8" :sm="12">
<el-form-item label="修改人" prop="updateBy"> <el-form-item label="产品正面">
<el-input v-model="form.updateBy" /> <ImageUpload
:limit="1"
:value="form.frontImg"
:fileSize="5"
@onUploaded="(url) => (this.form.frontImg = url)"
@onRemoved="() => (this.form.frontImg = '')"
></ImageUpload>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12">
<el-form-item label="产品背面">
<ImageUpload
:limit="1"
:value="form.backImg"
:fileSize="5"
@onUploaded="(url) => (this.form.backImg = url)"
@onRemoved="() => (this.form.backImg = '')"
></ImageUpload>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<!-- <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="修改日期" prop="updateTime"> <el-form-item label="样品形状大小" prop="shapeSize">
<el-input v-model="form.updateTime" /> <el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>--> </el-row> -->
</el-form> </el-form>
</div> </div>
</template> </template>
...@@ -236,7 +250,9 @@ export default { ...@@ -236,7 +250,9 @@ export default {
createBy: '', createBy: '',
createTime: '', createTime: '',
updateBy: '', updateBy: '',
updateTime: '' updateTime: '',
frontColor: [],
oppositeColor: [],
}, },
// 表单校验 // 表单校验
rules: { rules: {
...@@ -296,7 +312,9 @@ export default { ...@@ -296,7 +312,9 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null updateTime: null,
frontColor: [],
oppositeColor: [],
}; };
this.resetForm("form"); this.resetForm("form");
}, },
......
...@@ -4,309 +4,114 @@ ...@@ -4,309 +4,114 @@
<!--分类数据--> <!--分类数据-->
<el-col :span="4" :xs="24"> <el-col :span="4" :xs="24">
<div class="head-container"> <div class="head-container">
<el-input <el-input v-model="itemTypeName" placeholder="请输入分类名称" clearable size="small" prefix-icon="el-icon-search"
v-model="itemTypeName" style="margin-bottom: 20px" />
placeholder="请输入分类名称"
clearable
size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
</div> </div>
<div class="head-container"> <div class="head-container">
<el-tree <el-tree :data="itemTypeOptions" :props="defaultProps" :expand-on-click-node="false"
:data="itemTypeOptions" :filter-node-method="filterNode" ref="tree" default-expand-all @node-click="handleNodeClick" />
:props="defaultProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
default-expand-all
@node-click="handleNodeClick"
/>
</div> </div>
</el-col> </el-col>
<!--物料数据--> <!--物料数据-->
<el-col :span="20" :xs="24"> <el-col :span="20" :xs="24">
<el-form <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
:model="queryParams" label-width="68px">
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<el-input <el-input v-model="queryParams.itemCode" placeholder="请输入物料编码" clearable style="width: 240px"
v-model="queryParams.itemCode" @keyup.enter.native="handleQuery" />
placeholder="请输入物料编码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="物料名称" prop="itemName"> <el-form-item label="物料名称" prop="itemName">
<el-input <el-input v-model="queryParams.itemName" placeholder="请输入物料名称" clearable style="width: 240px"
v-model="queryParams.itemName" @keyup.enter.native="handleQuery" />
placeholder="请输入物料名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="品牌名称" prop="brandName"> <el-form-item label="品牌名称" prop="brandName">
<el-input <el-input v-model="queryParams.brandName" placeholder="请输入物料名称" clearable style="width: 240px"
v-model="queryParams.brandName" @keyup.enter.native="handleQuery" />
placeholder="请输入物料名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
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-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
type="success" @click="handleUpdate">修改</el-button>
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
type="danger" @click="handleDelete">删除</el-button>
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="multiple"
type="success" @click="handBecomeFormalProduct">转正式产品</el-button>
plain
icon="el-icon-edit"
size="mini"
:disabled="multiple"
@click="handBecomeFormalProduct"
>转正式产品</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport">导入</el-button>
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
>导入</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-col> </el-col>
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
:columns="columns"
></right-toolbar>
</el-row> </el-row>
<el-table <el-table v-loading="loading" :data="itemList" @selection-change="handleSelectionChange">
v-loading="loading"
:data="itemList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column <el-table-column label="物料编码" width="120" align="center" key="itemCode" prop="itemCode"
label="物料编码" v-if="columns[0].visible">
width="120"
align="center"
key="itemCode"
prop="itemCode"
v-if="columns[0].visible"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" @click="handleView(scope.row)">{{ scope.row.itemCode }}</el-button>
size="mini"
type="text"
@click="handleView(scope.row)"
>{{ scope.row.itemCode }}</el-button
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="SAP物料编码" min-width="120" align="left" key="sapItemCode" prop="sapItemCode"
label="SAP物料编码" v-if="columns[1].visible" :show-overflow-tooltip="true" />
min-width="120" <el-table-column label="物料名称" min-width="120" align="left" key="itemName" prop="itemName"
align="left" v-if="columns[1].visible" :show-overflow-tooltip="true" />
key="sapItemCode" <el-table-column label="品牌名称" min-width="120" align="left" key="brandName" prop="brandName"
prop="sapItemCode" v-if="columns[1].visible" :show-overflow-tooltip="true" />
v-if="columns[1].visible" <el-table-column label="规格型号" align="left" key="specification" prop="specification" v-if="columns[2].visible"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column label="单位" align="center" key="unitOfMeasure" prop="unitOfMeasure" v-if="columns[3].visible"
<el-table-column :show-overflow-tooltip="true">
label="物料名称"
min-width="120"
align="left"
key="itemName"
prop="itemName"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<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> </el-table-column>
<el-table-column <el-table-column label="物料/产品" align="center" key="itemOrProduct" prop="itemOrProduct"
label="物料/产品" v-if="columns[4].visible" :show-overflow-tooltip="true">
align="center"
key="itemOrProduct"
prop="itemOrProduct"
v-if="columns[4].visible"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct" />
:options="dict.type.mes_item_product"
:value="scope.row.itemOrProduct"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="所属分类" align="center" key="itemTypeName" prop="itemTypeName" v-if="columns[5].visible"
label="所属分类" width="120" />
align="center" <el-table-column label="是否启用" align="center" key="enableFlag" v-if="columns[6].visible">
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"> <template slot-scope="scope">
<dict-tag <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag" />
:options="dict.type.sys_yes_no"
:value="scope.row.enableFlag"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="设置安全库存" align="center" key="safeStockFlag" v-if="columns[7].visible">
label="设置安全库存"
align="center"
key="safeStockFlag"
v-if="columns[7].visible"
>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.safeStockFlag" />
:options="dict.type.sys_yes_no"
:value="scope.row.safeStockFlag"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[8].visible" width="160">
label="创建时间"
align="center"
prop="createTime"
v-if="columns[8].visible"
width="160"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
size="mini" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
v-show="total > 0" :limit.sync="queryParams.pageSize" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col> </el-col>
</el-row> </el-row>
...@@ -316,150 +121,85 @@ ...@@ -316,150 +121,85 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<el-input <el-input v-model="form.itemCode" readonly="readonly" maxlength="64" />
v-model="form.itemCode"
readonly="readonly"
maxlength="64"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料名称" prop="itemName"> <el-form-item label="物料名称" prop="itemName">
<el-input <el-input v-model="form.itemName" maxlength="255" readonly="readonly" v-if="optType == 'view'" />
v-model="form.itemName" <el-input v-model="form.itemName" placeholder="请输入物料名称" maxlength="255" v-else />
maxlength="255"
readonly="readonly"
v-if="optType == 'view'"
/>
<el-input
v-model="form.itemName"
placeholder="请输入物料名称"
maxlength="255"
v-else
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="规格型号" prop="specification"> <el-form-item label="规格型号" prop="specification">
<el-input <el-input v-model="form.specification" type="textarea" maxlength="500" readonly="readonly"
v-model="form.specification" v-if="optType == 'view'" />
type="textarea" <el-input v-model="form.specification" type="textarea" placeholder="请输入规格型号" maxlength="500" v-else />
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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="单位" prop="unitOfMeasure"> <el-form-item label="单位" prop="unitOfMeasure">
<el-select <el-select v-model="form.unitOfMeasure" disabled v-if="optType == 'view'">
v-model="form.unitOfMeasure" <el-option v-for="item in measureOptions" :key="item.measureCode" :label="item.measureName"
disabled :value="item.measureCode" :disabled="item.enableFlag == 'N'"></el-option>
v-if="optType == 'view'"
>
<el-option
v-for="item in measureOptions"
:key="item.measureCode"
:label="item.measureName"
:value="item.measureCode"
:disabled="item.enableFlag == 'N'"
></el-option>
</el-select> </el-select>
<el-select <el-select v-model="form.unitOfMeasure" placeholder="请选择单位" filterable v-else>
v-model="form.unitOfMeasure" <el-option v-for="item in measureOptions" :key="item.measureCode" :label="item.measureName"
placeholder="请选择单位" :value="item.measureCode" :disabled="item.enableFlag == 'N'"></el-option>
filterable
v-else
>
<el-option
v-for="item in measureOptions"
:key="item.measureCode"
:label="item.measureName"
:value="item.measureCode"
:disabled="item.enableFlag == 'N'"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料/产品分类" prop="itemTypeId"> <el-form-item label="物料/产品分类" prop="itemTypeName">
<treeselect <treeselect v-model="form.itemTypeName" :options="itemTypeOptions" :show-count="true" disabled
v-model="form.itemTypeId" v-if="optType == 'view'" />
:options="itemTypeOptions" <treeselect v-model="form.itemTypeName" :options="itemTypeOptions" :show-count="true" placeholder="请选择所属分类"
:show-count="true" v-else :disable-branch-nodes="true" />
disabled </el-form-item>
v-if="optType == 'view'" </el-col>
/> </el-row>
<treeselect <el-row>
v-model="form.itemTypeId" <el-col :span="12">
:options="itemTypeOptions" <el-form-item label="产品代号" prop="itemNo">
:show-count="true" <el-input v-model="form.itemNo" maxlength="255" readonly="readonly" v-if="optType == 'view'" />
placeholder="请选择所属分类" <el-input v-model="form.itemNo" placeholder="产品代号" maxlength="255" v-else />
v-else </el-form-item>
:disable-branch-nodes="true" </el-col>
/> <el-col :span="12">
<el-form-item label="英文名称" prop="itemEnglishName">
<el-input v-model="form.itemEnglishName" maxlength="255" readonly="readonly" v-if="optType == 'view'" />
<el-input v-model="form.itemEnglishName" placeholder="英文名称" maxlength="255" v-else />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否启用"> <el-form-item label="是否启用">
<el-radio-group <el-radio-group v-model="form.enableFlag" disabled v-if="optType == 'view'">
v-model="form.enableFlag" <el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label
disabled }}</el-radio>
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>
<el-radio-group v-model="form.enableFlag" v-else> <el-radio-group v-model="form.enableFlag" v-else>
<el-radio <el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label
v-for="dict in dict.type.sys_yes_no" }}</el-radio>
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="安全库存"> <el-form-item label="安全库存">
<el-radio-group <el-radio-group v-model="form.safeStockFlag" disabled v-if="optType == 'view'">
v-model="form.safeStockFlag" <el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label
disabled }}</el-radio>
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>
<el-radio-group v-model="form.safeStockFlag" v-else> <el-radio-group v-model="form.safeStockFlag" v-else>
<el-radio <el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label
v-for="dict in dict.type.sys_yes_no" }}</el-radio>
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -467,56 +207,22 @@ ...@@ -467,56 +207,22 @@
<el-row v-if="form.safeStockFlag == 'Y'"> <el-row v-if="form.safeStockFlag == 'Y'">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="最小库存量"> <el-form-item label="最小库存量">
<el-input-number <el-input-number v-model="form.minStock" :percision="2" :step="1" disabled v-if="optType == 'view'" />
v-model="form.minStock" <el-input-number v-model="form.minStock" :percision="2" :step="1" placeholder="请输入最小安全库存量" v-else />
: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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="最大库存量"> <el-form-item label="最大库存量">
<el-input-number <el-input-number v-model="form.maxStock" :percision="2" :step="1" disabled v-if="optType == 'view'" />
v-model="form.maxStock" <el-input-number v-model="form.maxStock" :percision="2" :step="1" placeholder="请输入最大安全库存量" v-else />
: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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input <el-input v-model="form.remark" type="textarea" readonly v-if="optType == 'view'"></el-input>
v-model="form.remark" <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" v-else></el-input>
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-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -530,48 +236,24 @@ ...@@ -530,48 +236,24 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="SAP返回消息"> <el-form-item label="SAP返回消息">
<el-input <el-input v-model="form.message" type="textarea" readonly></el-input>
v-model="form.message"
type="textarea"
readonly
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-tabs <el-tabs type="border-card" v-model="activeName" @tab-click="onTabClick"
type="border-card" v-if="form.itemId != null && form.itemOrProduct == 'PRODUCT'">
v-model="activeName"
@tab-click="onTabClick"
v-if="form.itemId != null && form.itemOrProduct == 'PRODUCT'"
>
<el-tab-pane label="基本信息" name="BaseInfo"> <el-tab-pane label="基本信息" name="BaseInfo">
<BaseInfo <BaseInfo ref="BaseInfo" :optType="optType" :itemId="form.itemId"></BaseInfo>
ref="BaseInfo"
:optType="optType"
:itemId="form.itemId"
></BaseInfo>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="产品特性" name="SpecProperty"> <el-tab-pane label="产品特性" name="SpecProperty">
<SpecProperty <SpecProperty ref="SpecProperty" :optType="optType" :itemId="form.itemId"></SpecProperty>
ref="SpecProperty"
:optType="optType"
:itemId="form.itemId"
></SpecProperty>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="销售单位转换" name="SaleUnit"> <el-tab-pane label="销售单位转换" name="SaleUnit">
<SaleUnit <SaleUnit ref="SaleUnit" :optType="optType" :itemId="form.itemId"></SaleUnit>
ref="SaleUnit"
:optType="optType"
:itemId="form.itemId"
></SaleUnit>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="工厂信息" name="Factory"> <el-tab-pane label="工厂信息" name="Factory">
<Factory <Factory ref="Factory" :optType="optType" :itemId="form.itemId"></Factory>
ref="Factory"
:optType="optType"
:itemId="form.itemId"
></Factory>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="客户信息"> <!-- <el-tab-pane label="客户信息">
<Customer :optType="optType" :itemId="form.itemId"></Customer> <Customer :optType="optType" :itemId="form.itemId"></Customer>
...@@ -580,39 +262,19 @@ ...@@ -580,39 +262,19 @@
<Look ref="Look" :optType="optType" :itemId="form.itemId"></Look> <Look ref="Look" :optType="optType" :itemId="form.itemId"></Look>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="生产版本" name="ProductionPlan"> <el-tab-pane label="生产版本" name="ProductionPlan">
<ProductionPlan <ProductionPlan ref="ProductionPlan" :optType="optType" :itemId="form.itemId"></ProductionPlan>
ref="ProductionPlan"
:optType="optType"
:itemId="form.itemId"
></ProductionPlan>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="排版参数" name="PublishedConf"> <el-tab-pane label="排版参数" name="PublishedConf">
<PublishedConf <PublishedConf ref="PublishedConf" :optType="optType" :itemId="form.itemId"></PublishedConf>
ref="PublishedConf"
:optType="optType"
:itemId="form.itemId"
></PublishedConf>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="正面颜色" name="FaceColor"> <el-tab-pane label="正面颜色" name="FaceColor">
<FaceColor <FaceColor ref="FaceColor" :optType="optType" :itemId="form.itemId"></FaceColor>
ref="FaceColor"
:optType="optType"
:itemId="form.itemId"
></FaceColor>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="反面颜色" name="BackFaceColor"> <el-tab-pane label="反面颜色" name="BackFaceColor">
<BackFaceColor <BackFaceColor ref="BackFaceColor" :optType="optType" :itemId="form.itemId"></BackFaceColor>
ref="BackFaceColor"
:optType="optType"
:itemId="form.itemId"
></BackFaceColor>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="客户loss" name="CustomerLoss"> <el-tab-pane label="客户loss" name="CustomerLoss">
<CustomerLoss <CustomerLoss ref="CustomerLoss" :optType="optType" :itemId="form.itemId"></CustomerLoss>
ref="CustomerLoss"
:optType="optType"
:itemId="form.itemId"
></CustomerLoss>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="SAP基本信息" name="SapBaseInfoProperty"> <el-tab-pane label="SAP基本信息" name="SapBaseInfoProperty">
<SapPropertyData ref="SapBaseInfoProperty" /> <SapPropertyData ref="SapBaseInfoProperty" />
...@@ -640,9 +302,7 @@ ...@@ -640,9 +302,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType == 'view'" <el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
>返回</el-button
>
<el-button type="primary" @click="submitForm" v-else>确 定</el-button> <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
<el-button @click="cancel">关 闭</el-button> <el-button @click="cancel">关 闭</el-button>
</div> </div>
...@@ -650,24 +310,10 @@ ...@@ -650,24 +310,10 @@
<!-- 物料导入对话框 --> <!-- 物料导入对话框 -->
<el-dialog <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
:title="upload.title" <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:visible.sync="upload.open" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
width="400px" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
append-to-body
>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
...@@ -676,13 +322,8 @@ ...@@ -676,13 +322,8 @@
是否更新已经存在的用户数据 是否更新已经存在的用户数据
</div> </div>
<span>仅允许导入xls、xlsx格式文件。</span> <span>仅允许导入xls、xlsx格式文件。</span>
<el-link <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
type="primary" @click="importTemplate">下载模板</el-link>
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板</el-link
>
</div> </div>
</el-upload> </el-upload>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -1018,7 +659,7 @@ export default { ...@@ -1018,7 +659,7 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => {}); .catch(() => { });
}, },
/** 临时产品转正式按钮操作 */ /** 临时产品转正式按钮操作 */
handBecomeFormalProduct(row) { handBecomeFormalProduct(row) {
...@@ -1032,7 +673,7 @@ export default { ...@@ -1032,7 +673,7 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("转正式成功"); this.$modal.msgSuccess("转正式成功");
}) })
.catch(() => {}); .catch(() => { });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
...@@ -1068,8 +709,8 @@ export default { ...@@ -1068,8 +709,8 @@ export default {
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
this.$alert( this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg + response.msg +
"</div>", "</div>",
"导入结果", "导入结果",
{ dangerouslyUseHTMLString: true } { dangerouslyUseHTMLString: true }
); );
......
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