diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue
index de8560ed..b12ff919 100644
--- a/klp-ui/src/components/CoilSelector/index.vue
+++ b/klp-ui/src/components/CoilSelector/index.vue
@@ -47,6 +47,9 @@
+
+
+
@@ -78,6 +81,7 @@
+
@@ -95,6 +99,7 @@
+
@@ -121,7 +126,10 @@
+
+
+
@@ -518,8 +526,9 @@ export default {
this.$message.warning('您没有权限选择此钢卷');
return; // 终止后续逻辑
}
- if (this.disableO && row.qualityStatus == 'O') {
- this.$message.warning('O卷不能选择');
+ const disabledOList = ['O', 'C+', 'C', 'C-', 'D+', 'D', 'D-']
+ if (this.disableO && disabledOList.includes(row.qualityStatus)) {
+ this.$message.warning(`${row.qualityStatus}卷不能选择`);
return;
}
this.handleSelect(row);
diff --git a/klp-ui/src/views/wms/delivery/components/detailTable.vue b/klp-ui/src/views/wms/delivery/components/detailTable.vue
index 6b59f99c..3e7b703a 100644
--- a/klp-ui/src/views/wms/delivery/components/detailTable.vue
+++ b/klp-ui/src/views/wms/delivery/components/detailTable.vue
@@ -1,7 +1,8 @@
-
+
-
+
+
发货单明细
新增
@@ -46,6 +47,7 @@
+
@@ -238,6 +240,7 @@ export default {
const coil = coilResponse.rows.find(c => c.coilId === item.coilId);
if (coil) {
item.actualWarehouseName = coil.actualWarehouseName;
+ item.surfaceTreatmentDesc = coil.surfaceTreatmentDesc;
}
});
}
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index 911383d7..9c50a074 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -39,64 +39,68 @@
-
-
-
-
-
-
-
-
-
- {{ scope.row.orderCode }}
- {{ scope.row.principalPhone }}
-
-
-
-
- {{ parseTime(scope.row.deliveryTime, '{y}-{m}-{d}') }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.orderCode }}
+ {{ scope.row.principalPhone }}
+
+
+
+
+ {{ parseTime(scope.row.deliveryTime, '{y}-{m}-{d}') }}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- 打印发货单
- 简单打印
- 复制新增
- 修改
- 删除
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 打印发货单
+ 简单打印
+ 复制新增
+ 修改
+ 删除
+
+
+
-
+
+
-
+
+
-
-
+
+
+
+
-
@@ -157,7 +161,7 @@