From 744819bfd6accd29a80a3494567cc2093cf3affa Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期四, 14 十一月 2024 15:27:46 +0800
Subject: [PATCH] 1、jar包更新 2、UI测试接口。获取产品和获取ebom

---
 Source/plt-web/plt-web-ui/src/views/system/department/index.vue |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
index d56868a..5059528 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
@@ -25,9 +25,10 @@
       </template>
 
       <template slot="menuLeft" slot-scope="scope">
-        <el-button icon="el-icon-school" plain size="small" type="primary" @click="assignMembersHandler">鍒嗛厤鎴愬憳</el-button>
+        <el-button icon="el-icon-school" plain size="small" type="primary" @click="assignMembersHandler">鍒嗛厤鎴愬憳
+        </el-button>
         <el-button icon="el-icon-user" plain size="small" type="primary" @click="statisticsHandler">缁熻</el-button>
-        <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="statisticsHandler">瀵煎叆閮ㄩ棬</el-button>
+        <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadHandler">瀵煎叆閮ㄩ棬</el-button>
         <el-button icon="el-icon-download" plain size="small" type="primary" @click="downLoadHandler">涓嬭浇瀵煎叆妯℃澘</el-button>
       </template>
     </avue-crud>
@@ -36,7 +37,6 @@
     <el-dialog
       v-dialogDrag
       v-loading="statisticsLoading"
-      :destroy-on-close="true"
       :visible.sync="statisticsVisible"
       append-to-body="true"
       class="avue-dialog"
@@ -62,6 +62,10 @@
               :transferTitle="transferTitle" title="閮ㄩ棬娣诲姞鎴愬憳"
               @transferSend="departTransferSend">
     </transfer>
+
+    <!-- 瀵煎叆閮ㄩ棬   -->
+    <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆閮ㄩ棬"
+                 @updata="getTableList"></upload-file>
 
   </basic-container>
 </template>
@@ -91,12 +95,15 @@
         ...basicOption,
         rowKey: 'oid',
         rowParentKey: 'parentId',
+        expandRowKeys:[],
         selection: false,
         addBtn: false,
         editBtn: false,
         delBtn: false,
         gridBtn: false,
+        menuWidth:280,
         highlightCurrentRow: true,
+        calcHeight: -50,
         column: column
       },
       tableLoading: false,
@@ -110,7 +117,9 @@
         selection: false,
         refreshBtn: false,
         addBtn: false,
+        header :false,
         menu: false,
+        calcHeight:80,
         column: [
           {
             label: '閮ㄩ棬',
@@ -131,12 +140,16 @@
             label: '瑙掕壊',
             prop: 'pkPersonName',
             sortable: true,
+            overHidden: true,
           },
         ]
       },
       leftTransferData: [],
       rightTransferData: [],
       transferTitle: ['寰呴�変汉鍛�', '宸查�変汉鍛�'],
+      tipList: ['瀵煎叆妯℃澘涓爣鏄庣孩鑹插瓧浣撶殑涓哄繀杈撻」', '瀵煎叆缁撴瀯涓烘爲缁撴瀯鏃惰淇濊瘉ID鍒椾笉鑳介噸澶�', '鐖禝D璇蜂娇鐢ㄧ晫闈笂閮ㄩ棬鐨勫敮涓�鏍囪瘑ID鎴栬�匛xcel涓墜鍔ㄨ緭鍏ョ殑ID', '鐖禝D鍒椾负绌烘椂锛屽鍏ョ殑閮ㄩ棬鍗充负椤跺眰閮ㄩ棬'],
+      upFileType: ['xls', 'xlsx'],
+      fileUrl: 'api/departmentQueryController/importDept',
     }
   },
   methods: {
@@ -144,6 +157,7 @@
     getTableList() {
       refTree({queryAllLevel: true, 'extandParamsMap[showAllDepartmentNode]': true}).then(res => {
         this.tableData = this.departDtaFormAtter(res.data.treeData);
+        this.option.expandRowKeys=[res.data.treeData[0].oid];
       })
     },
 
@@ -152,6 +166,7 @@
       return items.map(item => {
         // 杞崲褰撳墠鑺傜偣鐨勫睘鎬�
         const formList = {
+          expanded:item.expanded,
           oid: item.oid,
           id: item.attributes.id,
           name: item.attributes.name,
@@ -195,7 +210,6 @@
           done();
         }
       }).catch(err => {
-        console.log(err);
         loading();
       })
 
@@ -223,7 +237,6 @@
           done();
         }
       }).catch(err => {
-        console.log(err);
         loading();
       })
     },
@@ -273,7 +286,6 @@
       }
 
       countSmUserByDeptOid({pkDepartment: this.departCurrenRow.ALLDept === 'ALLDept' ? null : this.departCurrenRow.oid}).then(res => {
-        console.log(res);
         if (res.data.code === 200) {
           const data = res.data.data;
           this.countData = data.map(item => {
@@ -326,11 +338,11 @@
     // 鍒嗛厤鎴愬憳绌挎妗嗗洖濉�
     departTransferSend(row) {
       let params = {
-        userOids: row.join(','),
+        userOIds: row.join(','),
         deptId: this.departCurrenRow.oid
       }
       saveUsersDepts(params).then(res => {
-        console.log(res);
+        //console.log(res);
         this.$message.success(res.data.obj);
         this.getTableList();
       }).catch(err => {
@@ -339,13 +351,18 @@
     },
 
     // 涓嬭浇瀵煎叆妯℃澘
-    downLoadHandler(){
+    downLoadHandler() {
       download().then(res => {
         func.downloadFileByBlobHandler(res);
         this.$message.success('涓嬭浇鎴愬姛')
       }).catch(err => {
         this.$message.error(err);
       })
+    },
+
+    // 瀵煎叆閮ㄩ棬
+    upLoadHandler() {
+      this.$refs.upload.visible = true;
     }
   }
 }

--
Gitblit v1.9.3