From 1ae471941bbdf9dde5dba668d33acf415fc6ec07 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 16:54:48 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/business/internalMember.vue |   47 ++++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index b48da4e..3360015 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -93,13 +93,14 @@
           </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="positionName" 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>
+          <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 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">姝ｅ父</span>
@@ -206,13 +207,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: [],
       // 鎼滅储
@@ -240,7 +241,7 @@
       department: []
     }
   },
-  created() {
+  created () {
     this.config({
       module: '浜哄憳淇℃伅琛�',
       api: '/business/member',
@@ -252,7 +253,7 @@
     this.getPositionList()
   },
   methods: {
-    startEmpowerBatch() {
+    startEmpowerBatch () {
       if (this.tableData.selectedRows.length === 0) {
         this.$tip.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
         return
@@ -265,13 +266,13 @@
       })
       this.$refs.OperaMemberRoleWindow.open('鍐呴儴鍛樺伐涓嬪彂鏉冮檺', ids, names, this.searchForm.companyType)
     },
-    getPositionList() {
-      positionList({})
-          .then(res => {
-            this.positionList = res
-          })
+    getPositionList () {
+      allList({})
+        .then(res => {
+          this.positionList = res
+        })
     },
-    empower(id) {
+    empower (id) {
       var that = this
       this.$confirm('纭畾閲嶆柊鎺堟潈鍚�?', '鎻愮ず', {
         confirmButtonText: '纭畾',
@@ -288,7 +289,7 @@
       })
     },
     // 鑾峰彇缁勭粐鏍�
-    getfindCompanyTreePage() {
+    getfindCompanyTreePage () {
       fetchList()
         .then(res => {
           if (res && res.length > 0) {
@@ -300,7 +301,7 @@
           }
         })
     },
-    getDepartmentTree(tree) {
+    getDepartmentTree (tree) {
       if (tree == null) {
         return []
       }
@@ -316,7 +317,7 @@
         }
 
         if (newItem.type === this.searchForm.companyType) {
-          //newItem.disabled =false
+          // newItem.disabled =false
         } else {
           newItem.disabled = true
         }
@@ -324,7 +325,7 @@
       })
     },
     // 鍚屾淇℃伅
-    async synchronous() {
+    async synchronous () {
       this.$dialog.actionConfirm('璇ユ搷浣滈檷瑙﹀彂鍏ㄥ憳淇℃伅鏇存柊鍜岄噸鏂颁笅鍙戯紒璇疯皑鎱庢搷浣�', '鎮ㄧ‘璁ゅ叏閲忓悓姝ュ唴閮ㄤ汉鍛樹俊鎭悧锛�')
         .then(() => {
           this.loading = true
@@ -342,7 +343,7 @@
         })
         .catch(() => { })
     },
-    async updateHead(row, type) {
+    async updateHead (row, type) {
       this.$dialog.actionConfirm('鎮ㄧ‘璁よ繘琛屽綋鍓嶆搷浣滃悧锛�', '閮ㄩ棬涓荤璁剧疆鎿嶄綔鎻愮ず')
         .then(() => {
           this.heading = true
@@ -360,7 +361,7 @@
             .catch(() => { })
         })
     },
-    changeWorkStatus(e, row) {
+    changeWorkStatus (e, row) {
       this.working = true
       updateWorkStatus({ id: row.id, workStatus: e })
         .then(res => {
@@ -375,7 +376,7 @@
         })
         .catch(() => { })
     },
-    changeCanvisit(e, row) {
+    changeCanvisit (e, row) {
       this.canvisiting = true
       updateCanVisit({ id: row.id, canVisit: e })
         .then(res => {
@@ -390,7 +391,7 @@
         })
         .catch(() => { })
     },
-    callback(row) {
+    callback (row) {
       console.log(row)
       this.searchForm.erpOrgId = row.erpId
       this.searchForm.companyId = row.id

--
Gitblit v1.9.3