vue2-client 1.16.43 → 1.16.45

package/package.json

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

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

@@ -68,6 +68,7 @@
       width="60vw"
       :dialogStyle="{ top: '20px' }"
       wrapClassName="image-preview-modal"
+      :zIndex="1010"
     >
       <div class="image-preview-container">
         <img

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="x-collapse-wrapper" :class="wrapperClassObject">
     <a-collapse
       :activeKey="activeKey"
       @change="handleChange"
@@ -36,10 +36,20 @@
                 <span>{{ item.value }}</span>
               </span>
             </template>
-            <!-- 当有 title3 数据时显示时间项 -->
+            <!-- 当有 title3 数据时显示时间项（与 title2 一致：支持数组/单项） -->
+            <template v-if="panel.title3 && Array.isArray(panel.title3) && panel.title3.length">
+              <span
+                v-for="(item, t3Index) in panel.title3"
+                :key="t3Index"
+                :class="['time-item', { 'time-first': t3Index === 0 }]"
+                :style="config.title3Style">
+                <span v-if="item.showTitle">{{ item.key }}:</span>
+                <span>{{ item.value }}</span>
+              </span>
+            </template>
             <span
-              v-if="panel.title3"
-              class="time-item"
+              v-else-if="panel.title3"
+              class="time-item time-first"
               :style="config.title3Style">
               {{ panel.title3 }}
             </span>
@@ -77,6 +87,8 @@
             :countVisible="false"
             :env="env"
             :style="config.componentStyle || ''"
+            v-bind="panel.attrs || {}"
+            :class="panel.className"
             :ipanelIndex="panelIndex"
             @deleteData="deleteData"
             @add="add"
@@ -151,6 +163,24 @@ export default {
     this.getData(this.queryParamsName, this.parameter)
   },
   beforeDestroy () {},
