diff --git a/src/api/mes/dict/dictApi.ts b/src/api/mes/dict/dictApi.ts
new file mode 100644
index 0000000..886848d
--- /dev/null
+++ b/src/api/mes/dict/dictApi.ts
@@ -0,0 +1,21 @@
+import http from '../../http'
+
+
+// 获取字典
+export function getDictList(type) {
+ return http.get('/system/dict-data/queryByDictType?dictType=' + type)
+}
+export async function getDict(type) {
+ let data =[]
+ await getDictList(type).then((res) => {
+ if (res.code == 0) {
+ data = res.data.map(item=>{
+ return {
+ label:item.label,
+ value:item.value,
+ }
+ })
+ } else {}
+ }).catch((err) => {})
+ return data
+}
\ No newline at end of file
diff --git a/src/api/mes/productBackline/productBacklineApi.ts b/src/api/mes/productBackline/productBacklineApi.ts
new file mode 100644
index 0000000..3c4b73d
--- /dev/null
+++ b/src/api/mes/productBackline/productBacklineApi.ts
@@ -0,0 +1,15 @@
+import http from '../../http'
+
+
+// 产品离线登记列表
+export function getPage(params) {
+ return http.get('/mes/product-backline/page',{params})
+}
+
+export function changeStatus(data) {
+ return http.put('/mes/product-backline/update',data)
+}
+
+export function create(data) {
+ return http.post('/mes/product-backline/create',data)
+}
\ No newline at end of file
diff --git a/src/api/mes/productOffline/productOfflineApi.ts b/src/api/mes/productOffline/productOfflineApi.ts
new file mode 100644
index 0000000..88a935b
--- /dev/null
+++ b/src/api/mes/productOffline/productOfflineApi.ts
@@ -0,0 +1,23 @@
+import http from '../../http'
+
+
+// 产品离线登记列表
+export function getPage(params) {
+ return http.get('/mes/product-offline/page',{params})
+}
+
+export function changeStatus(data) {
+ return http.put('/mes/product-offline/update',data)
+}
+
+export function create(data) {
+ return http.post('/mes/product-offline/create',data)
+}
+
+export function getPageChildren(params) {
+ return http.get('/wms/team/getPageChildren',{params})
+}
+
+export function getworkSchedulingPage(params) {
+ return http.get('/mes/work-scheduling/page',{params})
+}
\ No newline at end of file
diff --git a/src/api/mes/reworkBatch/reworkBatchApi.ts b/src/api/mes/reworkBatch/reworkBatchApi.ts
new file mode 100644
index 0000000..e8d91b2
--- /dev/null
+++ b/src/api/mes/reworkBatch/reworkBatchApi.ts
@@ -0,0 +1,15 @@
+import http from '../../http'
+
+
+// 产品离线登记列表
+export function getPage(params) {
+ return http.get('/mes/rework-batch/page',{params})
+}
+
+export function update(data) {
+ return http.put('/mes/rework-batch/update',data)
+}
+
+export function create(data) {
+ return http.post('/mes/rework-batch/create',data)
+}
diff --git a/src/api/mes/reworkSingle/reworkSingleApi.ts b/src/api/mes/reworkSingle/reworkSingleApi.ts
new file mode 100644
index 0000000..5ba5667
--- /dev/null
+++ b/src/api/mes/reworkSingle/reworkSingleApi.ts
@@ -0,0 +1,15 @@
+import http from '../../http'
+
+
+// 产品离线登记列表
+export function getPage(params) {
+ return http.get('/mes/rework-single/page',{params})
+}
+
+export function update(data) {
+ return http.put('/mes/rework-single/update',data)
+}
+
+export function create(data) {
+ return http.post('/mes/rework-single/create',data)
+}
diff --git a/src/pages.json b/src/pages.json
index 2a933bf..6ac7c30 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1955,7 +1955,85 @@
"navigationBarTitleText": "工序报工",
"enablePullDownRefresh": true
}
+ },
+ {
+ "path": "pages/mes/productOffline/index",
+ "style": {
+ "navigationBarTitleText": "产品离线登记",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mes/productOffline/handle",
+ "style": {
+ "navigationBarTitleText": "处理产品离线登记",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mes/productOffline/createProductOffline",
+ "style": {
+ "navigationBarTitleText": "创建产品离线登记",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mes/productBackline/index",
+ "style": {
+ "navigationBarTitleText": "产品返线登记",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mes/productBackline/detail",
+ "style": {
+ "navigationBarTitleText": "产品返线登记详情",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mes/productBackline/handle",
+ "style": {
+ "navigationBarTitleText": "处理产品返线登记",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mes/productBackline/createProductBackline",
+ "style": {
+ "navigationBarTitleText": "创建产品返线登记",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mes/reworkSingle/index",
+ "style": {
+ "navigationBarTitleText": "返工返修单件管理",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mes/reworkSingle/create",
+ "style": {
+ "navigationBarTitleText": "创建返工返修登记",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mes/reworkBatch/index",
+ "style": {
+ "navigationBarTitleText": "返工返修批量管理",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mes/reworkBatch/create",
+ "style": {
+ "navigationBarTitleText": "批量创建返工返修登记",
+ "enablePullDownRefresh": true
+ }
}
+
],
diff --git a/src/pages/mes/productBackline/createProductBackline.vue b/src/pages/mes/productBackline/createProductBackline.vue
new file mode 100644
index 0000000..efd171c
--- /dev/null
+++ b/src/pages/mes/productBackline/createProductBackline.vue
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/productBackline/detail.vue b/src/pages/mes/productBackline/detail.vue
new file mode 100644
index 0000000..c7ca945
--- /dev/null
+++ b/src/pages/mes/productBackline/detail.vue
@@ -0,0 +1,319 @@
+
+
+
+
+
+ 产品返线登记详情
+
+
+
+
+ 返线编码：
+ {{paramData.backlineBillno}}
+
+
+ 离线编码：
+ {{paramData.offlineCode}}
+
+
+ 计划编码：
+ {{paramData.planCode}}
+
+
+ 工单编码：
+ {{paramData.workBillno}}
+
+
+ 产品编码：
+ {{paramData.productCode}}
+
+
+ 工序编码：
+ {{paramData.processCode}}
+
+
+ 工位编码：
+ {{paramData.stationCode}}
+
+
+ 离线原因：
+ {{paramData.offlineReson}}
+
+
+ 质检人员：
+ {{paramData.checkPersonCode}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/productBackline/handle.vue b/src/pages/mes/productBackline/handle.vue
new file mode 100644
index 0000000..79d10a3
--- /dev/null
+++ b/src/pages/mes/productBackline/handle.vue
@@ -0,0 +1,339 @@
+
+
+
+
+
+ 处理产品返线登记
+
+
+
+
+
+ 处理人员：
+ {{handleWorker.label}}
+
+
+ 处理结果：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/productBackline/index.vue b/src/pages/mes/productBackline/index.vue
new file mode 100644
index 0000000..275fba8
--- /dev/null
+++ b/src/pages/mes/productBackline/index.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+ {{item.offlineCode}}
+
+
+ {{`${$time.formatDate(item.createTime)}`}}
+
+
+
+ 登记状态：
+
+
+
+
+
+
+ 计划编码：{{item.planCode}}
+
+
+ 工单编码：{{item.workBillno}}
+
+
+ 产品编码：{{item.productCode}}
+
+
+ 工序编码：{{item.processCode}}
+
+
+ 工位编码：{{item.stationCode}}
+
+
+
+ 去处理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/productOffline/createProductOffline.vue b/src/pages/mes/productOffline/createProductOffline.vue
new file mode 100644
index 0000000..e089cc2
--- /dev/null
+++ b/src/pages/mes/productOffline/createProductOffline.vue
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/productOffline/detail.vue b/src/pages/mes/productOffline/detail.vue
new file mode 100644
index 0000000..dc3312e
--- /dev/null
+++ b/src/pages/mes/productOffline/detail.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+ 产品离线登记详情
+
+
+
+
+ 离线编码：
+ {{paramData.offlineCode}}
+
+
+ 计划编码：
+ {{paramData.planCode}}
+
+
+ 工单编码：
+ {{paramData.workBillno}}
+
+
+ 产品编码：
+ {{paramData.productCode}}
+
+
+ 工序编码：
+ {{paramData.processCode}}
+
+
+ 工位编码：
+ {{paramData.stationCode}}
+
+
+ 离线原因：
+ {{paramData.offlineReson}}
+
+
+ 质检人员：
+ {{paramData.checkPersonCode}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/productOffline/handle.vue b/src/pages/mes/productOffline/handle.vue
new file mode 100644
index 0000000..54cbb51
--- /dev/null
+++ b/src/pages/mes/productOffline/handle.vue
@@ -0,0 +1,373 @@
+
+
+
+
+
+ 处理产品离线登记
+
+
+
+
+ 处理类型：
+ {{handleType.label}}
+
+
+ 处理人员：
+ {{handleWorker.label}}
+
+
+ 处理结果：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/productOffline/index.vue b/src/pages/mes/productOffline/index.vue
new file mode 100644
index 0000000..fedade4
--- /dev/null
+++ b/src/pages/mes/productOffline/index.vue
@@ -0,0 +1,279 @@
+
+
+
+
+
+
+
+
+
+
+ {{item.offlineCode}}
+
+
+ {{`${$time.formatDate(item.createTime)}`}}
+
+
+
+ 登记状态：
+
+
+
+
+
+
+ 计划编码：{{item.planCode}}
+
+
+ 工单编码：{{item.workBillno}}
+
+
+ 产品编码：{{item.productCode}}
+
+
+ 工序编码：{{item.processCode}}
+
+
+ 工位编码：{{item.stationCode}}
+
+
+
+ 去处理
+
+
+ 返线处理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/reworkBatch/create.vue b/src/pages/mes/reworkBatch/create.vue
new file mode 100644
index 0000000..c6a9d85
--- /dev/null
+++ b/src/pages/mes/reworkBatch/create.vue
@@ -0,0 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/reworkBatch/index.vue b/src/pages/mes/reworkBatch/index.vue
new file mode 100644
index 0000000..c2ac32c
--- /dev/null
+++ b/src/pages/mes/reworkBatch/index.vue
@@ -0,0 +1,326 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.reworkbillNo}}
+
+
+ {{`${$time.formatDate(item.createTime)}`}}
+
+
+
+ 处理状态：
+
+
+
+
+
+
+
+ 批次号：{{item.batchNo}}
+
+
+ 产品编码：{{item.productionCode}}
+
+
+ 产品数量：{{item.productionCount}}
+
+
+ 工作类型：{{item.status == '1'?'返工' :'返修'}}
+
+
+ 是否有替换件：{{item.replaceFlag == 'TRUE'?'是' :'否'}}
+
+
+ 返修人员：{{item.reworkPersoncode}}
+
+
+ 返修时间： {{`${$time.formatDate(item.reworkTime)}`}}
+
+
+ 返修结果：{{item.reworkResult}}
+
+
+
+ 去处理
+
+
+ 退回
+
+
+
+ 退回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/reworkSingle/create.vue b/src/pages/mes/reworkSingle/create.vue
new file mode 100644
index 0000000..bb75146
--- /dev/null
+++ b/src/pages/mes/reworkSingle/create.vue
@@ -0,0 +1,303 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/reworkSingle/handle.vue b/src/pages/mes/reworkSingle/handle.vue
new file mode 100644
index 0000000..b9e8b93
--- /dev/null
+++ b/src/pages/mes/reworkSingle/handle.vue
@@ -0,0 +1,349 @@
+
+
+
+
+
+ 领取
+
+
+
+
+ 工作类型：
+ {{reworkType.label}}
+
+
+ 返修人员：
+ {{handleWorker.label}}
+
+
+ 返修人员：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/reworkSingle/index.vue b/src/pages/mes/reworkSingle/index.vue
new file mode 100644
index 0000000..c2f9a05
--- /dev/null
+++ b/src/pages/mes/reworkSingle/index.vue
@@ -0,0 +1,320 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.reworkbillNo}}
+
+
+ {{`${$time.formatDate(item.createTime)}`}}
+
+
+
+ 处理状态：
+
+
+
+
+
+
+
+ 产品编码：{{item.productionCode}}
+
+
+ 工作类型：{{item.status == '1'?'返工' :'返修'}}
+
+
+ 是否有替换件：{{item.replaceFlag == 'TRUE'?'是' :'否'}}
+
+
+ 返修人员：{{item.reworkPersoncode}}
+
+
+ 返修时间：{{`${$time.formatDate(item.reworkTime)}`}}
+
+
+ 返修结果：{{item.reworkResult}}
+
+
+
+ 去处理
+
+
+ 退回
+
+
+
+ 退回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/static/menus/mes/reworkSingle.svg b/src/static/menus/mes/reworkSingle.svg
new file mode 100644
index 0000000..e310f68
--- /dev/null
+++ b/src/static/menus/mes/reworkSingle.svg
@@ -0,0 +1 @@
+
\ No newline at end of file