vue2-client 1.12.25 → 1.12.27

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

@@ -1,64 +1,64 @@
-<template>
-  <a-card :bordered="false" v-if="currUserInfo">
-    <x-form-table
-      title="表具采集"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      service-name="af-revenue"
-      @action="action"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-
-export default {
-  name: 'WatchCollectionRecordQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'UserWatchCollectionRecordQueryCRUD',
-      // 查询表单固定值
-      fixedQueryForm: { wc_f_userfiles_id: this.currUserInfo.f_userfiles_id },
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  },
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  mounted () {
-    this.$refs.xFormTable.refresh(true)
-  },
-  methods: {
-    action (record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
-    },
-    onClose () {
-      this.detailVisible = false
-      // 关闭详情之后重新查询表单
-      this.$refs.xFormTable.refreshTable(true)
-    }
-  },
-
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', { isMobile: 'isMobile' })
-  },
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <a-card :bordered="false" v-if="currUserInfo">
+    <x-form-table
+      title="表具采集"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      service-name="af-revenue"
+      @action="action"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'WatchCollectionRecordQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'UserWatchCollectionRecordQueryCRUD',
+      // 查询表单固定值
+      fixedQueryForm: { wc_f_userfiles_id: this.currUserInfo.f_userfiles_id },
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  methods: {
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  },
+
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/pages/userInfoDetailManage/userInfoDetailQueryTabs.vue

@@ -1,132 +1,132 @@
-<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'
-
-export default {
-  name: 'UserInfoDetailQueryTabs',
-  components: {
-    XFormTable,
-    XDescriptions,
-    XAddNativeForm,
-    UserRecordQuery,
-    MachineRecordQuery,
-    UserChargeRecordQuery,
-    FillCardRecordQuery,
-    FillGasRecordQuery,
-    ChangeMeterRecordQuery,
-    InfoChangeRecordQuery,
-    InstructRecordQuery,
-    MeterParamRecordQuery,
-    OtherChargeRecordQuery,
-    WatchCollectionRecordQuery,
-    TransferRecordQuery,
-    UserHandRecordQuery,
-  },
-  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' },
-      ],
-    }
-  },
-  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'
+
+export default {
+  name: 'UserInfoDetailQueryTabs',
+  components: {
+    XFormTable,
+    XDescriptions,
+    XAddNativeForm,
+    UserRecordQuery,
+    MachineRecordQuery,
+    UserChargeRecordQuery,
+    FillCardRecordQuery,
+    FillGasRecordQuery,
+    ChangeMeterRecordQuery,
+    InfoChangeRecordQuery,
+    InstructRecordQuery,
+    MeterParamRecordQuery,
+    OtherChargeRecordQuery,
+    WatchCollectionRecordQuery,
+    TransferRecordQuery,
+    UserHandRecordQuery,
+  },
+  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' },
+      ],
+    }
+  },
+  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/EventLogPlugin.js

@@ -1,33 +1,33 @@
-const EventLogger = {
-
-  install (Vue) {
-    const originalEmit = Vue.prototype.$emit
-    // const originalOn = Vue.prototype.$on
-    // 排除 一些 vue 框架 / 前端脚手架 底层的一些事件日志
-    const exclude = ['menuSelect', 'menuDeselect', 'popupScroll', 'popupFocus', 'mouseenter',
-      'mouseleave', 'popupVisibleChange', 'popupScroll', 'click', 'keypress', 'keydown ', 'input ',
-      'change', 'popupVisibleChange', 'beforeCreate', 'created', 'beforeMount', 'mounted', 'componentDidMounted', 'update:visible',
-    ]
-    // 劫持 $emit
-    Vue.prototype.$emit = function (eventName, ...args) {
-      if (!exclude.includes(eventName) && !eventName.startsWith('hook:')) {
-        console.info(`Event emitted: ${eventName}`, args)
-      }
-      return originalEmit.call(this, eventName, ...args)
-    }
-    //
-    // Vue.prototype.$on = function (eventName, callback) {
-    //   // 包装原始回调函数，以便在触发时打印参数
-    //   const wrappedCallback = (...args) => {
-    //     if (!exclude.includes(eventName)) {
-    //       console.log(`Event handled: "${eventName}" triggered with:`, args)
-    //     }
-    //     callback.apply(this, args) // 执行原始回调
-    //   }
-    //   // 使用包装后的回调注册事件
-    //   return originalOn.call(this, eventName, wrappedCallback)
-    // }
-  }
-}
-
-export default EventLogger
+const EventLogger = {
+
+  install (Vue) {
+    const originalEmit = Vue.prototype.$emit
+    // const originalOn = Vue.prototype.$on
+    // 排除 一些 vue 框架 / 前端脚手架 底层的一些事件日志
+    const exclude = ['menuSelect', 'menuDeselect', 'popupScroll', 'popupFocus', 'mouseenter',
+      'mouseleave', 'popupVisibleChange', 'popupScroll', 'click', 'keypress', 'keydown ', 'input ',
+      'change', 'popupVisibleChange', 'beforeCreate', 'created', 'beforeMount', 'mounted', 'componentDidMounted', 'update:visible',
+    ]
+    // 劫持 $emit
+    Vue.prototype.$emit = function (eventName, ...args) {
+      if (!exclude.includes(eventName) && !eventName.startsWith('hook:')) {
+        console.info(`Event emitted: ${eventName}`, args)
+      }
+      return originalEmit.call(this, eventName, ...args)
+    }
+    //
+    // Vue.prototype.$on = function (eventName, callback) {
+    //   // 包装原始回调函数，以便在触发时打印参数
+    //   const wrappedCallback = (...args) => {
+    //     if (!exclude.includes(eventName)) {
+    //       console.log(`Event handled: "${eventName}" triggered with:`, args)
+    //     }
+    //     callback.apply(this, args) // 执行原始回调
+    //   }
+    //   // 使用包装后的回调注册事件
+    //   return originalOn.call(this, eventName, wrappedCallback)
+    // }
+  }
+}
+
+export default EventLogger

