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