Commit 147ad0f5 authored by renjintao's avatar renjintao

state

parent 23588f23
...@@ -689,6 +689,8 @@ export default { ...@@ -689,6 +689,8 @@ export default {
}); });
e[elem.key] = codeInfo.substr(0, codeInfo.length - 1); e[elem.key] = codeInfo.substr(0, codeInfo.length - 1);
} }
} else {
e[elem.key] = ''
} }
}); });
//导出数据增加对应的物料管理信息 code: 1【rootCategoryId 大类】 2【categoryId 大类】 3【codeRuleId 编码名称】 //导出数据增加对应的物料管理信息 code: 1【rootCategoryId 大类】 2【categoryId 大类】 3【codeRuleId 编码名称】
......
<template> <template>
<div class="ib" @click="showLife"> <div class="ib" @click="showLife">
<div class="ib" v-if="!isMore"> <div class="ib" v-if="!isMore">
<span v-if="type == 'text'" :style="style">{{ name }}</span> <span v-if="type == 'text'" :style="style">{{ name }}</span>
<Tag v-if="type == 'tag'" :color="tagcolor">{{ name }}</Tag> <Tag v-if="type == 'tag'" :color="tagcolor">{{ name }}</Tag>
<Badge v-if="type == 'dot'" :color="tagcolor" :text="name" /> <Badge v-if="type == 'dot'" :color="tagcolor" :text="name" />
<Icon <Icon v-if="type == 'icon'" :type="item.icon" :color="tagcolor" :title="name" :size="size" />
v-if="type == 'icon'"
:type="item.icon"
:color="tagcolor"
:title="name"
:size="size"
/>
</div> </div>
<div class="ib" v-else v-for="(li, i) in items" :key="i"> <div class="ib" v-else v-for="(li, i) in items" :key="i">
<span v-if="type == 'text'" :style="li.style">{{ li.name }}</span> <span v-if="type == 'text'" :style="li.style">{{ li.name }}</span>
<Tag v-if="type == 'tag'" :color="li.tagcolor">{{ li.name }}</Tag> <Tag v-if="type == 'tag'" :color="li.tagcolor">{{ li.name }}</Tag>
<Badge v-if="type == 'dot'" :color="li.tagcolor" :text="li.name" />&nbsp; <Badge v-if="type == 'dot'" :color="li.tagcolor" :text="li.name" />&nbsp;
</div> </div>
<Modal <Modal v-model="modal" title="生命周期" width="1200" footer-hide :mask-closable="false">
v-model="modal"
title="生命周期"
width="1200"
footer-hide
:mask-closable="false"
>
<component :is="detail" :code="code" :value="value" :mode="mode" /> <component :is="detail" :code="code" :value="value" :mode="mode" />
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "state", name: "state",
...@@ -96,7 +85,7 @@ export default { ...@@ -96,7 +85,7 @@ export default {
this.name = item.name; this.name = item.name;
this.item = item; this.item = item;
} else { } else {
if (this.value == "undefined") { if (v == "undefined" || v == '' || v == null || v == 'null') {
this.name = " "; this.name = " ";
} else { } else {
this.name = this.value; this.name = this.value;
...@@ -109,7 +98,9 @@ export default { ...@@ -109,7 +98,9 @@ export default {
this.data.map((u) => { this.data.map((u) => {
if (ul.indexOf(u.code) > -1) { if (ul.indexOf(u.code) > -1) {
u.tagcolor = u.color | "default"; u.tagcolor = u.color | "default";
u.style = { color: u.color | "inherit" }; u.style = {
color: u.color | "inherit"
};
items.push(u); items.push(u);
} }
}); });
...@@ -138,10 +129,8 @@ export default { ...@@ -138,10 +129,8 @@ export default {
return {}; return {};
} }
return { return {
color: color: this.item && this.item.color != "" && this.item.color != null ?
this.item && this.item.color != "" && this.item.color != null this.item.color : "inherit",
? this.item.color
: "inherit",
}; };
}, },
}, },
......
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