package/src/plugins/FindParentsData.js

@@ -1,17 +1,17 @@
-export default {
-    install (Vue) {
-      // 添加公共方法到 Vue 原型上
-      Vue.prototype.$findParentData = function (dataName) {
-        // 尝试从父组件获取数据
-        let parent = this.$parent
-        while (parent) {
-          const parentData = parent[dataName]
-          if (parentData !== undefined) {
-            return parentData // 找到返回数据
-          }
-          parent = parent.$parent // 继续向上寻找
-        }
-      return null // 如果没有找到，返回空
-    }
-  }
-}
+export default {
+    install (Vue) {
+      // 添加公共方法到 Vue 原型上
+      Vue.prototype.$findParentData = function (dataName) {
+        // 尝试从父组件获取数据
+        let parent = this.$parent
+        while (parent) {
+          const parentData = parent[dataName]
+          if (parentData !== undefined) {
+            return parentData // 找到返回数据
+          }
+          parent = parent.$parent // 继续向上寻找
+        }
+      return null // 如果没有找到，返回空
+    }
+  }
+}

package/src/plugins/HiPrintPlugin.js

@@ -4,8 +4,9 @@ import {
   hiprint,
   defaultElementTypeProvider,
 } from '@afwenming123/vue-plugin-hiprint'
-import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+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,
@@ -55,15 +56,33 @@ const hiPrintPlugin = {
      * @param {object} printData 打印数据
      * @param {string} type 打印类型
      */
-    const _commonPrint = async function (templateName, printData, type = 'B') {
+    const _commonPrint = async function (templateName, printData, type = 'B', customOption = {}) {
       return new Promise((resolve, reject) => {
         try {
-          getConfigByNameAsync(templateName).then((template) => {
+          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()]
@@ -72,17 +91,11 @@ const hiPrintPlugin = {
               template: template,
             })
             if (type === 'H') {
-              resolve(hiprintTemplate.getHtml(printData))
+              resolve(hiprintTemplate.getHtml(printData).html())
+            } else if (type === 'C') {
+              hiprintTemplate.print2(printData, printConfig)
             } else {
-              const printMethod = type === 'C' ? 'print2' : 'print'
-              hiprintTemplate[printMethod](printData, {}, {
-                callback: () => {
-                  resolve(hiprintTemplate)
-                },
-                styleHandler: () => {
-                  return hiPrintCss()
-                }
-              })
+              hiprintTemplate.print(printData, {}, printConfig)
             }
           }).catch((error) => {
             reject(error)
@@ -96,16 +109,16 @@ const hiPrintPlugin = {
     /**
      * 浏览器打印
      */
-    globalVue.$printB = async function (templateName, printData) {
-      return _commonPrint(templateName, printData, 'B')
+    globalVue.$printB = async function (templateName, printData, customOption) {
+      return _commonPrint(templateName, printData, 'B', customOption)
     }
 
     /**
      * 客户端打印
      */
-    globalVue.$printC = async function (templateName, printData) {
+    globalVue.$printC = async function (templateName, printData, customOption) {
       if (window.hiwebSocket.opened) {
-        return _commonPrint(templateName, printData, 'C')
+        return _commonPrint(templateName, printData, 'C', customOption)
       } else {
         this.$message.error('请确保打印服务已经启动')
         return Promise.reject(new Error('客户端打印失败，未连接打印服务'))
@@ -115,16 +128,23 @@ const hiPrintPlugin = {
     /**
      * 返回打印模板生成的 html
      */
-    globalVue.$getHtml = async function (templateName, printData) {
-      return _commonPrint(templateName, printData, 'H')
+    globalVue.$getHtml = async function (templateName, printData, customOption) {
+      return _commonPrint(templateName, printData, 'H', customOption)
     }
 
     /**
      * 打印html
      */
-    globalVue.$printHtml = async function (html) {
+    globalVue.$printHtml = async function (html, customOption = {}) {
       if (window.hiwebSocket.opened) {
-        return window.hiwebSocket.socket.send('news', html)
+        return window.hiwebSocket.send({
+          title: '打印内容',
+          html,
+          imgToBase64: false,
+          templateId: uuid(),
+          id: uuid(),
+          ...customOption
+        })
       } else {
         this.$message.error('请确保打印服务已经启动')
         return Promise.reject(new Error('客户端打印失败，未连接打印服务'))