vue2-client 1.12.2 → 1.12.4

package/package.json

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

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

@@ -0,0 +1,198 @@
+<template>
+  <div class="card-box">
+    <div
+      class="section-tab"
+      v-bind:innerText="configurationParameters"
+      contenteditable="true"
+      :style="{ backgroundColor: configurationParameters.tabBackgroundColor }">
+      <a-icon :type="configurationParameters.icon" style="margin-left: 2%;font-size: medium;"/>
+      {{ configurationParameters.tab }}
+    </div>
+    <div class="patient-overview">
+      <div
+        class="overview-section"
+        v-for="(item,index) in data"
+        :key="index"
+        :style="{borderBottom: index === data.length - 1 ? 'none' : '1px solid #ddd'}">
+        <div class="section-header" :style="{ backgroundColor: item.backgroundColor, color: item.fontColor }">
+          {{ item.titleName }}({{ item.messageNumber }})
+        </div>
+        <div class="patient-list-container">
+          <div class="patient-list">
+            <div
+              v-for="(patient, i) in item.showData"
+              :key="i"
+              class="patient-item"
+              :title="`${patient.room_number} - ${patient.patient_name}`">
+              <span class="card_data" :style="{ color: item.fontColor }">{{ patient.room_number }}</span>
+              <span class="card_data" >{{ patient.patient_name }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { getConfigByName, runLogic } from '@/services/api/common'
+
+export default {
+  name: 'XCardSet',
+  data () {
+    return {
+      tab: 'container',
+      data: [
+        { room_number: '', patient_name: '' }
+      ],
+      /* 配置参数(titleName：行标题名，dataSource：数据源，parameter：参数，fontColor：文字颜色，backgroundColor：背景颜色，
+     pageSize：分页数量，tabBackgroundColor：标签背景颜色，isPrimarySource：是否取mainDataSource中的元素) */
+      configurationParameters: {
+        tab: '',
+        icon: '',
+        tabBackgroundColor: '',
+        mainDataSource: '',
+        serverName: '',
+        parameter: { pageSize: 8 },
+        configurationData: [
+          {
+            titleName: '',
+            isPrimarySource: true,
+            dataSource: '',
+            fontColor: '',
+            backgroundColor: ''
+          }
+        ]
+      }
+    }
+  },
+  props: {
+    queryParamsName: {
+      type: String,
+      default: 'nurseStationHomeConfig'
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    async getData (data) {
+      this.data = []
+      getConfigByName(data, 'af-his', res => {
+        this.configurationParameters = res
+        console.log(this.configurationParameters)
+        runLogic(res.mainDataSource, res.parameter, 'af-his').then(result => {
+          for (let i = 0; i < res.configurationData.length; i++) {
+            const ConfigureDisplayData = {
+              titleName: res.configurationData[i].titleName,
+              fontColor: res.configurationData[i].fontColor,
+              backgroundColor: res.configurationData[i].backgroundColor,
+              messageNumber: result[res.configurationData[i].dataSource + 'Total'][0].total,
+              showData: []
+            }
+            this.data.push(ConfigureDisplayData)
+            this.data[i].showData = result[res.configurationData[i].dataSource]
+          }
+        })
+      })
+    }
+  },
+  watch: {
+    queryParamsName: {
+      handler (newValue) {
+        console.log(newValue)
+        this.getData(newValue)
+      },
+      deep: true
+    }
+  },
+}
+</script>
+
+<style scoped>
+.patient-overview {
+  width: 100%;
+  padding: 0.5%;
+  border: 1px solid #ddd;
+  border-radius: 0 5px 5px 5px;
+  height: 100%;
+  background-color: white;
+  overflow: scroll;
+}
+.section-header {
+  font-weight: bold;
+  display: flex;
+  width: 10%;
+  align-items: center;
+  justify-content: center;
+  min-height: 45px;
+  border-radius: 5px;
+  min-width: 90px;
+}
+.patient-list-container {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  padding-left: 1%;
+}
+.overview-section {
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  margin-top: 1%;
+  border-bottom: 1px solid #ddd;
+  padding-bottom: 0.7%;
+}
+.patient-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  width: 100%;
+}
+.patient-item {
+  background-color: #fff;
+  padding: 0.3%;
+  border: 1px solid #ddd;
+  width: 4%;
+  height: 21%;
+  text-align: center;
+  font-size: x-small;
+  border-radius: 5px;
+  min-width: 45px;
+  min-height: 45px;
+  cursor: pointer;
+}
+.patient-item:hover {
+  background-color: #f0f0f0;
+}
+.patient-item span {
+  display: block;
+}
+.section-tab {
+  width: 2vw;
+  height: 22vh;
+  display: flex;
+  writing-mode: vertical-rl;
+  align-items: center;
+  justify-content: space-evenly;
+  border-radius: 5px 0 0 5px;
+  color: white;
+  min-width: 27px;
+  min-height: 80px;
+  max-height: 95px;
+  max-width: 30px;
+}
+.card-box {
+  display: flex;
+  flex-direction: row;
+  height: 100%;
+}
+.card_data {
+  display: inline-block;
+  max-width: 5ch; /* 最多显示 3 个字符 */
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -33,7 +33,7 @@
             </template>
             <template v-else-if="cell.type === 'slot'">
               <template
-                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list'].includes(cell.slotType)">
+                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet'].includes(cell.slotType)">
                 <component
                   :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                   :key="cellIndex"
@@ -73,7 +73,7 @@
             </template>
             <template v-else-if="cell.type === 'slot'">
               <template
-                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list'].includes(cell.slotType)">
+                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet'].includes(cell.slotType)">
                 <component
                   :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                   :key="cellIndex"
@@ -478,6 +478,7 @@ export default {
     XLabelSelect: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelect.vue'),
     XConversation: () => import('@vue2-client/base-client/components/common/XConversation/XConversation.vue'),
     XCheckList: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
+    XCardSet: () => import('@vue2-client/base-client/components/common/XCardSet/XCardSet.vue'),
   },
   props: {
     // 每一行的配置

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

@@ -81,7 +81,7 @@
       </span>
       <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
         <template v-if="item.actionArr && item.actionArr.length > 0">
-          <a-dropdown>
+          <a-dropdown :getPopupContainer=" triggerNode => { return triggerNode.parentNode } ">
             <a class="ant-dropdown-link" @click="e => e.preventDefault()">
               {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
             </a>

package/src/logic/plugins/common/DateTools.js

@@ -1,3 +1,6 @@
+/**
+ * 日期工具类
+ */
 export default class DateTools {
   static instance = new DateTools()
 

package/src/logic/plugins/common/VueTools.js

@@ -0,0 +1,30 @@
+/**
+ * Vue工具类
+ */
+export default class VueTools {
+  static instance = new VueTools()
+
+  constructor () {
+    if (VueTools.instance) {
+      return VueTools.instance
+    }
+    VueTools.instance = this
+  }
+
+  static getInstance () {
+    if (!VueTools.instance) {
+      VueTools.instance = new VueTools()
+    }
+    return VueTools.instance
+  }
+
+  /**
+   * 获取组件实例
+   * @param vueRef vue实例
+   * @param componentName 组件实例名（refName）
+   * @returns {VueComponent}
+   */
+  getComponent (vueRef, componentName) {
+    return vueRef.$refs[componentName]
+  }
+}

package/src/logic/plugins/index.js

@@ -1,5 +1,7 @@
 import DateTools from '@vue2-client/logic/plugins/common/DateTools'
+import VueTools from '@vue2-client/logic/plugins/common/VueTools'
 
 export default {
-  dateTools: DateTools.getInstance()
+  dateTools: DateTools.getInstance(),
+  vueTools: VueTools.getInstance()
 }

package/src/pages/LogicCallExample/index.vue

@@ -2,6 +2,7 @@
 
 import LogicRunner from '@vue2-client/logic/LogicRunner'
 import { getCurrentInstance, ref } from 'vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
 
 const { proxy } = getCurrentInstance()
 
@@ -28,6 +29,15 @@ async function testLogic () {
     显示值：<span ref="displaySpan">{{ metaData.displayValue }}</span>
     <br/>
     <a-button @click="testLogic">修改</a-button>
+    <br/>
+    <p>调用组件方法</p>
+    <br/>
+    <x-form-table
+      ref="testFormTable"
+      serviceName="af-system"
+      :queryParamsName="'crud_dictionary_manage'"
+      title="字典">
+    </x-form-table>
   </div>
 </template>
 

package/src/pages/userInfoDetailManage/index.vue

@@ -1,82 +1,82 @@
-<template>
-  <a-drawer
-    id="agencyManageDetail"
-    title="用户详情信息"
-    placement="right"
-    :body-style="{padding:0}"
-    :destroy-on-close="true"
-    :z-index="200"
-    width="85vw"
-    :closable="false"
-    :visible="userInfoDetailVisible"
-    @close="onClose">
-    <a-page-header v-if="userInfoDetailVisible && userInfo" :title="`用户编号：${ userInfo ? userInfo.f_userinfo_code : '' }`">
-      <x-descriptions
-        :title="null"
-        :content="userInfo"
-        serviceName="af-revenue"
-        :getRealData="true"
-        :column="4"
-        config-name="User_Info_Desc_Config">
-        <template #addonAfter>
-          <div style="text-align: right">
-            <a-statistic title="用户状态" :value="userInfo.f_user_state || 0"/>
-            <a-statistic title="表具状态" :precision="0" :value="userInfo.f_table_state || 0"/>
-          </div>
-        </template>
-      </x-descriptions>
-      <user-info-detail-query-tabs :userInfo="userInfo"/>
-      <template #extra>
-        <a-button type="dashed" @click="refresh">刷新</a-button>
-      </template>
-    </a-page-header>
-  </a-drawer>
-</template>
-
-<script>
-import XDescriptions from '@vue2-client/base-client/components/common/XDescriptions/XDescriptions.vue'
-import { mapState } from 'vuex'
-import { runLogic } from '@vue2-client/services/api/common'
-import userInfoDetailQueryTabs from '@vue2-client/pages/userInfoDetailManage/userInfoDetailQueryTabs'
-
-export default {
-  name: 'UserInfoDetailManage',
-  components: {
-    XDescriptions,
-    userInfoDetailQueryTabs
-  },
-  data () {
-    return {
-      userInfo: undefined,
-      userInfoDetailVisible: false
-    }
-  },
-  methods: {
-    refresh () {
-      return runLogic('getUserInfoDetailV4', this.userInfo, 'af-revenue').then(res => {
-        this.userInfo = res
-      })
-    },
-    init (user) {
-      this.userInfo = user
-      this.userInfoDetailVisible = true
-      this.refresh()
-    },
-    onClose () {
-      this.userInfoDetailVisible = false
-      this.$emit('close')
-    }
-  },
-  created () {
-  },
-  mounted () {},
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', { isMobile: 'isMobile' })
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <a-drawer
+    id="agencyManageDetail"
+    title="用户详情信息"
+    placement="right"
+    :body-style="{padding:0}"
+    :destroy-on-close="true"
+    :z-index="200"
+    width="85vw"
+    :closable="false"
+    :visible="userInfoDetailVisible"
+    @close="onClose">
+    <a-page-header v-if="userInfoDetailVisible && userInfo" :title="`用户编号：${ userInfo ? userInfo.f_userinfo_code : '' }`">
+      <x-descriptions
+        :title="null"
+        :content="userInfo"
+        serviceName="af-revenue"
+        :getRealData="true"
+        :column="4"
+        config-name="User_Info_Desc_Config">
+        <template #addonAfter>
+          <div style="text-align: right">
+            <a-statistic title="用户状态" :value="userInfo.f_user_state || 0"/>
+            <a-statistic title="表具状态" :precision="0" :value="userInfo.f_table_state || 0"/>
+          </div>
+        </template>
+      </x-descriptions>
+      <user-info-detail-query-tabs :userInfo="userInfo"/>
+      <template #extra>
+        <a-button type="dashed" @click="refresh">刷新</a-button>
+      </template>
+    </a-page-header>
+  </a-drawer>
+</template>
+
+<script>
+import XDescriptions from '@vue2-client/base-client/components/common/XDescriptions/XDescriptions.vue'
+import { mapState } from 'vuex'
+import { runLogic } from '@vue2-client/services/api/common'
+import userInfoDetailQueryTabs from '@vue2-client/pages/userInfoDetailManage/userInfoDetailQueryTabs'
+
+export default {
+  name: 'UserInfoDetailManage',
+  components: {
+    XDescriptions,
+    userInfoDetailQueryTabs
+  },
+  data () {
+    return {
+      userInfo: undefined,
+      userInfoDetailVisible: false
+    }
+  },
+  methods: {
+    refresh () {
+      return runLogic('getUserInfoDetailV4', this.userInfo, 'af-revenue').then(res => {
+        this.userInfo = res
+      })
+    },
+   async init (user) {
+      this.userInfo = user
+      await this.refresh()
+      this.userInfoDetailVisible = true
+    },
+    onClose () {
+      this.userInfoDetailVisible = false
+      this.$emit('close')
+    }
+  },
+  created () {
+  },
+  mounted () {},
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/plugins/HiPrintPlugin.js

@@ -53,9 +53,9 @@ const hiPrintPlugin = {
      * 通用打印方法
      * @param {string} templateName 模板名称
      * @param {object} printData 打印数据
-     * @param {boolean} isClient 是否客户端打印
+     * @param {string} type 打印类型
      */
-    const _commonPrint = async function (templateName, printData, isClient = false) {
+    const _commonPrint = async function (templateName, printData, type = 'B') {
       return new Promise((resolve, reject) => {
         try {
           getConfigByNameAsync(templateName).then((template) => {
@@ -71,18 +71,19 @@ const hiPrintPlugin = {
             const hiprintTemplate = new hiprint.PrintTemplate({
               template: template,
             })
-            const printMethod = isClient ? 'print2' : 'print'
-            if (isClient) {
-              console.log(hiprintTemplate.getPrinterList())
+            if (type === 'H') {
+              resolve(hiprintTemplate.getHtml(printData))
+            } else {
+              const printMethod = type === 'C' ? 'print2' : 'print'
+              hiprintTemplate[printMethod](printData, {}, {
+                callback: () => {
+                  resolve(hiprintTemplate)
+                },
+                styleHandler: () => {
+                  return hiPrintCss()
+                }
+              })
             }
-            hiprintTemplate[printMethod](printData, {}, {
-              callback: () => {
-                resolve(hiprintTemplate)
-              },
-              styleHandler: () => {
-                return hiPrintCss()
-              }
-            })
           }).catch((error) => {
             reject(error)
           })
@@ -96,7 +97,7 @@ const hiPrintPlugin = {
      * 浏览器打印
      */
     globalVue.$printB = async function (templateName, printData) {
-      return _commonPrint(templateName, printData, false)
+      return _commonPrint(templateName, printData, 'B')
     }
 
     /**
@@ -104,12 +105,19 @@ const hiPrintPlugin = {
      */
     globalVue.$printC = async function (templateName, printData) {
       if (window.hiwebSocket.opened) {
-        return _commonPrint(templateName, printData, true)
+        return _commonPrint(templateName, printData, 'C')
       } else {
         this.$message.error('请确保打印服务已经启动')
         return Promise.reject(new Error('客户端打印失败，未连接打印服务'))
       }
     }
+
+    /**
+     * 输出html
+     */
+    globalVue.$printH = async function (templateName, printData) {
+        return _commonPrint(templateName, printData, 'H')
+    }
   }
 }
 

package/src/utils/request.js

@@ -150,14 +150,9 @@ function loadInterceptors () {
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
       if (config.url !== V4_LOGIN) {
-        // 判断是否为V4环境
-        const compatible = getSystemVersion()
-        if (compatible === 'V4') {
-          // V4 环境则添加 V4请求头
-          config.headers[V4_ACCESS_TOKEN] = token
-        } else {
-          config.headers[ACCESS_TOKEN] = token
-        }
+        // V4 环境则添加 V4请求头
+        config.headers[V4_ACCESS_TOKEN] = token
+        config.headers[ACCESS_TOKEN] = token
       }
     }
 

package/src/utils/routerUtil.js

@@ -515,6 +515,23 @@ function parsefuncOA (func) {
       icon: row.icon,
       name: row.name
     }
+    if (row.link) {
+      if (route.router.includes('?')) {
+        // 把问号后面的都删了
+        const [url, queryString] = route.router.split('?')
+        route.router = url
+        try {
+          const params = new URLSearchParams(queryString)
+          for (const [key, value] of params.entries()) {
+            route.meta[key] = value
+          }
+          if (route.meta.path) {
+            route.path = route.meta.path
+            delete route.meta.path
+          }
+        } catch (e) {}
+      }
+    }
     if (row.children && row.children.length > 0) {
       route.children = parsefunc(row.children)
     }