From 2e2cc56d419ce972d37c8f24b72090c5183b67e7 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期四, 09 十一月 2023 11:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/equipment/equipment/index.vue | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 7dcc880..f65ac9d 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -23,7 +23,7 @@
</template>
<script>
-import { delObj, fetchList } from '@/api/equipment/equipment'
+import { delObj, fetchList,pullEquip } from '@/api/equipment/equipment'
import TableForm from './equipment-form'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
@@ -188,7 +188,7 @@
label: '鐘舵��',
sort: true,
isTrue: true,
- isSearch: false,
+ isSearch: true,
searchInfoType: 'text'
}
],
@@ -197,7 +197,13 @@
text: '鏂板',
type: 'primary',
fun: this.addOrUpdateHandle
- }
+ },
+ // {
+ // text: '鍚屾',
+ // type: 'primary',
+ // loading: false,
+ // fun: this.pullEquipFun
+ // }
],
operator: [
{
@@ -243,6 +249,17 @@
})
},
methods: {
+ pullEquipFun(){
+ this.table.toolbar.find((e) => e.text === '鍚屾').loading = true
+ pullEquip().then(res=>{
+ this.$message.success(res.data.data.msg)
+ this.table.toolbar.find((e) => e.text === '鍚屾').loading = false
+ }).catch(error=>{
+ this.$message.error("鍚屾澶辫触",error)
+ this.getData()
+ this.table.toolbar.find((e) => e.text === '鍚屾').loading = false
+ })
+ },
workShopFormatter(row, column, cellValue) {
this.workshopList.forEach((obj) => {
if (obj.value == cellValue) {
--
Gitblit v1.9.3