From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/business/internalMember.vue |  165 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 96 insertions(+), 69 deletions(-)

diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index b48da4e..a95d580 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -1,46 +1,57 @@
 <template>
   <TableLayout1 :permissions="['business:member:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
-    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-      <el-form-item label="" prop="keyword">
-        <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="positionId" >
-        <el-select v-model="searchForm.positionId" clearable filterable placeholder="宀椾綅">
-          <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="hasFace">
-        <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" clearable placeholder="鏄惁鏈変汉鑴�">
-          <el-option label="鏃�" value="0"></el-option>
-          <el-option label="鏈�" value="1"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="canVisit">
-        <el-select v-model="searchForm.canVisit" clearable @keypress.enter.native="search" placeholder="鍙嫓璁�">
-          <el-option label="鏄�" value="1"></el-option>
-          <el-option label="鍚�" value="0"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="workStatus">
-        <el-select v-model="searchForm.workStatus" @keypress.enter.native="search" clearable placeholder="鍦ㄨ亴鐘舵��">
-          <el-option label="鍦ㄨ亴" value="0"></el-option>
-          <el-option label="绂昏亴" value="1"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="hkStatus">
-        <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" clearable placeholder="娴峰悍鍚屾鐘舵��">
-          <el-option label="寰呭悓姝�" value="0"></el-option>
-          <el-option label="鍚屾鎴愬姛" value="1"></el-option>
-          <el-option label="鍚屾澶辫触" value="2"></el-option>
-        </el-select>
-      </el-form-item>
-      <section>
-        <el-button type="primary" @click="search">鎼滅储</el-button>
-        <el-button @click="reset">閲嶇疆</el-button>
-      </section>
-    </el-form>
+    <div ref="QueryFormRef" slot="search-form">
+      <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+        <el-form-item label="" prop="keyword">
+          <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
+        </el-form-item>
+        <el-form-item label="" prop="positionId">
+          <el-select v-model="searchForm.positionId" clearable filterable placeholder="宀椾綅">
+            <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="hasFace">
+          <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" clearable placeholder="鏄惁鏈変汉鑴�">
+            <el-option label="鏃�" value="0"></el-option>
+            <el-option label="鏈�" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="authStatus">
+          <el-select v-model="searchForm.authStatus" @keypress.enter.native="search" clearable placeholder="鏄惁鎺堟潈">
+            <el-option label="鍚�" value="0"></el-option>
+            <el-option label="鏄�" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="canVisit">
+          <el-select v-model="searchForm.canVisit" clearable @keypress.enter.native="search" placeholder="鍙嫓璁�">
+            <el-option label="鏄�" value="1"></el-option>
+            <el-option label="鍚�" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="workStatus">
+          <el-select v-model="searchForm.workStatus" @keypress.enter.native="search" clearable placeholder="鍦ㄨ亴鐘舵��">
+            <el-option label="鍦ㄨ亴" value="0"></el-option>
+            <el-option label="绂昏亴" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="hkStatus">
+          <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" clearable placeholder="娴峰悍鍚屾鐘舵��">
+            <el-option label="寰呭悓姝�" value="0"></el-option>
+            <el-option label="鍚屾鎴愬姛" value="1"></el-option>
+            <el-option label="鍚屾澶辫触" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="idcardNo">
+          <el-input v-model="searchForm.idcardNo" placeholder="韬唤璇佸彿" @keypress.enter.native="search"></el-input>
+        </el-form-item>
+        <section>
+          <el-button type="primary" @click="search">鎼滅储</el-button>
+          <el-button @click="reset">閲嶇疆</el-button>
+        </section>
+      </el-form>
+    </div>
     <template v-slot:menu>
       <div
         style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
@@ -56,22 +67,22 @@
         <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading"
             @click="synchronous()">鍚屾</el-button></li>
         <li><el-button type="primary"
-            @click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐', null, department, searchForm.companyType)" icon="el-icon-plus"
+            @click="add" icon="el-icon-plus"
             v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
         <li><el-button type="primary" @click="$refs.OperaMemberImportWindow.open('浜哄憳瀵煎叆', searchForm.companyType)"
             icon="el-icon-plus" v-permissions="['business:member:create']">浜哄憳瀵煎叆</el-button></li>
         <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
             v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
-        <li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()"
-            >涓嬪彂鎺堟潈</el-button></li>
+        <li><el-button type="primary" v-permissions="['business:empower:create']"
+            @click="startEmpowerBatch()">涓嬪彂鎺堟潈</el-button></li>
         <li style="float: right">
           <el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1"
             @change="search">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
         </li>
       </ul>
-      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column  fixed="left"  prop="name" label="濮撳悕" min-width="110px">
+        <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
           <template slot-scope="{row}">
             <span>{{ row.name }}</span>
             <span class="zhuguan" v-if="row.headStatus == 1">涓荤</span>
