Skip to content

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

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

parents 7bcde15b 182d2c6f
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 167 deletions
pages/aps/complete/api.js
View file @ 8a15ad6f
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
// getpooltypeorderlist(params) {
// return Api.get(`${PlanUrl}/messchedule/getpooltypeorderlist`, params); //排产池订单数据
// },
getpooltypeorderlist(params) { getpooltypeorderlist(params) {
return Api.get(`${PlanUrl}/messchedule/getpooltypeorderlist`, params); //排产池订单数据 return Api.get(`${PlanUrl}/messchedule/getpooltypeorderlist_new`, params); //排产池订单数据
}, },
cmonestepschedule(params) { cmonestepschedule(params) {
return Api.post(`${PlanUrl}/messchedule/cmonestepschedule`, params); //整机排产--一级排产 return Api.post(`${PlanUrl}/messchedule/cmonestepschedule`, params); //整机排产--一级排产
...@@ -12,4 +15,8 @@ export default { ...@@ -12,4 +15,8 @@ export default {
shiftoutofcmorflpool(params) { shiftoutofcmorflpool(params) {
return Api.post(`${PlanUrl}/messchedule/shiftoutofcmorflpool`, params); //删除订单 return Api.post(`${PlanUrl}/messchedule/shiftoutofcmorflpool`, params); //删除订单
}, },
getorderroutings(params) {
return Api.get(`${PlanUrl}/messchedule/getorderroutings`, params); //查看工艺
},
} }
\ No newline at end of file
pages/aps/complete/index.vue
View file @ 8a15ad6f
...@@ -40,11 +40,21 @@ ...@@ -40,11 +40,21 @@
<div class="fa">产品名称：{{ li.productName }}</div> <div class="fa">产品名称：{{ li.productName }}</div>
<div class="time-s">产品数量：{{ li.quantity }}</div> <div class="time-s">产品数量：{{ li.quantity }}</div>
<div class="time-s"> <div class="time-s">
<span>工序：{{ li.drawnNumber }}</span> <span>图号：{{ li.drawnNumber }}</span>
</div> </div>
<div class="time-s"> <!-- <div class="time-s">
{{ li.demandFinishDate }} ~ {{ li.demandStartDate }} {{ li.demandFinishDate }} ~ {{ li.demandStartDate }}
</div> </div> -->
<Row class="time-s">
<Col :span="19">
<div>
{{ li.demandFinishDate }} — {{ li.demandStartDate }}
</div></Col
>
<Col :span="5" class="order-ringht"
><a @click="seeDetail(li.id)"> 查看工艺 </a></Col
>
</Row>
</div> </div>
</div> </div>
</div> </div>
...@@ -111,6 +121,9 @@ ...@@ -111,6 +121,9 @@
</Form> </Form>
</div> </div>
</div> </div>
<Modal v-model="seeModal" title="查看工艺" footer-hide width="800">
<Table border :columns="columns1" :data="data1"></Table>
</Modal>
</div> </div>
</template> </template>
<script> <script>
...@@ -125,6 +138,7 @@ export default { ...@@ -125,6 +138,7 @@ export default {
return { return {
list: [], list: [],
workShop: [], workShop: [],
seeModal: false,
listClass: [], listClass: [],
status: "0", //全部排产-1，0为未排产；2为已排查； status: "0", //全部排产-1，0为未排产；2为已排查；
formItem: { formItem: {
...@@ -140,8 +154,22 @@ export default { ...@@ -140,8 +154,22 @@ export default {
}, },
user: "", user: "",
showSet: false, showSet: false,
orderIds: [], orderIds: [],
data1: [],
columns1: [
{
title: "工艺名称",
key: "name",
},
{
title: "工艺编号",
key: "code",
},
{
title: "版本",
key: "version",
},
],
}; };
}, },
created() { created() {
...@@ -149,6 +177,14 @@ export default { ...@@ -149,6 +177,14 @@ export default {
this.getWorkshop(); this.getWorkshop();
}, },
methods: { methods: {
seeDetail(id) {
this.seeModal = true;
Api.getorderroutings({ id: id }).then((r) => {
if (r.result) {
this.data1 = r.result;
}
});
},
viewClose() { viewClose() {
this.$router.push("/aps/plan"); this.$router.push("/aps/plan");
}, },
...@@ -376,6 +412,9 @@ export default { ...@@ -376,6 +412,9 @@ export default {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
color: @table-color; color: @table-color;
.order-ringht {
text-align: center;
}
} }
} }
} }
......
pages/aps/stream/index.vue
View file @ 8a15ad6f
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<!-- </RadioGroup> --> <!-- </RadioGroup> -->
</Col> </Col>
</Row> </Row>
<div class="left-down"> <div class="left-down1">
<div <div
class="left-body" class="left-body"
v-for="(li, index) in list" v-for="(li, index) in list"
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<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>
<div class="time-s"> <div class="time-s">
{{ li.demandFinishDate }} — {{ li.demandStartDate }} {{ li.demandFinishDate }} — {{ li.demandStartDate }}
...@@ -455,7 +455,7 @@ export default { ...@@ -455,7 +455,7 @@ export default {
}, },
}; };
</script> </script>
<style lang="less"> <style lang="less" >
@import "../../../assets/css/custom.less"; @import "../../../assets/css/custom.less";
.addclass { .addclass {
border-color: rgba(38, 128, 235, 0.5) !important; border-color: rgba(38, 128, 235, 0.5) !important;
...@@ -486,7 +486,7 @@ export default { ...@@ -486,7 +486,7 @@ export default {
text-align: right; text-align: right;
} }
} }
.left-down { .left-down1 {
height: 82vh; height: 82vh;
overflow: auto; overflow: auto;
.left-body:hover { .left-body:hover {
......
pages/produce/orderlist.vue
View file @ 8a15ad6f
...@@ -105,10 +105,11 @@ ...@@ -105,10 +105,11 @@
</Col> </Col>
<Col span="16" class="row"> <Col span="16" class="row">
<p> <p>
工艺：{{ row.routingHeaderCode }} / 工艺编号：{{ row.routingHeaderCode }}
{{ row.routingHeaderName }} <!-- /
{{ row.routingHeaderName }} -->
</p> </p>
<!-- <p>工艺名称：{{ row.routingHeaderName }}</p> --> <p>工艺名称：{{ row.routingHeaderName }}</p>
<p>{{ l("beginTime") }}：{{ row.begin_time }}</p> <p>{{ l("beginTime") }}：{{ row.begin_time }}</p>
<p> <p>
<span v-if="getStatus(row.status)" <span v-if="getStatus(row.status)"
...@@ -130,10 +131,10 @@ ...@@ -130,10 +131,10 @@
<p>{{ l("quantity") }}：{{ row.quantity }}</p></Col <p>{{ l("quantity") }}：{{ row.quantity }}</p></Col
> >
<Col span="12" <Col span="12"
><p>工序号：{{ row.taskSeq }}</p></Col ><p>工序号：{{ row.task_seq }}</p></Col
> >
</Row> </Row>
<p>工序名称：{{ row.taskName }}</p> <p>工序名称：{{ row.name }}</p>
</Col> </Col>
</Row> </Row>
<Row class="rowBottom"> <Row class="rowBottom">
...@@ -210,7 +211,7 @@ export default { ...@@ -210,7 +211,7 @@ export default {
{ {
title: this.l("mesCode"), title: this.l("mesCode"),
key: "mesCode", key: "mesCode",
width: 240, width: 200,
align: "left", align: "left",
}, },
{ {
...@@ -224,7 +225,7 @@ export default { ...@@ -224,7 +225,7 @@ export default {
key: "routingHeaderName", key: "routingHeaderName",
title: this.l("routingHeaderName"), title: this.l("routingHeaderName"),
align: "center", align: "center",
width: 180, width: 240,
high: true, high: true,
}, },
{ {
......
pages/welcome/index.vue
View file @ 8a15ad6f
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
:key="index" :key="index"
@mouseenter="navClick(item,index)" @mouseenter="navClick(item,index)"
> >
<Icon type="ios-stats" class="f16" />{{ item.name }} <Icon :type="item.icons" class="f16" />{{ item.name }}
</li> </li>
</ul> </ul>
...@@ -42,149 +42,7 @@ import viewerVue from "../test/viewer.vue"; ...@@ -42,149 +42,7 @@ import viewerVue from "../test/viewer.vue";
export default { export default {
data() { data() {
return { return {
navMenus: false, menus: [],
onetest: "0",
menus: [
{
name: "项目管理",
style:{
left:'260px',
top:"100px"
},
children: [
{
name: "项目管理",
type: 2,
code: "",
icon: "",
target: 0,
url: "/project/project",
status: 1,
description: "",
source: 0,
app: "mes_roter",
priority: 0,
id: 541,
title: "项目管理",
expand: true,
upId: 537,
lay: 2,
children: null,
data: null,
},
{
name: "任务中心",
type: 2,
code: "",
icon: "",
target: 0,
url: "/project/task",
status: 1,
description: "",
source: 0,
app: "mes_roter",
priority: 0,
id: 542,
title: "任务中心",
expand: true,
upId: 537,
lay: 2,
children: null,
data: null,
},
{
name: "项目资源",
type: 2,
code: "",
icon: "",
target: 0,
url: "/project/resources",
status: 1,
description: "",
source: 0,
app: "mes_roter",
priority: 0,
id: 543,
title: "项目资源",
expand: true,
upId: 537,
lay: 2,
children: null,
data: null,
},
],
},
{
name: "文档管理",
style:{
left:'260px',
top:"190px"
},
children: [
{
name: "文档分类",
type: 2,
code: "",
icon: "",
target: 0,
url: "/word/classification",
status: 1,
description: "",
source: 0,
app: "mes_roter",
priority: 0,
id: 544,
title: "文档分类",
expand: true,
upId: 539,
lay: 2,
children: null,
data: null,
},
{
name: "文档管理",
type: 2,
code: "",
icon: "",
target: 0,
url: "/word/document",
status: 1,
description: "",
source: 0,
app: "mes_roter",
priority: 0,
id: 545,
title: "文档管理",
expand: true,
upId: 539,
lay: 2,
children: null,
data: null,
},
{
name: "模板类型",
type: 2,
code: "",
icon: "",
target: 0,
url: "/word/template",
status: 1,
description: "",
source: 0,
app: "mes_roter",
priority: 0,
id: 546,
title: "模板类型",
expand: true,
upId: 539,
lay: 2,
children: null,
data: null,
},
],
},
{ name: "大屏展示" },
],
list: [], list: [],
arrList: [], arrList: [],
isIndex: -1, isIndex: -1,
...@@ -204,16 +62,25 @@ export default { ...@@ -204,16 +62,25 @@ export default {
this.$api.get(`${systemUrl}/menu/getusermenu?id=mes_roter`).then((r) => { this.$api.get(`${systemUrl}/menu/getusermenu?id=mes_roter`).then((r) => {
if (r.result) { if (r.result) {
let arr = r.result[0].children.map((l) => { let arr = r.result[0].children.map((l) => {
if ( if ( !this.$u.isNull(l.description) && l.description.indexOf("{") > -1 ) {
!this.$u.isNull(l.description) &&
l.description.indexOf("{") > -1
) {
l.style = eval("(" + l.description + ")"); l.style = eval("(" + l.description + ")");
} }
return l; return l;
}); });
console.log("arr", arr);
this.arrList = arr; this.arrList = arr;
this.arrList.map(v=>{
if(v.name=='项目管理'){
this.menus[0]=v;
this.menus[0].icons='ios-list-box-outline';
}else if(v.name=='文档管理'){
this.menus[1]=v;
this.menus[1].icons='md-document';
}else if(v.name=='大屏展示'){
this.menus[2]=v;
this.menus[2].icons='ios-stats';
}
})
console.log(this.menus)
} }
}); });
}, },
...@@ -237,8 +104,7 @@ export default { ...@@ -237,8 +104,7 @@ export default {
this.menuPos = { left, top }; this.menuPos = { left, top };
} }
}, },
navClick(v,index) { navClick(v,index) {
if (v.children && v.children.length > 0) { if (v.children && v.children.length > 0) {
var { left, top } = v.style; var { left, top } = v.style;
this.list = v.children; this.list = v.children;
......
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