diff --git a/src/api/mes/prepareDetail.js b/src/api/mes/prepareDetail.js
index 4cf7215..a38bb08 100644
--- a/src/api/mes/prepareDetail.js
+++ b/src/api/mes/prepareDetail.js
@@ -1,12 +1,19 @@
import request from '@/utils/request'
// 打印
-export function printPrepareByCode(workorderCode) {
+export function printPrepareByCode(workorderCode,recoil) {
return request({
- url: '/mes/prepareDetail/printPrepareByCode/' + workorderCode,
+ url: '/mes/prepareDetail/printPrepareByCode/' + workorderCode+'/'+recoil,
method: 'get'
});
}
+export function printPrepareXByCode(productDate) {
+ return request({
+ url: '/mes/prepareDetail/printPrepareXByCode/' + productDate,
+ method: 'get'
+ });
+ }
+
// 查询mes备料单明细列表
export function listPrepareDetail(query) {
diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index dca7815..0e5ee37 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -344,3 +344,11 @@ export function getWarehouseList(query) {
params: query
});
}
+
+// 删除报工报表
+export function deleteReportNow(reportCode) {
+ return request({
+ url: '/mes/reportWork/deleteReportNow/' + reportCode,
+ method: 'delete'
+ });
+}
diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 36abf0b..954da11 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -112,17 +112,27 @@
v-hasPermi="['mes:prepare:export']"
>导出
-
- 打印预览
-
+
+ 打印生产物料
+
+
+ 打印反冲物料
+
@@ -212,7 +222,7 @@
-
+
-
+
- 生产订单备料单(订单物料)
+ 生产订单备料单({{printData.printTitle}})
工厂:{{printData.factory}}
工作中心:{{printData.workCenter}}
+ 线体:{{printData.prodLineCode}}
生产日期:{{printData.productDate}}
打印日期:{{printData.printDate}}
页次: 1/ 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ v-if="refreshNewWorkerTable" v-loading="newWorkerLoading"class="my-print-table":data="printData.workTable"
+ border style="width: 100%">
+
+
+
+
+
+
+
+
+
-
-
-
-
-