@@ -80,7 +91,7 @@
         <el-table-column label="浜鸿劯淇℃伅" min-width="100px">
           <template slot-scope="{row}">
             <el-image v-if="row.faceImgFull" style="width: 60px; height: 60px" :src="row.faceImgFull"
-                      :preview-src-list="[row.faceImgFull]">
+              :preview-src-list="[row.faceImgFull]">
             </el-image>
           </template>
         </el-table-column>
@@ -93,14 +104,15 @@
           </template>
         </el-table-column>
         <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
-        <el-table-column prop="postionName" label="宀椾綅" min-width="100px"></el-table-column>
-        <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
-          <span v-if="row.status == 0" style="color: green">鏄�</span>
-          <span v-else >鍚�</span>
-        </el-table-column>
-
-        <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px">
-<!--        <el-table-column prop="status" label="鐘舵��" min-width="100px">
+        <el-table-column prop="positionName" label="宀椾綅" min-width="100px"></el-table-column>
+        <!--<el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
+          <template slot-scope="{row}">
+          <span v-if="row.isDangyuan ==1" style="color: green">鍏氬憳</span>
+          <span v-if="row.isDangyuan ==0">闈炲厷鍛�</span>
+          </template>
+        </el-table-column>-->
+        <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"></el-table-column>
+        <!--<el-table-column prop="status" label="鐘舵��" min-width="100px">
           <template slot-scope="{row}">
             <span v-if="row.status == 0" style="color: green">姝e父</span>
             <span v-if="row.status == 1" style="color: red">绂佺敤</span>
@@ -158,21 +170,21 @@
             <div v-else>-</div>
           </template>
         </el-table-column>
-        <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
+<!--        <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
         <el-table-column label="鍗$墖" min-width="80px">
           <template slot-scope="{row}">
             <el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{ row.memberCardCount ||
-              '0'}}</el-button>
+              '0' }}</el-button>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
         <el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
         <el-table-column
           v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
-          label="鎿嶄綔" min-width="280" fixed="right">
+          label="鎿嶄綔" min-width="280">
           <template slot-scope="{row}">
-            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, department)"
-              v-permissions="['business:empower:update']">缂栬緫</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="edit(row)"
+              v-permissions="['business:member:update']">缂栬緫</el-button>
             <el-button type="text" icon="el-icon-plus" @click="empower(row.id)"
               v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
             <el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete"
@@ -206,13 +218,13 @@
 import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
 import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
 import { fetchList } from '@/api/business/company'
-import { fetchList as postionList } from '@/api/business/position'
+import { allList } from '@/api/business/position'
 import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
 export default {
   name: 'internalMember',
   extends: BaseTable,
   components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow, OperaMemberRoleWindow, OperaMemberImportWindow },
-  data() {
+  data () {
     return {
       TreeList: [],
       // 鎼滅储
@@ -229,7 +241,9 @@
         workStatus: '',
         positionId: '',
         companyId: '',
-        hasFace: ''
+        hasFace: '',
+        authStatus: '',
+        idcardNo: ''
       },
       loading: false,
       heading: false,
@@ -251,7 +265,20 @@
     this.getfindCompanyTreePage()
     this.getPositionList()
   },
+  mounted() {
+    // this.$nextTick(() => {
+    //   this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 276
+    // })
+  },
   methods: {
+    edit(row) {
+      this.$refs.OperaMemberWindow.treeData = this.companyTree
+      this.$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, this.department, this.searchForm.companyType)
+    },
+    add() {
+      this.$refs.OperaMemberWindow.treeData = this.companyTree
+      this.$refs.OperaMemberWindow.open('鏂板缓鍛樺伐', null, this.department, this.searchForm.companyType)
+    },
     startEmpowerBatch() {
       if (this.tableData.selectedRows.length === 0) {
         this.$tip.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
@@ -266,10 +293,10 @@
       this.$refs.OperaMemberRoleWindow.open('鍐呴儴鍛樺伐涓嬪彂鏉冮檺', ids, names, this.searchForm.companyType)
     },
     getPositionList() {
-      positionList({})
-          .then(res => {
-            this.positionList = res
-          })
+      allList({})
+        .then(res => {
+          this.positionList = res
+        })
     },
     empower(id) {
       var that = this
@@ -289,7 +316,7 @@
     },
     // 鑾峰彇缁勭粐鏍�
     getfindCompanyTreePage() {
-      fetchList()
+      fetchList(1)
         .then(res => {
           if (res && res.length > 0) {
             res[0].fsStatus = 1
@@ -316,7 +343,7 @@
         }
 
         if (newItem.type === this.searchForm.companyType) {
-          //newItem.disabled =false
+          // newItem.disabled =false
         } else {
           newItem.disabled = true
         }

--
Gitblit v1.9.3