diff --git a/src/api/shipment/roll.js b/src/api/shipment/roll.js
index 927e7ed..9a5a5d7 100644
--- a/src/api/shipment/roll.js
+++ b/src/api/shipment/roll.js
@@ -5,3 +5,5 @@ export const saveShipmentRollData = (data) => createAPI(`/shipment/roll/add`,'po
export const removeShipmentRollData = (data) => createAPI(`/shipment/roll/remove`,'post',data)
export const printShipmentRoll = (data) => createAPI(`/shipment/roll/print`,'post',data)
export const getShipmentRollAllData = (data) => createAPI(`/shipment/roll/all`,'post',data)
+
+export const getShipmentRollDataByShipmentId = (data) => createAPI(`/shipment/roll/box/list`,'post',data)
diff --git a/src/views/modules/finshProduct/outWarehouse.vue b/src/views/modules/finshProduct/outWarehouse.vue
index 35f28a3..7a37668 100644
--- a/src/views/modules/finshProduct/outWarehouse.vue
+++ b/src/views/modules/finshProduct/outWarehouse.vue
@@ -8,6 +8,7 @@ import {printShipmentInnerLabel} from '../label/print_shipment_inner_label'
import dayjs from 'dayjs'
import {printShipmentBoxLabel} from '../label/print_shipment_box_label'
import {printShipmentPackingBoxLabel} from '../label/print_shipment_packing_box_label'
+import {getShipmentRollDataByShipmentId} from '../../../api/shipment/roll'
export default {
name: "outWarehouse",
@@ -21,8 +22,11 @@ export default {
height2: 300,
loading: false,
open: false,
+ rollDetailVisible: false,
+ rollDetailList:[],
queryForm:{
shipmentId: "",
+ status: "",
startDate: "",
endDate: "",
},
@@ -289,7 +293,10 @@ export default {
}
}
},
- handleRowClick(row){
+ handleRowClick(row,column){
+ // if (column && column.label === "操作"){
+ // return
+ // }
this.row = {...row};
},
getBoxDataList(){
@@ -343,6 +350,18 @@ export default {
}).catch((error)=>{
this.$message.error(error)
})
+ },
+ handleQueryRoll(row){
+ getShipmentRollDataByShipmentId(row).then(({data})=>{
+ if (data && data.code === 0){
+ this.rollDetailVisible = true;
+ this.rollDetailList = data.rows;
+ }else {
+ this.$message.warning(data.msg)
+ }
+ }).catch((error)=>{
+ this.$message.error(error)
+ })
}
},
watch:{
@@ -355,7 +374,7 @@ export default {
mounted () {
this.$nextTick(() => {
this.height = (window.innerHeight-120)/2;
- this.height2 = window.innerHeight-150-height;
+ this.height2 = window.innerHeight-240- this.height;
})
},
created () {
@@ -374,11 +393,16 @@ export default {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -420,10 +444,11 @@ export default {
-
+
- 装箱单标签
- 装箱出库
+ 装箱单标签
+ 装箱出库
+ 卷明细
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue b/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue
index d5fc17c..7c4e405 100644
--- a/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue
+++ b/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue
@@ -138,6 +138,7 @@ export default {
}
saveShipmentRollData(params).then(({data})=>{
if (data && data.code === 0){
+ this.$emit('refresh')
this.$message.success(data.msg)
// 查询 roll
this.getDataList();
@@ -167,6 +168,7 @@ export default {
}).then(()=>{
removeShipmentRollData(row).then(({data})=>{
if (data && data.code === 0){
+ this.$emit('refresh')
this.getDataList();
this.$message.success(data.msg)
}else {
diff --git a/src/views/modules/label/print_shipment_box_label.js b/src/views/modules/label/print_shipment_box_label.js
index c222b6d..80287ff 100644
--- a/src/views/modules/label/print_shipment_box_label.js
+++ b/src/views/modules/label/print_shipment_box_label.js
@@ -87,7 +87,7 @@ export function printShipmentBoxLabel(printList) {
LODOP.ADD_PRINT_TEXT(325,230,100,20,`阶段:${printData.phaseCode}`);
LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
- LODOP.ADD_PRINT_TEXT(345,2,80,20,`config:`);
+ LODOP.ADD_PRINT_TEXT(345,2,80,20,`config:${printData.config}`);
LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
LODOP.ADD_PRINT_TEXT(345,230,100,20,`MCO:${printData.mco}`);
@@ -192,7 +192,7 @@ export function printShipmentBoxLabel(printList) {
LODOP.ADD_PRINT_TEXT(280,355,100,20,`模穴号(Tool):`);
LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
- LODOP.ADD_PRINT_TEXT(300,2,100,20,`config:`);
+ LODOP.ADD_PRINT_TEXT(300,2,100,20,`config:${printData.config}`);
LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
LODOP.ADD_PRINT_TEXT(300,355,100,20,`档位(Level):`);