vue2-client 1.2.93 → 1.2.96

package/src/base-client/components/common/PersonSetting/PersonSetting.vue

@@ -0,0 +1,221 @@
+<template>
+  <div>
+    <a-input
+      @click="inputClick"
+      :value="valueView"
+      style="cursor:pointer"
+      readOnly/>
+    <a-modal
+      v-if="visible"
+      v-model="visible"
+      :title="placeholder"
+      :z-index="1031"
+      :bodyStyle="{ maxHeight: '68vh', overflowY: 'auto' }"
+      @ok="handleOk"
+      @close="visible=false"
+    >
+      <!-- 搜索框 -->
+      <a-input-search :value="searchValue" style="margin-bottom: 8px" placeholder="搜索" @change="handleSearch"/>
+      <!-- 树形图 -->
+      <a-tree
+        v-model="checkedKeys"
+        :expanded-keys="expandedKeys"
+        :selectable="false"
+        checkable
+        @expand="onExpand"
+      >
+        <!-- department -->
+        <a-tree-node
+          v-for="department in treeData"
+          v-show="!department.hidden"
+          :key="department.key"
+          :title="department.title">
+          <!-- person -->
+          <a-tree-node v-for="person in department.children" v-show="!person.hidden" :key="person.key">
+            <!-- 搜索关键词红色 -->
+            <template slot="title">
+              <span v-if="person.title.indexOf(searchValue) > -1">
+                {{ person.title.substr(0, person.title.indexOf(searchValue)) }}
+                <span style="color: #f50">{{ searchValue }}</span>
+                {{ person.title.substr(person.title.indexOf(searchValue) + searchValue.length) }}
+              </span>
+              <span v-else>{{ person.title }}</span>
+            </template>
+          </a-tree-node>
+        </a-tree-node>
+      </a-tree>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { commonApi, post } from '@vue2-client/services/api'
+
+const departments = ['运维部', '项目部', '项目一部', '项目二部', '开发部', '售后部', '办公室', '管理员', '软件工程部', 'IC卡部', '销售部']
+
+export default {
+  name: 'PersonSetting',
+  data () {
+    return {
+      searchValue: '',
+      treeData: [],
+      checkedKeys: [],
+      expandedKeys: [],
+      sourceTreeData: [],
+      visible: false,
+      valueView: this.placeholder
+    }
+  },
+  props: {
+    buttonText: {
+      type: String,
+      default: '选择人员'
+    },
+    placeholder: {
+      type: String,
+      default: '请选择人员'
+    },
+    value: {
+      type: Array,
+      default: () => []
+    },
+    // 默认选中key
+    defaultCheckedNames: {
+      type: Array,
+      default: () => []
+    },
+    defaultCheckedIds: {
+      type: Array,
+      default: () => []
+    },
+    // // 返回数据类型 String,Array 发现返回类型只能有一个
+    // type: {
+    //   type: String,
+    //   default: 'Array'
+    // },
+    // 返回数据字段 name , id
+    field: {
+      type: String,
+      default: 'name'
+    },
+  },
+  model: {
+    prop: 'value',
+    event: 'onOk'
+  },
+  watch: {},
+  components: {},
+  created () {
+    post(commonApi.getEmpTree, {}).then(res => {
+      this.sourceTreeData = res
+    })
+  },
+  methods: {
+    inputClick () {
+      this.visible = true
+      this.searchValue = ''
+      this.treeData = this.sourceTreeData
+      if (this.defaultCheckedIds.length > 0) {
+        this.checkedKeys = this.getCheckedKeys(this.defaultCheckedIds)
+      } else if (this.defaultCheckedNames.length > 0) {
+        this.checkedKeys = this.getCheckedKeys(this.defaultCheckedNames)
+      }
+      this.expandedKeys = []
+    },
+    // 获取选择得key
+    getCheckedKeys (arr) {
+      const brr = []
+      this.treeData.forEach(item => {
+          adaptToChildrenList(item)
+      })
+      function adaptToChildrenList (o) {
+        if (arr.some(item => o.key.indexOf(item) > -1)) {
+          brr.push(o.key)
+        }
+        if (o.children) {
+          for (const c of o.children) {
+            adaptToChildrenList(c)
+          }
+        }
+      }
+      return brr
+    },
+    handleOk () {
+      this.$emit('onOk', this.allPerson())
+      this.visible = false
+    },
+    onExpand (expandedKeys) {
+      this.expandedKeys = expandedKeys
+    },
+    // 搜索处理
+    handleSearch (e) {
+      const value = e.target.value.trim()
+      if (!value) {
+        this.treeData = this.sourceTreeData
+        this.expandedKeys = []
+        this.searchValue = ''
+        return
+      }
+      const expandedKeys = []
+      const treeData = JSON.parse(JSON.stringify(this.sourceTreeData))
+      // 过滤结果
+      for (const department of treeData) {
+        if (department.key.includes(value)) {
+          continue
+        }
+        let hasChildren = false
+        if (department.children) {
+          for (const person of department.children) {
+            if (!person.key.includes(value)) {
+              person.hidden = true
+            } else {
+              hasChildren = true
+            }
+          }
+        }
+        if (!hasChildren) {
+          department.hidden = true
+        } else {
+          expandedKeys.push(department.key)
+        }
+      }
+      this.treeData = treeData
+      this.expandedKeys = expandedKeys
+      this.searchValue = value
+    },
+    allPerson () {
+      const index = this.type === 'id' ? 1 : 0
+      const _allPerson = this.checkedKeys.filter(value => !departments.includes(value)).map(item => item.split('_')[index])
+      this.valueView = this.checkedKeys.filter(value => !departments.includes(value)).map(item => item.split('_')[0]).join(',')
+      return _allPerson
+    }
+  },
+}
+</script>
+<style lang="less" scoped>
+.ant-tree-title {
+  width: 100%;
+}
+
+.title {
+  float: left;
+}
+
+.ant-card-body {
+  :global {
+    .ant-tree {
+      line-height: 3;
+
+      li {
+        position: relative;
+      }
+    }
+  }
+}
+
+.ant-card-body .but_type {
+  float: right;
+  position: absolute;
+  right: 40px;
+}
+</style>

