Commit bb2d2546 authored by 仇晓婷's avatar 仇晓婷

流水排产样式

parent bc148006
...@@ -67,12 +67,7 @@ ...@@ -67,12 +67,7 @@
<Row class="right-body"> <Row class="right-body">
<Col class="list" span="24"> <Col class="list" span="24">
<Timeline> <Timeline>
<TimelineItem <TimelineItem v-for="(item, index) in result" :key="index">
v-for="(item, index) in result"
:key="index"
:style="{ height: activeHeight }"
>
<!-- :class="addActive == index ? 'activeHeight' : ''" -->
<Badge :count="item.seq" slot="dot" :type="type(index)"></Badge> <Badge :count="item.seq" slot="dot" :type="type(index)"></Badge>
<div class="set-name"> <div class="set-name">
<span <span
...@@ -97,7 +92,9 @@ ...@@ -97,7 +92,9 @@
v-if="item.chai" v-if="item.chai"
></op> ></op>
</div> </div>
<div class="content">数量:{{ item.quantity }}</div> <div class="content">数量:{{ item.quantity }}</div>
<div v-show="item.userIds" class="content"> <div v-show="item.userIds" class="content">
人员: 人员:
<span v-for="(u, j) in item.userIds" :key="j"> <span v-for="(u, j) in item.userIds" :key="j">
...@@ -177,7 +174,7 @@ export default { ...@@ -177,7 +174,7 @@ export default {
disabled: false, disabled: false,
chaiLIst: [], chaiLIst: [],
mode: 1, mode: 1,
activeHeight: "100%",
curIndex: -1, curIndex: -1,
indexId: 0, indexId: 0,
active: null, active: null,
...@@ -237,12 +234,11 @@ export default { ...@@ -237,12 +234,11 @@ export default {
}, },
//点击选中排产订单 //点击选中排产订单
listData(li, index) { listData(li, index) {
console.log(li); // console.log(li);
this.isactive = index; this.isactive = index;
this.orderId = li.id; this.orderId = li.id;
this.routingHeaderId = li.routingHeaderId; this.routingHeaderId = li.routingHeaderId;
this.tagTata(li.id); this.tagTata(li.id);
this.activeHeight = "100%";
}, },
changeMode(a) { changeMode(a) {
this.mode = a; this.mode = a;
...@@ -290,7 +286,7 @@ export default { ...@@ -290,7 +286,7 @@ export default {
}, },
//工序列表序列设置 //工序列表序列设置
type(i) { type(i) {
console.log(i); // console.log(i);
if (i < this.result.length) { if (i < this.result.length) {
return "normal"; return "normal";
} else if (i === this.result.length) { } else if (i === this.result.length) {
...@@ -321,7 +317,7 @@ export default { ...@@ -321,7 +317,7 @@ export default {
let curItem = items[this.curIndex]; let curItem = items[this.curIndex];
curItem.aps = this.mode; curItem.aps = this.mode;
console.log(curItem.aps); // console.log(curItem.aps);
let addItem = this.$u.clone(curItem); let addItem = this.$u.clone(curItem);
curItem.quantity -= this.chaiNum; curItem.quantity -= this.chaiNum;
curItem.chaiCount += 1; curItem.chaiCount += 1;
...@@ -421,8 +417,6 @@ export default { ...@@ -421,8 +417,6 @@ export default {
item.aps = this.mode; item.aps = this.mode;
this.$set(this.result, index, item); this.$set(this.result, index, item);
this.set = false; this.set = false;
this.activeHeight = "140px";
this.tagTata(0);
}, },
}, },
computed: { computed: {
...@@ -537,7 +531,7 @@ export default { ...@@ -537,7 +531,7 @@ export default {
padding-top: 30px; padding-top: 30px;
.set-name { .set-name {
font-weight: bold; font-weight: bold;
// margin-bottom: -15px; height: 30px;
span { span {
cursor: pointer; cursor: pointer;
} }
...@@ -554,10 +548,7 @@ export default { ...@@ -554,10 +548,7 @@ export default {
text-align: center; text-align: center;
} }
} }
div {
height: 30px;
// margin-bottom: 10px;
}
.content { .content {
padding-left: 5px; padding-left: 5px;
height: 30px; height: 30px;
...@@ -583,7 +574,10 @@ export default { ...@@ -583,7 +574,10 @@ export default {
height: 100%; height: 100%;
} }
.ivu-timeline-item { .ivu-timeline-item {
padding-bottom: 25px !important; // padding-bottom: 25px !important;
height: 100%;
}
.ivu-timeline-item-content {
height: 100%; height: 100%;
} }
</style> </style>
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