diff --git a/src/api/purchasingManagement/materialSplit.js b/src/api/purchasingManagement/materialSplit.js
index 68ede80..d4d1d7a 100644
--- a/src/api/purchasingManagement/materialSplit.js
+++ b/src/api/purchasingManagement/materialSplit.js
@@ -47,3 +47,8 @@ export const sapSynchronization = data => createAPI(`materialSplit/sapSynchroniz
export const freezing = data => createAPI(`materialSplit/freezing`,'POST',data)
export const notFreezing = data => createAPI(`materialSplit/notFreezing`,'POST',data)
export const getReferenceData = data => createAPI(`materialSplit/getReferenceData`,'POST',data)
+
+//获取打印CRollInfo的打印数据 2022-04-26 LR
+export const getPrintCRollInfo = data => createAPI(`materialSplit/getPrintCRollInfo`,'POST',data)
+
+
diff --git a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
index 88e6f3b..0aae772 100644
--- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
+++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
@@ -172,7 +172,7 @@
checkCustomerID,
getSupplierDetail,
} from "@/api/base/site.js"
- /*打印数据*/
+ /*打印标签专用的js*/
import {
printMaterialLabel,
} from "@/views/modules/yieldReport/print_roll_label.js"
@@ -931,7 +931,6 @@
this.$message.success('操作成功')
//打印材料卷标签
let printList = data.obj;
- debugger;
printMaterialLabel(printList);
//调用打印的方法
/*for(let i = 0; i < printList.length; i++){
diff --git a/src/views/modules/purchasingManagement/searchOrderRoll.vue b/src/views/modules/purchasingManagement/searchOrderRoll.vue
index d28539f..6739472 100644
--- a/src/views/modules/purchasingManagement/searchOrderRoll.vue
+++ b/src/views/modules/purchasingManagement/searchOrderRoll.vue
@@ -80,10 +80,11 @@
删除卷
+ 打印卷标签
{
+ //打印材料卷标签
+ let printList = data.rows;
+ printMaterialLabel(printList);
+ });
+ },
+
},
created() {
diff --git a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
index 00955cf..5a763e6 100644
--- a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
+++ b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
@@ -307,6 +307,12 @@
doSaveSuppRollNo,
getReferenceData,
} from "@/api/purchasingManagement/materialSplit.js"
+
+ /*打印标签专用的js*/
+ import {
+ printMaterialLabel,
+ } from "@/views/modules/yieldReport/print_roll_label.js"
+
import {
getPartNoDetail,
checkCustomerID
@@ -1140,7 +1146,11 @@
}
this.sum3 = data.total;
})
- this.$message.success( '操作成功')
+ this.$message.success( '操作成功');
+ //打印材料卷标签
+ let printList = data.obj;
+ //打印标签
+ printMaterialLabel(printList);
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
diff --git a/src/views/modules/yieldReport/com_cutting_material.vue b/src/views/modules/yieldReport/com_cutting_material.vue
index 90d0386..306c4a3 100644
--- a/src/views/modules/yieldReport/com_cutting_material.vue
+++ b/src/views/modules/yieldReport/com_cutting_material.vue
@@ -46,6 +46,12 @@
import {
processCuttingMaterialRoll,
} from "@/api/yieldReport/com_cutting_material.js";
+
+/*打印标签专用的js*/
+import {
+ printMaterialLabel,
+} from "@/views/modules/yieldReport/print_roll_label.js"
+
export default {
data() {
return {
@@ -176,6 +182,9 @@ export default {
this.$message.success(data.msg);
//刷新报工的页面
this.$emit('refreshPageData');
+ //打印材料卷标签
+ let printList = data.printList;
+ printMaterialLabel(printList);
//关闭当前的页面
this.closeDialog();
}
diff --git a/src/views/modules/yieldReport/com_separate_roll_with_split.vue b/src/views/modules/yieldReport/com_separate_roll_with_split.vue
index 0ec41ab..4ef50ed 100644
--- a/src/views/modules/yieldReport/com_separate_roll_with_split.vue
+++ b/src/views/modules/yieldReport/com_separate_roll_with_split.vue
@@ -140,6 +140,12 @@ import {
checkCreateSeparateRoll,/*检查是否可以创建分卷*/
createSeparateRoll,/*创建分卷*/
} from '@/api/yieldReport/com_separate_roll_with_split.js';
+
+/*打印标签专用的js*/
+import {
+ printMaterialLabel,
+} from "@/views/modules/yieldReport/print_roll_label.js"
+
export default {
name: "com_finish_roll",
data() {
@@ -630,6 +636,10 @@ export default {
this.pageData.rollQty = 0;
//关闭当前的页面
//this.closeDialog()
+
+ //打印材料卷标签
+ let printList = data.printList;
+ printMaterialLabel(printList);
}
})
},
diff --git a/src/views/modules/yieldReport/print_roll_label.js b/src/views/modules/yieldReport/print_roll_label.js
index 391ba04..7818a13 100644
--- a/src/views/modules/yieldReport/print_roll_label.js
+++ b/src/views/modules/yieldReport/print_roll_label.js
@@ -58,7 +58,7 @@ export function printMaterialLabel(printList) {
}
//LODOP.PRINT_DESIGN();
//LODOP.PREVIEW();
- LODOP.PRINT();
+ LODOP.PRINT();
console.log("操作成功!")
}