From bcd894e924bc796bf8312762f9b9e524e25d4726 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Wed, 5 Jul 2023 11:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=88=97=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/mk/basic-pages/list.vue       | 44 ++++++++++---------
 .../Middle/Mes/MesStaff/MesStaff/Edit.vue     |  4 +-
 .../Middle/Mes/MesStaff/MesStaff/List.vue     | 15 ++++++-
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/application/mk/basic-pages/list.vue b/src/application/mk/basic-pages/list.vue
index 451e1c1..9f22456 100644
--- a/src/application/mk/basic-pages/list.vue
+++ b/src/application/mk/basic-pages/list.vue
@@ -40,6 +40,10 @@
           </div>
         </template>
 
+        <template #column1="{ row }">
+          <slot name="column1" :row="row"></slot>
+        </template>
+
       </vxe-grid>
     </div>
 
@@ -273,7 +277,7 @@ export default {
         date[0]._d.setHours(0, 0, 0, 0);
         date[1]._d.setHours(23, 59, 59, 59);
         this.start_time = parseInt(date[0]._d.getTime() / 1000); // 将日期转换为时间戳
-        this.end_time = parseInt( date[1]._d.getTime() / 1000); // 将日期转换为时间戳
+        this.end_time = parseInt(date[1]._d.getTime() / 1000); // 将日期转换为时间戳
       } else { // 如果没有值
         this.start_time = 0; // 将日期转换为时间戳
         this.end_time = 0; // 将日期转换为时间戳
@@ -359,8 +363,8 @@ export default {
             width: this.$mk.getWindowSize().width * 0.9,
             height: this.$mk.getWindowSize().height * 0.9,
             dataId: 0,
-            callback:({success})=>{
-              if(success){
+            callback: ({ success }) => {
+              if (success) {
                 this.$refs.xGrid.commitProxy('query')
               }
             }
@@ -459,7 +463,7 @@ export default {
         if (editPage != null) {
           editPage.beforeTabClose().then(() => {
             this.$closePage(this.options.editPageUrl);
-            this.showPageEdit( row[this.options.keyName]); // 打开页面
+            this.showPageEdit(row[this.options.keyName]); // 打开页面
           });
         } else {
           this.showPageEdit(row[this.options.keyName]); // 打开页面
@@ -474,27 +478,27 @@ export default {
     },
 
 
-    showPageEdit(dataId){
+    showPageEdit(dataId) {
 
-      if( this.options.editPage){
+      if (this.options.editPage) {
         this.$mk.dialog.open({
-            page: this.options.editPage,
-            title: this.options.editPageTitle,
-            pageOptions: {
-            },
-            width: this.$mk.getWindowSize().width * 0.9,
-            height: this.$mk.getWindowSize().height * 0.9,
-            dataId: dataId,
-            callback:({success})=>{
-              if(success){
-                this.$refs.xGrid.commitProxy('query')
-              }
+          page: this.options.editPage,
+          title: this.options.editPageTitle,
+          pageOptions: {
+          },
+          width: this.$mk.getWindowSize().width * 0.9,
+          height: this.$mk.getWindowSize().height * 0.9,
+          dataId: dataId,
+          callback: ({ success }) => {
+            if (success) {
+              this.$refs.xGrid.commitProxy('query')
             }
-          });
-      }else{
+          }
+        });
+      } else {
         this.$openPage(this.options.editPageUrl + dataId);
       }
-      
+
     },
 
 
diff --git a/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue b/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
index f676a68..fea14e4 100644
--- a/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
+++ b/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
@@ -1,5 +1,7 @@
 <template>
-  <basic-page-edit :desc="desc" :dataId="getDataId()" :options="pageOptions"></basic-page-edit>
+  <basic-page-edit :desc="desc" :dataId="getDataId()" :options="pageOptions">
+
+  </basic-page-edit>
 </template>
 
 <script>
diff --git a/src/pages/Middle/Mes/MesStaff/MesStaff/List.vue b/src/pages/Middle/Mes/MesStaff/MesStaff/List.vue
index 69aff08..c1eff49 100644
--- a/src/pages/Middle/Mes/MesStaff/MesStaff/List.vue
+++ b/src/pages/Middle/Mes/MesStaff/MesStaff/List.vue
@@ -1,5 +1,13 @@
 <template>
-  <basic-page-list :desc="desc" :options="pageOptions"></basic-page-list>
+  <basic-page-list :desc="desc" :options="pageOptions">
+    <template v-slot:column1="{row}">
+       
+            <img v-if="row && row.avatar" :src="row.avatar" style="width: 100px;"/> 
+     
+
+      </template>
+
+  </basic-page-list>
 </template>
 
 <script>
@@ -136,6 +144,10 @@ export default {
 
           // =============================== 表格列 自动生成 Start ===============================
  
+          {   slots: { default: 'column1' },title: '员工头像', width: 250 }, 
+
+
+
 					{ field: 'name', sortable: true, title: '员工姓名', width: 250 }, // 员工姓名
 					{ field: 'code', sortable: true, title: '员工工号', width: 250 }, // 员工工号
           { field: 'base_department', formatter: 'formatRef', params: { dataType: "object", textField: "name" }, title: '部门', width: 250 },
@@ -144,7 +156,6 @@ export default {
 					//{ field: 'password', sortable: true, title: '员工密码', width: 250 }, // 员工密码
 					//{ field: 'salt', sortable: true, title: '员工盐', width: 250 }, // 员工盐
 					{ field: 'nickname', sortable: true, title: '员工昵称', width: 250 }, // 员工昵称
-				//	{ field: 'avatar', sortable: true, title: '员工头像', width: 250 }, // 员工头像
 					//{ field: 'openid', sortable: true, title: '员工openid', width: 250 }, // 员工openid
 					//{ field: 'unionid', sortable: true, title: '员工unionid', width: 250 }, // 员工unionid
 					//{ field: 'session_key', sortable: true, title: '员工session_key', width: 250 }, // 员工session_key