diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 62b647b4..1b5a436e 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -213,6 +213,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -323,15 +333,7 @@
{{ formatDuration(scope.row.productionDuration * 60 * 1000) }}
-
-
-
-
-
-
-
-
-
+
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 90d70926..39d28ba4 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -525,7 +525,7 @@ export default {
// 双机架修复工序
else if (this.acidRollingActionType == 524) {
return {
- background: 'linear-gradient(45deg, #orange 0% 90%, #FFAACC 90% 100%)',
+ background: 'linear-gradient(45deg, orange 0% 90%, #FFAACC 90% 100%)',
color: '#fff'
}
}
diff --git a/klp-ui/src/views/wms/delivery/canuse/index.vue b/klp-ui/src/views/wms/delivery/canuse/index.vue
index 617cc2f6..85fad0e0 100644
--- a/klp-ui/src/views/wms/delivery/canuse/index.vue
+++ b/klp-ui/src/views/wms/delivery/canuse/index.vue
@@ -26,7 +26,8 @@ export default {
materialType: '成品',
itemType: 'product',
status: 0,
- orderBy: true
+ orderBy: true,
+ excludeBound: true,
},
labelType: '3',
showStatus: true,
diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue
index 6ed9c016..eb7b3006 100644
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -163,8 +163,8 @@ export default {
// 厂家材质透视表配置
hierarchicalPivotConfig: {
- groupFields: ['manufacturer', 'material'],
- groupLabels: ['厂家', '材质'],
+ groupFields: ['manufacturer', 'material', 'specification'],
+ groupLabels: ['厂家', '材质', '规格'],
summaryFields: [
{ prop: 'count', label: '求和项:件数', field: '', align: 'center' },
{ prop: 'weight', label: '求和项:重量', field: 'netWeight', align: 'center' }