厚度:
{{ item.rawMaterial.thickness }}mm
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index c0ecf87d..4e8d8da5 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -21,17 +21,21 @@
-
+
+
+
+
-
-
@@ -251,6 +255,8 @@ import MaterialSelect from "@/components/KLPService/MaterialSelect";
import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
import { findItemWithBom } from "@/store/modules/category";
import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
export default {
@@ -267,9 +273,11 @@ export default {
CoilTraceResult,
LabelRender,
ActualWarehouseSelect,
- CoilNo
+ CoilNo,
+ MemoInput,
+ MutiSelect,
},
- dicts: ['product_coil_status'],
+ dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
props: {
qrcode: {
type: Boolean,
@@ -399,7 +407,8 @@ export default {
{ label: '质量状态', prop: 'qualityStatus' },
{ label: '打包状态', prop: 'packingStatus' },
{ label: '切边要求', prop: 'edgeRequirement' },
- { label: '包装要求', prop: 'packagingRequirement' }
+ { label: '包装要求', prop: 'packagingRequirement' },
+ { label: '厂家', prop: 'itemManufacturer' },
],
title: '详细信息'
}
diff --git a/klp-ui/src/views/wms/delivery/components/coilsTranfer.vue b/klp-ui/src/views/wms/delivery/components/coilsTranfer.vue
index f362e635..ec972f7f 100644
--- a/klp-ui/src/views/wms/delivery/components/coilsTranfer.vue
+++ b/klp-ui/src/views/wms/delivery/components/coilsTranfer.vue
@@ -9,10 +9,6 @@
-
-
-
diff --git a/klp-ui/src/views/wms/receive/detail/index.vue b/klp-ui/src/views/wms/receive/detail/index.vue
index a608bb08..483fbec6 100644
--- a/klp-ui/src/views/wms/receive/detail/index.vue
+++ b/klp-ui/src/views/wms/receive/detail/index.vue
@@ -43,9 +43,9 @@
-
+
-
+
@@ -86,16 +86,10 @@
签收
+ 删除
-
import { updateMaterialCoilSimple, getMaterialCoil } from '@/api/wms/coil'
-import { listPendingAction, updatePendingAction } from '@/api/wms/pendingAction'
+import { listPendingAction, updatePendingAction, delPendingAction } from '@/api/wms/pendingAction'
import { listDeliveryPlan } from '@/api/wms/deliveryPlan'
import MemoInput from "@/components/MemoInput";
import ImportGuide from "@/views/wms/receive/components/ImportGuide.vue";
@@ -320,6 +314,20 @@ export default {
// 转换为树形数据格式
this.planTreeData = response.rows;
this.planLoading = false;
+ // 后台加载每一条钢卷的明细
+ });
+ },
+
+ handleDelete(row) {
+ this.$modal.confirm("确认删除吗?", "删除确认", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ delPendingAction(row.actionId).then(response => {
+ this.$modal.msgSuccess("删除成功");
+ this.getList();
+ });
});
},
@@ -385,21 +393,6 @@ export default {
}
});
},
- /** 删除按钮操作 */
- handleDelete(row) {
- const waybillIds = row.waybillId || this.ids;
- this.$modal.confirm('是否确认删除收货单编号为"' + waybillIds + '"的数据项?').then(() => {
- this.loading = true;
- return delDeliveryWaybill(waybillIds);
- }).then(() => {
- this.loading = false;
- this.getList();
- this.$modal.msgSuccess("删除成功");
- }).catch(() => {
- }).finally(() => {
- this.loading = false;
- });
- },
/** 导出按钮操作 */
handleExport() {
this.download('wms/deliveryWaybill/export', {