From 0af8d2525b8e58c3eb2c3eb30bb32ac482d20856 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/identityInfo.vue |   80 ++++++++++++++++++++++++----------------
 1 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/admin/src/views/business/identityInfo.vue b/admin/src/views/business/identityInfo.vue
index da67bcb..04c95b3 100644
--- a/admin/src/views/business/identityInfo.vue
+++ b/admin/src/views/business/identityInfo.vue
@@ -2,11 +2,18 @@
   <TableLayout :permissions="['business:identityinfo:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-      <el-form-item label="绫诲瀷:0=鐢ㄥ伐韬唤锛�1=璐ц繍韬唤锛�2=渚涢韬唤锛�" prop="type">
-        <el-input v-model="searchForm.type" placeholder="璇疯緭鍏ョ被鍨�:0=鐢ㄥ伐韬唤锛�1=璐ц繍韬唤锛�2=渚涢韬唤锛�" @keypress.enter.native="search"></el-input>
+      <el-form-item label="韬唤绫诲瀷" prop="type">
+        <el-select v-model="searchForm.type" clearable placeholder="璇烽�夋嫨韬唤绫诲瀷" @change="search">
+          <el-option :value="0" label="鐢ㄥ伐韬唤"></el-option>
+          <el-option :value="1" label="璐ц繍韬唤"></el-option>
+          <el-option :value="2" label="渚涢韬唤"></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="璁よ瘉绫诲瀷:0=涓汉锛�1=浼佷笟" prop="authType">
-        <el-input v-model="searchForm.authType" placeholder="璇疯緭鍏ヨ璇佺被鍨�:0=涓汉锛�1=浼佷笟" @keypress.enter.native="search"></el-input>
+      <el-form-item label="璁よ瘉绫诲瀷 " prop="authType">
+        <el-select v-model="searchForm.authType" clearable placeholder="璇烽�夋嫨璁よ瘉绫诲瀷" @change="search">
+          <el-option :value="0" label="涓汉"></el-option>
+          <el-option :value="1" label="浼佷笟"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="鑱旂郴浜�" prop="linkName">
         <el-input v-model="searchForm.linkName" placeholder="璇疯緭鍏ヨ仈绯讳汉" @keypress.enter.native="search"></el-input>
@@ -27,10 +34,10 @@
     </el-form>
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
-      <ul class="toolbar" v-permissions="['business:identityinfo:create', 'business:identityinfo:delete']">
+<!--      <ul class="toolbar" v-permissions="['business:identityinfo:create', 'business:identityinfo:delete']">
         <li><el-button type="primary" @click="$refs.operaIdentityInfoWindow.open('鏂板缓浼氬憳韬唤璁よ瘉淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:identityinfo:create']">鏂板缓</el-button></li>
         <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:identityinfo:delete']">鍒犻櫎</el-button></li>
-      </ul>
+      </ul>-->
       <el-table
           :height="tableHeightNew"
         v-loading="isWorking.search"
@@ -39,41 +46,50 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
-        <el-table-column prop="deleted" label="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�" min-width="100px"></el-table-column>
-        <el-table-column prop="createUser" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
-        <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
-        <el-table-column prop="updateUser" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
-        <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
-        <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
-        <el-table-column prop="type" label="绫诲瀷:0=鐢ㄥ伐韬唤锛�1=璐ц繍韬唤锛�2=渚涢韬唤锛�" min-width="100px"></el-table-column>
-        <el-table-column prop="memberId" label="浼氬憳閫愭笎" min-width="100px"></el-table-column>
-        <el-table-column prop="authType" label="璁よ瘉绫诲瀷:0=涓汉锛�1=浼佷笟" min-width="100px"></el-table-column>
+
+        <el-table-column prop="openid" label="openid" min-width="100px"></el-table-column>
+        <el-table-column prop="memberName" label="浼氬憳鏄电О" min-width="100px"></el-table-column>
+        <el-table-column prop="type" label="绫诲瀷" min-width="100px">
+          <template slot-scope="{row}">
+           <span v-if="row.type ==0">鐢ㄥ伐韬唤</span>
+           <span v-if="row.type ==1">璐ц繍韬唤</span>
+           <span v-if="row.type ==2">渚涢韬唤</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="auditStatus" label="瀹℃牳鐘舵��" min-width="100px">
+          <template slot-scope="{row}">
+            <span class="bluestate" v-if="row.auditStatus ==1">鐢宠涓�</span>
+            <span class="greenstate" v-if="row.auditStatus ==2">宸查�氳繃</span>
+            <span class="redstate" v-if="row.auditStatus ==3">鏈�氳繃</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="authType" label="璁よ瘉绫诲瀷" min-width="100px">
+          <template slot-scope="{row}">
+            <span v-if="row.authType ==0">涓汉</span>
+            <span v-if="row.authType ==1">浼佷笟</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="linkName" label="鑱旂郴浜�" min-width="100px"></el-table-column>
         <el-table-column prop="telephone" label="鑱旂郴鏂瑰紡" min-width="100px"></el-table-column>
         <el-table-column prop="location" label="鎺ュ崟浣嶇疆" min-width="100px"></el-table-column>
         <el-table-column prop="companyName" label="鍗曚綅鍚嶇О" min-width="100px"></el-table-column>
