From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
platform_web/src/views/business/clientManger.vue | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/platform_web/src/views/business/clientManger.vue b/platform_web/src/views/business/clientManger.vue
index 19ff745..8543327 100644
--- a/platform_web/src/views/business/clientManger.vue
+++ b/platform_web/src/views/business/clientManger.vue
@@ -1,6 +1,6 @@
<template>
<!-- :permissions="['business:appliancechange:query']" -->
- <TableLayout>
+ <TableLayout :permissions="['ext:companyext:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" label-suffix="锛�" inline>
<el-form-item label="瀹㈡埛鍚嶇О" prop="name">
@@ -26,11 +26,11 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar">
- <!-- v-permissions="['ext:workorderrecordext:exportExcel']" -->
- <li><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '鏂板瀹㈡埛')">鏂板</el-button></li>
+ <!-- -->
+ <li v-permissions="['ext:companyext:create']"><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '鏂板瀹㈡埛')">鏂板</el-button></li>
<!-- <li><el-button type="primary" @click="exportExcel">璋冩暣鏈夋晥鏈�</el-button></li> -->
<li><el-button type="primary" @click="resetUserPwd">閲嶇疆涓昏处鍙峰瘑鐮�</el-button></li>
- <li><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
+ <li v-permissions="['ext:companyext:delete']"><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe border
@selection-change="handleSelectionChange">
@@ -51,12 +51,11 @@
<span>{{ row.oepnType == 1 ? '姝ｅ紡' : '璇曠敤' }}</span>
</template>
</el-table-column>
+ <el-table-column prop="openUserNum" label="浜烘暟闄愬埗" align="center" min-width="140px"></el-table-column>
<el-table-column prop="phone" label="涓昏处鍙�" align="center" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="浜烘暟闄愬埗" align="center" min-width="100px"></el-table-column>
<el-table-column prop="linkName" label="鑱旂郴浜�" align="center" min-width="100px"></el-table-column>
<el-table-column prop="linkPhone" label="鑱旂郴鐢佃瘽" align="center" min-width="120px"></el-table-column>
<el-table-column prop="oepnValidDate" label="鏈夋晥鏈�" align="center" min-width="140px"></el-table-column>
- <el-table-column prop="openUserNum" label="寮�閫氱敤鎴锋暟" align="center" min-width="140px"></el-table-column>
<el-table-column prop="salespersonName" label="閿�鍞汉鍛�" align="center" min-width="100px"></el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" align="center" min-width="100px">
@@ -66,13 +65,16 @@
:inactive-value="0" @change="statusChange(row)"></el-switch>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" min-width="220px" fixed="right">
+ <el-table-column
+ v-if="containPermissions(['ext:companyext:update', 'ext:companyext:delete'])"
+
+ label="鎿嶄綔" align="center" min-width="220px" fixed="right">
<template slot-scope="{ row }">
<!-- <el-button type="text" @click="$refs.operaClientMangerWindow.open('缂栬緫瀹㈡埛', row)">缂栬緫</el-button> -->
- <el-button type="text" @click="showDetail(row, true)">缂栬緫</el-button>
- <el-button type="text" @click="$refs.operaClientValidDateWindow.open('璋冩暣', row)">璋冩暣</el-button>
- <el-button type="text" @click="$refs.operaDDSettingWindow.open('閽夐拤閰嶇疆', row)">閽夐拤閰嶇疆</el-button>
- <el-button type="text" style="color:red" :loading="isWorking.delete"
+ <el-button type="text" v-permissions="['ext:companyext:update']" @click="showDetail(row, true)">缂栬緫</el-button>
+ <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaClientValidDateWindow.open('璋冩暣', row)">璋冩暣</el-button>
+ <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaDDSettingWindow.open('閽夐拤閰嶇疆', row)">閽夐拤閰嶇疆</el-button>
+ <el-button type="text" v-permissions="['ext:companyext:delete']" style="color:red" :loading="isWorking.delete"
@click="deleteById(row, false)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -143,8 +145,13 @@
// this.$refs.operaApplianceChangeDetailWindow.open('鏇存崲鍗曡鎯�', row)
findCompanyInfo({ CompanyId: row.id })
.then(res => {
- const element = isEdit ? this.$refs.operaClientMangerWindow : this.$refs.operaClientDetailWindow
- element.open(res)
+ if (isEdit) {
+ this.$refs.operaClientMangerWindow.open({...res, openUserNum: row.openUserNum})
+ } else {
+ this.$refs.operaClientDetailWindow.open(res)
+ }
+ // const element = isEdit ? this.$refs.operaClientMangerWindow : this.$refs.operaClientDetailWindow
+ // element.open({...res, ...row})
})
.catch(err => {
this.$tip.error(err)
--
Gitblit v1.9.3