Skip to content

M
mes-ui
Commit b9d38390 authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents e3370a7e e55a8703
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
pages/material/detail.vue
View file @ b9d38390
......@@ -69,36 +69,36 @@ export default {
{
key: "code",
title: this.l("code"),
align: "left",
align: "center",
easy: true,
high: true,
},
{ key: "total", title: this.l("total"), high: true },
{ key: "total", title: this.l("total"), high: true, align: "center" },
{
key: "nowTotal",
title: this.l("nowTotal"),
high: true,
},
{ key: "batch", title: this.l("batch"), align: "left", high: true },
{
key: "certificateOfApproval",
title: this.l("certificateOfApproval"),
align: "left",
align: "center",
high: true,
},
{
key: "unitPrice",
title: this.l("unitPrice"),
// { key: "batch", title: this.l("batch"), align: "left", high: true },
// {
// key: "certificateOfApproval",
// title: this.l("certificateOfApproval"),
// align: "left",
// high: true,
// },
// {
// key: "unitPrice",
// title: this.l("unitPrice"),
high: true,
},
{
key: "originalManufacturer",
title: this.l("originalManufacturer"),
align: "left",
high: true,
},
// high: true,
// },
// {
// key: "originalManufacturer",
// title: this.l("originalManufacturer"),
// align: "left",
// high: true,
// },
{
key: "creationTime",
title: this.l("creationTime"),
......@@ -108,7 +108,7 @@ export default {
{
key: "creator",
title: this.l("creatorUserId"),
align: "left",
align: "center",
high: true,
},
{
......
pages/store/index.vue
View file @ b9d38390
......@@ -80,15 +80,15 @@ export default {
},
{
key: "materialTypeName",
title: "物料编号",
align: "left",
},
{
key: "materialType",
title: "物料类型",
align: "left",
code: "material.main.type",
},
// {
// key: "materialType",
// title: "物料类别",
// align: "left",
// code: "material.main.type",
// },
{
key: "userName",
title: this.l("userName"),
......
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