-        <el-table-column prop="lat" label="绾害" min-width="100px"></el-table-column>
-        <el-table-column prop="lgt" label="缁忓害" min-width="100px"></el-table-column>
-        <el-table-column prop="identityFront" label="韬唤璇佷汉鍍忛潰" min-width="100px"></el-table-column>
-        <el-table-column prop="identityBack" label="韬唤璇佸浗寰介潰" min-width="100px"></el-table-column>
-        <el-table-column prop="businessLicense" label="钀ヤ笟鎵х収锛堜紒涓氱被浣跨敤锛�" min-width="100px"></el-table-column>
-        <el-table-column prop="otherFile" label="鍏朵粬璁よ瘉璧勬枡锛堜紒涓氱被浣跨敤锛�" min-width="100px"></el-table-column>
-        <el-table-column prop="transportFile" label="閬撹矾杩愯緭缁忛獙璁稿彲璇侊紙浼佷笟绫昏揣杩愯韩浠戒娇鐢級" min-width="100px"></el-table-column>
-        <el-table-column prop="foodBusinessFile" label="椋熷搧缁忚惀璁稿彲璇侊紙浼佷笟绫讳緵椁愯韩浠戒娇鐢級" min-width="100px"></el-table-column>
-        <el-table-column prop="healthFile" label="浠庝笟浜哄憳鍋ュ悍璇�" min-width="100px"></el-table-column>
-        <el-table-column prop="auditStatus" label="璁よ瘉瀹℃壒鐘舵��:1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�" min-width="100px"></el-table-column>
+        <el-table-column prop="createTime" label="鐢宠鏃堕棿" min-width="100px"></el-table-column>
+        <el-table-column prop="updateUser" label="瀹℃牳浜�" min-width="100px"></el-table-column>
         <el-table-column prop="auditTime" label="璁よ瘉瀹℃壒鏃堕棿" min-width="100px"></el-table-column>
         <el-table-column prop="auditRemark" label="璁よ瘉瀹℃壒澶囨敞" min-width="100px"></el-table-column>
         <el-table-column
-          v-if="containPermissions(['business:identityinfo:update', 'business:identityinfo:delete'])"
+          v-if="containPermissions(['business:identityinfo:update','business:identityinfo:query'])"
           label="鎿嶄綔"
-          min-width="120"
+          min-width="160"
           fixed="right"
         >
-          <template slot-scope="{row}">
+        <template slot-scope="{row}">
+            <el-button type="text" v-if="row.auditStatus==1" @click="$refs.OperaIdentityDetailWindow.open('鐢ㄦ埛璁よ瘉瀹℃牳', row)" icon="el-icon-edit" v-permissions="['business:identityinfo:update']">瀹℃牳</el-button>
+            <el-button type="text"  @click="$refs.OperaIdentityDetailWindow.open('鐢ㄦ埛璁よ瘉璇︽儏', row)" icon="el-icon-info" >璇︽儏</el-button>
+<!--
             <el-button type="text" @click="$refs.operaIdentityInfoWindow.open('缂栬緫浼氬憳韬唤璁よ瘉淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:identityinfo:update']">缂栬緫</el-button>
             <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:identityinfo:delete']">鍒犻櫎</el-button>
+-->
           </template>
         </el-table-column>
       </el-table>
@@ -85,7 +101,7 @@
       </pagination>
     </template>
     <!-- 鏂板缓/淇敼 -->
-    <OperaIdentityInfoWindow ref="operaIdentityInfoWindow" @success="handlePageChange"/>
+    <OperaIdentityDetailWindow ref="OperaIdentityDetailWindow" @success="handlePageChange"/>
   </TableLayout>
 </template>
 
@@ -93,11 +109,11 @@
 import BaseTable from '@/components/base/BaseTable'
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
-import OperaIdentityInfoWindow from '@/components/business/OperaIdentityInfoWindow'
+import OperaIdentityDetailWindow from '@/components/business/OperaIdentityDetailWindow'
 export default {
   name: 'IdentityInfo',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaIdentityInfoWindow },
+  components: { TableLayout, Pagination, OperaIdentityDetailWindow },
   data () {
     return {
       // 鎼滅储

--
Gitblit v1.9.3