vue2-client 1.17.25 → 1.17.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.17.25",
+  "version": "1.17.26",
   "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/XReport/print.js

@@ -1,186 +1,186 @@
-// print.js
-
-export function printElement (elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+
+export function printElement (elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}

package/src/components/FileImageItem/ImageItem.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import ImagePreview from '@/components/ImagePreview/ImagePreview.vue'
+import ImagePreview from '@vue2-client/components/ImagePreview/ImagePreview.vue'
 
 export default {
   name: 'ImageItem',

package/src/utils/map-utils.js

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }