Skip to content

M
mes-ui
Commit 0af9f71f authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

流水排产池样式

parent 1a97957b
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 55 deletions
pages/aps/stream/index.vue
View file @ 0af9f71f
...@@ -14,23 +14,25 @@ ...@@ -14,23 +14,25 @@
<div class="left-down"> <div class="left-down">
<div <div
class="left-body" class="left-body"
v-for="(li,index) in list" v-for="(li, index) in list"
:key="index" :key="index"
@click="listData(li,index)" @click="listData(li, index)"
:class="isactive == index ? 'addclass' : '' " :class="isactive == index ? 'addclass' : ''"
> >
<Row class="title-i"> <Row class="title-i">
<Col :span="20" class="order-code">订单号：{{li.mesCode}}</Col> <Col :span="20" class="order-code">订单号：{{ li.mesCode }}</Col>
<Col :span="4" class="order-ringht"> <Col :span="4" class="order-ringht">
<Icon type="md-close" @click="close(li.id)" /> <Icon type="md-close" @click="close(li.id)" />
</Col> </Col>
</Row> </Row>
<div class="fa">产品名称：{{li.productName}}</div> <div class="fa">产品名称：{{ li.productName }}</div>
<div class="time-s"> <div class="time-s">
<!-- <Icon type="ios-copy" /> --> <!-- <Icon type="ios-copy" /> -->
<span>工序：{{li.drawnNumber}}</span> <span>工序：{{ li.drawnNumber }}</span>
</div>
<div class="time-s">
{{ li.demandFinishDate }} — {{ li.demandStartDate }}
</div> </div>
<div class="time-s">{{li.demandFinishDate}} — {{li.demandStartDate}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -44,11 +46,22 @@ ...@@ -44,11 +46,22 @@
<span></span> <span></span>
</Col> </Col>
<Col :span="6"> <Col :span="6">
<RadioGroup v-model="mode" type="button" size="small" @on-change="changeMode"> <RadioGroup
v-model="mode"
type="button"
size="small"
@on-change="changeMode"
>
<Radio :label="1">一级排产</Radio> <Radio :label="1">一级排产</Radio>
<Radio :label="2">二级排产</Radio> <Radio :label="2">二级排产</Radio>
</RadioGroup> </RadioGroup>
<Button type="primary" @click="lowerHair" :disabled="!allow" v-if="showXia">下发</Button> <Button
type="primary"
@click="lowerHair"
:disabled="!allow"
v-if="showXia"
>下发</Button
>
</Col> </Col>
</Row> </Row>
<Row class="right-body"> <Row class="right-body">
...@@ -58,50 +71,56 @@ ...@@ -58,50 +71,56 @@
<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
@click="sets(item,index)" @click="sets(item, index)"
class="mr20" class="mr20"
:class="active == index ? 'gongTitle' : '' " :class="active == index ? 'gongTitle' : ''"
>工序名称：{{item.name}}</span> >工序名称：{{ item.name }}</span
>
<op <op
title="拆分工序" title="拆分工序"
@click="split(item,index)" @click="split(item, index)"
type="icon" type="icon"
icon="ios-cut" icon="ios-cut"
v-if="item.quantity>1&&!item.chai" v-if="item.quantity > 1 && !item.chai"
></op> ></op>
<op <op
title="移除" title="移除"
@click="remove(item,index)" @click="remove(item, index)"
type="icon" type="icon"
icon="ios-trash" icon="ios-trash"
oprate="delete" oprate="delete"
v-if="item.chai" v-if="item.chai"
></op> ></op>
</div> </div>
<div>数量：{{item.quantity}}</div> <div>数量：{{ item.quantity }}</div>
<div v-if="item.userIds"> <div v-if="item.userIds">
人员： 人员：
<span v-for="(u,j) in item.userIds" :key="j"> <span v-for="(u, j) in item.userIds" :key="j">
<User :value="u"></User>&nbsp;&nbsp;&nbsp; <User :value="u"></User>&nbsp;&nbsp;&nbsp;
</span> </span>
</div> </div>
<div v-if="item.shopName"> <div v-if="item.shopName">
班组： 班组：
{{item.shopName}} {{ item.shopName }}
</div> </div>
<div v-if="item.beginTime"> <div v-if="item.beginTime">
时间： 时间：
{{item.beginTime}} —— {{item.endTime}} {{ item.beginTime }} —— {{ item.endTime }}
</div> </div>
<div v-if="item.remark"> <div v-if="item.remark">
备注： 备注：
{{item.remark}} {{ item.remark }}
</div> </div>
<!-- <div>工序号：{{item.task_seq}}</div> --> <!-- <div>工序号：{{item.task_seq}}</div> -->
</TimelineItem> </TimelineItem>
</Timeline> </Timeline>
<div> <div>
<Drawer title="排产设置盘" :closable="false" v-model="set" width="55%"> <Drawer
title="排产设置盘"
:closable="false"
v-model="set"
width="55%"
>
<Set <Set
:mode="mode" :mode="mode"
:detailId="detailId" :detailId="detailId"
...@@ -127,7 +146,12 @@ ...@@ -127,7 +146,12 @@
> >
拆分数量: 拆分数量:
<InputNumber v-model="chaiNum" :min="1" :max="maxnum"></InputNumber> <InputNumber v-model="chaiNum" :min="1" :max="maxnum"></InputNumber>
<Slider v-if="maxnum>1" v-model="chaiNum" :min="1" :max="maxnum"></Slider> <Slider
v-if="maxnum > 1"
v-model="chaiNum"
:min="1"
:max="maxnum"
></Slider>
</Modal> </Modal>
</div> </div>
</template> </template>
...@@ -137,7 +161,7 @@ import Api from "./api"; ...@@ -137,7 +161,7 @@ import Api from "./api";
export default { export default {
name: "set", name: "set",
components: { components: {
Set Set,
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
...@@ -164,7 +188,7 @@ export default { ...@@ -164,7 +188,7 @@ export default {
orderId: 0, orderId: 0,
routingHeaderId: 0, routingHeaderId: 0,
detailId: 0 detailId: 0,
}; };
}, },
created() { created() {
...@@ -186,23 +210,25 @@ export default { ...@@ -186,23 +210,25 @@ export default {
//排产池列表 //排产池列表
orderlist() { orderlist() {
Api.getpooltypeorderlist({ PoolType: 3, status: this.status }).then(r => { Api.getpooltypeorderlist({ PoolType: 3, status: this.status }).then(
if (r.result) { (r) => {
r.result.map(u => { if (r.result) {
u.aps = 0; r.result.map((u) => {
u.demandFinishDate = u.demandFinishDate.substr(0, 10); u.aps = 0;
u.demandStartDate = u.demandStartDate.substr(0, 10); u.demandFinishDate = u.demandFinishDate.substr(0, 10);
}); u.demandStartDate = u.demandStartDate.substr(0, 10);
this.list = r.result; });
// if (r.result[0]) { this.list = r.result;
// this.tagTata(r.result[0].id); // if (r.result[0]) {
// } else { // this.tagTata(r.result[0].id);
// this.result = []; // } else {
// } // this.result = [];
} else { // }
this.$Message.info("排产池数据请求失败"); } else {
this.$Message.info("排产池数据请求失败");
}
} }
}); );
}, },
//点击选中排产订单 //点击选中排产订单
listData(li, index) { listData(li, index) {
...@@ -218,9 +244,9 @@ export default { ...@@ -218,9 +244,9 @@ export default {
}, },
//工序列表 //工序列表
tagTata(id) { tagTata(id) {
Api.getroutingdetails({ id: id }).then(r => { Api.getroutingdetails({ id: id }).then((r) => {
if (r.success) { if (r.success) {
r.result.map(u => { r.result.map((u) => {
u.seq = u.task_seq; u.seq = u.task_seq;
u.chaiCount = 0; u.chaiCount = 0;
u.chai = false; u.chai = false;
...@@ -242,7 +268,7 @@ export default { ...@@ -242,7 +268,7 @@ export default {
title: "删除", title: "删除",
content: "<p>您确定要移除此订单吗</p>", content: "<p>您确定要移除此订单吗</p>",
onOk: () => { onOk: () => {
Api.shiftoutofcmorflpool({ ids: ids }).then(r => { Api.shiftoutofcmorflpool({ ids: ids }).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success("删除成功"); this.$Message.success("删除成功");
this.orderlist(this.status); this.orderlist(this.status);
...@@ -253,7 +279,7 @@ export default { ...@@ -253,7 +279,7 @@ export default {
}, },
onCancel: () => { onCancel: () => {
this.$Message.info("您已取消删除"); this.$Message.info("您已取消删除");
} },
}); });
}, },
//工序列表序列设置 //工序列表序列设置
...@@ -331,16 +357,16 @@ export default { ...@@ -331,16 +357,16 @@ export default {
quantity: this.result[i].quantity, quantity: this.result[i].quantity,
beginTime: this.result[i].beginTime, beginTime: this.result[i].beginTime,
endTime: this.result[i].endTime, endTime: this.result[i].endTime,
remark: this.result[i].remark remark: this.result[i].remark,
}; };
items.push(obj); items.push(obj);
} }
let data = { let data = {
orderId: this.orderId, orderId: this.orderId,
routingHeaderId: this.routingHeaderId, routingHeaderId: this.routingHeaderId,
items: items items: items,
}; };
Api.flonestepschedule(data).then(r => { Api.flonestepschedule(data).then((r) => {
if (r.result) { if (r.result) {
this.$Message.success("下发成功"); this.$Message.success("下发成功");
this.orderlist(this.status); this.orderlist(this.status);
...@@ -357,16 +383,16 @@ export default { ...@@ -357,16 +383,16 @@ export default {
quantity: this.result[i].quantity, quantity: this.result[i].quantity,
beginTime: this.result[i].beginTime, beginTime: this.result[i].beginTime,
endTime: this.result[i].endTime, endTime: this.result[i].endTime,
remark: this.result[i].remark remark: this.result[i].remark,
}; };
items.push(obj); items.push(obj);
} }
let data = { let data = {
orderId: this.orderId, orderId: this.orderId,
routingHeaderId: this.routingHeaderId, routingHeaderId: this.routingHeaderId,
items: items items: items,
}; };
Api.fltwostepschedule(data).then(r => { Api.fltwostepschedule(data).then((r) => {
if (r.result) { if (r.result) {
this.$Message.success("下发成功"); this.$Message.success("下发成功");
this.orderlist(this.status); this.orderlist(this.status);
...@@ -389,17 +415,17 @@ export default { ...@@ -389,17 +415,17 @@ export default {
this.$set(this.result, index, item); this.$set(this.result, index, item);
this.set = false; this.set = false;
// this.active = null; // this.active = null;
} },
}, },
computed: { computed: {
allow() { allow() {
let mode = this.mode; let mode = this.mode;
let oks = this.result.filter(u => { let oks = this.result.filter((u) => {
return u.aps == mode; return u.aps == mode;
}); });
return oks.length == this.result.length; return oks.length == this.result.length;
} },
} },
}; };
</script> </script>
<style lang="less"> <style lang="less">
...@@ -532,11 +558,15 @@ export default { ...@@ -532,11 +558,15 @@ export default {
} }
} }
} }
.ivu-timeline-item {
padding: 0 0 25px 0;
}
} }
.right-body { .right-body {
.list { .list {
.s0 { .s0 {
color:@table-color !important; color: @table-color !important;
} }
} }
} }
......
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