-
+
@@ -17,10 +17,10 @@
-
+
@@ -141,11 +141,11 @@
-
-
+
+
-
+
@@ -243,14 +243,14 @@
-
-
+
+
-
-
+
+
@@ -357,7 +357,7 @@
-
+
@@ -377,7 +377,7 @@
-
+
@@ -482,13 +482,13 @@ export default {
},
columns: [
{ key: 0, label: `主键标识`, visible: false },
- { key: 1, label: `订单编号`, visible: true },
- { key: 2, label: `销售订单编号`, visible: false },
+ { key: 1, label: `任务编号`, visible: true },
+ { key: 2, label: `销售任务编号`, visible: false },
{ key: 3, label: `销售订单行号`, visible: false },
- { key: 4, label: `物料编码`, visible: true },
- { key: 5, label: `物料名称`, visible: true },
- { key: 6, label: `物料组`, visible: true },
- { key: 7, label: `BOM编号`, visible: true },
+ { key: 4, label: `物料编码`, visible: false },
+ { key: 5, label: `输送带规格`, visible: true },
+ { key: 6, label: `物料组`, visible: false },
+ { key: 7, label: `BOM编号`, visible: false },
{ key: 8, label: `订单计划数量`, visible: true },
{ key: 9, label: `完成数量`, visible: true },
{ key: 10, label: `工单类型`, visible: false },
diff --git a/src/views/mes/prod/prodOrderInfo/releasePlan.vue b/src/views/mes/prod/prodOrderInfo/releasePlan.vue
index c0dfa1c..7b0192a 100644
--- a/src/views/mes/prod/prodOrderInfo/releasePlan.vue
+++ b/src/views/mes/prod/prodOrderInfo/releasePlan.vue
@@ -7,18 +7,18 @@
{{ form.orderCode }}
- {{ form.materialCode }}
+
{{ parseTime(form.beginDate) }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
{{ form.orderAmount }}
@@ -177,9 +177,10 @@ export default {
getProdOrderInfo(objId).then(res => {
this.form = res.data
// 查询生产BOM列表
- findOrderBomList({ materialCode: this.form.materialCode, parentId: 0 }).then(res => {
- this.orderBomList = res.data
- })
+ // findOrderBomList({ materialCode: this.form.materialCode, parentId: 0 }).then(res => {
+ // this.orderBomList = res.data
+ // })
+ this.addTicketInfo();
})
getBaseProductLineList({ productLineType: 2 }).then(response => {
this.productLineList = response.data
@@ -189,15 +190,15 @@ export default {
})
}
},
- watch: {
- 'form.bomId': function(newVal, oldVal) {
- // 执行方法,可以在这里调用你的方法
- if (newVal == null) {
- return
- }
- this.addTicketInfo(newVal)
- }
- },
+ // watch: {
+ // 'form.bomId': function(newVal, oldVal) {
+ // // 执行方法,可以在这里调用你的方法
+ // if (newVal == null) {
+ // return
+ // }
+ // this.addTicketInfo(newVal)
+ // }
+ // },
methods: {
/** 提交按钮 */
submitForm() {
@@ -216,20 +217,20 @@ export default {
//添加工单信息
addTicketInfo(bomId) {
this.mesProductPlanList = []
- generateTickets({ ancestors: bomId }).then(res => {
- let bomList = res.data
- bomList.forEach(e => {
- let obj = {}
- obj.planCode = e.planCode
- obj.orderCode = this.form.orderCode
- obj.materialCode = e.materialCode
- obj.materialName = e.materialName
- obj.planAmount = (e.standardAmount * this.form.orderAmount).toFixed(2)
- obj.planBeginTime = this.form.beginDate
- obj.planEndTime = this.form.endDate
- this.mesProductPlanList.push(obj)
- })
- })
+ // generateTickets({ ancestors: bomId }).then(res => {
+ // let bomList = res.data
+ // bomList.forEach(e => {
+ // let obj = {}
+ // obj.planCode = e.planCode
+ // obj.orderCode = this.form.orderCode
+ // obj.materialCode = e.materialCode
+ // obj.materialName = e.materialName
+ // obj.planAmount = (e.standardAmount * this.form.orderAmount).toFixed(2)
+ // obj.planBeginTime = this.form.beginDate
+ // obj.planEndTime = this.form.endDate
+ // this.mesProductPlanList.push(obj)
+ // })
+ // })
},
/** 生产计划明细序号 */