From 5f7f074ac063ddfae2134f8d84841927f5685394 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 01 二月 2024 14:50:17 +0800
Subject: [PATCH] Mr.Shi
---
company/src/views/enterprise/add_subtract.vue | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index 9f45503..80bf584 100644
--- a/company/src/views/enterprise/add_subtract.vue
+++ b/company/src/views/enterprise/add_subtract.vue
@@ -42,12 +42,6 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
-<<<<<<< HEAD
-=======
- <ul class="toolbar" v-permissions="['business:applychange:create']">
- <li><el-button type="primary" @click="$refs.operaApplyChangeWindow.open('鏂板缓')" v-permissions="['business:applychange:create']">鏂板缓</el-button></li>
- </ul>
->>>>>>> 48eb5dc61ac07d232632b13d040006128ed5cceb
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -66,7 +60,6 @@
<span v-if="row.status === 3">閫�鍥炵敵璇�</span>
</template>
</el-table-column>
- <el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
<el-table-column prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="addNum" label="鍔犱繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
@@ -79,7 +72,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaApplyChangeWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -91,7 +84,7 @@
</pagination>
</template>
<!-- 璇︽儏 -->
- <add_subtractDetails ref="add_subtractDetails" @success="handlePageChange"/>
+ <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -100,11 +93,13 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import add_subtractDetails from '@/components/enterprise/add_subtractDetails'
+ import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import {all as solutionAll, all} from '@/api/business/solutions'
+ import { mapState } from 'vuex'
export default {
name: 'add_subtract',
extends: BaseTable,
- components: { TableLayout, Pagination, add_subtractDetails },
+ components: { TableLayout, Pagination, add_subtractDetails, OperaApplyChangeDetailWindow },
data () {
return {
// 鎼滅储
--
Gitblit v1.9.3