+  computed: {
+    // 基于 $attrs 的样式类开关（与 XHDescriptions.vue 思路一致）
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = [
+        'style1'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`xcollapse-${key}`] = true
+      })
+      const size = attrs.size
+      if (size && typeof size === 'string') classes[`xcollapse-size-${size}`] = true
+      return classes
+    }
+  },
   methods: {
     handleMounted (instance) {
       this.sonInstances.push(instance)
@@ -200,12 +230,13 @@ export default {
         console.warn(this.config)
         runLogic(res.mainLogic, parameter, 'af-his').then(result => {
           this.config.showData = result
+          console.log('result', result)
           // 更具timeType更改时间类型
           if (this.config.timeType && this.config.timeType === '.') {
             this.config.showData.forEach(panel => {
-              if (panel.title3) {
-                panel.title3 = this.convertToCustomFormat(panel.title3)
-              }
+              // if (panel.title3) {
+              //   panel.title3 = this.convertToCustomFormat(panel.title3)
+              // }
             })
             this.$forceUpdate()
           }
@@ -256,7 +287,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .header-content {
   display: flex;
   align-items: center;
@@ -353,4 +384,77 @@ export default {
   text-align: center;
   margin: 20px 0;
 }
+
+// 基于根容器类进行样式整合：x-collapse-wrapper.xcollapse-style1
+.x-collapse-wrapper {
+  &.xcollapse-style1 {
+    .header-content {
+      gap: 6px; // 圆点与title1更紧凑的基础间距
+    }
+    .blue-circle-icon {
+      margin-right: 0px !important; // 图标与标题更紧凑
+    }
+    .header-text {
+      font-family: "Source Han Sans";
+      font-size: 18px;
+      font-weight: 700;
+      line-height: normal;
+      letter-spacing: 0em;
+      color: #313131;
+      // 额外拉开与 title2 的距离（在小gap基础上单独增大）
+      margin-right: 25px !important;
+    }
+
+    .info-item {
+      font-family: "Source Han Sans";
+      font-size: 18px;
+      font-weight: 700;
+      line-height: normal;
+      text-align: right;
+      color: #313131;
+      letter-spacing: 0em
+    }
+
+    .time-item {
+      font-family: "Source Han Sans";
+      font-size: 18px;
+      font-weight: 400;
+      line-height: normal;
+      text-align: right;
+      color: #313131;
+      letter-spacing: 0em;
+    }
+
+    // 让每个面板成为独立卡片：去掉 antd 默认的分隔线，增加间距与圆角
+    :deep(.ant-collapse) {
+      background: transparent;
+      border: 0;
+    }
+
+    :deep(.ant-collapse > .ant-collapse-item) {
+      width: 550px;
+      height: 410px;
+      margin: 16px 0;              // 面板之间留白
+      border-radius: 6px;          // 分离的圆角
+      overflow: hidden;            // 保持圆角
+      background: #FFFFFF;         // 独立白底
+      box-sizing: border-box;
+      border: 1px solid #E5E9F0;   // 每个面板自身边框
+    }
+
+    :deep(.ant-collapse > .ant-collapse-item:first-child) { margin-top: 0; }
+    :deep(.ant-collapse > .ant-collapse-item:last-child) { margin-bottom: 0; }
+
+    :deep(.ant-collapse-content > .ant-collapse-content-box) { background: #FFFFFF; }
+
+    // 表头：恢复合适的上下内边距，去掉顶部额外空白
+    :deep(.ant-collapse-header) {
+      background: #FFFFFF;
+      padding: 12px 16px; // 恢复上下内边距
+      align-items: center;
+      color: #262626;
+      border-bottom: none !important; // 移除标题处下边线，避免与外边框连为一体
+    }
+  }
+}
 </style>

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

@@ -153,7 +153,9 @@ export default {
       const classes = {}
 
       const booleanStyleKeys = [
-        'description', 'no-padding'
+        'description',
+        'no-padding',
+        'medical-history'
       ]
       booleanStyleKeys.forEach(key => {
         const val = attrs[key]
@@ -455,6 +457,7 @@ export default {
   border-bottom: 1px dashed rgba(0, 0, 0, 0.15);
 }
 /* 加边框 */
+/* 加边框 */
 .xhdesc-description {
   padding: 4px 4px 4px 4px;
 
@@ -479,4 +482,139 @@ export default {
 .xhdesc-no-padding {
   padding: 0px;
 }
+/* 医疗病史样式开关：通过 wrapperClassObject 添加类 xhdesc-medical-history */
+.patient-info-descriptions.xhdesc-medical-history {
+  /* 移除右侧空白（本模式不需要详情按钮预留空间） */
+  .descriptions-container {
+    padding-right: 0;
+    padding-left: 12px;
+  }
+
+  /* 保持原有的自适应布局样式 */
+  .flex-descriptions {
+    gap: 4px 16px;
+  }
+
+  .description-item {
+    padding: 2px 4px;
+    width: 100%;
+    align-items: flex-start;
+    display: flex;
+    flex-direction: column;
+  }
+
+  /* 只修改布局，保持原有字体样式 */
+  .label-wrapper {
+    font-family: "Source Han Sans";
+    font-size: 18px;
+    font-weight: 600;
+    line-height: 24px;
+    text-align: justify;
+    letter-spacing: 0em;
+    white-space: nowrap;
+    margin-right: 8px;
+    margin-bottom: 0;
+    display: inline;
+  }
+
+  .content-wrapper {
+    font-family: "Source Han Sans";
+    font-size: 18px;
+    font-weight: 400;
+    line-height: 24px;
+    letter-spacing: 0em;
+    margin-left: 0;
+    max-width: none;
+    overflow: visible;
+    text-overflow: initial;
+    white-space: normal;
+    word-break: break-word;
+    display: inline;
+  }
+
+  /* 修复Ant Design描述列表的布局，保持字体样式 */
+  :deep(.ant-descriptions-item) {
+    display: block !important;
+    white-space: nowrap;
+    width: 100% !important;
+    margin-bottom: 8px;
+    margin-right: 0;
+  }
+
+  :deep(.ant-descriptions-item-container) {
+    display: inline !important;
+    white-space: nowrap;
+    width: auto !important;
+    align-items: start !important;
+  }
+
+  :deep(.ant-descriptions-item-label) {
+    display: inline !important;
+    white-space: nowrap !important;
+    min-width: auto !important;
+    padding-right: 1px !important;
+    /* 保持原有字体样式 */
+    font-family: "Source Han Sans" !important;
+    font-size: 18px !important;
+    font-weight: 600 !important;
+    line-height: 24px !important;
+    text-align: justify !important;
+    letter-spacing: 0em !important;
+  }
+
+  :deep(.ant-descriptions-item-content) {
+    display: inline !important;
+    white-space: normal !important;
+    word-break: break-word !important;
+    margin-left: 0 !important;
+    overflow: visible !important;
+    /* 保持原有字体样式 */
+    font-family: "Source Han Sans" !important;
+    font-size: 18px !important;
+    font-weight: 400 !important;
+    line-height: 24px !important;
+    letter-spacing: 0em !important;
+  }
+
+  :deep(.ant-descriptions-item-colon) {
+    margin-right: 2px !important;
+    display: inline !important;
+  }
+
+  /* 确保内部元素正确对齐 */
+  :deep(.ant-descriptions-item-label .label-wrapper) {
+    display: inline !important;
+    white-space: nowrap !important;
+    width: auto !important;
+    gap: 0 !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    line-height: 24px !important;
+  }
+
+  :deep(.ant-descriptions-row) {
+    display: block !important;
+    white-space: nowrap;
+    width: 100%;
+  }
+
+  /* 移除所有可能冲突的布局属性 */
+  :deep(.ant-descriptions-item),
+  :deep(.ant-descriptions-item-container) {
+    float: none !important;
+    flex: none !important;
+    flex-direction: row !important;
+    align-items: flex-start !important;
+  }
+
+  /* 确保表格布局正确 */
+  :deep(.ant-descriptions-view) {
+    white-space: nowrap;
+    table-layout: auto !important;
+  }
+
+  :deep(.ant-descriptions-table) {
+    table-layout: auto !important;
+  }
+}
 </style>

package/src/pages/WorkflowDetail/WorkFlowDemo3.vue

@@ -1,203 +1,225 @@
-<template>
-  <div id="beingProcessed">
-    <x-form-table
-      title="我的工单"
-      ref="xFormTable"
-      :queryParamsName="queryParamsName"
-      :fixed-query-form="{
-        users_f_handler_id: currUser.id,
-      }"
-      @action="toDetail">
-      <template #leftButton>
-        <a-button @click="addApply">
-          <a-icon type="plus"/>
-          发起报建
-        </a-button>
-      </template>
-    </x-form-table>
-    <a-modal
-      v-model="applyAddFlag"
-      :footer="null"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="发起报建"
-      :destroyOnClose="true">
-      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
-    </a-modal>
-    <WorkflowDetail
-      ref="workFlow"
-      @success="success"
-      @nextClick="nextClick"
-      @x-form-item-emit-func="handleFormItemEvent"
-    >
-    </WorkflowDetail>
-    <!--  地址选择器  -->
-    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
-  </div>
-</template>
-
-<script>
-import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-import { mapState } from 'vuex'
-import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
-import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup'
-
-export default {
-  name: 'Apply',
-  components: {
-    XFormTable,
-    XAddNativeForm,
-    WorkflowDetail,
-    AddressSelect,
-    XFormGroup,
-  },
-  // 透传给子组件的方法（目前XFormTable接了）
-  provide () {
-    return {
-      generalFunction: {
-        setCancel: this.setCancel,
-        chargeAdd: this.chargeAdd,
-        addUser: this.addUser,
-        editUser: this.editUser,
-        addContract: this.addContract,
-        addcharge: this.addcharge,
-        updateFormData: this.updateFormData,
-        chargeCancel: this.chargeCancel,
-        chargeBatchRefund: this.chargeBatchRefund,
-      }
-    }
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'ApplyProcessCRUD',
-      // 发起报建弹框控制
-      applyAddFlag: false,
-      // 提交加载动画
-      confirmLoading: false,
-      refreshFn: null,
-      chargeVisible: false
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-  },
-  methods: {
-    addApply () {
-      console.log('打开了吗')
-      this.applyAddFlag = true
-      this.$nextTick(
-        () => {
-          getConfigByName('addApplyForm', 'af-apply', (res) => {
-            this.$refs.xForm.init({
-              businessType: '新增',
-              title: '发起报建',
-              ...res
-            })
-          })
-        }
-      )
-    },
-    applySubmit (formData) {
-      runLogic('addApply', formData).then(
-        res => {
-          this.$message.success('发起报建成功')
-          this.$refs.xFormTable.refreshTable(true)
-          this.applyAddFlag = false
-        }
-      ).catch(() => {
-        this.applyAddFlag = false
-      })
-    },
-    success () {
-      console.log('完工')
-    },
-    toDetail (record, id) {
-      this.$refs.workFlow.init({
-        workflowId: record.ab_f_workflow_id
-      })
-    },
-    handleFormItemEvent (func, data, value) {
-      console.log('打印一下：', func, data, value)
-      if (func === 'selectAddress') {
-        this.$refs.addressSelect.setFormShow()
-      }
-    },
-    setForm (record) {
-      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
-    },
-    nextClick ({ form, formStep, workflowId }) {
-      console.log('success', form, formStep, workflowId)
-      const data = {
-        workflowId,
-        form,
-        formStep
-      }
-      runLogic('applySubmitAfter', data, 'af-apply').then(
-        res => {
-          if (res) {
-            // this.$message.success('提交成功！')
-            this.$refs.xFormTable.refreshTable(true)
-          }
-        }
-      )
-    },
-    // 协议作废
-    setCancel (record, refreshFn) {
-      this.$refs.cancelContract.setCancel(record, refreshFn)
-    },
-    // 增值收费新增
-    chargeAdd (refreshFn) {
-      this.$refs.addCharge.chargeAdd(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 协议新增
-    addContract (refreshFn) {
-      this.$refs.addContract.addContract(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 新增用户
-    addUser (refreshFn) {
-      if (this.$refs.workFlow.$refs.baseInformation.details.f_workflow_define_name != '团购报建流程') {
-        this.$message.success('只有团购报建流程才可以新增用户信息!')
-        return
-      }
-      this.$refs.addUser.addUser(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 编辑用户
-    editUser (record, refreshFn) {
-      this.$refs.addUser.editUser(record, refreshFn)
-    },
-    // 新增收费
-    addcharge (refreshFn) {
-      this.$refs.addApplyCharge.addcharge(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 报装缴费页面初始化
-    updateFormData (workflowId) {
-      if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '报装缴费') {
-        runLogic('getApplyBusinessrecode', { f_workflow_id: workflowId }, 'af-apply').then((res) => {
-          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(res)
-        })
-      } else if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '合同签订') {
-        runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
-          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: res[0].f_contract_money })
-        })
-      }
-    },
-    // 增值收费单个数据的撤销功能
-    chargeCancel (record, refreshFn) {
-      this.$refs.cancel.chargeCancel(record, refreshFn)
-    },
-    // 批量撤销(退费)
-    chargeBatchRefund (selectedRowKeys, selectedRows, refreshFn) {
-      if (selectedRowKeys.length === 0 || selectedRows.length === 0) {
-        this.$message.warn('请选择要退费的记录', 5)
-        return
-      }
-      const workflowId = this.$refs.workFlow.workflowId
-      this.$refs.batchRefund.selectRow(selectedRowKeys, selectedRows, refreshFn, workflowId)
-    }
-  }
-}
-</script>
+<template>
+  <div id="beingProcessed">
+    <x-form-table
+      title="我的工单"
+      ref="xFormTable"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template #leftButton>
+        <a-button @click="addApply">
+          <a-icon type="plus"/>
+          发起报建
+        </a-button>
+      </template>
+    </x-form-table>
+    <a-modal
+      v-model="applyAddFlag"
+      :footer="null"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="发起报建"
+      :destroyOnClose="true">
+      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
+    </a-modal>
+    <WorkflowDetail
+      ref="workFlow"
+      @success="success"
+      @nextClick="nextClick"
+      @x-form-item-emit-func="handleFormItemEvent"
+    >
+    </WorkflowDetail>
+    <!--  地址选择器  -->
+    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
+    <!--  协议新增功能  -->
+    <add-contract
+      ref="addContract"
+      table="报建流程"
+      @upFormData="upFormData"
+    ></add-contract>
+    <!--  协议作废功能  -->
+    <cancel-contract ref="cancelContract"></cancel-contract>
+    <!--  增值收费新增  -->
+    <add-charge ref="addCharge"></add-charge>
+    <!--  新增/编辑 用户信息  -->
+    <add-user ref="addUser"></add-user>
+    <!--  新增 收费信息  -->
+    <add-apply-charge ref="addApplyCharge"></add-apply-charge>
+    <!--  增值收费撤销  -->
+    <cancel ref="cancel"></cancel>
+    <!--  增值收费批量撤销  -->
+    <batch-refund ref="batchRefund"></batch-refund>
+  </div>
+</template>
+
+<script>
+import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup'
+
+export default {
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail,
+    AddressSelect,
+    XFormGroup,
+  },
+  // 透传给子组件的方法（目前XFormTable接了）
+  provide () {
+    return {
+      generalFunction: {
+        setCancel: this.setCancel,
+        chargeAdd: this.chargeAdd,
+        addUser: this.addUser,
+        editUser: this.editUser,
+        addContract: this.addContract,
+        addcharge: this.addcharge,
+        updateFormData: this.updateFormData,
+        chargeCancel: this.chargeCancel,
+        chargeBatchRefund: this.chargeBatchRefund,
+        updateContractFormData: this.updateContractFormData,
+      }
+    }
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ApplyProcessCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false,
+      // 提交加载动画
+      confirmLoading: false,
+      refreshFn: null,
+      chargeVisible: false
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+  },
+  methods: {
+    addApply () {
+      console.log('打开了吗')
+      this.applyAddFlag = true
+      this.$nextTick(
+        () => {
+          getConfigByName('addApplyForm', 'af-apply', (res) => {
+            this.$refs.xForm.init({
+              businessType: '新增',
+              title: '发起报建',
+              ...res
+            })
+          })
+        }
+      )
+    },
+    applySubmit (formData) {
+      runLogic('addApply', formData).then(
+        res => {
+          this.$message.success('发起报建成功')
+          this.$refs.xFormTable.refreshTable(true)
+          this.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
+    },
+    success () {
+      console.log('完工')
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.ab_f_workflow_id,
+        stepId: record.ws_f_step_id
+      })
+    },
+    handleFormItemEvent (func, data, value) {
+      console.log('打印一下：', func, data, value)
+      if (func === 'selectAddress') {
+        this.$refs.addressSelect.setFormShow()
+      }
+    },
+    setForm (record) {
+      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
+    },
+    nextClick ({ form, formStep, workflowId }) {
+      console.log('success', form, formStep, workflowId)
+      // const data = {
+      //   workflowId,
+      //   form,
+      //   formStep
+      // }
+      // runLogic('applySubmitAfter', data, 'af-apply').then(
+      //   res => {
+      //     if (res) {
+      //       // this.$message.success('提交成功！')
+      //       this.$refs.xFormTable.refreshTable(true)
+      //     }
+      //   }
+      // )
+    },
+    // 协议作废
+    setCancel (record, refreshFn) {
+      this.$refs.cancelContract.setCancel(record, refreshFn)
+    },
+    // 增值收费新增
+    chargeAdd (refreshFn) {
+      this.$refs.addCharge.chargeAdd(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 协议新增
+    addContract (refreshFn) {
+      this.$refs.addContract.addContract(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 新增用户
+    addUser (refreshFn) {
+      if (this.$refs.workFlow.$refs.baseInformation.details.f_workflow_define_name != '团购报建流程') {
+        this.$message.success('只有团购报建流程才可以新增用户信息!')
+        return
+      }
+      this.$refs.addUser.addUser(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 编辑用户
+    editUser (record, refreshFn, showForm) {
+      this.$refs.addUser.editUser(record, refreshFn, showForm)
+    },
+    // 新增收费
+    addcharge (refreshFn) {
+      this.$refs.addApplyCharge.addcharge(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 报装缴费页面初始化
+    updateFormData (workflowId) {
+      runLogic('getApplyBusinessrecode', { f_workflow_id: workflowId }, 'af-apply').then((res) => {
+        this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(res)
+      })
+    },
+    // 合同签订页面初始化
+    updateContractFormData (param) {
+      this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(param)
+    },
+    // 补充协议回更表单数据
+    upFormData (record) {
+      this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(record)
+    },
+    // 增值收费单个数据的撤销功能
+    chargeCancel (record, refreshFn) {
+      this.$refs.cancel.chargeCancel(record, refreshFn)
+    },
+    // 批量撤销(退费)
+    chargeBatchRefund (selectedRowKeys, selectedRows, refreshFn) {
+      if (selectedRowKeys.length === 0 || selectedRows.length === 0) {
+        this.$message.warn('请选择要退费的记录', 5)
+        return
+      }
+      const workflowId = this.$refs.workFlow.workflowId
+      this.$refs.batchRefund.selectRow(selectedRowKeys, selectedRows, refreshFn, workflowId)
+    }
+  }
+}
+</script>

package/src/router/async/router.map.js

@@ -60,15 +60,12 @@ path: 'example',
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XReport/XReportHospitalizationDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/his/XCharge/XChargeDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),

package/src/base-client/components/common/XReport/XReportHospitalizationDemo.vue

@@ -1,45 +0,0 @@
-<template>
-  <div id="xreport-hosp-demo">
-    <a-space style="margin-bottom: 12px;">
-      <a-button type="primary" @click="doInit">手动初始化</a-button>
-    </a-space>
-    <XReport
-      ref="reportRef"
-      :edit-mode="true"
-      :show-save-button="true"
-      :show-img-in-cell="false"
-      :use-oss-for-img="false"
-      server-name="af-his"
-      @updateImg="onUpdateImg"/>
-  </div>
-</template>
-
-<script setup>
-import { ref } from 'vue'
-import XReport from '@vue2-client/base-client/components/common/XReport'
-
-const reportRef = ref(null)
-
-const payload = {
-  arr: [
-    { BQ: '病房区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '感染科', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '骨科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '呼吸科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '急症科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '内科二病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 }
-  ]
-}
-
-const doInit = async () => {
-  if (!reportRef.value || !reportRef.value.init) return
-  await reportRef.value.init({
-    configName: 'hospitalizationStatsReport',
-    configData: payload
-  })
-}
-
-const onUpdateImg = data => {
-  console.warn('updateImg:', data)
-}
-</script>

package/src/base-client/components/his/XCharge/testConfig.js

@@ -1,149 +0,0 @@
-// 测试配置 - 用于演示混合支付功能
-export const testChargeConfig = {
-  "amountFields": [
-    {
-      "field": 'f_amount',
-      "disabled": false,
-      "label": '费用总额'
-    },
-    {
-      "field": 'f_insurance_amount',
-      "disabled": true,
-      "label": '医保支付'
-    },
-    {
-      "field": 'f_self_amount',
-      "disabled": true,
-      "label": '自费金额'
-    },
-    {
-      "field": 'out_of_pocket_amount',
-      "disabled": true,
-      "label": '自付金额'
-    },
-    {
-      "field": 'biscount_amount',
-      "disabled": true,
-      "label": '折扣金额'
-    },
-    {
-      "field": 'billing_amount',
-      "disabled": true,
-      "label": '记账金额'
-    }
-  ],
-  "paymentMethods": [
-    {
-      "key": '医保卡',
-      "label": '医保卡'
-    },
-    {
-      "key": '微信/支付宝',
-      "label": '微信/支付宝'
-    },
-    {
-      "key": '银行卡',
-      "label": '银行卡'
-    },
-    {
-      "key": '现金',
-      "label": '现金'
-    }
-  ],
-  "bottomFields": [
-    {
-      "field": 'f_balance',
-      "label": '账户余额',
-      "disabled": false
-    },
-    {
-      "field": 'received',
-      "label": '实收',
-      "disabled": false
-    },
-    {
-      "field": 'change',
-      "label": '找零',
-      "disabled": false
-    }
-  ],
-  "actionButtons": [
-    {
-      "key": 'charge',
-      "label": '收费',
-      "icon": 'check'
-    },
-    {
-      "key": 'refund',
-      "label": '退费',
-      "icon": 'undo'
-    },
-    {
-      "key": 'print',
-      "label": '打印',
-      "icon": 'printer'
-    }
-  ],
-  "enableMixedPayment": true, // 启用混合支付
-  // 可配置事件名，参考 fronImport 风格
-  "eventNames": {
-    "method": 'method',
-    "methods": 'methods',
-    "totalPaymentAmount": 'totalPaymentAmount',
-    "action": 'action'
-  },
-  "dataSourceConfig": 'testChargeLogic'
-}
-
-// 单选模式测试配置
-export const testSingleChargeConfig = {
-  "amountFields": [
-    {
-      "field": 'f_amount',
-      "disabled": false,
-      "label": '费用总额'
-    },
-    {
-      "field": 'f_insurance_amount',
-      "disabled": true,
-      "label": '医保支付'
-    }
-  ],
-  "paymentMethods": [
-    {
-      "key": '医保卡',
-      "label": '医保卡'
-    },
-    {
-      "key": '现金',
-      "label": '现金'
-    }
-  ],
-  "bottomFields": [
-    {
-      "field": 'received',
-      "label": '实收',
-      "disabled": false
-    },
-    {
-      "field": 'change',
-      "label": '找零',
-      "disabled": false
-    }
-  ],
-  "actionButtons": [
-    {
-      "key": 'charge',
-      "label": '收费',
-      "icon": 'check'
-    }
-  ],
-  "enableMixedPayment": false, // 禁用混合支付（单选模式）
-  "eventNames": {
-    "method": 'method',
-    "methods": 'methods',
-    "totalPaymentAmount": 'totalPaymentAmount',
-    "action": 'action'
-  },
-  "dataSourceConfig": 'testChargeLogic'
-}