From fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 30 Mar 2022 16:21:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/systemManage/unitManage/index.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/views/systemManage/unitManage/index.vue b/src/views/systemManage/unitManage/index.vue
index 1d44e38..859d841 100644
--- a/src/views/systemManage/unitManage/index.vue
+++ b/src/views/systemManage/unitManage/index.vue
@@ -51,7 +51,7 @@
<el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="text" @click="showUnitForm(scope.row,'编辑')">编辑</el-button>
- <el-button type="text" style="color: red" @click="deleteById(scope.row)">删除</el-button>
+<!-- <el-button type="text" style="color: red" @click="deleteById(scope.row)">删除</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -229,6 +229,7 @@
params['pageIndex'] = this.currentPage
params['pageSize'] = this.pageSize
params['company'] = this.company
+ params['isMain'] = true
let res = await getUnitList(params)
if(res.data.code === '200'){
this.recordTotal = res.data.result.totalCount
--
Gitblit v1.9.2