vue2-client 1.14.60 → 1.14.62

package/package.json

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

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

@@ -314,17 +314,13 @@ export default {
       let result
       if (this.searchResultType !== 'Default') {
         if (this.searchResultType === 'Array') {
-          // 如果是坐标搜索，只返回坐标
-          if (this.attr.type === 'coordinateSearch') {
-            result = [this.addressObj.lng_lat]
-          } else {
-            result = [_addstr || this.addressObj.address, this.addressObj.lng_lat]
-          }
+          result = [_addstr || this.addressObj.address, this.addressObj.lng_lat]
         } else {
           result = {}
           // 如果是坐标搜索，只返回坐标
+          // 不知道为什么这么加 命名之前的组件已经返回了 lng_lat  ，算了 还是相信后人的智慧吧
           if (this.attr.type === 'coordinateSearch') {
-            result[this.resultKeys.coords] = this.addressObj.lng_lat
+            result[this.resultKeys.address] = this.addressObj.lng_lat
           } else {
             result[this.resultKeys.address] = _addstr || this.addressObj.address
             result[this.resultKeys.coords] = this.addressObj.lng_lat

package/src/base-client/components/common/AmapMarker/index.js

@@ -1,3 +1,3 @@
-import AmapPointRendering from './AmapPointRendering'
-
-export default AmapPointRendering
+import AmapPointRendering from './AmapPointRendering'
+
+export default AmapPointRendering

package/src/base-client/components/common/XAddNativeForm/demo.vue

@@ -6,13 +6,10 @@ export default {
   name: 'Demo',
   components: { XAddNativeForm },
   mounted () {
-    const realTableData = [{ tsc_f_contract_id: null, tsc_f_contract_code: '3316370809565024955', tsc_f_createfile_date: '2025-01-13 00:00:00', tsc_f_data: '王翔测试-15358338312: 繁荣南路滨河花园4楼号4单元19楼层1908门牌号' }]
-    getConfigByNameAsync('ceshiCRUD', 'af-system').then(res => {
+    getConfigByNameAsync('form_check_test', 'af-system').then(res => {
       this.$refs.xAddFrom.init(Object.assign(res, {
         modifyModelData: {
-          data: {
-            oldSignList: realTableData
-          }
+          data: {}
         }
       }))
     })

package/src/base-client/components/common/XDetailsView/index.js

@@ -1,3 +1,3 @@
-import XDetailsView from './XDetailsView'
-
-export default XDetailsView
+import XDetailsView from './XDetailsView'
+
+export default XDetailsView

package/src/base-client/components/common/XFormGroupDetails/index.js

@@ -1,3 +1,3 @@
-import XFormGroupDetails from './XFormGroupDetails'
-
-export default XFormGroupDetails
+import XFormGroupDetails from './XFormGroupDetails'
+
+export default XFormGroupDetails

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

@@ -249,8 +249,6 @@ export default {
   },
   methods: {
     findComponentByName (instance, componentName, maxDepth, findType) {
-      findType = findType || 'children'
-      maxDepth = maxDepth || 50
       // 基础判断：如果实例不存在或者已经超过最大深度，返回null
       if (!instance || maxDepth <= 0) {
         return null

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

@@ -86,8 +86,7 @@
 </template>
 
 <script>
-import html2canvas from 'html2canvas'
-import jsPDF from 'jspdf'
+
 import { runLogic } from '@vue2-client/services/api/common'
 import { initDiagnosisDropdown } from './diagnosisAutocomplete'
 
@@ -388,136 +387,31 @@ export default {
         })
       }
     },
-    // 修改 save 方法
-    async save() {
+    // 保存文档
+    save () {
       // 验证必须输入项
       if (this.editorRef.validate()) {
-        try {
-          // 1. 先生成 PDF
-          const pdfBlob = await this.generatePDF()
-          
-          // 2. 获取HTML文档和结构化数据(JSON)
-          const data = {
-            doc: this.editorRef.getHtml(),
-            dataObject: this.editorRef.getBindObject(),
-            dataMode: this.dataMode,
-            resId: this.resId,
-            modifyResModel: this.modifyResModel,
-            logicExtraParams: this.logicExtraParams,
-            // 添加 PDF 数据
-            pdfData: pdfBlob
-          }
-
-          // 3. 保存到后端
-          const res = await runLogic(this.saveDataLogicName, data, this.serviceName)
-          
+        // 获取HTML文档和结构化数据(JSON)
+        const data = {
+          doc: this.editorRef.getHtml(),
+          dataObject: this.editorRef.getBindObject(),
+          dataMode: this.dataMode,
+          resId: this.resId,
+          modifyResModel: this.modifyResModel,
+          logicExtraParams: this.logicExtraParams
+        }
+        // 保存HTML文档和结构化数据到后端服务
+        runLogic(this.saveDataLogicName, data, this.serviceName).then(res => {
           this.$message.success('保存成功')
           this.changeRes(res.currResData.id)
           this.$emit('saveafter', data.dataObject)
-        } catch (error) {
-          console.error('保存失败:', error)
-          this.$message.error('保存失败，请重试')
-        } finally {
+        }).finally(() => {
           this.resDataModalVisible = false
-        }
+        })
       } else {
         this.$message.error('请检查未填写的项目')
       }
     },
-    // 修改 generatePDF 方法，返回 PDF Blob
-    async generatePDF() {
-      // 显示加载提示
-      this.$message.loading('正在生成 PDF...', 0)
-
-      try {
-        const iframe = document.getElementById('x-editor')
-        const iframeDocument = iframe.contentDocument || iframe.contentWindow.document
-
-        // 添加自定义样式
-        const style = iframeDocument.createElement('style')
-        style.textContent = `
-          body {
-            font-family: Arial, sans-serif;
-            line-height: 1.5;
-            color: #333;
-            padding: 20px;
-          }
-          h1, h2, h3 {
-            color: #000;
-            margin-bottom: 15px;
-          }
-          table {
-            border-collapse: collapse;
-            width: 100%;
-            margin-bottom: 20px;
-          }
-          th, td {
-            border: 1px solid #ddd;
-            padding: 8px;
-            text-align: left;
-          }
-          th {
-            background-color: #f5f5f5;
-          }
-          img {
-            max-width: 100%;
-            height: auto;
-          }
-        `
-        iframeDocument.head.appendChild(style)
-
-        const canvas = await html2canvas(iframeDocument.body, {
-          scale: 2,
-          useCORS: true,
-          logging: false,
-          backgroundColor: '#ffffff',
-          windowWidth: iframeDocument.documentElement.scrollWidth,
-          windowHeight: iframeDocument.documentElement.scrollHeight
-        })
-
-        const pdf = new jsPDF({
-          orientation: 'portrait',
-          unit: 'mm',
-          format: 'a4'
-        })
-
-        const imgData = canvas.toDataURL('image/png')
-        const imgWidth = 210
-        const imgHeight = (canvas.height * imgWidth) / canvas.width
-
-        const pageHeight = 297
-        let heightLeft = imgHeight
-        let position = 0
-
-        pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight)
-
-        while (heightLeft > 0) {
-          position = heightLeft - pageHeight
-          pdf.addPage()
-          pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight)
-          heightLeft -= pageHeight
-        }
-
-        // 生成 PDF 的 Blob 数据
-        const pdfBlob = pdf.output('blob')
-        
-        // 预览 PDF
-        const pdfUrl = URL.createObjectURL(pdfBlob)
-        window.open(pdfUrl, '_blank')
-
-        // 关闭加载提示
-        this.$message.destroy()
-        this.$message.success('PDF 生成成功')
-
-        // 返回 PDF Blob 数据
-        return pdfBlob
-      } catch (error) {
-        console.error('PDF 生成失败:', error)
-        this.$message.destroy()
-        this.$message.error('PDF 生成失败，请重试')
-        throw error // 抛出错误，让 save 方法捕获
-      }
-    },
     // 打印文档
     print () {
       this.editorRef.execCommand('print')

package/src/base-client/components/his/XTitle/README.md

@@ -22,7 +22,7 @@ XTitle 是一个多功能的标题组件，可以显示标题文本或按钮，
 
 ### 配置参数格式
 
-XTitle 组件通过一个字符串参数进行配置
+XTitle 组件通过一个字符串参数进行配置 
 
 各部分说明：
 
@@ -37,9 +37,6 @@ XTitle 组件通过一个字符串参数进行配置
 
 ### 1. 基本标题
 
-```vue
-<x-title query-params-name="患者信息"></x-title>
-```
 ```vue
 <x-title query-params-name="患者信息-title"></x-title>
 ```
@@ -47,7 +44,7 @@ XTitle 组件通过一个字符串参数进行配置
 ### 2. 带下划线的标题
 
 ```vue
-<x-title query-params-name="患者信息-title-line"></x-title>
+<x-title query-params-name="患者信息-title--line"></x-title>
 ```
 
 ### 3. 自定义下划线颜色和宽度
@@ -56,6 +53,12 @@ XTitle 组件通过一个字符串参数进行配置
 <x-title query-params-name="患者信息-title--line-red-800"></x-title>
 ```
 
+### 4. 带点击事件的标题
+
+```vue
+<x-title query-params-name="患者信息-title-showPatient-line" @showPatient="handleShowPatient"></x-title>
+```
+
 ### 5. 按钮模式
 
 ```vue

package/src/pages/ReportGrid/index.vue

@@ -4,14 +4,13 @@
       @updateImg="updateImg"
       ref="main"
       :use-oss-for-img="false"
-      config-name="outpatientMedicationDispensingMainCover"
+      config-name="outpatientWait"
       server-name="af-his"
       :show-img-in-cell="true"
       :display-only="displayOnly"
       :edit-mode="false"
       :show-save-button="false"
       :dont-format="true"/>
-    <button @click="clickButton()"></button>
   </div>
 </template>
 
@@ -68,9 +67,6 @@ export default {
         result.push(item.exportData())
       })
       console.warn('save', result)
-    },
-    clickButton () {
-      this.findComponentByName(this, 'aaa', 10, 'parent')
     }
   }
 }

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,47 +1,90 @@
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="示例页面"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template slot="button">
+        <a-button @click="add">
+          <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"></WorkflowDetail>
+  </a-card>
+</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'
 
 export default {
-  name: 'WorkFlowDemo',
-  components: { WorkflowDetail },
-  mounted () {
-    this.$refs.workFlow.init({
-      workflowId: '11'
-    })
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'applyCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
   },
   methods: {
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId
-     */
-    success ({ note, form, workflowId }) {
-      console.log('success', note, form, workflowId)
+    add () {
+      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.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
     },
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId 工作流id
-     * @param fromStepId 起ID
-     * @param toStepId 往ID
-     * @param successStepId 完成步骤id
-     * @param successStep 完成步骤名称
-     * @param fromStep 起步骤名称
-     * @param toStep 往步骤名称
-     */
-    nextClick ({ note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep }) {
-      console.log('success', note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep)
+    success () {
+      console.log('完工')
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.twf_id
+      })
     }
   }
 }
 </script>
-
-<template>
-  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
-</template>
-
-<style scoped lang="less">
-
-</style>

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -45,11 +45,11 @@
                   bordered
                 >
                   <a-descriptions-item
-                    v-for="(value,key) in formCompletedDataPreview.data"
-                    :key="key"
+                    v-for="item in formCompletedDataPreview.data"
+                    :key="item.label"
                   >
-                    <span slot="label" style="color: #000">{{ key }}</span>
-                    <div style="white-space: pre-wrap">{{ value }}</div>
+                    <span slot="label" style="color: #000">{{ item.label }}</span>
+                    <div style="white-space: pre-wrap">{{ item.value }}</div>
                   </a-descriptions-item>
                 </a-descriptions>
                 <div v-if="formCompletedDataPreview.note">
@@ -786,33 +786,28 @@ export default {
         formCompletedDataPreview = JSON.parse(JSON.stringify(this.formCompletedData))
         // 使用字段定义中内容，将回显数据的列名，替换为定义的中文名
         const formData = formCompletedDataPreview.data
-        for (const key in formData) {
-          for (let i = 0; i < this.targetStepDefine.length; i++) {
-            const stepDefine = this.targetStepDefine[i]
-            if (key === stepDefine.model) {
-              if (!['FilesId', 'Images'].includes(key)) {
-                // 读取字典值
-                if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
-                  for (const item of this.$appdata.getDictionaryList(stepDefine.selectKey)) {
-                    if (item.value === formData[key]) {
-                      formData[stepDefine.name] = item.label
-                      break
-                    }
-                  }
-                } else {
-                  formData[stepDefine.name] = formData[key]
+        // 新增：有序处理表单数据，保证顺序与formJson一致
+        const orderedFormData = []
+        for (const stepDefine of this.targetStepDefine) {
+          const key = stepDefine.model
+          if (formData && Object.prototype.hasOwnProperty.call(formData, key)) {
+            let value = formData[key]
+            // 读取字典值
+            if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
+              for (const item of this.$appdata.getDictionaryList(stepDefine.selectKey)) {
+                if (item.value === value) {
+                  value = item.label
+                  break
                 }
               }
-              if (key !== stepDefine.name) {
-                delete formData[key]
-              }
-              break
             }
+            orderedFormData.push({
+              label: stepDefine.name,
+              value
+            })
           }
         }
-        if (!Object.keys(formCompletedDataPreview.data).length) {
-          formCompletedDataPreview.data = null
-        }
+        formCompletedDataPreview.data = orderedFormData
         // 备注
         formCompletedDataPreview.note = this.stepsForChild[stepId - 1].note
         if (!formCompletedDataPreview.data && !formCompletedDataPreview.files.length && !formCompletedDataPreview.images.length && !formCompletedDataPreview.note) {

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

@@ -55,17 +55,16 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
-  // component: () => import('@vue2-client/base-client/components/common/XCalendar/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
-  // component: () => import('@vue2-client/base-client/components/his/XCharge/XCharge.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
+  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/XReportGrid/XReportDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/d emo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/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/XForm/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),

package/src/services/api/restTools.js

@@ -1,5 +1,4 @@
 import { getSystemVersion, METHOD, request } from '@vue2-client/utils/request'
-import { fetchEventSource } from '@microsoft/fetch-event-source'
 import { ACCESS_TOKEN, V4_ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 
 /**

package/vue.config.js

@@ -11,12 +11,12 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://aote-office.8866.org:31567'
+const v3Server = 'http://192.168.50.67:31567'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
 // const revenue = 'http://aote-office.8866.org:31567'
-const revenue = 'http://aote-office.8866.org:31567'
+const revenue = 'http://192.168.50.67:31567'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川
@@ -83,7 +83,7 @@ module.exports = {
         // v3用
         // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
         // pathRewrite: { '^/api/': '/' },
-        target: v3Server,
+        target: revenue,
         changeOrigin: true
       },
       '/devApi': {