From 1eb08ced0ef966804e96c9b792bba45ca6eb6601 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 11:25:45 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
index 3744a08..b8f7f93 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -176,7 +176,9 @@
<a-button type="info" v-if="hasPerm('WmsMaterial:exportExcel')" icon="download" @click="WmsMaterialToExcel()">
瀵煎嚭
</a-button>
- <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.addForm.add()">鏂板鐗╂枡淇℃伅琛�</a-button>
+ <!-- <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.addForm.add()">鏂板鐗╂枡淇℃伅琛�</a-button> -->
+ <!-- 鑷畾涔� -->
+ <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.tabForm.add()">鏂板鐗╂枡淇℃伅</a-button>
</div>
</template>
<span slot="isDisabledscopedSlots" slot-scope="text">
@@ -190,7 +192,9 @@
</span>
<span slot="action" slot-scope="text, record">
- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
+ <!-- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a> -->
+ <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record)">缂栬緫</a>
+
<a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')"/>
<a-popconfirm v-if="hasPerm('WmsMaterial:delete')" placement="topRight" title="纭鍒犻櫎锛�" @confirm="() => WmsMaterialDelete(record)">
<a>鍒犻櫎</a>
@@ -200,6 +204,9 @@
<add-form ref="addForm" @ok="handleOk" />
<edit-form ref="editForm" @ok="handleOk" />
<excel-form ref="excelForm" @ok="handleOk" />
+ <!-- 鑷畾涔� -->
+ <tab-form ref="tabForm" @ok="handleOk" />
+
</a-card>
</div>
</template>
@@ -210,6 +217,9 @@
//鑷畾涔塼able楂樺害
import setTableHtMixin from '@/mixins/handleTableHt.js'
import addForm from './addForm.vue'
+//鑷畾涔�
+ import tabForm from './tabForm.vue'
+
import { exportExcel } from '@/utils/exportToExcel'
import { downloadFile } from '@/utils/util'
import editForm from './editForm.vue'
@@ -220,7 +230,8 @@
STable,
addForm,
editForm,
- excelForm
+ excelForm,
+ tabForm //鑷畾涔�
},
data () {
return {
--
Gitblit v1.9.3