vue2-client 1.15.84 → 1.15.86

package/src/pages/userInfoDetailManage/userInfoDetailQueryTabs.vue

@@ -1,144 +1,144 @@
-<template>
-  <a-tabs :activeKey="activeKey" @change="changeTab">
-    <a-tab-pane
-      v-for="tab in filteredTabs"
-      :key="tab.key"
-      :tab="tab.label"
-    >
-      <component
-        :is="tab.component"
-        :currUserInfo="userInfo"
-        v-if="activeKey === tab.key && userInfo"
-      ></component>
-    </a-tab-pane>
-  </a-tabs>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import XDescriptions from '@vue2-client/base-client/components/common/XDescriptions/XDescriptions.vue'
-import UserRecordQuery from '@vue2-client/pages/userInfoDetailManage/UserRecordQuery'
-import MachineRecordQuery from '@vue2-client/pages/userInfoDetailManage/MachineRecordQuery'
-import UserChargeRecordQuery from '@vue2-client/pages/userInfoDetailManage/UserChargeRecordQuery'
-import UserHandRecordQuery from '@vue2-client/pages/userInfoDetailManage/UserHandRecordQuery'
-import FillCardRecordQuery from '@vue2-client/pages/userInfoDetailManage/FillCardRecordQuery'
-import FillGasRecordQuery from '@vue2-client/pages/userInfoDetailManage/FillGasRecordQuery'
-import ChangeMeterRecordQuery from '@vue2-client/pages/userInfoDetailManage/ChangeMeterRecordQuery'
-import InfoChangeRecordQuery from '@vue2-client/pages/userInfoDetailManage/InfoChangeRecordQuery'
-import InstructRecordQuery from '@vue2-client/pages/userInfoDetailManage/InstructRecordQuery'
-import MeterParamRecordQuery from '@vue2-client/pages/userInfoDetailManage/MeterParamRecordQuery'
-import OtherChargeRecordQuery from '@vue2-client/pages/userInfoDetailManage/OtherChargeRecordQuery'
-import TransferRecordQuery from '@vue2-client/pages/userInfoDetailManage/TransferRecordQuery'
-import WatchCollectionRecordQuery from '@vue2-client/pages/userInfoDetailManage/WatchCollectionRecordQuery'
-import UserException from '@vue2-client/pages/userInfoDetailManage/UserException'
-import PriceAdjustments from '@vue2-client/pages/userInfoDetailManage/PriceAdjustments'
-import uploadFilesHistory from '@vue2-client/pages/userInfoDetailManage/uploadFilesHistory'
-import InsuranceDetailQuery from '@vue2-client/pages/userInfoDetailManage/InsuranceDetailQuery'
-
-export default {
-  name: 'UserInfoDetailQueryTabs',
-  components: {
-    XFormTable,
-    XDescriptions,
-    XAddNativeForm,
-    UserRecordQuery,
-    MachineRecordQuery,
-    UserChargeRecordQuery,
-    FillCardRecordQuery,
-    FillGasRecordQuery,
-    ChangeMeterRecordQuery,
-    InfoChangeRecordQuery,
-    InstructRecordQuery,
-    MeterParamRecordQuery,
-    OtherChargeRecordQuery,
-    WatchCollectionRecordQuery,
-    TransferRecordQuery,
-    UserHandRecordQuery,
-    UserException,
-    PriceAdjustments,
-    uploadFilesHistory,
-    InsuranceDetailQuery
-  },
-  props: {
-    userInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  data () {
-    return {
-      activeKey: '1',
-      tabs: [
-        { key: '1', label: '流水查询', permission: '流水查询', component: 'UserRecordQuery' },
-        {
-          key: '2',
-          label: '机表流水查询',
-          permission: '机表流水查询',
-          component: 'MachineRecordQuery',
-          condition: () => this.userInfo?.f_meter_type === '机表'
-        },
-        { key: '3', label: '收费查询', permission: '收费查询', component: 'UserChargeRecordQuery' },
-        { key: '4', label: '抄表记录', permission: '抄表记录', component: 'UserHandRecordQuery' },
-        {
-          key: '5',
-          label: '补卡查询',
-          permission: '补卡查询',
-          component: 'FillCardRecordQuery',
-          condition: () => this.userInfo?.f_meter_type?.includes('卡表')
-        },
-        { key: '6', label: '补气查询', permission: '补气查询', component: 'FillGasRecordQuery' },
-        { key: '7', label: '换表查询', permission: '换表查询', component: 'ChangeMeterRecordQuery' },
-        { key: '8', label: '其他收费', permission: '其他收费', component: 'OtherChargeRecordQuery' },
-        { key: '9', label: '过户查询', permission: '过户查询', component: 'TransferRecordQuery' },
-        { key: '10', label: '档案变更记录', permission: '变更记录', component: 'InfoChangeRecordQuery' },
-        {
-          key: '11',
-          label: '指令查看',
-          permission: '指令查看',
-          component: 'InstructRecordQuery',
-          condition: () => this.userInfo?.f_meter_type === '物联网表'
-        },
-        {
-          key: '12',
-          label: '表具采集',
-          permission: '表具采集',
-          component: 'WatchCollectionRecordQuery',
-          condition: () => this.userInfo?.f_meter_type === '物联网表'
-        },
-        { key: '13', label: '流量计参数查看', permission: '流量计参数查看', component: 'MeterParamRecordQuery' },
-        { key: '14', label: '异常报警', permission: '异常报警', component: 'UserException' },
-        { key: '15', label: '价格调整', permission: '价格调整', component: 'PriceAdjustments' },
-        { key: '16', label: '附件查看', permission: '附件查看', component: 'uploadFilesHistory' },
-        { key: '17', label: '保险明细', permission: '保险明细', component: 'InsuranceDetailQuery' },
-      ],
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user', login: 'login' }),
-    ...mapState('setting', { isMobile: 'isMobile' }),
-    currUserInfo () {
-      return this.userInfo
-    },
-    filteredTabs () {
-      return this.tabs.filter((tab) => {
-        const hasPermission = this.login?.r.includes(tab.permission)
-        const meetsCondition = tab.condition ? tab.condition() : true
-        return hasPermission && meetsCondition
-      })
-    },
-  },
-  methods: {
-    changeTab (key) {
-      this.activeKey = key
-    },
-  },
-}
-</script>
-
-<style scoped lang="less">
-:deep(.ant-statistic-content-value) {
-  color: @primary-color;
-}
-</style>
+<template>
+  <a-tabs :activeKey="activeKey" @change="changeTab">
+    <a-tab-pane
+      v-for="tab in filteredTabs"
+      :key="tab.key"
+      :tab="tab.label"
+    >
+      <component
+        :is="tab.component"
+        :currUserInfo="userInfo"
+        v-if="activeKey === tab.key && userInfo"
+      ></component>
+    </a-tab-pane>
+  </a-tabs>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import XDescriptions from '@vue2-client/base-client/components/common/XDescriptions/XDescriptions.vue'
+import UserRecordQuery from '@vue2-client/pages/userInfoDetailManage/UserRecordQuery'
+import MachineRecordQuery from '@vue2-client/pages/userInfoDetailManage/MachineRecordQuery'
+import UserChargeRecordQuery from '@vue2-client/pages/userInfoDetailManage/UserChargeRecordQuery'
+import UserHandRecordQuery from '@vue2-client/pages/userInfoDetailManage/UserHandRecordQuery'
+import FillCardRecordQuery from '@vue2-client/pages/userInfoDetailManage/FillCardRecordQuery'
+import FillGasRecordQuery from '@vue2-client/pages/userInfoDetailManage/FillGasRecordQuery'
+import ChangeMeterRecordQuery from '@vue2-client/pages/userInfoDetailManage/ChangeMeterRecordQuery'
+import InfoChangeRecordQuery from '@vue2-client/pages/userInfoDetailManage/InfoChangeRecordQuery'
+import InstructRecordQuery from '@vue2-client/pages/userInfoDetailManage/InstructRecordQuery'
+import MeterParamRecordQuery from '@vue2-client/pages/userInfoDetailManage/MeterParamRecordQuery'
+import OtherChargeRecordQuery from '@vue2-client/pages/userInfoDetailManage/OtherChargeRecordQuery'
+import TransferRecordQuery from '@vue2-client/pages/userInfoDetailManage/TransferRecordQuery'
+import WatchCollectionRecordQuery from '@vue2-client/pages/userInfoDetailManage/WatchCollectionRecordQuery'
+import UserException from '@vue2-client/pages/userInfoDetailManage/UserException'
+import PriceAdjustments from '@vue2-client/pages/userInfoDetailManage/PriceAdjustments'
+import uploadFilesHistory from '@vue2-client/pages/userInfoDetailManage/uploadFilesHistory'
+import InsuranceDetailQuery from '@vue2-client/pages/userInfoDetailManage/InsuranceDetailQuery'
+
+export default {
+  name: 'UserInfoDetailQueryTabs',
+  components: {
+    XFormTable,
+    XDescriptions,
+    XAddNativeForm,
+    UserRecordQuery,
+    MachineRecordQuery,
+    UserChargeRecordQuery,
+    FillCardRecordQuery,
+    FillGasRecordQuery,
+    ChangeMeterRecordQuery,
+    InfoChangeRecordQuery,
+    InstructRecordQuery,
+    MeterParamRecordQuery,
+    OtherChargeRecordQuery,
+    WatchCollectionRecordQuery,
+    TransferRecordQuery,
+    UserHandRecordQuery,
+    UserException,
+    PriceAdjustments,
+    uploadFilesHistory,
+    InsuranceDetailQuery
+  },
+  props: {
+    userInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  data () {
+    return {
+      activeKey: '1',
+      tabs: [
+        { key: '1', label: '流水查询', permission: '流水查询', component: 'UserRecordQuery' },
+        {
+          key: '2',
+          label: '机表流水查询',
+          permission: '机表流水查询',
+          component: 'MachineRecordQuery',
+          condition: () => this.userInfo?.f_meter_type === '机表'
+        },
+        { key: '3', label: '收费查询', permission: '收费查询', component: 'UserChargeRecordQuery' },
+        { key: '4', label: '抄表记录', permission: '抄表记录', component: 'UserHandRecordQuery' },
+        {
+          key: '5',
+          label: '补卡查询',
+          permission: '补卡查询',
+          component: 'FillCardRecordQuery',
+          condition: () => this.userInfo?.f_meter_type?.includes('卡表')
+        },
+        { key: '6', label: '补气查询', permission: '补气查询', component: 'FillGasRecordQuery' },
+        { key: '7', label: '换表查询', permission: '换表查询', component: 'ChangeMeterRecordQuery' },
+        { key: '8', label: '其他收费', permission: '其他收费', component: 'OtherChargeRecordQuery' },
+        { key: '9', label: '过户查询', permission: '过户查询', component: 'TransferRecordQuery' },
+        { key: '10', label: '档案变更记录', permission: '变更记录', component: 'InfoChangeRecordQuery' },
+        {
+          key: '11',
+          label: '指令查看',
+          permission: '指令查看',
+          component: 'InstructRecordQuery',
+          condition: () => this.userInfo?.f_meter_type === '物联网表'
+        },
+        {
+          key: '12',
+          label: '表具采集',
+          permission: '表具采集',
+          component: 'WatchCollectionRecordQuery',
+          condition: () => this.userInfo?.f_meter_type === '物联网表'
+        },
+        { key: '13', label: '流量计参数查看', permission: '流量计参数查看', component: 'MeterParamRecordQuery' },
+        { key: '14', label: '异常报警', permission: '异常报警', component: 'UserException' },
+        { key: '15', label: '价格调整', permission: '价格调整', component: 'PriceAdjustments' },
+        { key: '16', label: '附件查看', permission: '附件查看', component: 'uploadFilesHistory' },
+        { key: '17', label: '保险明细', permission: '保险明细', component: 'InsuranceDetailQuery' },
+      ],
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user', login: 'login' }),
+    ...mapState('setting', { isMobile: 'isMobile' }),
+    currUserInfo () {
+      return this.userInfo
+    },
+    filteredTabs () {
+      return this.tabs.filter((tab) => {
+        const hasPermission = this.login?.r.includes(tab.permission)
+        const meetsCondition = tab.condition ? tab.condition() : true
+        return hasPermission && meetsCondition
+      })
+    },
+  },
+  methods: {
+    changeTab (key) {
+      this.activeKey = key
+    },
+  },
+}
+</script>
+
+<style scoped lang="less">
+:deep(.ant-statistic-content-value) {
+  color: @primary-color;
+}
+</style>

package/src/plugins/HiPrintPlugin.js

@@ -1,164 +1,164 @@
-import {
-  autoConnect,
-  disAutoConnect,
-  hiprint,
-  defaultElementTypeProvider,
-} from '@afwenming123/vue-plugin-hiprint'
-import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
-import hiPrintCss from '@vue2-client/base-client/components/common/XPrint/css/hiPrintCss'
-import { uuid } from '@vue2-client/utils/util'
-
-const hiPrintPlugin = {
-  disAutoConnect,
-  install: function (Vue, autoConnect = true, name = '$hiPrint') {
-    if (!autoConnect) {
-      disAutoConnect()
-    }
-    const globalVue = Vue.prototype || Vue.config.globalProperties
-    globalVue[name] = hiprint
-    /**
-     * 预览打印，调起系统打印预览
-     * provider 左侧拖拽元素
-     * template 模版json字符串
-     * args 打印数据data, options,
-     */
-    globalVue.$print = function (provider = defaultElementTypeProvider, template, ...args) {
-      hiprint.init({
-        // eslint-disable-next-line new-cap
-        providers: [new provider()]
-      })
-      const hiprintTemplate = new hiprint.PrintTemplate({
-        template: template,
-      })
-      hiprintTemplate.print(...args)
-      return hiprintTemplate
-    }
-    /**
-     * 单模版直接打印， 需客户端支持
-     * provider 左侧拖拽项对象
-     * template 模版json字符串
-     * args 打印数据data, options,
-     */
-    globalVue.$print2 = function (provider = defaultElementTypeProvider, template, ...args) {
-      hiprint.init({
-        // eslint-disable-next-line new-cap
-        providers: [new provider()]
-      })
-      const hiprintTemplate = new hiprint.PrintTemplate({
-        template: template,
-      })
-      hiprintTemplate.print2(...args)
-      return hiprintTemplate
-    }
-    /**
-     * 通用打印方法
-     * @param {string} templateName 模板名称
-     * @param {object} printData 打印数据
-     * @param {string} type 打印类型
-     */
-    const _commonPrint = async function (templateName, printData, type = 'B', customOption = {}) {
-      return new Promise((resolve, reject) => {
-        try {
-          getConfigByNameAsync(templateName).then(async (template) => {
-            if (!template) {
-              this.$message.error(`${templateName} 打印模板不存在`)
-              reject(new Error(`${templateName} 打印模板不存在`))
-              return
-            }
-            if (template.dataLogicName) {
-              const remoteData = await runLogic(template.dataLogicName, printData).catch(() => {
-                this.$message.error(`${template.dataLogicName} 打印数据逻辑获取失败`)
-                return {}
-              })
-              printData = Object.assign({}, printData, remoteData)
-            }
-            console.log('打印数据', printData)
-            const printConfig = {
-              callback: () => resolve(hiprintTemplate),
-              styleHandler: () => hiPrintCss(),
-              title: '打印测试',
-              pageSize: {
-                height: template.panels[0].height * 1000,
-                width: template.panels[0].width * 1000
-              },
-              ...customOption
-            }
-            hiprint.init({
-              // eslint-disable-next-line new-cap
-              providers: [new defaultElementTypeProvider()]
-            })
-            const hiprintTemplate = new hiprint.PrintTemplate({
-              template: template,
-            })
-            if (type === 'H') {
-              resolve(hiprintTemplate.getHtml(printData).html())
-            } else if (type === 'C') {
-              hiprintTemplate.print2(printData, printConfig)
-            } else {
-              hiprintTemplate.print(printData, {}, printConfig)
-            }
-          }).catch((error) => {
-            reject(error)
-          })
-        } catch (error) {
-          reject(error)
-        }
-      })
-    }
-
-    /**
-     * 浏览器打印
-     */
-    globalVue.$printB = async function (templateName, printData, customOption) {
-      return _commonPrint(templateName, printData, 'B', customOption)
-    }
-
-    /**
-     * 客户端打印
-     */
-    globalVue.$printC = async function (templateName, printData, customOption) {
-      if (window.hiwebSocket.opened) {
-        return _commonPrint(templateName, printData, 'C', customOption)
-      } else {
-        this.$message.error('请确保打印服务已经启动')
-        return Promise.reject(new Error('客户端打印失败，未连接打印服务'))
-      }
-    }
-
-    /**
-     * 返回打印模板生成的 html
-     */
-    globalVue.$getHtml = async function (templateName, printData, customOption) {
-      return _commonPrint(templateName, printData, 'H', customOption)
-    }
-
-    /**
-     * 打印html
-     */
-    globalVue.$printHtml = async function (html, customOption = {}) {
-      if (window.hiwebSocket.opened) {
-        return window.hiwebSocket.send({
-          title: '打印内容',
-          html,
-          imgToBase64: false,
-          templateId: uuid(),
-          id: uuid(),
-          ...customOption
-        })
-      } else {
-        this.$message.error('请确保打印服务已经启动')
-        return Promise.reject(new Error('客户端打印失败，未连接打印服务'))
-      }
-    }
-  }
-}
-
-window.hiprint = hiprint
-
-export {
-  autoConnect,
-  disAutoConnect,
-  hiprint,
-  hiPrintPlugin,
-  defaultElementTypeProvider,
-}
+import {
+  autoConnect,
+  disAutoConnect,
+  hiprint,
+  defaultElementTypeProvider,
+} from '@afwenming123/vue-plugin-hiprint'
+import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
+import hiPrintCss from '@vue2-client/base-client/components/common/XPrint/css/hiPrintCss'
+import { uuid } from '@vue2-client/utils/util'
+
+const hiPrintPlugin = {
+  disAutoConnect,
+  install: function (Vue, autoConnect = true, name = '$hiPrint') {
+    if (!autoConnect) {
+      disAutoConnect()
+    }
+    const globalVue = Vue.prototype || Vue.config.globalProperties
+    globalVue[name] = hiprint
+    /**
+     * 预览打印，调起系统打印预览
+     * provider 左侧拖拽元素
+     * template 模版json字符串
+     * args 打印数据data, options,
+     */
+    globalVue.$print = function (provider = defaultElementTypeProvider, template, ...args) {
+      hiprint.init({
+        // eslint-disable-next-line new-cap
+        providers: [new provider()]
+      })
+      const hiprintTemplate = new hiprint.PrintTemplate({
+        template: template,
+      })
+      hiprintTemplate.print(...args)
+      return hiprintTemplate
+    }
+    /**
+     * 单模版直接打印， 需客户端支持
+     * provider 左侧拖拽项对象
+     * template 模版json字符串
+     * args 打印数据data, options,
+     */
+    globalVue.$print2 = function (provider = defaultElementTypeProvider, template, ...args) {
+      hiprint.init({
+        // eslint-disable-next-line new-cap
+        providers: [new provider()]
+      })
+      const hiprintTemplate = new hiprint.PrintTemplate({
+        template: template,
+      })
+      hiprintTemplate.print2(...args)
+      return hiprintTemplate
+    }
+    /**
+     * 通用打印方法
+     * @param {string} templateName 模板名称
+     * @param {object} printData 打印数据
+     * @param {string} type 打印类型
+     */
+    const _commonPrint = async function (templateName, printData, type = 'B', customOption = {}) {
+      return new Promise((resolve, reject) => {
+        try {
+          getConfigByNameAsync(templateName).then(async (template) => {
+            if (!template) {
+              this.$message.error(`${templateName} 打印模板不存在`)
+              reject(new Error(`${templateName} 打印模板不存在`))
+              return
+            }
+            if (template.dataLogicName) {
+              const remoteData = await runLogic(template.dataLogicName, printData).catch(() => {
+                this.$message.error(`${template.dataLogicName} 打印数据逻辑获取失败`)
+                return {}
+              })
+              printData = Object.assign({}, printData, remoteData)
+            }
+            console.log('打印数据', printData)
+            const printConfig = {
+              callback: () => resolve(hiprintTemplate),
+              styleHandler: () => hiPrintCss(),
+              title: '打印测试',
+              pageSize: {
+                height: template.panels[0].height * 1000,
+                width: template.panels[0].width * 1000
+              },
+              ...customOption
+            }
+            hiprint.init({
+              // eslint-disable-next-line new-cap
+              providers: [new defaultElementTypeProvider()]
+            })
+            const hiprintTemplate = new hiprint.PrintTemplate({
+              template: template,
+            })
+            if (type === 'H') {
+              resolve(hiprintTemplate.getHtml(printData).html())
+            } else if (type === 'C') {
+              hiprintTemplate.print2(printData, printConfig)
+            } else {
+              hiprintTemplate.print(printData, {}, printConfig)
+            }
+          }).catch((error) => {
+            reject(error)
+          })
+        } catch (error) {
+          reject(error)
+        }
+      })
+    }
+
+    /**
+     * 浏览器打印
+     */
+    globalVue.$printB = async function (templateName, printData, customOption) {
+      return _commonPrint(templateName, printData, 'B', customOption)
+    }
+
+    /**
+     * 客户端打印
+     */
+    globalVue.$printC = async function (templateName, printData, customOption) {
+      if (window.hiwebSocket.opened) {
+        return _commonPrint(templateName, printData, 'C', customOption)
+      } else {
+        this.$message.error('请确保打印服务已经启动')
+        return Promise.reject(new Error('客户端打印失败，未连接打印服务'))
+      }
+    }
+
+    /**
+     * 返回打印模板生成的 html
+     */
+    globalVue.$getHtml = async function (templateName, printData, customOption) {
+      return _commonPrint(templateName, printData, 'H', customOption)
+    }
+
+    /**
+     * 打印html
+     */
+    globalVue.$printHtml = async function (html, customOption = {}) {
+      if (window.hiwebSocket.opened) {
+        return window.hiwebSocket.send({
+          title: '打印内容',
+          html,
+          imgToBase64: false,
+          templateId: uuid(),
+          id: uuid(),
+          ...customOption
+        })
+      } else {
+        this.$message.error('请确保打印服务已经启动')
+        return Promise.reject(new Error('客户端打印失败，未连接打印服务'))
+      }
+    }
+  }
+}
+
+window.hiprint = hiprint
+
+export {
+  autoConnect,
+  disAutoConnect,
+  hiprint,
+  hiPrintPlugin,
+  defaultElementTypeProvider,
+}