vue2-client 1.17.29 → 1.17.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.17.29",
+  "version": "1.17.30",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XForm/XTreeSelect.vue

@@ -1,276 +1,276 @@
-<template>
-  <div>
-    <!-- 树形选择框 -->
-    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model" :rules="rules">
-      <a-spin v-show="!loaded" size="small"/>
-      <a-tree-select
-        v-show="loaded"
-        ref="tree-select"
-        v-model="localValue"
-        :disabled="disabled"
-        :tree-data="getTreeData()"
-        :tree-checkable="mode === '查询' && queryType !== 'RIGHT_LIKE'"
-        :placeholder="`请选择${name||''}`"
-        :dropdown-style="{ maxHeight: '400px' }"
-        tree-node-filter-prop="label"
-        :show-checked-strategy="queryType === 'RIGHT_LIKE' ? 'SHOW_ALL' : undefined"
-        allow-clear
-        :showArrow="true"
-        class="tree-select"
-        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-        @change="onTreeSelectChange">
-      </a-tree-select>
-    </a-form-model-item>
-  </div>
-</template>
-<script>
-import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
-
-export default {
-  name: 'XTreeSelect',
-  components: { XFormCol },
-  model: {
-    prop: 'value',
-    event: 'onChange'
-  },
-  // eslint-disable-next-line vue/require-prop-types
-  props: ['value', 'attr', 'rules'],
-  watch: {
-    value (newVal) {
-      if (newVal.length && !newVal[0]) {
-        this.localValue = undefined
-      }
-      if (!newVal) {
-        this.localValue = undefined
-      }
-    },
-  },
-  data () {
-    return {
-      // 内容加载是否完成
-      loaded: false,
-      // 数据列表
-      option: [],
-      // 表单
-      form: {},
-      // 查询方式
-      queryType: 'IN',
-      // label名称
-      name: undefined,
-      // 模型名称
-      model: undefined,
-      // 使用方式
-      mode: '查询',
-      // 是否禁用
-      disabled: false,
-      localValue: this.value
-    }
-  },
-  methods: {
-    init (params) {
-      const {
-        option = [], form, queryType = 'IN', name, model, mode = '查询', disabled = false
-      } = params
-      this.loaded = false
-      this.option = option
-      this.form = form
-      this.queryType = queryType
-      this.name = name
-      this.model = model
-      this.mode = mode
-      this.disabled = disabled
-      // 修改时恢复树形选择框选中状态
-      if (this.queryType !== 'RIGHT_LIKE') {
-        const value = this.form[this.model]
-        if (value) {
-          // 如果数据源中值含'-'，代表是由多个数据源组成的树，需要重新组织新增/编辑时的表单值
-          if (this.option.length > 0 && this.option[0].value.toString().indexOf('-') !== -1) {
-            this.value = model + '-' + value
-          } else {
-            if (this.mode === '查询') {
-              const values = []
-              this.getValues(option, value, values)
-              this.$emit('onChange', values)
-            } else {
-              this.value = value
-            }
-            // value = option 自身和所有子得集合
-          }
-        } else {
-          this.value = undefined
-        }
-      }
-      this.$emit('mounted', this.attr)
-      this.loaded = true
-    },
-    getValues (option, value, values) {
-      const _values = []
-      for (const item of option) {
-        if (value.includes(item.value)) {
-          values.push(item.value)
-          _values.push(item.value)
-          // 找到匹配节点后，递归添加所有子节点的值
-          if (item.children && item.children.length) {
-            this.getAllChildrenValues(item.children, values)
-          }
-        }
-        if (item.children && item.children.length) {
-          const tempV = this.getValues(item.children, value, values)
-          if (tempV.length === item.children.length) {
-            values.push(item.value)
-          }
-        }
-      }
-      return _values
-    },
-    getAllChildrenValues (children, values) {
-      for (const child of children) {
-        values.push(child.value)
-        if (child.children && child.children.length) {
-          this.getAllChildrenValues(child.children, values)
-        }
-      }
-      return values
-    },
-    // 获取树形选择框数据
-    getTreeData () {
-      const treeData = this.option
-      if (this.mode === '新增/修改') {
-        this.setParentSelectable(treeData)
-      }
-      return treeData
-    },
-    // 设置树形选择框不能选择父节点
-    setParentSelectable (treeData) {
-      treeData.forEach(item => {
-        if (item.children && item.children.length) {
-          item.selectable = false
-          this.setParentSelectable(item.children)
-        }
-      })
-    },
-    // 选中树节点
-    onTreeSelectChange (value, label, extra) {
-      if (this.queryType === 'RIGHT_LIKE') {
-        // 获取可用于模糊查询的组织机构字符串
-        let node = extra.triggerNode.$parent
-        label = label[0]
-        while (node && node.label) {
-          label = node.label + '.' + label
-          node = node.$parent
-        }
-        // this.form[this.model] = label
-        this.$emit('onChange', label)
-      } else {
-        // 如果选中值含'-'，代表是由多个数据源组成的树，需要重新组织查询或新增/编辑时的表单
-        if ((Array.isArray(value) && value.length > 0 && String(value[0]).indexOf('-') !== -1) || (typeof value === 'string' && value.indexOf('-') !== -1)) {
-          const treeDatas = {}
-          // 单选情况用于新增.修改表单场景，使用extra.triggerNode获取选中节点信息
-          if (!extra.allCheckedNodes) {
-            this.setNodeData(treeDatas, extra.triggerNode)
-          } else {
-            // 多选情况用于查询表单场景，使用extra.allCheckedNodes获取选中节点集合
-            const nodes = extra.allCheckedNodes
-            // 获取任意选中节点的叶子节点的字段名，用于查询时组织查询项的key
-            const name = this.getNodeDataProps(nodes[0])
-            // 获取所有选中节点的叶子节点的value,用于查询时组织查询项的value
-            const values = []
-            for (const node of nodes) {
-              const ref = this.setDataRef(node)
-              if (ref instanceof Array) {
-                for (const nodeRef of ref) {
-                  const keyValue = nodeRef.node.key
-                  values.push(keyValue.substring(keyValue.lastIndexOf('-') + 1))
-                }
-              } else {
-                const keyValue = ref.node.key
-                values.push(keyValue.substring(keyValue.lastIndexOf('-') + 1))
-              }
-            }
-            treeDatas[name] = values
-          }
-          // 移除默认的表单项，将组织好后的表单项合并进表单
-          this.form[this.model] = undefined
-          Object.assign(this.form, treeDatas)
-          // this.$emit('onChange', treeDatas)
-        } else {
-          // 从单一数据源组成的树可以直接赋值
-          // this.form[this.model] = value
-          // 获取所有选中节点的value
-          if (this.mode === '查询') {
-            const values = []
-            if (extra.allCheckedNodes) {
-              for (const item of extra.allCheckedNodes) {
-                if (item.node.key) {
-                  if (item.node?.data?.props?.label === item.node?.data?.props?.value) {
-                    if (!item.children?.length) {
-                      values.push(`${item.node.key}`)
-                    }
-                  } else {
-                    values.push(`${item.node.key}`)
-                  }
-                }
-                if (item.children && item.children.length) {
-                  this.getNodeValues(item.children, value, values)
-                }
-              }
-            }
-            this.$emit('onChange', values)
-          } else {
-            this.$emit('onChange', value)
-          }
-        }
-      }
-    },
-    getNodeValues (data, value, values) {
-      for (const item of data) {
-        values.push(`${item.node.key}`)
-        if (item.children && item.children.length) {
-          this.getNodeValues(item.children, value, values)
-        }
-      }
-    },
-    // 设置选中值
-    setValue (value) {
-      this.value = value
-    },
-    setDataRef (node) {
-      if (node.children) {
-        return this.setDataRef(node.children)
-      }
-      return node
-    },
-    /**
-     * 组织节点和每层父节点的数据，用于新增/修改时更新表单数据
-     * @param data 组织完成的数据
-     * @param node 节点
-     * @return 返回示例： { parentId: 1, childId: 2 }
-     */
-    setNodeData (data, node) {
-      if (node.value) {
-        const value = node.value
-        const columnsName = value.substring(0, value.indexOf('-'))
-        data[columnsName] = value.substring(value.lastIndexOf('-') + 1)
-        if (node.$parent) {
-          this.setNodeData(data, node.$parent)
-        }
-      }
-    },
-    getNodeDataProps (node) {
-      if (node.children && node.children.length > 0) {
-        return this.getNodeDataProps(node.children[0])
-      }
-      const value = node.node.key
-      return value.substring(0, value.indexOf('-'))
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.tree-select {
-  /deep/ .ant-select-selection.ant-select-selection--multiple {
-    max-height: 32px;
-    overflow-y: auto;
-  }
-}
-</style>
+<template>
+  <div>
+    <!-- 树形选择框 -->
+    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model" :rules="rules">
+      <a-spin v-show="!loaded" size="small"/>
+      <a-tree-select
+        v-show="loaded"
+        ref="tree-select"
+        v-model="localValue"
+        :disabled="disabled"
+        :tree-data="getTreeData()"
+        :tree-checkable="mode === '查询' && queryType !== 'RIGHT_LIKE'"
+        :placeholder="`请选择${name||''}`"
+        :dropdown-style="{ maxHeight: '400px' }"
+        tree-node-filter-prop="label"
+        :show-checked-strategy="queryType === 'RIGHT_LIKE' ? 'SHOW_ALL' : undefined"
+        allow-clear
+        :showArrow="true"
+        class="tree-select"
+        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+        @change="onTreeSelectChange">
+      </a-tree-select>
+    </a-form-model-item>
+  </div>
+</template>
+<script>
+import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
+
+export default {
+  name: 'XTreeSelect',
+  components: { XFormCol },
+  model: {
+    prop: 'value',
+    event: 'onChange'
+  },
+  // eslint-disable-next-line vue/require-prop-types
+  props: ['value', 'attr', 'rules'],
+  watch: {
+    value (newVal) {
+      if (newVal.length && !newVal[0]) {
+        this.localValue = undefined
+      }
+      if (!newVal) {
+        this.localValue = undefined
+      }
+    },
+  },
+  data () {
+    return {
+      // 内容加载是否完成
+      loaded: false,
+      // 数据列表
+      option: [],
+      // 表单
+      form: {},
+      // 查询方式
+      queryType: 'IN',
+      // label名称
+      name: undefined,
+      // 模型名称
+      model: undefined,
+      // 使用方式
+      mode: '查询',
+      // 是否禁用
+      disabled: false,
+      localValue: this.value
+    }
+  },
+  methods: {
+    init (params) {
+      const {
+        option = [], form, queryType = 'IN', name, model, mode = '查询', disabled = false
+      } = params
+      this.loaded = false
+      this.option = option
+      this.form = form
+      this.queryType = queryType
+      this.name = name
+      this.model = model
+      this.mode = mode
+      this.disabled = disabled
+      // 修改时恢复树形选择框选中状态
+      if (this.queryType !== 'RIGHT_LIKE') {
+        const value = this.form[this.model]
+        if (value) {
+          // 如果数据源中值含'-'，代表是由多个数据源组成的树，需要重新组织新增/编辑时的表单值
+          if (this.option.length > 0 && this.option[0].value.toString().indexOf('-') !== -1) {
+            this.value = model + '-' + value
+          } else {
+            if (this.mode === '查询') {
+              const values = []
+              this.getValues(option, value, values)
+              this.$emit('onChange', values)
+            } else {
+              this.value = value
+            }
+            // value = option 自身和所有子得集合
+          }
+        } else {
+          this.value = undefined
+        }
+      }
+      this.$emit('mounted', this.attr)
+      this.loaded = true
+    },
+    getValues (option, value, values) {
+      const _values = []
+      for (const item of option) {
+        if (value.includes(item.value)) {
+          values.push(item.value)
+          _values.push(item.value)
+          // 找到匹配节点后，递归添加所有子节点的值
+          if (item.children && item.children.length) {
+            this.getAllChildrenValues(item.children, values)
+          }
+        }
+        if (item.children && item.children.length) {
+          const tempV = this.getValues(item.children, value, values)
+          if (tempV.length === item.children.length) {
+            values.push(item.value)
+          }
+        }
+      }
+      return _values
+    },
+    getAllChildrenValues (children, values) {
+      for (const child of children) {
+        values.push(child.value)
+        if (child.children && child.children.length) {
+          this.getAllChildrenValues(child.children, values)
+        }
+      }
+      return values
+    },
+    // 获取树形选择框数据
+    getTreeData () {
+      const treeData = this.option
+      if (this.mode === '新增/修改') {
+        this.setParentSelectable(treeData)
+      }
+      return treeData
+    },
+    // 设置树形选择框不能选择父节点
+    setParentSelectable (treeData) {
+      treeData.forEach(item => {
+        if (item.children && item.children.length) {
+          item.selectable = false
+          this.setParentSelectable(item.children)
+        }
+      })
+    },
+    // 选中树节点
+    onTreeSelectChange (value, label, extra) {
+      if (this.queryType === 'RIGHT_LIKE') {
+        // 获取可用于模糊查询的组织机构字符串
+        let node = extra.triggerNode.$parent
+        label = label[0]
+        while (node && node.label) {
+          label = node.label + '.' + label
+          node = node.$parent
+        }
+        // this.form[this.model] = label
+        this.$emit('onChange', label)
+      } else {
+        // 如果选中值含'-'，代表是由多个数据源组成的树，需要重新组织查询或新增/编辑时的表单
+        if ((Array.isArray(value) && value.length > 0 && String(value[0]).indexOf('-') !== -1) || (typeof value === 'string' && value.indexOf('-') !== -1)) {
+          const treeDatas = {}
+          // 单选情况用于新增.修改表单场景，使用extra.triggerNode获取选中节点信息
+          if (!extra.allCheckedNodes) {
+            this.setNodeData(treeDatas, extra.triggerNode)
+          } else {
+            // 多选情况用于查询表单场景，使用extra.allCheckedNodes获取选中节点集合
+            const nodes = extra.allCheckedNodes
+            // 获取任意选中节点的叶子节点的字段名，用于查询时组织查询项的key
+            const name = this.getNodeDataProps(nodes[0])
+            // 获取所有选中节点的叶子节点的value,用于查询时组织查询项的value
+            const values = []
+            for (const node of nodes) {
+              const ref = this.setDataRef(node)
+              if (ref instanceof Array) {
+                for (const nodeRef of ref) {
+                  const keyValue = nodeRef.node.key
+                  values.push(keyValue.substring(keyValue.lastIndexOf('-') + 1))
+                }
+              } else {
+                const keyValue = ref.node.key
+                values.push(keyValue.substring(keyValue.lastIndexOf('-') + 1))
+              }
+            }
+            treeDatas[name] = values
+          }
+          // 移除默认的表单项，将组织好后的表单项合并进表单
+          this.form[this.model] = undefined
+          Object.assign(this.form, treeDatas)
+          // this.$emit('onChange', treeDatas)
+        } else {
+          // 从单一数据源组成的树可以直接赋值
+          // this.form[this.model] = value
+          // 获取所有选中节点的value
+          if (this.mode === '查询') {
+            const values = []
+            if (extra.allCheckedNodes) {
+              for (const item of extra.allCheckedNodes) {
+                if (item.node.key) {
+                  if (item.node?.data?.props?.label === item.node?.data?.props?.value) {
+                    if (!item.children?.length) {
+                      values.push(`${item.node.key}`)
+                    }
+                  } else {
+                    values.push(`${item.node.key}`)
+                  }
+                }
+                if (item.children && item.children.length) {
+                  this.getNodeValues(item.children, value, values)
+                }
+              }
+            }
+            this.$emit('onChange', values)
+          } else {
+            this.$emit('onChange', value)
+          }
+        }
+      }
+    },
+    getNodeValues (data, value, values) {
+      for (const item of data) {
+        values.push(`${item.node.key}`)
+        if (item.children && item.children.length) {
+          this.getNodeValues(item.children, value, values)
+        }
+      }
+    },
+    // 设置选中值
+    setValue (value) {
+      this.value = value
+    },
+    setDataRef (node) {
+      if (node.children) {
+        return this.setDataRef(node.children)
+      }
+      return node
+    },
+    /**
+     * 组织节点和每层父节点的数据，用于新增/修改时更新表单数据
+     * @param data 组织完成的数据
+     * @param node 节点
+     * @return 返回示例： { parentId: 1, childId: 2 }
+     */
+    setNodeData (data, node) {
+      if (node.value) {
+        const value = node.value
+        const columnsName = value.substring(0, value.indexOf('-'))
+        data[columnsName] = value.substring(value.lastIndexOf('-') + 1)
+        if (node.$parent) {
+          this.setNodeData(data, node.$parent)
+        }
+      }
+    },
+    getNodeDataProps (node) {
+      if (node.children && node.children.length > 0) {
+        return this.getNodeDataProps(node.children[0])
+      }
+      const value = node.node.key
+      return value.substring(0, value.indexOf('-'))
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.tree-select {
+  /deep/ .ant-select-selection.ant-select-selection--multiple {
+    max-height: 32px;
+    overflow-y: auto;
+  }
+}
+</style>

package/src/base-client/components/common/XFormTable/demo.vue

@@ -1,89 +1,89 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="示例表单"
-      :queryParamsName="queryParamsName"
-      :fixedAddForm="fixedAddForm"
-      :externalSelectedRowKeys="selectedKeys"
-      @action="action"
-      @selectRow="selectRow"
-      @columnClick="columnClick"
-      serviceName="af-system"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { microDispatch } from '@vue2-client/utils/microAppUtils'
-
-export default {
-  name: 'Demo',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
-      // 查询配置左侧tree
-      xTreeConfigName: 'addressType',
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {},
-      // 选中的行keys
-      selectedKeys: [],
-      selected: {
-        keys: [],
-        rows: []
-      }
-    }
-  },
-  methods: {
-    test () {
-      this.$refs.xFormTable.setTableData([])
-    },
-    defaultF () {
-      this.$refs.xFormTable.setTableSize('default')
-    },
-    middleF () {
-      this.$refs.xFormTable.setTableSize('middle')
-    },
-    smallF () {
-      this.$refs.xFormTable.setTableSize('small')
-    },
-    columnClick (key, value, record) {
-      microDispatch({
-        type: 'v3route',
-        path: '/bingliguanli/dianzibingliluru',
-        props: { selected: arguments[0].his_f_admission_id }
-      })
-    },
-    action (record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
-    },
-    onClose () {
-      this.detailVisible = false
-      // 关闭详情之后重新查询表单
-      this.$refs.xFormTable.refreshTable(true)
-    },
-    selectRow (selectedRowKeys, selectedRows) {
-      this.selected = {
-        keys: selectedRowKeys,
-        rows: selectedRows
-      }
-      console.log('selectedDemo', this.selected)
-    },
-  },
-  computed: {},
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="示例表单"
+      :queryParamsName="queryParamsName"
+      :fixedAddForm="fixedAddForm"
+      :externalSelectedRowKeys="selectedKeys"
+      @action="action"
+      @selectRow="selectRow"
+      @columnClick="columnClick"
+      serviceName="af-system"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import { microDispatch } from '@vue2-client/utils/microAppUtils'
+
+export default {
+  name: 'Demo',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ceshiCRUD',
+      // 查询配置左侧tree
+      xTreeConfigName: 'addressType',
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {},
+      // 选中的行keys
+      selectedKeys: [],
+      selected: {
+        keys: [],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    test () {
+      this.$refs.xFormTable.setTableData([])
+    },
+    defaultF () {
+      this.$refs.xFormTable.setTableSize('default')
+    },
+    middleF () {
+      this.$refs.xFormTable.setTableSize('middle')
+    },
+    smallF () {
+      this.$refs.xFormTable.setTableSize('small')
+    },
+    columnClick (key, value, record) {
+      microDispatch({
+        type: 'v3route',
+        path: '/bingliguanli/dianzibingliluru',
+        props: { selected: arguments[0].his_f_admission_id }
+      })
+    },
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    },
+    selectRow (selectedRowKeys, selectedRows) {
+      this.selected = {
+        keys: selectedRowKeys,
+        rows: selectedRows
+      }
+      console.log('selectedDemo', this.selected)
+    },
+  },
+  computed: {},
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -249,7 +249,15 @@
       </span>
       <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
         <template v-if="item.actionArr && item.actionArr.length > 0">
-          <a-dropdown placement="bottomCenter" :getPopupContainer=" triggerNode => { return triggerNode.parentNode } ">
+          <a-dropdown
+            placement="bottomRight"
+            :overlayStyle="{
+              whiteSpace: 'nowrap',
+              maxWidth: '250px',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }"
+          >
             <a class="ant-dropdown-link" @click="e => e.preventDefault()">
               {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
             </a>

package/src/pages/userInfoDetailManage/uploadFilesHistory/index.vue

@@ -1,159 +1,159 @@
-<template>
-  <div>
-    <div class="filter-bar">
-      <a-date-picker v-model="upload_date" placeholder="上传日期" @change="selfSearch" />
-      <a-select
-        style="width: 200px;"
-        v-model="fusetype"
-        :options="fusetypes"
-        placeholder="分类"
-        @change="selfSearch"
-        allow-clear />
-      <a-button type="primary" @click="selfSearch">查询</a-button>
-    </div>
-    <a-list bordered>
-      <a-list-item v-for="item in files" :key="item.days">
-        <div class="file-group">
-          <h4>{{ item.days }}</h4>
-          <div class="file-items">
-            <div v-for="file in item.arrays" :key="file.id" class="file-card">
-              <img :src="getFileUrl(file.f_downloadpath)" class="file-image" v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')" @click="openPreview(file.f_downloadpath)" style="cursor:pointer" />
-              <p>上传时间: {{ file.f_uploaddate }}</p>
-              <p>操作员: {{ file.f_username }}</p>
-              <p>分类: {{ file.fusetype }}</p>
-              <p>说明: {{ file.fremarks }}</p>
-              <a :href="getFileUrl(file.f_downloadpath)" target="_blank">预览</a>
-              <a-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
-            </div>
-          </div>
-        </div>
-      </a-list-item>
-    </a-list>
-    <ImagePreview :src="previewImg" :visible="previewVisible" @close="previewVisible = false" />
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-import { del } from '@vue2-client/services/api/restTools'
-import ImagePreview from './ImagePreview.vue'
-export default {
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  components: { ImagePreview },
-  data () {
-    return {
-      upload_date: null,
-      fusetype: null,
-      files: [],
-      fusetypes: [],
-      isDelete: '0',
-      previewVisible: false,
-      previewImg: ''
-    }
-  },
-  methods: {
-    async getfusetypes () {
-      this.fusetypes = [{ label: '全部', value: '' }]
-      const res = await post('/api/af-revenue/logic/getFileUseType', {})
-      this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
-    },
-    async getFiles () {
-      if (!this.currUserInfo) return
-      this.files = []
-      let condition = `f_blobid = '${this.currUserInfo.f_userinfo_id}'`
-      if (this.upload_date) {
-        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
-      }
-      if (this.fusetype) {
-        condition += ` and fusetype = '${this.fusetype}'`
-      }
-      const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
-      this.files = res.days.map(day => ({
-        days: day.uploadday,
-        arrays: res.array.filter(file => file.uploadday === day.uploadday)
-      }))
-    },
-    async delet (fileId) {
-      await del('api/af-revenue/entity/save/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
-      this.getFiles()
-    },
-    selfSearch () {
-      this.getFiles()
-    },
-    openPreview (src) {
-      this.previewImg = this.getFileUrl(src)
-      this.previewVisible = true
-    },
-    getFileUrl (path) {
-      if (!path) return ''
-
-      console.log('原始路径:', path)
-
-      // 获取当前域名和端口
-      const baseUrl = `${window.location.protocol}//${window.location.host}`
-
-      // 如果是本地文件路径，转换为新的转发路径
-      if (path.match(/^[A-Za-z]:[\/\\]/)) {
-        // 提取文件名
-        const fileName = path.split(/[/\\]/).pop()
-        const newUrl = `${baseUrl}/rs/image/file/${fileName}`
-        console.log('转换后路径:', newUrl)
-        return newUrl
-      }
-      // 如果已经是HTTP路径，直接返回
-      if (path.startsWith('http')) {
-        console.log('HTTP路径，直接返回:', path)
-        return path
-      }
-      // 如果是相对路径，添加域名前缀
-      if (path.startsWith('/resource/')) {
-        const newUrl = `${baseUrl}${path}`
-        console.log('相对路径转换:', newUrl)
-        return newUrl
-      }
-      console.log('其他路径，直接返回:', path)
-      return path
-    }
-  },
-  mounted () {
-    if (this.$login.r.includes('上传附件删除')) {
-      this.isDelete = '1'
-    }
-    this.getFiles()
-    this.getfusetypes()
-  }
-}
-</script>
-
-<style scoped>
-.filter-bar {
-  display: flex;
-  gap: 10px;
-  margin-bottom: 15px;
-}
-.file-group {
-  margin-bottom: 15px;
-}
-.file-items {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-}
-.file-card {
-  border: 1px solid #ddd;
-  padding: 10px;
-  border-radius: 5px;
-  width: 200px;
-}
-.file-image {
-  width: 100%; /* 让图片填充整个容器 */
-  height: 150px; /* 调整高度 */
-  object-fit: cover; /* 保持图片比例，填充整个区域 */
-  border-radius: 5px; /* 圆角边框 */
-}
-</style>
+<template>
+  <div>
+    <div class="filter-bar">
+      <a-date-picker v-model="upload_date" placeholder="上传日期" @change="selfSearch" />
+      <a-select
+        style="width: 200px;"
+        v-model="fusetype"
+        :options="fusetypes"
+        placeholder="分类"
+        @change="selfSearch"
+        allow-clear />
+      <a-button type="primary" @click="selfSearch">查询</a-button>
+    </div>
+    <a-list bordered>
+      <a-list-item v-for="item in files" :key="item.days">
+        <div class="file-group">
+          <h4>{{ item.days }}</h4>
+          <div class="file-items">
+            <div v-for="file in item.arrays" :key="file.id" class="file-card">
+              <img :src="getFileUrl(file.f_downloadpath)" class="file-image" v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')" @click="openPreview(file.f_downloadpath)" style="cursor:pointer" />
+              <p>上传时间: {{ file.f_uploaddate }}</p>
+              <p>操作员: {{ file.f_username }}</p>
+              <p>分类: {{ file.fusetype }}</p>
+              <p>说明: {{ file.fremarks }}</p>
+              <a :href="getFileUrl(file.f_downloadpath)" target="_blank">预览</a>
+              <a-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
+            </div>
+          </div>
+        </div>
+      </a-list-item>
+    </a-list>
+    <ImagePreview :src="previewImg" :visible="previewVisible" @close="previewVisible = false" />
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+import { del } from '@vue2-client/services/api/restTools'
+import ImagePreview from './ImagePreview.vue'
+export default {
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  components: { ImagePreview },
+  data () {
+    return {
+      upload_date: null,
+      fusetype: null,
+      files: [],
+      fusetypes: [],
+      isDelete: '0',
+      previewVisible: false,
+      previewImg: ''
+    }
+  },
+  methods: {
+    async getfusetypes () {
+      this.fusetypes = [{ label: '全部', value: '' }]
+      const res = await post('/api/af-revenue/logic/getFileUseType', {})
+      this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
+    },
+    async getFiles () {
+      if (!this.currUserInfo) return
+      this.files = []
+      let condition = `f_blobid = '${this.currUserInfo.f_userinfo_id}'`
+      if (this.upload_date) {
+        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
+      }
+      if (this.fusetype) {
+        condition += ` and fusetype = '${this.fusetype}'`
+      }
+      const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
+      this.files = res.days.map(day => ({
+        days: day.uploadday,
+        arrays: res.array.filter(file => file.uploadday === day.uploadday)
+      }))
+    },
+    async delet (fileId) {
+      await del('api/af-revenue/entity/save/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
+      this.getFiles()
+    },
+    selfSearch () {
+      this.getFiles()
+    },
+    openPreview (src) {
+      this.previewImg = this.getFileUrl(src)
+      this.previewVisible = true
+    },
+    getFileUrl (path) {
+      if (!path) return ''
+
+      console.log('原始路径:', path)
+
+      // 获取当前域名和端口
+      const baseUrl = `${window.location.protocol}//${window.location.host}`
+
+      // 如果是本地文件路径，转换为新的转发路径
+      if (path.match(/^[A-Za-z]:[\/\\]/)) {
+        // 提取文件名
+        const fileName = path.split(/[/\\]/).pop()
+        const newUrl = `${baseUrl}/rs/image/file/${fileName}`
+        console.log('转换后路径:', newUrl)
+        return newUrl
+      }
+      // 如果已经是HTTP路径，直接返回
+      if (path.startsWith('http')) {
+        console.log('HTTP路径，直接返回:', path)
+        return path
+      }
+      // 如果是相对路径，添加域名前缀
+      if (path.startsWith('/resource/')) {
+        const newUrl = `${baseUrl}${path}`
+        console.log('相对路径转换:', newUrl)
+        return newUrl
+      }
+      console.log('其他路径，直接返回:', path)
+      return path
+    }
+  },
+  mounted () {
+    if (this.$login.r.includes('上传附件删除')) {
+      this.isDelete = '1'
+    }
+    this.getFiles()
+    this.getfusetypes()
+  }
+}
+</script>
+
+<style scoped>
+.filter-bar {
+  display: flex;
+  gap: 10px;
+  margin-bottom: 15px;
+}
+.file-group {
+  margin-bottom: 15px;
+}
+.file-items {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+.file-card {
+  border: 1px solid #ddd;
+  padding: 10px;
+  border-radius: 5px;
+  width: 200px;
+}
+.file-image {
+  width: 100%; /* 让图片填充整个容器 */
+  height: 150px; /* 调整高度 */
+  object-fit: cover; /* 保持图片比例，填充整个区域 */
+  border-radius: 5px; /* 圆角边框 */
+}
+</style>