@@ -234,7 +221,6 @@ import { addCustomer } from "@/api/crm/customer";
import { listDeliveryWaybill } from "@/api/wms/deliveryWaybill";
import dayjs from "dayjs";
import ContractList from "./components/ContractList.vue";
-import ContractPreview from "./components/ContractPreview.vue";
import ContractTabs from "./components/ContractTabs.vue";
import ContractExportDialog from "./components/ContractExportDialog.vue";
import ProductContent from "./components/ProductContent.vue";
@@ -246,7 +232,6 @@ export default {
name: "Contract",
components: {
ContractList,
- ContractPreview,
ContractTabs,
ContractExportDialog,
ProductContent,
@@ -706,34 +691,6 @@ export default {
this.customerOpen = false;
this.customerForm = {};
},
- /** 开始拖拽调整 */
- startResize(e) {
- e.preventDefault();
- const previewPanel = this.$refs.previewPanel;
- const tabPanel = this.$refs.tabPanel;
- const startY = e.clientY;
- const startPreviewHeight = previewPanel.offsetHeight;
- const parentHeight = previewPanel.parentElement.offsetHeight;
-
- const handleMouseMove = (event) => {
- const deltaY = event.clientY - startY;
- const newPreviewHeight = startPreviewHeight + deltaY;
- const newTabHeight = parentHeight - newPreviewHeight - 8; // 8是拖拽条的高度
-
- if (newPreviewHeight > 100 && newTabHeight > 100) { // 最小高度限制
- previewPanel.style.flex = `0 0 ${newPreviewHeight}px`;
- tabPanel.style.flex = `0 0 ${newTabHeight}px`;
- }
- };
-
- const handleMouseUp = () => {
- document.removeEventListener('mousemove', handleMouseMove);
- document.removeEventListener('mouseup', handleMouseUp);
- };
-
- document.addEventListener('mousemove', handleMouseMove);
- document.addEventListener('mouseup', handleMouseUp);
- }
}
};
@@ -756,11 +713,7 @@ export default {
overflow: hidden;
}
-.preview-panel {
- overflow-y: auto;
-}
-
.tab-panel {
- overflow-y: auto;
+ overflow: hidden;
}
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index d9e6f7f06..4a9f4d876 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -83,7 +83,10 @@
-
+
+
+
@@ -997,7 +1000,7 @@ export default {
ContractSelect,
ExceptionManager,
},
- dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status', 'wms_next_warehouse', 'coil_business_purpose'],
+ dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status', 'wms_next_warehouse', 'coil_business_purpose', 'wip_pack_saleman'],
props: {
qrcode: {
type: Boolean,
diff --git a/klp-ui/src/views/wms/move/do.vue b/klp-ui/src/views/wms/move/do.vue
index 0f4254a93..453b57d71 100644
--- a/klp-ui/src/views/wms/move/do.vue
+++ b/klp-ui/src/views/wms/move/do.vue
@@ -17,11 +17,11 @@
-
+ :value="item.orderId" />
@@ -32,7 +32,7 @@
查询
- 批量执行
+ 批量执行
清空
@@ -46,7 +46,7 @@
+ @refreshData="handleBatchConfirmDone">
@@ -103,7 +103,7 @@ export default {
currentCoilNo: '',
warehouseIdBefore: '',
warehouseIdAfter: '',
- transferNo: '',
+ transferId: '',
isTransferred: '0',
pageSize: 20,
pageNum: 1,
@@ -114,6 +114,7 @@ export default {
transferOrderOptions: [],
transferOrderLoading: false,
loading: false,
+ batchConfirmLoading: false,
total: 0,
dialogVisible: false,
};
@@ -171,7 +172,7 @@ export default {
currentCoilNo: '',
warehouseIdBefore: '',
warehouseIdAfter: '',
- transferNo: '',
+ transferId: '',
isTransferred: '0',
pageSize: 20,
pageNum: 1,
@@ -192,7 +193,18 @@ export default {
}
},
handleConfirmBatch() {
- this.$refs.transferItemTable.handleBatchConfirm();
+ this.$confirm('确定要批量执行调拨吗?', '确认操作', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.batchConfirmLoading = true;
+ this.$refs.transferItemTable.handleBatchConfirm();
+ }).catch(() => {});
+ },
+ handleBatchConfirmDone() {
+ this.batchConfirmLoading = false;
+ this.handleRegularSearch();
},
},
mounted() {
diff --git a/klp-ui/src/views/wms/move/record.vue b/klp-ui/src/views/wms/move/record.vue
index 5de416f7d..c6c56b37c 100644
--- a/klp-ui/src/views/wms/move/record.vue
+++ b/klp-ui/src/views/wms/move/record.vue
@@ -30,11 +30,11 @@
-
+ :label="item.transferNo" :value="item.orderId" />
@@ -105,7 +105,7 @@ export default {
currentCoilNo: '',
warehouseIdBefore: '',
warehouseIdAfter: '',
- transferNo: '',
+ transferId: '',
isTransferred: '',
pageSize: 20,
pageNum: 1,
@@ -173,7 +173,7 @@ export default {
currentCoilNo: '',
warehouseIdBefore: '',
warehouseIdAfter: '',
- transferNo: '',
+ transferId: '',
isTransferred: '',
pageSize: 20,
pageNum: 1,