diff --git a/src/api/mes/prod/prodBomInfo.js b/src/api/mes/prod/prodBomInfo.js
index c935aaa..bb90a8e 100644
--- a/src/api/mes/prod/prodBomInfo.js
+++ b/src/api/mes/prod/prodBomInfo.js
@@ -60,3 +60,12 @@ export function productionBomTreeList(query) {
params: query
})
}
+
+// 通过生产BOM生成工单
+export function generateTickets(query) {
+ return request({
+ url: '/mes/prod/prodBomInfo/generateTickets',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/api/mes/prod/prodPlanInfo.js b/src/api/mes/prod/prodPlanInfo.js
new file mode 100644
index 0000000..a23e1bd
--- /dev/null
+++ b/src/api/mes/prod/prodPlanInfo.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询生产工单列表
+export function listProdPlanInfo(query) {
+ return request({
+ url: '/mes/prod/prodPlanInfo/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询生产工单详细
+export function getProdPlanInfo(objId) {
+ return request({
+ url: '/mes/prod/prodPlanInfo/' + objId,
+ method: 'get'
+ })
+}
+
+// 新增生产工单
+export function addProdPlanInfo(data) {
+ return request({
+ url: '/mes/prod/prodPlanInfo',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改生产工单
+export function updateProdPlanInfo(data) {
+ return request({
+ url: '/mes/prod/prodPlanInfo',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除生产工单
+export function delProdPlanInfo(objId) {
+ return request({
+ url: '/mes/prod/prodPlanInfo/' + objId,
+ method: 'delete'
+ })
+}
+
+// 订单新增生产工单List
+export function orderAddProdPlanInfoList(data) {
+ return request({
+ url: '/mes/prod/prodPlanInfo/orderAddProdPlanInfoList',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/views/mes/prod/prodOrderInfo/index.vue b/src/views/mes/prod/prodOrderInfo/index.vue
index 943c154..54ad116 100644
--- a/src/views/mes/prod/prodOrderInfo/index.vue
+++ b/src/views/mes/prod/prodOrderInfo/index.vue
@@ -512,6 +512,9 @@ export default {
}
},
created() {
+ if (this.$route.params != null){
+ this.queryParams = this.$route.params
+ }
this.getList()
},
methods: {
diff --git a/src/views/mes/prod/prodOrderInfo/releasePlan.vue b/src/views/mes/prod/prodOrderInfo/releasePlan.vue
index 34af303..9ee9a4e 100644
--- a/src/views/mes/prod/prodOrderInfo/releasePlan.vue
+++ b/src/views/mes/prod/prodOrderInfo/releasePlan.vue
@@ -2,97 +2,110 @@
- 工单信息
+ ERP订单信息
+
- {{ form.orderCode }}
+ {{ form.orderCode }}
{{ form.materialCode }}
- {{ parseTime(form.planBeginTime) }}
-
- {{ form.planAmount }}/{{ form.dispatchAmount }}/{{ form.completeAmount }}
+ {{ parseTime(form.beginDate) }}
+
+
+
+
- {{ form.dispatchName }}
- {{ form.materialName }}
- {{ parseTime(form.planEndTime) }}
+ {{ form.orderAmount }}
+ {{ form.materialName }}
+ {{ parseTime(form.endDate) }}
- 派工信息
-
-
-
- 新增
-
-
-
- 删除
-
-
-
+ 生产工单信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+ :row-class-name="rowMesProductPlanIndex" @selection-change="handleMesProductPlanSelectionChange"
+ >
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -104,15 +117,18 @@
-
diff --git a/src/views/mes/prod/prodPlanInfo/index.vue b/src/views/mes/prod/prodPlanInfo/index.vue
new file mode 100644
index 0000000..196f44e
--- /dev/null
+++ b/src/views/mes/prod/prodPlanInfo/index.vue
@@ -0,0 +1,511 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+ {{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+ {{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+