From 752030a34315629a07810faff9bcd6522c1ebf41 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期五, 23 五月 2025 09:08:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/spare/EamSparePartsList.vue | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/views/eam/spare/EamSparePartsList.vue b/src/views/eam/spare/EamSparePartsList.vue
index e5f9d88..249bec8 100644
--- a/src/views/eam/spare/EamSparePartsList.vue
+++ b/src/views/eam/spare/EamSparePartsList.vue
@@ -98,6 +98,12 @@
type="primary"
icon="plus"
>鏂板</a-button>
+
+ <a-button
+ @click="handleInto"
+ type="primary"
+ icon="plus"
+ >鍏ュ簱</a-button>
<!-- <a-button
type="primary"
icon="download"
@@ -198,6 +204,11 @@
ref="modalForm"
@ok="modalFormOk"
></eamSpareParts-modal>
+
+ <eamSpare-part-into-modal
+ ref="intoModalForm"
+ @ok="modalFormOk"
+ ></eamSpare-part-into-modal>
</a-card>
</template>
@@ -205,6 +216,7 @@
import '@assets/less/TableExpand.less'
import EamSparePartsModal from './modules/EamSpareParts/EamSparePartsModal.vue'
import EamSparePartInventoryList from './modules/EamSpareParts/EamSparePartInventoryList.vue'
+import EamSparePartIntoModal from './modules/EamSpareParts/EamSparePartIntoModal.vue'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
@@ -212,7 +224,8 @@
mixins: [JeecgListMixin],
components: {
EamSparePartsModal,
- EamSparePartInventoryList
+ EamSparePartInventoryList,
+ EamSparePartIntoModal
},
data() {
return {
@@ -281,6 +294,11 @@
dataIndex: 'inventoryWarning'
},
{
+ title: '搴撳瓨鎬绘暟',
+ align: "center",
+ dataIndex: 'totalQuantity'
+ },
+ {
title: '鎿嶄綔',
dataIndex: 'action',
align: "center",
@@ -302,11 +320,20 @@
}
},
methods: {
+
+ handleInto() {
+ this.$refs.intoModalForm.add();
+ this.$refs.intoModalForm.title = "鍏ュ簱";
+ },
searchReset() {
this.queryParam = {}
this.onClearSelected()
this.loadData(1);
},
+ searchQuery() {
+ this.onClearSelected()
+ this.loadData(1);
+ },
clickThenSelect(record) {
return {
on: {
--
Gitblit v1.9.3