Skip to content

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

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

parents 787673f4 7d51f13a
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 79 deletions
components/modalTree/technologyTree.vue
View file @ bafd6ab3
......@@ -8,8 +8,7 @@
:type="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'"
size="16"
@click="toggle"
title="展开/合并"
/>
title="展开/合并"/>
</Button>
<Button>
<Icon type="md-refresh" size="16" @click="loadTree" title="刷新" />
......
pages/mesPlan/add.vue
View file @ bafd6ab3
......@@ -37,7 +37,6 @@
</Col>
</Row>
<Row>
<Col span="8">
<FormItem label="数量" style="width:100%" prop="quantity">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
......@@ -72,7 +71,7 @@
<Input v-model="orderSearchForm.projectNumber" style="width:240px" />
</FormItem>
</Col>
<Col span="8">
<Col span="8">
<FormItem label="批次号" style="width:100%">
<Input v-model="orderSearchForm.batchNumber" style="width:240px" />
</FormItem>
......@@ -90,7 +89,7 @@
<Row>
<Col span="24">
<FormItem label="任务节点要求" style="width:100%">
<Input v-model="orderSearchForm.taskRequire" placeholder />
<Input v-model="orderSearchForm.taskRequire" placeholder />
</FormItem>
</Col>
<Col span="24">
......@@ -169,20 +168,20 @@ export default {
type: "number",
trigger: "change"
}
],
]
},
disabled:false,
disabled: false
};
},
mounted(){
this.loadTree()
mounted() {
this.loadTree();
},
methods: {
handleSubmit() {
this.$refs.formValidate.validate(v => {
if (v) {
this.disabled = true;
this.orderSearchForm.status=1
this.orderSearchForm.status = 1;
Api.mesplancreate(this.orderSearchForm)
.then(r => {
this.disabled = false;
......@@ -202,7 +201,7 @@ export default {
});
},
handleClose() {
this.resetFields()
this.resetFields();
this.$emit("on-close");
},
l(key) {
......@@ -225,33 +224,20 @@ export default {
}
},
resetFields() {
this.orderSearchForm = {
productId: null, //产品id
productName: "", //产品名称
drawnNumber: null, //图号
taskType: null, //任务类型
stage: null, //阶段
materialId: null, //材料
quantity: 1, //数量
guestName: "", //甲方客户
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: "", //任务接点要求
putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: "", //外部图号/模型号
modelVersion: "", //模型版本
taskCode: "", //甲方任务号
designer: "", //甲方设计人员
officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: "", //厂内主工艺人员
routing_Method: null, //工艺方法
outer_Envelope_Size: "", //包装尺寸
demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间
remark: "" //备注
};
this.orderSearchForm = {
productId: null, //产品id
productName: "", //产品名称
drawnNumber: null, //图号
taskType: null, //任务类型
quantity: 1, //数量
taskRequire: "", //任务接点要求
demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDateEnd(tomorrowDate), //完成时间
remark: "", //备注
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
};
},
loadTree() {
//打开新增订单窗口加载产品
......@@ -312,7 +298,8 @@ export default {
"-" +
this.p(d.getMonth() + 1) +
"-" +
this.p(d.getDate())+ " 00:00:01";
this.p(d.getDate()) +
" 00:00:01";
return resDate;
},
getFormatDateEnd(dates) {
......@@ -322,13 +309,14 @@ export default {
"-" +
this.p(d.getMonth() + 1) +
"-" +
this.p(d.getDate())+ " 23:59:59";
this.p(d.getDate()) +
" 23:59:59";
return resDate;
},
p(s) {
return s < 10 ? "0" + s : s;
}
//时间相关end
//时间相关end
}
};
</script>
pages/technology/details.vue
View file @ bafd6ab3
<style lang="less">
@import './technolog.less';
@import "./technolog.less";
</style>
<template>
<Layout class="details_box">
<Header>
<h4 class="details_top tc">
<a class="back_href" @click="back"> <Icon type="ios-undo-outline" />返回工艺规程</a>
<div>工艺信息</div>
</h4>
<div class="details_body">
<Menu mode="horizontal" theme="light" active-name="1">
<MenuItem name="1" to="/technology/details/working">工序</MenuItem>
<MenuItem name="2" to="/technology/details/routingqccard">质控卡</MenuItem>
<MenuItem name="3" to="/technology/details/routingsupporting">工艺BOM</MenuItem>
<MenuItem name="4" to="/technology/details/setup/setupDetails">生产准备</MenuItem>
</Menu>
</div>
</Header>
<Layout class="bottom_box" >
<nuxt-child keep-alive ></nuxt-child>
</Layout>
<Layout class="details_box">
<Header>
<h4 class="details_top tc">
<a class="back_href" @click="back">
<Icon type="ios-undo-outline" />返回工艺规程
</a>
<div>工艺信息:{{info}}</div>
</h4>
<div class="details_body">
<Menu mode="horizontal" theme="light" active-name="1">
<MenuItem name="1" to="/technology/details/working">工序</MenuItem>
<MenuItem name="2" to="/technology/details/routingqccard">质控卡</MenuItem>
<MenuItem name="3" to="/technology/details/routingsupporting">工艺BOM</MenuItem>
<MenuItem name="4" to="/technology/details/setup/setupDetails">生产准备</MenuItem>
</Menu>
</div>
</Header>
<Layout class="bottom_box">
<nuxt-child keep-alive :info="info"></nuxt-child>
</Layout>
</Layout>
</template>
<script>
import Api from "./api";
export default {
components: {},
data() {
......@@ -31,6 +34,8 @@ export default {
showMenu:true,
treeHeight: '',
actNum:'1',
info:"",
urlQccard:'',
}
},
created() {
......@@ -41,6 +46,8 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
this.getRoutingheaderInfo()
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
......@@ -50,12 +57,23 @@ export default {
},
computed: { },
methods: {
getRoutingheaderInfo()
{
let params={
id:this.$http.common.getquerystring('id')
}
Api.get(params).then(r=>{
this.info=r.result.name
}).catch(err=>{
this.$Message.error("连接错误")
})
},
back(){
this.$router.push({
name: "technology",
// params: { transmitData: lemData }
});
},
}
},
}
</script>
pages/technology/details/routingqccard/add.vue
View file @ bafd6ab3
......@@ -170,13 +170,6 @@ export default {
return {
disabled: false,
entity: {
creationTime: null,
creatorUserId: null,
lastModificationTime: null,
lastModifierUserId: null,
isDeleted: null,
deleterUserId: null,
deletionTime: null,
routingHeaderId: null,
routingDetailId: null,
routingStepId: null,
......
pages/technology/details/routingqccard/index.vue
View file @ bafd6ab3
<template>
<div>
{{info}}
<DataGrid :columns="columns" ref="grid" :action="action">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
......@@ -39,6 +40,9 @@ export default {
author: "henq",
description: "routing_qc_card 4/27/2020 10:31:00 AM"
},
props: {
info: { type: String }
},
data() {
return {
action: Api.index,
......
pages/technology/index.vue
View file @ bafd6ab3
<style lang="less">
@import "./technolog.less";
.lay100 {
height: calc(100vh - 105px);
background-color: #F5F6FA;
.con{
padding: 5px 5px 0px 10px;
}
}
</style>
<template>
<Layout class="lay100">
......@@ -23,7 +16,7 @@
<Icon type="ios-undo-outline" />详情页面
</a>-->
<Card class="h100">
<DataGrid :columns="columns" ref="grid" :action="action">
<DataGrid :columns="columns" ref="grid" :action="action" class="card_box">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
......@@ -259,9 +252,9 @@ export default {
this.showMenu = true;
},
// 详情页面
view() {
view(id) {
// this.$router.push("technology/details");
window.open("/technology/details","_blank")
window.open("/technology/details?id="+id,"_blank")
},
ok() {
this.$refs.grid.load();
......
pages/technology/technolog.less
View file @ bafd6ab3
......@@ -150,5 +150,16 @@
left: 44%;
}
}
}
.lay100 {
height: calc(100vh - 105px);
background-color: #F5F6FA;
.con{
padding: 5px 5px 0px 10px;
.h100{
overflow-y: auto;
}
}
}
\ No newline at end of file
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