Skip to content

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

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

parents 56f858f0 40bf3fd1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 881 additions and 940 deletions
assets/css/base.less
View file @ 2c8fbb84
...@@ -1296,7 +1296,7 @@ html [type=button] { ...@@ -1296,7 +1296,7 @@ html [type=button] {
left: 0; left: 0;
text-align: center; text-align: center;
padding: 20px 0; padding: 20px 0;
background: #08080894; background: #080808;
div { div {
height: 25px; height: 25px;
......
i18n/locale/zh-CN.js
View file @ 2c8fbb84
...@@ -920,7 +920,7 @@ export default { ...@@ -920,7 +920,7 @@ export default {
productId: '产品Id', productId: '产品Id',
quantity: '数量', quantity: '数量',
remark: '备注', remark: '备注',
taskRequire: '任务节点要求', taskRequire: '任务要求',
status: '订单状态', status: '订单状态',
divideMark: '分解标记:1-已分解;0-未分解', divideMark: '分解标记:1-已分解;0-未分解',
productCode: '产品序号:No1~No99', productCode: '产品序号:No1~No99',
...@@ -930,13 +930,13 @@ export default { ...@@ -930,13 +930,13 @@ export default {
batchNumber: '批次号', batchNumber: '批次号',
projectNumber: '项目号', projectNumber: '项目号',
urgencyLevel: '紧急程度', urgencyLevel: '紧急程度',
productingPreparationPeople: '生产准备(主制车间)', productingPreparationPeople: '生产车间',
productingPreparationFinishDate: '生产准备完成时间', productingPreparationFinishDate: '生产完成时间',
quotationPeople: '订单报价人员', quotationPeople: '订单报价人员',
quotationFinishDate: '订单报价完成时间', quotationFinishDate: '订单报价完成时间',
upId: '父订单id', upId: '父订单id',
demandStartDate: '投料时间', demandStartDate: '开始时间',
demandFinishDate: '节点时间', demandFinishDate: '完成时间',
//tempTitle------ //tempTitle------
stage: '阶段', stage: '阶段',
materialId: '材料', materialId: '材料',
......
pages/aps/plan/index.vue
View file @ 2c8fbb84
...@@ -150,9 +150,9 @@ export default { ...@@ -150,9 +150,9 @@ export default {
modalAccessory: false, modalAccessory: false,
columns: [{ columns: [{
key: "selection", key: "selection",
title: "#", title: '多选',
type: "selection", type: "selection",
width: 70, width: 50,
align: "center", align: "center",
}, },
{ {
...@@ -259,13 +259,13 @@ export default { ...@@ -259,13 +259,13 @@ export default {
high: true, high: true,
hide: true, hide: true,
}, },
{ // {
key: "spareQty", // key: "spareQty",
title: this.l("spareQty"), // title: this.l("spareQty"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ {
key: "isPreschedule", key: "isPreschedule",
title: this.l("isPreschedule"), title: this.l("isPreschedule"),
...@@ -274,28 +274,28 @@ export default { ...@@ -274,28 +274,28 @@ export default {
high: true, high: true,
code: "aps.plan.ispreschedule", code: "aps.plan.ispreschedule",
}, },
{ // {
key: "demandStart", // key: "demandStart",
title: this.l("demandStart"), // title: this.l("demandStart"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "demandFinish", // key: "demandFinish",
title: this.l("demandFinish"), // title: this.l("demandFinish"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "partNamePro", // key: "partNamePro",
title: this.l("partNamePro"), // title: this.l("partNamePro"),
align: "left", // align: "left",
easy: true, // easy: true,
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ {
title: "操作", title: "操作",
key: "action", key: "action",
......
pages/handle/examine1/index.vue
View file @ 2c8fbb84
This diff is collapsed.
pages/mesPlan/add.vue
View file @ 2c8fbb84
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
productId: null, //产品id productId: null, //产品id
productName: "", //产品名称 productName: "", //产品名称
drawnNumber: null, //图号 drawnNumber: null, //图号
taskType: null, //任务类型 taskType: 1, //任务类型
quantity: 1, //数量 quantity: 1, //数量
taskRequire: "", //任务接点要求 taskRequire: "", //任务接点要求
demandStartDate: this.getFormatDate(nowDate), //开始时间 demandStartDate: this.getFormatDate(nowDate), //开始时间
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
remark: "", //备注 remark: "", //备注
projectNumber: "", //项目号 projectNumber: "", //项目号
batchNumber: "", //批次号 batchNumber: "", //批次号
urgencyLevel: null, //紧急程度 urgencyLevel: 1, //紧急程度
bomId: null, bomId: null,
}, },
ruleValidate: { ruleValidate: {
...@@ -147,7 +147,9 @@ export default { ...@@ -147,7 +147,9 @@ export default {
wfstatu: 1, wfstatu: 1,
}; };
}, },
created() {},
mounted() { mounted() {
let params = { let params = {
id: "123327da-42b3-41f6-b785-cf933f137a95", id: "123327da-42b3-41f6-b785-cf933f137a95",
}; };
...@@ -161,8 +163,8 @@ export default { ...@@ -161,8 +163,8 @@ export default {
} }
} }
}); });
this.loadTree(); this.loadTree();
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
...@@ -173,6 +175,7 @@ export default { ...@@ -173,6 +175,7 @@ export default {
.then((r) => { .then((r) => {
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.resetFields();
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error("保存失败");
...@@ -215,10 +218,11 @@ export default { ...@@ -215,10 +218,11 @@ export default {
}, },
resetFields() { resetFields() {
this.orderSearchForm = { this.orderSearchForm = {
productId: null, //产品id productId: null, //产品id
productName: "", //产品名称 productName: "", //产品名称
drawnNumber: null, //图号 drawnNumber: null, //图号
taskType: null, //任务类型 taskType: 1, //任务类型
quantity: 1, //数量 quantity: 1, //数量
taskRequire: "", //任务接点要求 taskRequire: "", //任务接点要求
demandStartDate: this.getFormatDate(nowDate), //开始时间 demandStartDate: this.getFormatDate(nowDate), //开始时间
...@@ -226,7 +230,7 @@ export default { ...@@ -226,7 +230,7 @@ export default {
remark: "", //备注 remark: "", //备注
projectNumber: "", //项目号 projectNumber: "", //项目号
batchNumber: "", //批次号 batchNumber: "", //批次号
urgencyLevel: null, //紧急程度 urgencyLevel: 1, //紧急程度
}; };
}, },
loadTree() { loadTree() {
......
pages/mesPlan/detail.vue
View file @ 2c8fbb84
<template> <template>
<div class="orderDetail"> <div class="orderDetail">
<Row> <Row>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('mesCode')}}</span> <span class="fwBold">{{l('mesCode')}}</span>
<p>{{entity.mesCode}}</p> <p>{{entity.mesCode}}</p>
</Col> </Col>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('taskType')}}</span> <span class="fwBold">{{l('taskType')}}</span>
<p> <state code="plan.order.taskType" :value="entity.taskType" type="text"></state></p> <p>
</Col> <state code="plan.order.taskType" :value="entity.taskType" type="text"></state>
<Col span="8"> </p>
</Col>
<Col span="8">
<span class="fwBold">{{l('quantity')}}</span> <span class="fwBold">{{l('quantity')}}</span>
<p>{{entity.quantity}}</p> <p>{{entity.quantity}}</p>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('status')}}</span> <span class="fwBold">{{l('status')}}</span>
<p><state code="plan.order.status" :value="entity.status" type="text"></state></p> <p>
</Col> <state code="plan.order.status" :value="entity.status" type="text"></state>
<Col span="8"> </p>
</Col>
<Col span="8">
<span class="fwBold">{{l('productName')}}</span> <span class="fwBold">{{l('productName')}}</span>
<p>{{entity.productName}}</p> <p>{{entity.productName}}</p>
</Col> </Col>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('drawnNumber')}}</span> <span class="fwBold">{{l('drawnNumber')}}</span>
<p>{{entity.drawnNumber}}</p> <p>{{entity.drawnNumber}}</p>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('batchNumber')}}</span> <span class="fwBold">{{l('batchNumber')}}</span>
<p>{{entity.batchNumber}}</p> <p>{{entity.batchNumber}}</p>
</Col> </Col>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('projectNumber')}}</span> <span class="fwBold">{{l('projectNumber')}}</span>
<p>{{entity.projectNumber}}</p> <p>{{entity.projectNumber}}</p>
</Col> </Col>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('urgencyLevel')}}</span> <span class="fwBold">{{l('urgencyLevel')}}</span>
<p><state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state></p> <p>
</Col> <state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state>
</p>
</Col>
</Row> </Row>
<Row> <Row>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('demandStartDate')}}</span> <span class="fwBold">{{l('demandStartDate')}}</span>
<p><DTSpan type="date" v-model="entity.demandStartDate"></DTSpan></p> <p>
</Col> <DTSpan type="date" v-model="entity.demandStartDate"></DTSpan>
<Col span="8"> </p>
</Col>
<Col span="8">
<span class="fwBold">{{l('demandFinishDate')}}</span> <span class="fwBold">{{l('demandFinishDate')}}</span>
<p><DTSpan type="date" v-model="entity.demandFinishDate"></DTSpan></p> <p>
</Col> <DTSpan type="date" v-model="entity.demandFinishDate"></DTSpan>
<Col span="8"> </p>
</Col>
<Col span="8">
<span class="fwBold">{{l('taskRequire')}}</span> <span class="fwBold">{{l('taskRequire')}}</span>
<p>{{entity.taskRequire}}</p> <p>{{entity.taskRequire}}</p>
</Col> </Col>
</Row>
<Row>
<Col span="8">
<span class="fwBold">{{l('productingPreparationPeople')}}</span>
<p>
<WorkShopName v-model="entity.productingPreparationPeople" v-if="entity.productingPreparationPeople>0"></WorkShopName>
</p>
</Col>
<Col span="8">
<span class="fwBold">{{l('quotationPeople')}}</span>
<p>
<User v-model="entity.quotationPeople" v-if="entity.quotationPeople>0"></User>
</p>
</Col>
<Col span="8">
<span class="fwBold">&nbsp;</span>
<p>&nbsp;</p>
</Col>
</Row> </Row>
<Row class="lastRow"> <Row class="lastRow">
<Col span="24"> <Col span="24">
<span class="fwBold">{{l('remark')}}</span> <span class="fwBold">{{l('remark')}}</span>
<p>{{entity.remark}}</p> <p>{{entity.remark}}</p>
</Col> </Col>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
name: "detail", name: "detail",
data() { data() {
return { return {
entity: {} entity: {}
}; };
},
props: {
row: {
type: Object,
default: () => {
return null;
}
}
},
methods: {
handleClose() {
this.$emit("on-close");
}, },
l(key) { props: {
key = "mes_plan" + "." + key; row: {
return this.$t(key); type: Object,
} default: () => {
}, return null;
watch: { }
row(v) { }
if (v != null) { },
this.entity = this.$u.clone(this.row); methods: {
} handleClose() {
this.$emit("on-close");
},
l(key) {
key = "mes_plan" + "." + key;
return this.$t(key);
}
},
watch: {
row(v) {
if (v != null) {
this.entity = this.$u.clone(this.row);
}
}
} }
}
}; };
</script> </script>
<style lang="less"> <style lang="less">
.orderDetail .orderDetail {
{ line-height: 30px;
line-height: 30px; width: 90%;
width: 90%; margin: 0 auto;
margin: 0 auto;
.ivu-row{ .ivu-row {
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
border-bottom:#ccc solid 1px; border-bottom: #ccc solid 1px;
} }
.lastRow
{ .lastRow {
border-bottom:none; border-bottom: none;
} }
} }
</style> </style>
pages/mesPlan/edit.vue
View file @ 2c8fbb84
...@@ -163,15 +163,16 @@ export default { ...@@ -163,15 +163,16 @@ export default {
.then((r) => { .then((r) => {
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
//this.resetFields()
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error("保存失败");
} }
}) })
.catch((err) => { // .catch((err) => {
this.$Message.error("保存失败"); // this.$Message.error("保存失败");
console.warn(err); // console.warn(err);
}); // });
} }
}); });
}, },
......
pages/mesPlan/index.vue
View file @ 2c8fbb84
...@@ -141,15 +141,11 @@ export default { ...@@ -141,15 +141,11 @@ export default {
id: "id", id: "id",
columns: [{ columns: [{
key: "selection", key: "selection",
title: '多选',
type: "selection", type: "selection",
width: 50, width: 50,
align: "center" align: "center"
}, },
{
key: "id",
title: this.l("id"),
hide: true
},
{ {
key: "mesCode", key: "mesCode",
title: this.l("mesCode"), title: this.l("mesCode"),
......
pages/mesPlan/send.vue
View file @ 2c8fbb84
This diff is collapsed.
pages/mesPlan/split.vue
View file @ 2c8fbb84
This diff is collapsed.
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