package/src/base-client/components/common/PersonSetting/index.js

@@ -0,0 +1,3 @@
+import PersonSetting from './PersonSetting'
+
+export default PersonSetting

package/src/base-client/components/common/Upload/Upload.vue

@@ -1,151 +1,152 @@
-<template>
-  <div>
-    <a-upload-dragger
-      v-if="model.type === 'file'"
-      name="file"
-      :multiple="true"
-      :accept="model.accept.join('')"
-      :remove="deleteFileItem"
-      :customRequest="uploadFiles"
-      :file-list="uploadedFileList">
-      <p class="ant-upload-drag-icon">
-        <a-icon type="inbox"/>
-      </p>
-      <p class="ant-upload-text">
-        点击或拖动文件到该区域上传
-      </p>
-      <p class="ant-upload-hint">
-        支持单个或多个文件
-      </p>
-    </a-upload-dragger>
-    <a-upload
-      v-if=" model.type === 'image'"
-      list-type="picture-card"
-      :accept="model.accept.join('')"
-      :customRequest="uploadFiles"
-      :remove="deleteFileItem"
-      :file-list="uploadedFileList">
-      <a-icon type="plus"/>
-      <div class="ant-upload-text">
-        Upload
-      </div>
-    </a-upload>
-  </div>
-</template>
-
-<script>
-
-import { post } from '@vue2-client/services/api'
-import { mapState } from 'vuex'
-
-export default {
-  name: 'uploads',
-  data () {
-    return {
-      uploadedFileList: [],
-    }
-  },
-  props: {
-    // 表单属性
-    model: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    files: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    images: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' })
-  },
-  created () {
-    this.uploadedFileList = this.model.type === 'file' ? [...this.files] : [...this.images]
-  },
-  methods: {
-    uploadFiles (info) {
-      if (this.uploadedFileList.length >= this.model.acceptCount) {
-        this.$message.error(`当前表单限制仅可上传 ${this.model.acceptCount} 个文件`)
-        return
-      }
-      // 初始化文件信息
-      const fileInfo = {
-        uid: info.file.uid,
-        name: info.file.name,
-        status: 'uploading',
-        response: '',
-        url: '',
-      }
-      // 放入上传列表中，以便于显示上传进度
-      this.uploadedFileList.push(fileInfo)
-      // 组装上传数据
-      const headers = {
-        'Content-Type': 'multipart/form-data',
-      }
-      // TODO 暂时给默认值 基础表单调整好后处理
-      const formData = new FormData()
-      formData.append('avatar', info.file)
-      formData.append('resUploadMode', this.model.resUploadMode ?? 'server')
-      if (this.model.pathKey) {
-        formData.append('pathKey', this.model.pathKey ?? 'Default')
-      }
-      // formData.append('stockAlias', this.model.stockAlias)
-      formData.append('formType', this.model.type)
-      formData.append('resUploadStock', this.model.resUploadStock)
-      formData.append('filename', info.file.name)
-      formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
-      formData.append('f_operator', this.currUser ? this.currUser.username : '')
-
-      // const url = '/webmeteruploadapi/resource'
-      // if (process.env.NODE_ENV === 'production') {
-      //   url = `/${this.model.stockAlias}/webmeteruploadapi/resource`
-      // }
-      post('/webmeterresourceapi/upload', formData, { headers }).then(res => {
-        // 根据服务端返回的结果判断成功与否，设置文件条目的状态
-        if (res.success) {
-          fileInfo.status = 'done'
-          fileInfo.response = JSON.parse(res.data)
-          fileInfo.id = JSON.parse(res.data).id
-          fileInfo.url = JSON.parse(res.data).f_downloadpath
-          this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
-          this.$message.success('上传成功！')
-        } else {
-          fileInfo.status = 'error'
-          fileInfo.response = res.data
-          this.$message.error('上传失败！')
-        }
-      }).catch((e) => {
-        fileInfo.status = 'error'
-        fileInfo.response = e
-        this.$message.error(`请求失败！${e}`)
-      })
-    },
-    // 删除文件
-    deleteFileItem (file) {
-      if (file.id) {
-        post('/rs/entity/t_files', { id: file.id, f_state: '删除' }).then(res => {
-        }).catch(e => { })
-      }
-      // 找到当前文件所在列表的索引
-      const index = this.uploadedFileList.indexOf(file)
-      // 从列表中移除该文件
-      this.uploadedFileList.splice(index, 1)
-      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
-      return true
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-
-</style>
+<template>
+  <div>
+    <a-upload-dragger
+      v-if="model.type === 'file'"
+      name="file"
+      :multiple="true"
+      :accept="model.accept.join('')"
+      :remove="deleteFileItem"
+      :customRequest="uploadFiles"
+      :file-list="uploadedFileList">
+      <p class="ant-upload-drag-icon">
+        <a-icon type="inbox"/>
+      </p>
+      <p class="ant-upload-text">
+        点击或拖动文件到该区域上传
+      </p>
+      <p class="ant-upload-hint">
+        支持单个或多个文件
+      </p>
+    </a-upload-dragger>
+    <a-upload
+      v-if=" model.type === 'image'"
+      list-type="picture-card"
+      :accept="model.accept.join('')"
+      :customRequest="uploadFiles"
+      :remove="deleteFileItem"
+      :file-list="uploadedFileList">
+      <a-icon type="plus"/>
+      <div class="ant-upload-text">
+        Upload
+      </div>
+    </a-upload>
+  </div>
+</template>
+
+<script>
+
+import { post } from '@vue2-client/services/api'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'uploads',
+  data () {
+    return {
+      uploadedFileList: [],
+    }
+  },
+  props: {
+    // 表单属性
+    model: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    files: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    images: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  created () {
+    this.uploadedFileList = this.model.type === 'file' ? [...this.files] : [...this.images]
+  },
+  methods: {
+    uploadFiles (info) {
+      if (this.uploadedFileList.length >= this.model.acceptCount) {
+        this.$message.error(`当前表单限制仅可上传 ${this.model.acceptCount} 个文件`)
+        return
+      }
+      // 初始化文件信息
+      const fileInfo = {
+        uid: info.file.uid,
+        name: info.file.name,
+        status: 'uploading',
+        response: '',
+        url: '',
+      }
+      // 放入上传列表中，以便于显示上传进度
+      this.uploadedFileList.push(fileInfo)
+      // 组装上传数据
+      const headers = {
+        'Content-Type': 'multipart/form-data',
+      }
+      // TODO 暂时给默认值 基础表单调整好后处理
+      const formData = new FormData()
+      formData.append('avatar', info.file)
+      formData.append('resUploadMode', this.model.resUploadMode ?? 'server')
+      if (this.model.pathKey) {
+        formData.append('pathKey', this.model.pathKey ?? 'Default')
+      }
+      // formData.append('stockAlias', this.model.stockAlias)
+      formData.append('formType', this.model.type)
+      formData.append('useType', this.model.useType ?? 'Default')
+      formData.append('resUploadStock', this.model.resUploadStock)
+      formData.append('filename', info.file.name)
+      formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
+      formData.append('f_operator', this.currUser ? this.currUser.username : '')
+
+      // const url = '/webmeteruploadapi/resource'
+      // if (process.env.NODE_ENV === 'production') {
+      //   url = `/${this.model.stockAlias}/webmeteruploadapi/resource`
+      // }
+      post('/webmeterresourceapi/upload', formData, { headers }).then(res => {
+        // 根据服务端返回的结果判断成功与否，设置文件条目的状态
+        if (res.success) {
+          fileInfo.status = 'done'
+          fileInfo.response = JSON.parse(res.data)
+          fileInfo.id = JSON.parse(res.data).id
+          fileInfo.url = JSON.parse(res.data).f_downloadpath
+          this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+          this.$message.success('上传成功！')
+        } else {
+          fileInfo.status = 'error'
+          fileInfo.response = res.data
+          this.$message.error('上传失败！')
+        }
+      }).catch((e) => {
+        fileInfo.status = 'error'
+        fileInfo.response = e
+        this.$message.error(`请求失败！${e}`)
+      })
+    },
+    // 删除文件
+    deleteFileItem (file) {
+      if (file.id) {
+        post('/rs/entity/t_files', { id: file.id, f_state: '删除' }).then(res => {
+        }).catch(e => { })
+      }
+      // 找到当前文件所在列表的索引
+      const index = this.uploadedFileList.indexOf(file)
+      // 从列表中移除该文件
+      this.uploadedFileList.splice(index, 1)
+      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+      return true
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+
+</style>

package/src/base-client/components/common/Upload/index.js

@@ -1,3 +1,3 @@
-import Upload from './Upload'
-
-export default Upload
+import Upload from './Upload'
+
+export default Upload