diff --git a/klp-ui/src/components/MutiSelect/index.vue b/klp-ui/src/components/MutiSelect/index.vue
index 4daac80b..af805587 100644
--- a/klp-ui/src/components/MutiSelect/index.vue
+++ b/klp-ui/src/components/MutiSelect/index.vue
@@ -14,13 +14,13 @@
@change="handleChange"
>
-
+ /> -->
+
-
+
-
-
-
-
+
+
+
{{ scope.row.weight * scope.row.contractPrice }}
-
-
-
-
-
-
+
+
+
+
diff --git a/klp-ui/src/views/crm/contract/components/ContractList.vue b/klp-ui/src/views/crm/contract/components/ContractList.vue
index 1e2c8680..f5d4e202 100644
--- a/klp-ui/src/views/crm/contract/components/ContractList.vue
+++ b/klp-ui/src/views/crm/contract/components/ContractList.vue
@@ -51,8 +51,8 @@
-
-
+
+
diff --git a/klp-ui/src/views/micro/zinc/index.vue b/klp-ui/src/views/micro/pages/zinc/index.vue
similarity index 100%
rename from klp-ui/src/views/micro/zinc/index.vue
rename to klp-ui/src/views/micro/pages/zinc/index.vue
diff --git a/klp-ui/src/views/wms/anneal/performance/index.vue b/klp-ui/src/views/wms/anneal/performance/index.vue
index c72e6fa4..6b3647f4 100644
--- a/klp-ui/src/views/wms/anneal/performance/index.vue
+++ b/klp-ui/src/views/wms/anneal/performance/index.vue
@@ -105,13 +105,14 @@ export default {
const data = response.data || {};
this.summary = data.summary || {};
this.detailList = data.details.map(item => {
- return item.coils.map(coil => {
+ return item.coils?.map(coil => {
return {
...item,
...coil,
}
- })
+ }) || []
}).flat();
+ console.log(this.detailList);
this.loading = false;
}).catch(() => {
this.loading = false;
diff --git a/klp-ui/src/views/wms/anneal/plan/ctrl.vue b/klp-ui/src/views/wms/anneal/plan/ctrl.vue
index 3d70ef4c..697fc9ba 100644
--- a/klp-ui/src/views/wms/anneal/plan/ctrl.vue
+++ b/klp-ui/src/views/wms/anneal/plan/ctrl.vue
@@ -153,30 +153,36 @@
+
+
+
+
+
+
-
+
-
+
+
+
-
-
-
-
-
-
+
+
@@ -184,12 +190,15 @@
- 请为每条钢卷分配实际库位，未分配将无法完成。
+ 请为每条钢卷分配逻辑库区去向，未分配将无法完成。
-
+
+
+
@@ -253,6 +262,7 @@
import { listAnnealPlan, updateAnnealPlanCoil, getAnnealPlan, addAnnealPlan, updateAnnealPlan, delAnnealPlan, changeAnnealPlanStatus, inFurnace, completeAnnealPlan, listAnnealPlanCoils, bindAnnealPlanCoils, unbindAnnealPlanCoil } from "@/api/wms/annealPlan";
import { listAnnealFurnace } from "@/api/wms/annealFurnace";
import { listMaterialCoil } from "@/api/wms/coil";
+import { listWarehouse } from '@/api/wms/warehouse'
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
export default {
@@ -308,14 +318,15 @@ export default {
completeLoading: false,
completePlanId: null,
completeCoils: [],
+ warehouseList: [],
};
},
created() {
this.getList();
this.loadFurnaces();
this.getMaterialCoils();
- this.loadActualWarehouses();
- },
+ this.loadWarehouses();
+ },
methods: {
getList() {
this.loading = true;
@@ -325,6 +336,11 @@ export default {
this.loading = false;
});
},
+ loadWarehouses() {
+ listWarehouse().then(response => {
+ this.warehouseList = response.data || [];
+ });
+ },
loadFurnaces() {
listAnnealFurnace({ pageNum: 1, pageSize: 999, status: 1 }).then(response => {
this.furnaceOptions = response.rows || [];
@@ -395,6 +411,7 @@ export default {
planId: this.currentPlan.planId,
coilId: item.coilId
}).then(() => {
+ // anneal-todo: 新增操作事件
this.$message.success('已加入计划');
this.loadPlanCoils();
}).finally(() => {
@@ -526,6 +543,7 @@ export default {
});
this.loading = true;
await inFurnace({ planId: row.planId });
+ // anneal-todo: 新增操作事件
this.loading = false;
row.status = 2;
row.actualStartTime = new Date();
@@ -552,6 +570,7 @@ export default {
planId: this.completePlanId,
locations: locations
}).then(() => {
+ // anneal-todo: 新增操作事件
this.$message.success('已完成');
this.completeOpen = false;
this.getList();
@@ -571,6 +590,7 @@ export default {
coilId: row.coilId
});
}).then(() => {
+ // anneal-todo: 新增操作事件
this.$message.success('解绑成功');
this.loadPlanCoils();
});
diff --git a/klp-ui/src/views/wms/anneal/plan/index.vue b/klp-ui/src/views/wms/anneal/plan/index.vue
index 5603074c..ec65e6a1 100644
--- a/klp-ui/src/views/wms/anneal/plan/index.vue
+++ b/klp-ui/src/views/wms/anneal/plan/index.vue
@@ -308,7 +308,6 @@ export default {
this.getList();
this.loadFurnaces();
this.getMaterialCoils();
- this.loadActualWarehouses();
},
methods: {
getList() {
@@ -383,6 +382,7 @@ export default {
coilId: item.coilId
}).then(() => {
this.$message.success('已加入计划');
+ // anneal-todo: 新增操作事件
this.loadPlanCoils();
}).finally(() => {
this.coilLoading = false;
@@ -512,6 +512,7 @@ export default {
});
this.loading = true;
await inFurnace({ planId: row.planId });
+ // anneal-todo: 新增操作事件
this.loading = false;
row.status = 2;
row.actualStartTime = new Date();
@@ -540,6 +541,7 @@ export default {
}).then(() => {
this.$message.success('已完成');
this.completeOpen = false;
+ // anneal-todo: 新增操作事件
this.getList();
this.loadPlanCoils();
}).finally(() => {
@@ -558,6 +560,7 @@ export default {
});
}).then(() => {
this.$message.success('解绑成功');
+ // anneal-todo: 新增操作事件
this.loadPlanCoils();
});
},
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index 52c06b6a..c53c83d3 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -33,6 +33,7 @@
{{ coilInfo.itemName || '-' }}
{{ coilInfo.specification || '-' }}
{{ coilInfo.material || '-' }}
+ {{ coilInfo.manufacturer || '-' }}
{{ coilInfo.packingStatus || '-' }}
{{ coilInfo.actualLength || '-' }}
{{ coilInfo.actualWidth || '-' }}
diff --git a/klp-ui/src/views/wms/move/record.vue b/klp-ui/src/views/wms/move/record.vue
index 8a0c69f8..bdff37d7 100644
--- a/klp-ui/src/views/wms/move/record.vue
+++ b/klp-ui/src/views/wms/move/record.vue
@@ -25,8 +25,8 @@
- 已生效
- 未生效
+
+