物料单位显示问题修复
This commit is contained in:
parent
75bd71aa8d
commit
3c339c9b69
@ -15,7 +15,7 @@
|
|||||||
<el-table-column label="物料编码" align="center" prop="bomItemCode" />
|
<el-table-column label="物料编码" align="center" prop="bomItemCode" />
|
||||||
<el-table-column label="物料名称" align="center" prop="bomItemName" :show-overflow-tooltip="true" />
|
<el-table-column label="物料名称" align="center" prop="bomItemName" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="规格" align="center" prop="bomItemSpec" :show-overflow-tooltip="true" />
|
<el-table-column label="规格" align="center" prop="bomItemSpec" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="单位" width="60px" align="center" prop="unitOfMeasure" />
|
<el-table-column label="单位" width="60px" align="center" prop="unitName" />
|
||||||
<el-table-column label="使用比例" width="90px" align="center" prop="quantity" />
|
<el-table-column label="使用比例" width="90px" align="center" prop="quantity" />
|
||||||
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
|
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
|
||||||
</el-table>
|
</el-table>
|
||||||
@ -74,6 +74,7 @@
|
|||||||
bomItemName: null,
|
bomItemName: null,
|
||||||
bomItemSpec: null,
|
bomItemSpec: null,
|
||||||
unitOfMeasure: null,
|
unitOfMeasure: null,
|
||||||
|
unitName: null,
|
||||||
quantity: null,
|
quantity: null,
|
||||||
enableFlag: null,
|
enableFlag: null,
|
||||||
attr1: null,
|
attr1: null,
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
</el-table-column>
|
</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="物料名称" 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="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="单位" align="center" key="unitName" prop="unitName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
|
||||||
<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">
|
<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"/>
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
</el-table-column>
|
</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="物料名称" 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="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="单位" align="center" key="unitName" prop="unitName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
|
||||||
<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">
|
<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"/>
|
||||||
|
@ -122,7 +122,7 @@
|
|||||||
</el-table-column>
|
</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="物料名称" 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="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="单位" align="center" key="unitName" prop="unitName" v-if="columns[3].visible" :show-overflow-tooltip="true" >
|
||||||
</el-table-column>
|
</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">
|
<template slot-scope="scope">
|
||||||
@ -336,7 +336,9 @@
|
|||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="供应商"></el-tab-pane>
|
<el-tab-pane label="供应商"></el-tab-pane>
|
||||||
<el-tab-pane label="替代品"></el-tab-pane>
|
<el-tab-pane label="替代品"></el-tab-pane>
|
||||||
<el-tab-pane label="SIP"></el-tab-pane>
|
<el-tab-pane label="SIP">
|
||||||
|
<SIPTab :itemId="form.itemId" :optType="optType"></SIPTab>
|
||||||
|
</el-tab-pane>
|
||||||
<el-tab-pane label="SOP">
|
<el-tab-pane label="SOP">
|
||||||
<SOPTab :itemId="form.itemId" :optType="optType"></SOPTab>
|
<SOPTab :itemId="form.itemId" :optType="optType"></SOPTab>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
@ -385,6 +387,7 @@ import { listMdItem, getMdItem, delMdItem, addMdItem, updateMdItem} from "@/api/
|
|||||||
|
|
||||||
import ItemBom from "./components/itembom.vue";
|
import ItemBom from "./components/itembom.vue";
|
||||||
import SOPTab from "./components/sop.vue"
|
import SOPTab from "./components/sop.vue"
|
||||||
|
import SIPTab from "./components/sip.vue"
|
||||||
import { listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
|
import { listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
|
||||||
import {genCode} from "@/api/system/autocode/rule"
|
import {genCode} from "@/api/system/autocode/rule"
|
||||||
import { getToken } from "@/utils/auth";
|
import { getToken } from "@/utils/auth";
|
||||||
@ -396,7 +399,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|||||||
export default {
|
export default {
|
||||||
name: "MdItem",
|
name: "MdItem",
|
||||||
dicts: ['sys_yes_no','mes_item_product'],
|
dicts: ['sys_yes_no','mes_item_product'],
|
||||||
components: { Treeselect,ItemBom,SOPTab },
|
components: { Treeselect,ItemBom,SOPTab,SIPTab },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
@ -552,6 +555,7 @@ export default {
|
|||||||
itemName: undefined,
|
itemName: undefined,
|
||||||
specification: undefined,
|
specification: undefined,
|
||||||
unitOfMeasrue: undefined,
|
unitOfMeasrue: undefined,
|
||||||
|
unitName: undefined,
|
||||||
enableFlag: undefined,
|
enableFlag: undefined,
|
||||||
itemOrProduct: undefined,
|
itemOrProduct: undefined,
|
||||||
enableFlag: 'Y',
|
enableFlag: 'Y',
|
||||||
|
@ -720,7 +720,7 @@ export default {
|
|||||||
this.form.productCode = obj.itemCode;
|
this.form.productCode = obj.itemCode;
|
||||||
this.form.productName = obj.itemName;
|
this.form.productName = obj.itemName;
|
||||||
this.form.productSpc = obj.specification;
|
this.form.productSpc = obj.specification;
|
||||||
this.form.unitOfMeasure = obj.unitOfMeasure;
|
this.form.unitOfMeasure = obj.unitName;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
//客户选择弹出框
|
//客户选择弹出框
|
||||||
|
Loading…
Reference in New Issue
Block a user