diff --git a/pages.json b/pages.json
index 532e2a2..b62b37d 100644
--- a/pages.json
+++ b/pages.json
@@ -145,10 +145,12 @@
}
,{
- "path" : "pages/task/equip-task-manage",
+ "path" : "pages/task/task-manage",
"style" :
{
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 50
}
}
@@ -170,6 +172,14 @@
}
}
+ ,{
+ "path" : "pages/check/check-task",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/check/check-task.vue b/pages/check/check-task.vue
new file mode 100644
index 0000000..ba9a165
--- /dev/null
+++ b/pages/check/check-task.vue
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
+
+ 托盘码
+
+
+
+
+
+
+
+ 盘点单
+
+
+
+
+
+
+
+ 盘点仓库
+
+
+
+
+
+
+
+ 创建时间
+
+
+
+
+
+
+
+ 作业数量
+
+
+
+
+
+
+
+ 已盘作业数量
+
+
+
+
+
+
+
+ 物料名称
+
+
+
+
+
+
+
+ 物料编码
+
+
+
+
+
+
+
+ 物料批次
+
+
+
+
+
+
+
+ 盘点货位
+
+
+
+
+
+
+
+ 盘点数量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4c3f41e..d2a7f25 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -46,7 +46,7 @@
{title: '在库管理', path: 'RF03', sonTree: [{title: '库存信息', path: '/pages/in/store-info'}]},
{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
{title: '盘点管理', path: 'RF05', sonTree: [{title: '盘点作业', path: '/pages/check/check-task'}]},
- {title: '任务管理', path: 'RF06', sonTree: [{title: '设备作业管理', path: '/pages/task/equip-task-manage'}]}
+ {title: '任务管理', path: 'RF06', sonTree: [{title: '任务管理', path: '/pages/task/task-manage'}]}
],
show: false,
secM: [],
diff --git a/pages/pick/pick-list.vue b/pages/pick/pick-list.vue
index f2234e7..945c2bc 100644
--- a/pages/pick/pick-list.vue
+++ b/pages/pick/pick-list.vue
@@ -58,7 +58,7 @@
-
-
diff --git a/pages/task/task-manage.vue b/pages/task/task-manage.vue
new file mode 100644
index 0000000..68711d6
--- /dev/null
+++ b/pages/task/task-manage.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+ 任务类型
+
+
+
+
+
+
+
+ 载具编码
+
+
+
+
+
+
+
+
+
+
+
+ | 任务类型 |
+ 任务编码 |
+ 载具编码 |
+ 状态 |
+ 起点 |
+ 终点 |
+ 创建时间 |
+
+
+
+
+ | {{e.task_type}} |
+ {{e.task_code}} |
+ {{e.vehicle_code}} |
+ {{e.status}} |
+ {{e.point_code1}} |
+ {{e.point_code2}} |
+ {{e.create_time}} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/getData2.js b/utils/getData2.js
index 44f0d8b..504a109 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -30,9 +30,9 @@ export const FormTypes = () => request({
url:'api/bmFormStruc/getTypes?type=pda'
})
// 单据数据
-export const pmFormData = (page, size, sort, form_type) => request({
+export const pmFormData = (page, size, form_type, code) => request({
method: 'GET',
- url:'api/pmFormData?page=' + page + '&size=' + size + '&sort=' + sort + '&form_type=' + form_type
+ url:'api/pmFormData?page=' + page + '&size=' + size + '&form_type=' + form_type + '&vehicle_code=' + code
})
// 组盘确认
export const mdGruopDick = (item, code, type) => request({
@@ -63,3 +63,37 @@ export const ioStorageOut = (code) => request({
/**
* 拣选单列表
*/
+export const pmFormData2 = (page, size, form_type, status, code) => request({
+ method: 'GET',
+ url:'api/pmFormData?page=' + page + '&size=' + size + '&form_type=' + form_type + '&status=' + status + '&vehicle_code=' + code
+})
+export const savePickTask = (data) => request({
+ url:'api/pda/pick/savePickTask',
+ data: data
+})
+/**
+ * 盘点作业
+ */
+export const checkByVehicle = (code) => request({
+ url:'api/pda/check/byVehicle',
+ data: {vehicle_code: code}
+})
+export const checkSaveCheckTask = (id, vehicle, qty, cqty) => request({
+ url:'api/pda/check/saveCheckTask',
+ data: {children_id: id,children_vehicle: vehicle,check_qty, qty,children_qty: cqty}
+})
+/**
+ * 任务管理
+ */
+export const getStatusEnum = () => request({
+ method: 'GET',
+ url:'api/dict/getStatusEnum?code=TASK_TYPE'
+})
+export const schBaseTask = (page, size, sort, code) => request({
+ method: 'GET',
+ url:'api/schBaseTask?page=' + page + '&size=' + size + '&sort=' + sort + '&vehicle_code=' + code
+})
+export const saveCheckTask = (code, status) => request({
+ url:'api/pda/check/saveCheckTask',
+ data: {task_code: code, status: status}
+})
\ No newline at end of file