Skip to content

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

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

parents 6a67aa28 d4c64b07
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 68 deletions
pages/materiel/codeRule/add.vue
View file @ 22a5c1f3
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="120"> <Form ref="form" :model="entity" :rules="rules" :label-width="120">
<Row> <Row>
<Col :span="12"> <!-- <Col :span="12">
<FormItem :label="l('code')" prop="code"> <FormItem :label="l('code')" prop="code">
<Input v-model="entity.code" disabled></Input> <Input v-model="entity.code" disabled></Input>
</FormItem> </FormItem>
</Col> </Col> -->
<Col :span="12"> <Col :span="12">
<FormItem :label="l('name')" prop="name"> <FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input> <Input v-model="entity.name"></Input>
...@@ -56,13 +56,13 @@ export default { ...@@ -56,13 +56,13 @@ export default {
data() { data() {
return { return {
entity: { entity: {
creationTime: null, // creationTime: null,
creatorUserId: null, // creatorUserId: null,
lastModificationTime: null, // lastModificationTime: null,
lastModifierUserId: null, // lastModifierUserId: null,
isDeleted: null, // isDeleted: null,
deletionTime: null, // deletionTime: null,
deleterUserId: null, // deleterUserId: null,
code: "", code: "",
name: "", name: "",
type: null, type: null,
......
pages/technology/details/routingsupporting/detail.vue
View file @ 22a5c1f3
<template> <template>
<div class="new-detail"> <div class="new-detail">
<Row> <Row>
<Filed :span="8" :name="l('routingDetailNo')+'：'">{{entity.routingDetailNo}}</Filed> <Filed :span="8" :name="l('routingDetailNo') + '：'">{{
<Filed :span="8" :name="l('routingDetailName')+'：'">{{entity.routingDetailName}}</Filed> entity.routingDetailNo
<Filed :span="8" :name="l('materialNumber')+'：'">{{entity.materialNumber}}</Filed> }}</Filed>
<Filed :span="8" :name="l('nameMaterial')+'：'">{{entity.nameMaterial}}</Filed> <Filed :span="8" :name="l('routingDetailName') + '：'">{{
entity.routingDetailName
}}</Filed>
<Filed :span="8" :name="l('materialNumber') + '：'">{{
entity.materialNumber
}}</Filed>
<Filed :span="8" :name="l('nameMaterial') + '：'">{{
entity.nameMaterial
}}</Filed>
<Filed :span="8" :name="l('creationTime')+'：'">{{entity.creationTime}}</Filed> <Filed :span="8" :name="l('creationTime') + '：'">{{
entity.creationTime
}}</Filed>
<Filed :span="8" :name="l('creatorUserId')+'：'"> <Filed :span="8" :name="l('creatorUserId') + '：'">
<User :value="parseInt(entity.creatorUserId)" /> <User :value="parseInt(entity.creatorUserId)" />
</Filed> </Filed>
<Filed :span="8" :name="l('quantity')+'：'">{{entity.quantity}}</Filed> <Filed :span="8" :name="l('quantity') + '：'">{{
entity.quantity
}}</Filed>
</Row> </Row>
<Divider orientation="left">扩展属性</Divider> <Divider orientation="left">扩展属性</Divider>
<Row> <Row>
...@@ -19,8 +31,24 @@ ...@@ -19,8 +31,24 @@
v-for="li in fileds" v-for="li in fileds"
:key="li.field" :key="li.field"
:span="li.span" :span="li.span"
:name="li.title+'：'" :name="li.title + '：'"
>{{li.newConten}}</Filed> >
<!-- {{li.newConten}} -->
<State
v-if="li.dataType == 3"
:code="li.note"
:value="entity[li.field]"
/>
<div v-else-if="li.dataType == 8">{{ entity[li.field] }}</div>
<div v-else-if="li.dataType == 5" v-html="entity[li.field]"></div>
<DTSpan v-else-if="li.dataType == 4" :value="entity[li.field]" />
<span v-else>{{ entity[li.field] }}</span>
<State
v-if="li.unitName && (li.dataType == 1 || li.dataType == 2)"
:code="li.note"
:value="entity[li.field]"
/>
</Filed>
</Row> </Row>
</div> </div>
</template> </template>
......
pages/technology/details/routingsupporting/index.vue
View file @ 22a5c1f3
...@@ -142,56 +142,56 @@ export default { ...@@ -142,56 +142,56 @@ export default {
high: true, high: true,
width: 80, width: 80,
}, },
{ // {
key: "brand", // key: "brand",
title: this.l("brand"), // title: this.l("brand"),
align: "left", // align: "left",
easy: true, // easy: true,
high: true, // high: true,
}, // },
{ // {
key: "specifications", // key: "specifications",
title: this.l("specifications"), // title: this.l("specifications"),
align: "left", // align: "left",
easy: true, // easy: true,
high: true, // high: true,
}, // },
{ // {
key: "xhgg", // key: "xhgg",
title: this.l("xhgg"), // title: this.l("xhgg"),
align: "left", // align: "left",
easy: true, // easy: true,
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "texture", // key: "texture",
title: this.l("texture"), // title: this.l("texture"),
align: "left", // align: "left",
easy: true, // easy: true,
high: true, // high: true,
}, // },
{ // {
key: "procurementStandards", // key: "procurementStandards",
title: this.l("procurementStandards"), // title: this.l("procurementStandards"),
align: "left", // align: "left",
easy: true, // easy: true,
high: true, // high: true,
}, // },
{ // {
key: "qualityGrade", // key: "qualityGrade",
title: this.l("qualityGrade"), // title: this.l("qualityGrade"),
align: "left", // align: "left",
easy: true, // easy: true,
high: true, // high: true,
}, // },
{ // {
key: "drawNum", // key: "drawNum",
title: this.l("drawNum"), // title: this.l("drawNum"),
align: "left", // align: "left",
easy: true, // easy: true,
high: true, // high: true,
}, // },
{ {
key: "creationTime", key: "creationTime",
title: this.l("creationTime"), title: this.l("creationTime"),
......
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