From ae2b2626259e87e4c40d7e13b74a4305ae5adb28 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 15 三月 2021 17:56:13 +0800
Subject: [PATCH] ..
---
src/views/user/archivesChange.vue | 6 +-
src/views/user/archivesEdit.vue | 6 +-
src/views/yunpan/zhishou.vue | 70 +++++++++++++++++++++++++++++------
3 files changed, 64 insertions(+), 18 deletions(-)
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index c1532cd..5d0ed18 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -27,7 +27,7 @@
</el-upload>
<!-- <img src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1333074204,3035391839&fm=26&gp=0.jpg" class="jbxxImg">-->
<div class="title-da">
- 编号：{{ empBaseInfoForm.empNumb }}
+ 档案号：{{ empBaseInfoForm.archivesNumb }}
</div>
</div>
<ul class="jbxx-ul" style="height: 68vh;overflow: auto">
@@ -204,8 +204,8 @@
<el-form ref="empBaseInfoForm" :model="empBaseInfoForm" class="formjbxx" label-width="150px">
<el-row style="width: 100%;">
<el-col :span="8">
- <el-form-item label="档案号" prop="archivesNumb">
- <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="readon ? false : true" />
+ <el-form-item label="编号" prop="empNumb">
+ <el-input v-model="empBaseInfoForm.empNumb" style="width: 100%;" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index ec6da03..da2d22f 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -27,7 +27,7 @@
</el-upload>
<!-- <img src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1333074204,3035391839&fm=26&gp=0.jpg" class="jbxxImg">-->
<div class="title-da">
- 编号：{{ empBaseInfoForm.empNumb }}
+ 档案号：{{ empBaseInfoForm.archivesNumb }}
</div>
</div>
<ul class="jbxx-ul" style="height: 68vh;overflow: auto">
@@ -221,8 +221,8 @@
<el-form ref="empBaseInfoForm" :model="empBaseInfoForm" class="formjbxx" label-width="150px">
<el-row style="width: 100%;">
<el-col :span="8">
- <el-form-item label="档案号" prop="archivesNumb">
- <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="readon ? false : true" />
+ <el-form-item label="编号" prop="empNumb">
+ <el-input v-model="empBaseInfoForm.empNumb" style="width: 100%;" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
diff --git a/src/views/yunpan/zhishou.vue b/src/views/yunpan/zhishou.vue
index cdb8343..53da34d 100644
--- a/src/views/yunpan/zhishou.vue
+++ b/src/views/yunpan/zhishou.vue
@@ -54,7 +54,19 @@
>确 定</el-button>
</div>
</el-dialog>
- <el-timeline>
+ <el-tree
+ ref="deptTree"
+ :data="activitiesTree"
+ :check-strictly="false"
+ accordion
+ node-key="id"
+ default-expand-all
+ :expand-on-click-node="false"
+ highlight-current
+ :filter-node-method="filterNode"
+ @node-click="nodeClick"
+ />
+ <!-- <el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
@@ -70,7 +82,7 @@
>
{{ activity.timestamp }}</span>
</el-timeline-item>
- </el-timeline>
+ </el-timeline>-->
</el-aside>
<el-container>
<el-header class="text-header">
@@ -160,14 +172,28 @@
shadow="never"
>
<el-image
+ v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1"
:src="showFileImg(node.filesformat)"
class="uploading-image"
:preview-src-list="srcList"
@click="clickImg(node)"
/>
- <el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
+ <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1" class="item" effect="dark" :content="node.filesname" placement="bottom">
<div style="padding-top: 14px;">
<el-checkbox v-model="checkedArr[index * rowCount + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
+ </div>
+ </el-tooltip>
+ <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) != -1" class="item" effect="dark" :content="node.filesname" placement="bottom">
+ <div style="padding-top: 14px;">
+ <el-checkbox v-model="checkedArr[index * rowCount + nodeIndex].isChecked" class="myRedCheckBox">
+ <el-image
+ style="width: 100px; height: 80px"
+ :src="getImg+node.filesid"
+ :preview-src-list="srcList"
+ @click="clickImg(node)"
+ />
+ {{ node.filesname }}
+ </el-checkbox>
</div>
</el-tooltip>
</el-card>
@@ -207,6 +233,8 @@
export default {
data() {
return {
+ url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+ activitiesTree: [],
srcList: [],
getImg: pages.getFilesUploadImage,
updateFileNameFormVisible: false,
@@ -225,6 +253,7 @@
dialogDelVisible: false,
dialogFormVisible: false,
folderform: {
+ parentId: '',
folderid: '',
foldername: '',
sort: 0
@@ -255,6 +284,26 @@
this.initFolder()
},
methods: {
+ filterNode(value, data) {
+ if (!value) return true
+ return data.label.indexOf(value) !== -1
+ },
+ nodeClick(data) {
+ this.folderform.parentId = data.parentId
+ if (this.folderform.parentId === '0') {
+ this.folderform.parentId = null
+ }
+ this.folderform.sort = data.orderNum
+ this.folderform.foldername = data.label
+ this.folderform.folderid = data.id
+ // eslint-disable-next-line no-unused-vars
+ var params = {}
+ params = {
+ folderid: data.id,
+ filesname: this.fileName
+ }
+ this.initFile(params)
+ },
clickImg(node) {
this.srcList = []
if ('tif,bmp,jpg,png,gif'.indexOf(node.filesformat) >= 0) {
@@ -307,18 +356,19 @@
}
},
async initFolder() {
- await this.$get('hr/folder').then(r => {
+ await this.$get('hr/folder/treeList').then(r => {
this.activities = []
this.beforeIndex = 0
- r.data.data.forEach((v, i) => {
+ this.activitiesTree = r.data.data.rows
+ r.data.data.rows.forEach((v, i) => {
if (i === 0) {
this.activities.push({
- timestamp: v.foldername,
- id: v.folderid,
+ timestamp: v.label,
+ id: v.id,
color: '#a32c30'
})
} else {
- this.activities.push({ timestamp: v.foldername, id: v.folderid })
+ this.activities.push({ timestamp: v.label, id: v.id })
}
})
})
@@ -489,8 +539,6 @@
return require('../../assets/uploading/word.png')
case 'zip':
return require('../../assets/uploading/zip.png')
- case 'jpg':
- return require('../../assets/uploading/jpg.png')
case 'png':
return require('../../assets/uploading/png.png')
case 'doc':
@@ -501,8 +549,6 @@
return require('../../assets/uploading/tif.png')
case 'wps':
return require('../../assets/uploading/wps.png')
- default:
- return require('../../assets/uploading/unknown.png')
}
},
beforeAvatarUpload(file) {
--
Gitblit v1.8.0