Merge remote-tracking branch 'origin/master'

yz

2021-03-15 7978a869329a6e975c2c6b7acb3e8f47903351be

Merge remote-tracking branch 'origin/master'

 src/views/user/archivesEdit.vue

@@ -4171,7 +4171,8 @@
    initdimissionLogData(params = {}) {
      params.pageSize = this.pagination.size
      params.pageNum = this.pagination.num
      params.certificateNumb = this.empBaseInfoForm.certificateNumb
      params.empStatus = this.empBaseInfoForm.empStatus
      params.empId = this.empBaseInfoForm.empId
      params.dimissionType = ''
      params.delFlag = '0'
      this.$get('hr/empDimissionlog/list', {

 src/views/yunpan/zhishou.vue

@@ -37,6 +37,17 @@
            >
              <el-input v-model="folderform.foldername" autocomplete="off" />
            </el-form-item>

            <el-form-item label="上级文件夹名称" prop="parentId">
              <treeselect
                v-model="folderform.parentId"
                :multiple="false"
                :options="activitiesTree"
                :clear-value-text="$t('common.clear')"
                placeholder=" "
                style="width:100%"
              />
            </el-form-item>
            <el-form-item label="文件夹排序:" :label-width="formLabelWidth" prop="sort">
              <el-input-number
                v-model="folderform.sort"
@@ -229,8 +240,12 @@
import { getToken } from '@/utils/auth'
import { pages } from '@/settings'
import { Loading } from 'element-ui'

import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
  components: {
    Treeselect
  },
  data() {
    return {
      url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',