diff --git a/src/api/mes/pro/protask.js b/src/api/mes/pro/protask.js
new file mode 100644
index 0000000..c0cef4e
--- /dev/null
+++ b/src/api/mes/pro/protask.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询生产任务列表
+export function listProtask(query) {
+ return request({
+ url: '/mes/pro/protask/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询生产任务详细
+export function getProtask(taskId) {
+ return request({
+ url: '/mes/pro/protask/' + taskId,
+ method: 'get'
+ })
+}
+
+// 新增生产任务
+export function addProtask(data) {
+ return request({
+ url: '/mes/pro/protask',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改生产任务
+export function updateProtask(data) {
+ return request({
+ url: '/mes/pro/protask',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除生产任务
+export function delProtask(taskId) {
+ return request({
+ url: '/mes/pro/protask/' + taskId,
+ method: 'delete'
+ })
+}
diff --git a/src/api/mes/pro/routeprocess.js b/src/api/mes/pro/routeprocess.js
index f88db96..4598113 100644
--- a/src/api/mes/pro/routeprocess.js
+++ b/src/api/mes/pro/routeprocess.js
@@ -9,6 +9,17 @@ export function listRouteprocess(query) {
})
}
+
+// 查询产品的工艺组成列表
+export function listProductprocess(query) {
+ return request({
+ url: '/mes/pro/routeprocess/listProductProcess',
+ method: 'get',
+ params: query
+ })
+}
+
+
// 查询工艺组成详细
export function getRouteprocess(recordId) {
return request({
diff --git a/src/components/workstationSelect/simpletableSingle.vue b/src/components/workstationSelect/simpletableSingle.vue
new file mode 100644
index 0000000..20cf608
--- /dev/null
+++ b/src/components/workstationSelect/simpletableSingle.vue
@@ -0,0 +1,235 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+ {{""}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue
new file mode 100644
index 0000000..b80d869
--- /dev/null
+++ b/src/views/mes/pro/schedule/index.vue
@@ -0,0 +1,560 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ {{scope.row.workorderCode}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+ 排产
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/pro/schedule/proTask.vue b/src/views/mes/pro/schedule/proTask.vue
new file mode 100644
index 0000000..a14d74e
--- /dev/null
+++ b/src/views/mes/pro/schedule/proTask.vue
@@ -0,0 +1,386 @@
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+ {{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 95c4006..0ba50fb 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -142,12 +142,15 @@
-
+
-
+
+
+
+
@@ -280,7 +283,7 @@
-
+
@@ -391,6 +394,9 @@ export default {
productSpc: null,
unitOfMeasure: null,
quantity: null,
+ quantityProduced: null,
+ quantityChanged: null,
+ quantityScheduled: null,
clientId: null,
clientCode: null,
clientName: null,
@@ -484,6 +490,9 @@ export default {
productSpc: null,
unitOfMeasure: null,
quantity: null,
+ quantityProduced: null,
+ quantityChanged: null,
+ quantityScheduled: null,
clientId: null,
clientCode: null,
clientName: null,