vue2-client 1.12.70 → 1.12.72

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

@@ -1,44 +1,44 @@
-<template>
-  <div id="test">
-    <a-card :bordered="false">
-      <XReport
-        ref="main"
-        :use-oss-for-img="false"
-        config-name="nurseWorkstationCover"
-        server-name="af-his"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :dont-format="true"/>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import XReport from './XReport'
-import XAddReport from '../XAddReport/XAddReport.vue'
-// eslint-disable-next-line no-unused-vars
-
-export default {
-  name: 'XReportDemo',
-  components: {
-    XReport, XAddReport
-  },
-  mounted () {
-    // this.$refs.xAddReport.init({
-    //   configName: 'skinTestExecuActionCover',
-    //   selectedId: '11111',
-    //   mixinData: {}
-    // })
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <div id="test">
+    <a-card :bordered="false">
+      <XReport
+        ref="main"
+        :use-oss-for-img="false"
+        config-name="openPrescriptionCover"
+        server-name="af-his"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :dont-format="true"/>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import XReport from './XReport'
+import XAddReport from '../XAddReport/XAddReport.vue'
+// eslint-disable-next-line no-unused-vars
+
+export default {
+  name: 'XReportDemo',
+  components: {
+    XReport, XAddReport
+  },
+  mounted () {
+    // this.$refs.xAddReport.init({
+    //   configName: 'skinTestExecuActionCover',
+    //   selectedId: '11111',
+    //   mixinData: {}
+    // })
+  },
+  data () {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped>
+
+</style>

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -88,6 +88,7 @@
 <script>
 
 import { runLogic } from '@vue2-client/services/api/common'
+import { initDiagnosisDropdown } from './diagnosisAutocomplete'
 
 export default {
   name: 'XHisEditor',
@@ -163,12 +164,42 @@ export default {
   },
   methods: {
     runLogic,
+    async initDiagnosisAutocomplete (dropDownBoxParams) {
+      if (!this.editorRef || !this.editorRef.document) {
+        return
+      }
+
+      // 添加参数检查
+      if (!dropDownBoxParams || !Array.isArray(dropDownBoxParams) || dropDownBoxParams.length === 0) {
+        return
+      }
+
+      dropDownBoxParams.forEach(async (param) => {
+        if (param.identificationCode && param.dataLogic) {
+          try {
+            let preliDiagnoData = null
+            // 保留获取后端数据的逻辑
+            await runLogic(param.dataLogic,
+              {}, 'af-his').then(res => {
+              preliDiagnoData = res
+            })
+            const scriptElement = this.editorRef.document.createElement('script')
+            scriptElement.textContent = `(${initDiagnosisDropdown.toString()})(editor,${JSON.stringify(preliDiagnoData)},'${param.identificationCode}')`
+            this.editorRef.document.body.appendChild(scriptElement)
+          } catch (error) {
+
+          }
+        }
+      })
+    },
     // 初始化文档
-    onload: function (e) {
-      this.editorRef = e.target.contentWindow.editor
-      this.$emit('init', {})
+    onload (e) {
+      if (e && e.target && e.target.contentWindow) {
+        this.editorRef = e.target.contentWindow.editor
+        // 等待文档加载完成
+        this.$emit('init', {})
+      }
     },
-    // 初始化组件
     init (params) {
       const {
         fileUrl,
@@ -177,6 +208,7 @@ export default {
         bindObject,
         saveDataLogicName,
         logicExtraParams,
+        dropDownBoxParams,
         serviceName,
         showModeChoose = true,
         modeType = 'readonly'
@@ -194,29 +226,36 @@ export default {
       this.showModeChoose = showModeChoose
       this.modeType = modeType
       this.ready = true
-      this.loadFile(fileUrl, bindObject, currResData)
+      // 先加载文件
+      this.loadFile(fileUrl, bindObject, currResData).then(() => {
+        // 文件加载完成后再初始化自动完成
+        this.initDiagnosisAutocomplete(dropDownBoxParams)
+      })
       this.loadResList()
     },
     // 加载文档
     loadFile (fileUrl, bindObject, currResData) {
       this.loading = true
-      this.editorRef.loadUrl(fileUrl).then(() => {
-        if (bindObject) {
-          this.editorRef.setBindObject(bindObject)
-          if (bindObject.template) {
-            for (const key of Object.keys(bindObject.template)) {
-              this.editorRef.bindDataList(key, bindObject.template[key])
+      return new Promise((resolve) => {
+        this.editorRef.loadUrl(fileUrl).then(() => {
+          if (bindObject) {
+            this.editorRef.setBindObject(bindObject)
+            if (bindObject.template) {
+              for (const key of Object.keys(bindObject.template)) {
+                this.editorRef.bindDataList(key, bindObject.template[key])
+              }
             }
           }
-        }
-        this.changeMode()
-        this.fileUrl = fileUrl
-        if (!currResData.f_file_name) {
-          currResData.f_file_name = '未命名'
-        }
-        this.currResData = currResData
-        this.loading = false
-        this.$emit('afterLoadFile', {})
+          this.changeMode()
+          this.fileUrl = fileUrl
+          if (!currResData.f_file_name) {
+            currResData.f_file_name = '未命名'
+          }
+          this.currResData = currResData
+          this.loading = false
+          this.$emit('afterLoadFile', {})
+          resolve()
+        })
       })
     },
     // 加载文档列表
@@ -270,7 +309,7 @@ export default {
     },
     // 重新加载
     reload (params) {
-      runLogic('getMedicalRecord', params, this.serviceName).then(res => {
+      runLogic('getFileInformation', params, this.serviceName).then(res => {
         this.resDataModalVisible = false
         this.init({
           modeType: this.modeType,
@@ -280,7 +319,8 @@ export default {
           bindObject: res.bindObject,
           saveDataLogicName: this.saveDataLogicName,
           serviceName: this.serviceName,
-          logicExtraParams: this.logicExtraParams
+          logicExtraParams: this.logicExtraParams,
+          dropDownBoxParams: this.dropDownBoxParams
         })
       })
     },

package/src/base-client/components/his/XHisEditor/diagnosisAutocomplete.js

@@ -0,0 +1,241 @@
+export function initDiagnosisDropdown (editor, data, identificationCode) {
+  if (typeof editor === 'undefined' || !editor.$) {
+    return
+  }
+
+  // 确保元素存在
+  const diagnosisField = editor.$(identificationCode)
+
+  if (!diagnosisField.length) {
+    return
+  }
+
+  // 更详细的调试信息
+  const fieldElement = diagnosisField[0]
+
+  // 模拟诊断数据
+  const mockDiagnosisList = data
+  // 生成唯一的下拉框类名
+  const dropdownClassName = `diagnosis-dropdown-${identificationCode.replace('#', '')}`
+// 创建下拉列表容器 - 使用 Ant Design 风格
+  editor.$(`.${dropdownClassName}`).remove() // 修改这里，使用唯一的类名
+  const dropdownList = editor.document.createElement('div')
+  dropdownList.className = dropdownClassName // 使用唯一的类名
+
+  // 添加 Ant Design 样式，修改样式选择器使用唯一的类名
+  const styleElement = editor.document.createElement('style')
+  styleElement.textContent = `
+    .${dropdownClassName} {
+      display: none;
+      position: absolute;
+      z-index: 999999;
+      background: #fff;
+      border-radius: 2px;
+      box-shadow: 0 3px 6px -4px rgba(0,0,0,.12), 0 6px 16px 0 rgba(0,0,0,.08), 0 9px 28px 8px rgba(0,0,0,.05);
+      padding: 4px 0;
+      min-width: 300px;
+      width: auto;
+      max-width: 400px;
+      max-height: 256px;
+      overflow-y: auto;
+    }
+    .${dropdownClassName}::-webkit-scrollbar {
+      width: 6px;
+      height: 6px;
+    }
+    .${dropdownClassName}::-webkit-scrollbar-thumb {
+      background: rgba(0,0,0,.2);
+      border-radius: 3px;
+    }
+    .${dropdownClassName} .ant-list-item {
+      padding: 8px 12px;
+      cursor: pointer;
+      transition: all .3s;
+      white-space: nowrap;
+    }
+    .${dropdownClassName} .ant-list-item:hover {
+      background: #f5f5f5;
+    }
+    .${dropdownClassName} .ant-list-item-content {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      gap: 8px;
+    }
+    .${dropdownClassName} .ant-list-item-title {
+      color: rgba(0,0,0,.85);
+      font-weight: 500;
+      font-size: 14px;
+      line-height: 1.5715;
+      flex: 1;
+      min-width: 120px;
+    }
+    .${dropdownClassName} .ant-list-item-description {
+      color: rgba(0,0,0,.45);
+      font-size: 12px;
+      line-height: 1.5715;
+      min-width: 80px;
+    }
+    .${dropdownClassName} .ant-list-empty {
+      padding: 16px;
+      color: rgba(0,0,0,.45);
+      text-align: center;
+      min-width: 200px;
+    }
+  `
+  editor.document.head.appendChild(styleElement)
+
+  // 将下拉列表添加到编辑器文档中
+  diagnosisField.after(dropdownList)
+
+  // 获取当前模式
+  function getCurrentMode () {
+    return editor.option.mode
+  }
+
+  // 检查是否允许编辑
+  function isEditableMode () {
+    const currentMode = getCurrentMode()
+    return currentMode === 'form' || currentMode === 'design'
+  }
+
+  // 更新下拉列表位置的函数
+  function updateDropdownPosition () {
+    try {
+      // 获取输入框的位置和尺寸
+      const fieldRect = fieldElement.getBoundingClientRect()
+
+      // 获取父容器的滚动位置
+      const scrollTop = editor.$(editor.document).scrollTop()
+      const scrollLeft = editor.$(editor.document).scrollLeft()
+
+      // 计算绝对位置
+      const top = fieldRect.bottom + scrollTop
+      const left = fieldRect.left + scrollLeft
+
+      // 设置下拉列表位置，不设置宽度，让它自适应内容
+      dropdownList.style.cssText = `
+        position: absolute;
+        top: ${top}px;
+        left: ${left}px;
+        display: block;
+      `
+    } catch (error) {
+    }
+  }
+
+  // 处理输入事件的函数
+  function handleInput () {
+    if (!isEditableMode()) {
+      dropdownList.style.display = 'none'
+      return
+    }
+
+    const keyword = this.textContent.trim()
+
+    if (keyword && keyword !== '请输入') {
+      const results = mockDiagnosisList.filter(item =>
+        item.name.toLowerCase().includes(keyword.toLowerCase()) ||
+        item.code.toLowerCase().includes(keyword.toLowerCase())
+      )
+
+      // 1. 先清空内容
+      dropdownList.innerHTML = ''
+
+      // 2. 添加内容
+      if (results.length === 0) {
+        dropdownList.innerHTML = `
+          <div class="ant-list-empty">
+            <div style="color: rgba(0,0,0,.25);">
+              <svg viewBox="64 64 896 896" width="16" height="16" fill="currentColor">
+                <path d="M928 224H768v-56c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v56H548v-56c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v56H328v-56c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v56H96c-17.7 0-32 14.3-32 32v576c0 17.7 14.3 32 32 32h832c17.7 0 32-14.3 32-32V256c0-17.7-14.3-32-32-32zM424 688c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8v-48c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v48zm0-136c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8v-48c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v48zm136 136c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8v-48c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v48zm0-136c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8v-48c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v48zm136 136c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8v-48c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v48zm0-136c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8v-48c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v48z"/>
+              </svg>
+              <div style="margin-top: 8px;">无匹配结果</div>
+            </div>
+          </div>
+        `
+      } else {
+        const itemsHtml = results.map(item => `
+          <div class="ant-list-item">
+            <div class="ant-list-item-content">
+              <div class="ant-list-item-title">${item.name}</div>
+              <div class="ant-list-item-description">${item.code}</div>
+            </div>
+          </div>
+        `).join('')
+        dropdownList.innerHTML = itemsHtml
+      }
+
+      // 3. 更新位置并显示
+      updateDropdownPosition()
+    } else {
+      dropdownList.style.display = 'none'
+    }
+  }
+
+  // 输入法编辑状态处理
+  let isCompositing = false
+
+  // 输入法开始
+  fieldElement.addEventListener('compositionstart', function (e) {
+    isCompositing = true
+  })
+
+  // 输入法结束
+  fieldElement.addEventListener('compositionend', function (e) {
+    isCompositing = false
+    handleInput.call(this)
+  })
+
+  // 输入事件
+  fieldElement.addEventListener('input', function (e) {
+    if (!isCompositing) {
+      handleInput.call(this)
+    }
+  })
+
+  // 焦点事件
+  fieldElement.addEventListener('focus', function (e) {
+  })
+
+  // 失去焦点事件
+  fieldElement.addEventListener('blur', function (e) {
+    setTimeout(() => {
+      if (!this.textContent.trim()) {
+        this.textContent = '请输入'
+      }
+    }, 200)
+  })
+
+  // 点击选项事件
+  editor.$(dropdownList).on('mousedown', '.ant-list-item', function (e) {
+    e.preventDefault()
+    e.stopPropagation()
+    if (isEditableMode()) {
+      const name = editor.$(this).find('.ant-list-item-title').text()
+      fieldElement.textContent = name
+      dropdownList.style.display = 'none'
+      fieldElement.focus()
+    }
+  })
+
+  // 点击文档其他区域时隐藏下拉列表，修改选择器
+  editor.$(editor.document).on('mousedown', function (e) {
+    if (!editor.$(e.target).closest(`.${dropdownClassName}, ${identificationCode}`).length) {
+      dropdownList.style.display = 'none'
+    }
+  })
+
+  // 添加滚动事件监听，实时更新下拉列表位置
+  editor.$(editor.window).on('scroll', function () {
+    if (dropdownList.style.display !== 'none') {
+      updateDropdownPosition()
+    }
+  })
+
+  editor.$(editor.window).on('resize', function () {
+    if (dropdownList.style.display !== 'none') {
+      updateDropdownPosition()
+    }
+  })
+}

package/src/base-client/components/his/XList/XList.vue

@@ -28,7 +28,6 @@ export default {
   },
   created () {
     this.getData(this.queryParamsName)
-    this.getComponentByName()
   },
   methods: {
     async getData (config) {
@@ -37,6 +36,10 @@ export default {
         })
     },
     handleClick (index) {
+      console.log('xlist按钮被点击了！')
+      console.warn(this.getComponentByName)
+      const xCollapseComponent = this.getComponentByName('XCollapse')
+      console.warn('xCollapseComponent', xCollapseComponent)
       this.$emit('listClick', this.data[index])
     },
     refreshList () {

package/src/pages/ReportGrid/index.vue

@@ -4,7 +4,7 @@
       @updateImg="updateImg"
       ref="main"
       :use-oss-for-img="false"
-      config-name="openPrescriptionCover"
+      config-name="outpatientWait"
       server-name="af-his"
       :show-img-in-cell="true"
       :display-only="displayOnly"

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

@@ -0,0 +1,64 @@
+<template>
+  <a-card :bordered="false" v-if="currUserInfo">
+    <x-form-table
+      title="价格调整查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      @action="action"
+      service-name="af-revenue"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'PriceAdjustments',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data() {
+    return {
+      // 查询配置名称
+      queryParamsName: 'PriceAdjustmentsCRUD',
+      // 查询表单固定值
+      fixedQueryForm: {p_f_userinfo_id: this.currUserInfo.f_userinfo_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/UserChargeRecordQuery/index.vue

@@ -67,6 +67,7 @@ export default {
       this.$refs['bill-print'].print({
         id: record.uc_id,
         billUrl: billUrl,
+        billType: record.uc_type,
         operator: this.currUser.name,
         billStyle: '普通票据'
       })

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

@@ -0,0 +1,64 @@
+<template>
+  <a-card :bordered="false" v-if="currUserInfo">
+    <x-form-table
+      title="异常报警查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      @action="action"
+      service-name="af-revenue"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'UserException',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data() {
+    return {
+      // 查询配置名称
+      queryParamsName: 'UserException360CRUD',
+      // 查询表单固定值
+      fixedQueryForm: {e_f_user_id: this.currUserInfo.f_user_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

@@ -32,6 +32,8 @@ import MeterParamRecordQuery from '@vue2-client/pages/userInfoDetailManage/Meter
 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'
 
 export default {
   name: 'UserInfoDetailQueryTabs',
@@ -52,6 +54,8 @@ export default {
     WatchCollectionRecordQuery,
     TransferRecordQuery,
     UserHandRecordQuery,
+    UserException,
+    PriceAdjustments,
   },
   props: {
     userInfo: {
@@ -84,7 +88,7 @@ export default {
         { 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: '10', label: '档案变更记录', permission: '变更记录', component: 'UserException' },
         {
           key: '11',
           label: '指令查看',
@@ -100,6 +104,8 @@ export default {
           condition: () => this.userInfo?.f_meter_type === '物联网表'
         },
         { key: '13', label: '流量计参数查看', permission: '流量计参数查看', component: 'MeterParamRecordQuery' },
+        { key: '14', label: '异常报警', permission: '异常报警', component: 'MeterParamRecordQuery' },
+        { key: '15', label: '价格调整', permission: '价格调整', component: 'PriceAdjustments' },
       ],
     }
   },