Commit 16b0bf6b authored by chenzj's avatar chenzj

把所有的物料编码换成sap物料编码

parent 718aa832
...@@ -430,7 +430,7 @@ export default { ...@@ -430,7 +430,7 @@ export default {
this.form.toolId = row.toolId; this.form.toolId = row.toolId;
this.form.toolName = row.toolName; this.form.toolName = row.toolName;
this.form.toolCode = row.toolCode; this.form.toolCode = row.toolCode;
this.form.itemCode = row.itemCode; this.form.itemCode = row.sapItemCode;
this.form.location = row.location; this.form.location = row.location;
} }
}, },
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="刀模版具类型" prop="toolTypeId"> <el-form-item label="刀模版具类型" prop="toolTypeId">
<el-select v-model="form.toolTypeId" placeholder="请选择类型"> <el-select v-model="queryParams.toolTypeId" placeholder="请选择类型">
<el-option <el-option
v-for="dict in toolTypeOptions" v-for="dict in toolTypeOptions"
:key="dict.toolTypeId" :key="dict.toolTypeId"
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料编码" width="120" :show-overflow-tooltip="true" align="center" prop="itemCode" /> <el-table-column label="物料编码" width="120" :show-overflow-tooltip="true" align="center" prop="sapItemCode" />
<el-table-column label="名称" min-width="180" align="center" prop="toolName" :show-overflow-tooltip="true"> <el-table-column label="名称" min-width="180" align="center" prop="toolName" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -210,8 +210,8 @@ ...@@ -210,8 +210,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="sapItemCode">
<el-input v-model="form.itemCode" placeholder="请选择物料编码"> <el-input v-model="form.sapItemCode" placeholder="请选择物料编码">
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
...@@ -394,6 +394,7 @@ export default { ...@@ -394,6 +394,7 @@ export default {
toolName: null, toolName: null,
itemId: null, itemId: null,
itemCode: null, itemCode: null,
sapItemCode: null,
lifeTime: null, lifeTime: null,
location: null, location: null,
brand: null, brand: null,
...@@ -460,6 +461,7 @@ export default { ...@@ -460,6 +461,7 @@ export default {
toolName: null, toolName: null,
itemId: null, itemId: null,
itemCode: null, itemCode: null,
sapItemCode: null,
lifeTime: null, lifeTime: null,
location: null, location: null,
brand: null, brand: null,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<el-table-column label="上机时间" width="170" align="center" prop="upDate" /> <el-table-column label="上机时间" width="170" align="center" prop="upDate" />
<el-table-column label="下机时间" width="170" align="center" prop="downDate" /> <el-table-column label="下机时间" width="170" align="center" prop="downDate" />
<el-table-column label="物料名称" width="150" align="center" prop="itemName" /> <el-table-column label="物料名称" width="150" align="center" prop="itemName" />
<el-table-column label="物料编码" width="150" align="center" prop="itemCode" /> <el-table-column label="物料编码" width="150" align="center" prop="sapItemCode" />
<el-table-column label="台账编码" width="180" align="center" prop="toolCode" /> <el-table-column label="台账编码" width="180" align="center" prop="toolCode" />
<el-table-column label="台账名称" width="180" align="center" prop="toolName" /> <el-table-column label="台账名称" width="180" align="center" prop="toolName" />
<el-table-column label="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" /> <el-table-column label="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" />
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料编码" width="130" align="center" prop="itemCode" /> <el-table-column label="物料编码" width="130" align="center" prop="sapItemCode" />
<el-table-column label="物料名称" width="100" align="center" prop="itemName" /> <el-table-column label="物料名称" width="100" align="center" prop="itemName" />
<el-table-column label="工作单元编码" min-width="100" align="center" prop="workunitCode" /> <el-table-column label="工作单元编码" min-width="100" align="center" prop="workunitCode" />
<el-table-column label="工作单元名称" min-width="120" align="center" prop="workunitName" /> <el-table-column label="工作单元名称" min-width="120" align="center" prop="workunitName" />
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
type="index" type="index"
label="序号" label="序号"
width="50"/> width="50"/>
<el-table-column label="物料编码" align="center" prop="itemCode" /> <el-table-column label="物料编码" align="center" prop="sapItemCode" />
<el-table-column width="100px" label="物料名称" align="center" prop="itemName" /> <el-table-column width="100px" label="物料名称" align="center" prop="itemName" />
<el-table-column width="100px" label="SN号" align="center" prop="toolCode" /> <el-table-column width="100px" label="SN号" align="center" prop="toolCode" />
<el-table-column width="120px" v-if="$attrs.optType === 'add'" label="入库位置" align="center" prop="local" > <el-table-column width="120px" v-if="$attrs.optType === 'add'" label="入库位置" align="center" prop="local" >
...@@ -122,6 +122,7 @@ export default { ...@@ -122,6 +122,7 @@ export default {
toolCode:item.toolCode, toolCode:item.toolCode,
toolName:item.toolName, toolName:item.toolName,
itemCode:item.itemCode, itemCode:item.itemCode,
sapItemCode:item.sapItemCode,
itemName:item.itemName, itemName:item.itemName,
local:item.local, local:item.local,
processId:Number(item.processId), processId:Number(item.processId),
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<el-table-column label="入库单编号" width="130px" align="center" prop="recptCode" /> <el-table-column label="入库单编号" width="130px" align="center" prop="recptCode" />
<el-table-column label="入库单名称" width="150px" align="center" prop="recptName" :show-overflow-tooltip="true"/> <el-table-column label="入库单名称" width="150px" align="center" prop="recptName" :show-overflow-tooltip="true"/>
<el-table-column label="生产工单编码" width="150px" align="center" prop="workorderCode" /> <el-table-column label="生产工单编码" width="150px" align="center" prop="workorderCode" />
<el-table-column label="产品编码" align="center" prop="itemCode" /> <el-table-column label="产品编码" align="center" prop="sapItemCode" />
<el-table-column label="产品名称" align="center" prop="itemName" /> <el-table-column label="产品名称" align="center" prop="itemName" />
<el-table-column label="入库日期" align="center" prop="recptDate" width="120"> <el-table-column label="入库日期" align="center" prop="recptDate" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<el-table v-loading="loading" :data="productrecptlineList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="productrecptlineList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" /> <el-table-column label="产品物料编码" width="120px" align="center" prop="sapItemCode" />
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/> <el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" width="120px" align="center" prop="specification" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" width="120px" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitOfMeasure" /> <el-table-column label="单位" align="center" prop="unitOfMeasure" />
......
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