From 3aedad63dd01f1fc5154cb520af32edab967d6e0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 12 5月 2025 09:15:26 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx
index c606d18..7fec7c0 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx
@@ -19,6 +19,11 @@
ElDatePicker,
ElForm,
ElFormItem,
+ ElDialog,
+ ElButton,
+ ElTable,
+ ElTableColumn,
+ ElMessage,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
@@ -37,6 +42,7 @@
directives: {
permission: vPermission,
},
+
setup(props, ctx) {
const {
dataSource,
@@ -46,6 +52,7 @@
tableRef,
current,
search,
+ selection,
sort,
headers,
onError,
@@ -173,6 +180,66 @@
return filteredData
}
+ // 鍙枡寮圭獥鐩稿叧鐘舵��
+ const callMaterialDialog = reactive({
+ visible: false,
+ title: '鍙枡',
+ selectedItems: [] as any[],
+ })
+
+ // 鎵撳紑鍙枡寮圭獥
+ const openCallMaterialDialog = () => {
+ console.log('閫変腑鐨勬暟鎹�:', callMaterialDialog.selectedItems)
+ if (selection.value.length === 0) {
+ ElMessage.warning('璇疯嚦灏戦�夋嫨涓�鏉¤褰�')
+ return
+ }
+ callMaterialDialog.selectedItems = [...selection.value]
+ callMaterialDialog.visible = true
+ }
+
+ // 纭鍙枡
+ const confirmCallMaterial = () => {
+ // 杩欓噷娣诲姞鍙枡閫昏緫
+ console.log('鍙枡鏁版嵁:', callMaterialDialog.selectedItems)
+ ElMessage.success('鍙枡鎴愬姛')
+ callMaterialDialog.visible = false
+ }
+
+ /**
+ * @returns 鍙枡寮圭獥
+ */
+ const RenderCallMaterialDialog = () => {
+ return (
+ <ElDialog
+ v-model={callMaterialDialog.visible}
+ title={callMaterialDialog.title}
+ width="70%"
+ v-slots={{
+ footer: () => (
+ <div class={styles.dialogFooter}>
+ <ElButton onClick={() => (callMaterialDialog.visible = false)}>
+ 鍙栨秷
+ </ElButton>
+ <ElButton type="primary" onClick={confirmCallMaterial}>
+ 纭鍙枡
+ </ElButton>
+ </div>
+ ),
+ }}
+ >
+ <ElTable data={callMaterialDialog.selectedItems} border>
+ <ElTableColumn prop="orderNo" label="鍗曟嵁鍙�" width="180" />
+ <ElTableColumn prop="materialNo" label="鐗╂枡缂栧彿" width="180" />
+ <ElTableColumn prop="materialName" label="鐗╂枡鍚嶇О" />
+ <ElTableColumn prop="materialModel" label="鍨嬪彿" />
+ <ElTableColumn prop="placeNo" label="搴撲綅缂栧彿" />
+ <ElTableColumn prop="quantity" label="鏁伴噺" />
+ </ElTable>
+ </ElDialog>
+ )
+ }
+
/**
* @returns 琛ㄦ牸
*/
@@ -273,6 +340,9 @@
<div class={styles.headerContent}>
<div class={styles.header}>
+ {/* 鍙枡寮圭獥 */}
+ <RenderCallMaterialDialog />
+
<IconButton
v-permission="wmsInOutStockOrder-add"
icon="add-p"
@@ -282,9 +352,16 @@
娣诲姞
</IconButton>
<el-divider direction="vertical" />
-
+ <IconButton
+ v-permission="wmsInOutStockOrder-add"
+ icon="add-p"
+ onClick={openCallMaterialDialog}
+ type="primary"
+ >
+ 鍙枡
+ </IconButton>
<el-divider direction="vertical" />
- <el-upload
+ {/* <el-upload
v-permission="wmsInOutStockOrder-import"
name="file"
accept=".xlsx,.xls,.csv"
@@ -304,7 +381,7 @@
onClick={handleExport}
>
瀵煎嚭
- </IconButton>
+ </IconButton> */}
</div>
<ElFormItem style={{ marginTop: '15px' }}>
<ElFormItem label="鍏抽敭瀛�">
--
Gitblit v1.9.3