vue2-client 1.14.76 → 1.14.78

package/src/base-client/components/his/threeTestOrders/editor.vue

@@ -1,111 +1,111 @@
-<template>
-  <!-- 根据实际部署环境修改 editor.html 的路径 -->
-  <iframe
-    src="/his/editor/editor.html"
-    width="100%"
-    height="800"
-    frameborder="0"
-    @load="onIframeLoad"
-    ref="editorIframe">
-  </iframe>
-</template>
-
-<script setup>
-
-import { ref, onBeforeUnmount } from 'vue'
-
-const editorIframe = ref(null)
-const checkEditorTimer = ref(null)
-const checkCount = ref(0)
-const editor = ref(null)
-const iframeWindow = ref(null)
-// 对外暴露的获取editor方法
-const getEditor = () => {
-  if (editor.value) {
-    return editor.value
-  }
-  if (iframeWindow.value && iframeWindow.value.editor) {
-    editor.value = iframeWindow.value.editor
-    return editor.value
-  }
-  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
-    editor.value = editorIframe.value.contentWindow.editor
-    return editor.value
-  }
-  return null
-}
-// 创建体温单方法
-const createVitalSigns = (data) => {
-  const editorObj = getEditor()
-  if (!editorObj) {
-    throw new Error('editor对象未初始化，无法创建体温单')
-  }
-  if (typeof editorObj.createVitalSigns === 'function') {
-    return editorObj.createVitalSigns(data)
-  } else {
-    throw new Error('editor对象未包含createVitalSigns方法')
-  }
-}
-
-// 检查editor对象是否已初始化
-const startEditorCheck = (frameWindow, iframe) => {
-  if (checkEditorTimer.value) {
-    clearInterval(checkEditorTimer.value)
-  }
-  checkCount.value = 0
-  checkEditorTimer.value = setInterval(() => {
-    checkCount.value++
-    try {
-      const editorObj = frameWindow.editor
-      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
-        clearInterval(checkEditorTimer.value)
-        editor.value = editorObj
-        // 将editor对象暴露到全局
-        window.iframeEditor = editorObj
-        window.iframeWindow = frameWindow
-        // 触发事件
-        emit('editor-ready', editorObj)
-        emit('load', { target: iframe, editor: editorObj })
-        // 发送消息通知
-        window.parent.postMessage({ type: 'editorReady' }, '*')
-      }
-    } catch (err) {
-      console.error('检查editor对象时出错:', err)
-    }
-    if (checkCount.value >= 20) {
-      clearInterval(checkEditorTimer.value)
-      console.error('Editor 对象加载失败')
-    }
-  }, 500)
-}
-// iframe加载完成的处理
-const onIframeLoad = (e) => {
-  const iframe = e.target
-  const frameWindow = iframe.contentWindow
-  iframeWindow.value = frameWindow
-  if (!frameWindow) {
-    console.error('无法访问 iframe 内容')
-    return
-  }
-  startEditorCheck(frameWindow, iframe)
-}
-// 组件销毁前清理
-onBeforeUnmount(() => {
-  if (checkEditorTimer.value) {
-    clearInterval(checkEditorTimer.value)
-  }
-})
-// 暴露方法给父组件
-defineExpose({ getEditor, createVitalSigns })
-
-// 定义事件
-const emit = defineEmits(['editor-ready', 'load'])
-</script>
-
-<style scoped>
-iframe {
-  border: none;
-  width: 100%;
-  min-height: 800px;
-}
-</style>
+<template>
+  <!-- 根据实际部署环境修改 editor.html 的路径 -->
+  <iframe
+    src="/his/editor/editor.html"
+    width="100%"
+    height="800"
+    frameborder="0"
+    @load="onIframeLoad"
+    ref="editorIframe">
+  </iframe>
+</template>
+
+<script setup>
+
+import { ref, onBeforeUnmount } from 'vue'
+
+const editorIframe = ref(null)
+const checkEditorTimer = ref(null)
+const checkCount = ref(0)
+const editor = ref(null)
+const iframeWindow = ref(null)
+// 对外暴露的获取editor方法
+const getEditor = () => {
+  if (editor.value) {
+    return editor.value
+  }
+  if (iframeWindow.value && iframeWindow.value.editor) {
+    editor.value = iframeWindow.value.editor
+    return editor.value
+  }
+  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
+    editor.value = editorIframe.value.contentWindow.editor
+    return editor.value
+  }
+  return null
+}
+// 创建体温单方法
+const createVitalSigns = (data) => {
+  const editorObj = getEditor()
+  if (!editorObj) {
+    throw new Error('editor对象未初始化，无法创建体温单')
+  }
+  if (typeof editorObj.createVitalSigns === 'function') {
+    return editorObj.createVitalSigns(data)
+  } else {
+    throw new Error('editor对象未包含createVitalSigns方法')
+  }
+}
+
+// 检查editor对象是否已初始化
+const startEditorCheck = (frameWindow, iframe) => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+  checkCount.value = 0
+  checkEditorTimer.value = setInterval(() => {
+    checkCount.value++
+    try {
+      const editorObj = frameWindow.editor
+      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
+        clearInterval(checkEditorTimer.value)
+        editor.value = editorObj
+        // 将editor对象暴露到全局
+        window.iframeEditor = editorObj
+        window.iframeWindow = frameWindow
+        // 触发事件
+        emit('editor-ready', editorObj)
+        emit('load', { target: iframe, editor: editorObj })
+        // 发送消息通知
+        window.parent.postMessage({ type: 'editorReady' }, '*')
+      }
+    } catch (err) {
+      console.error('检查editor对象时出错:', err)
+    }
+    if (checkCount.value >= 20) {
+      clearInterval(checkEditorTimer.value)
+      console.error('Editor 对象加载失败')
+    }
+  }, 500)
+}
+// iframe加载完成的处理
+const onIframeLoad = (e) => {
+  const iframe = e.target
+  const frameWindow = iframe.contentWindow
+  iframeWindow.value = frameWindow
+  if (!frameWindow) {
+    console.error('无法访问 iframe 内容')
+    return
+  }
+  startEditorCheck(frameWindow, iframe)
+}
+// 组件销毁前清理
+onBeforeUnmount(() => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+})
+// 暴露方法给父组件
+defineExpose({ getEditor, createVitalSigns })
+
+// 定义事件
+const emit = defineEmits(['editor-ready', 'load'])
+</script>
+
+<style scoped>
+iframe {
+  border: none;
+  width: 100%;
+  min-height: 800px;
+}
+</style>

package/src/pages/addressSelect/addressDemo.vue

@@ -0,0 +1,24 @@
+<template>
+  <!--  测试界面——测试地址选择新增组件-->
+  <div>
+    <a-button @click="open">打开选择地址弹窗</a-button>
+    <address-select :addressShow="showDialog"/>
+  </div>
+</template>
+
+  <script>
+  import AddressSelect from '@/pages/addressSelect'
+
+  export default {
+    components: { AddressSelect },
+    data: () => ({
+      showDialog: false
+    }),
+    methods: {
+      open () {
+        console.log('打开选择地址弹窗')
+        this.showDialog = true
+      }
+    }
+  }
+  </script>

package/src/pages/addressSelect/index.vue

@@ -0,0 +1,259 @@
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+export default {
+  components: {
+    XFormTable
+  },
+  props: {
+    addressShow: {
+      required: true,
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    addressShow (val) {
+      this.selectAddressVisible = val
+    },
+    'form.f_address_type' (newVal, oldVal) {
+      this.onAddressTypeChange(newVal, oldVal)
+    }
+  },
+  data () {
+    return {
+      selectAddressVisible: false,
+      addAddressFlag: false,
+      form: {
+        f_address_type: '',
+        f_residential_area_id: '',
+        f_residential_area: '',
+        f_iscity: ''
+      },
+      addressModel: [
+        {
+          expression: '{f_building}楼号{f_unit}单元{f_floor}楼层{f_room}门牌号',
+          label: '城市',
+          value: '城市'
+        },
+        {
+          expression: '{f_building}组{f_unit}号',
+          label: '乡镇',
+          value: '乡镇'
+        },
+        {
+          expression: '{f_address}',
+          label: '自定义',
+          value: '自定义'
+        }
+      ],
+      labelCol: { span: 4 },
+      wrapperCol: { span: 20 },
+      formItems: [],
+      areaList: [],
+      signContractVisible: false
+    }
+  },
+  methods: {
+    selAddress (record) {
+      // 给表单赋值
+      const form = {
+        f_address: record.tua_f_address,
+        f_address_id: record.tua_id
+      }
+      console.log('选择了地址是', form)
+      this.$emit('selAddress', form)
+      this.selectAddressVisible = false
+    },
+    addAddress () {
+      // 获取地址模式配置
+      getConfigByName('addressTypeDic', 'af-revenue', (res) => {
+        // 地址模式赋值
+        if (res.value?.length) {
+          this.addressModel = res.value
+        }
+        // 赋值默认地址模式
+        this.form = { f_address_type: this.addressModel[0].value }
+        this.addAddressFlag = true
+        this.addAddressMsg = '添加地址'
+        this.onAddressTypeChange()
+      })
+    },
+    onAddressTypeChange (newVal, oldVal) {
+      const selectedModel = this.addressModel.find(item => item.value === this.form.f_address_type)
+      Object.keys(this.form).forEach(key => {
+        if (key.endsWith('_suffix')) {
+          this.form[key] = ''
+        }
+      })
+      if (selectedModel) {
+        const matches = selectedModel.expression.match(/{(.*?)}([^{}]*)(?={|$)/g)
+        this.formItems = matches.map(item => {
+          const value = item.match(/{(.*?)}/)[1]
+          const label = item.replace(/{.*?}/, '').trim()
+          // 处理后缀
+          this.form[`${value}_suffix`] = label
+          return {
+            label: label || (value === 'f_address' ? '' : value), // 如果存在后面的文字，就使用后面的文字作为 label，否则使用原来的值
+            value: `${value}`
+          }
+        })
+      }
+    },
+    handleSearch (value) {
+      this.getAreaList(value)
+    },
+    getAreaList (value) {
+      console.log('搜索小区', this.currUser.orgid)
+      runLogic('getAreaListByName', {
+        orgId: this.currUser.orgid,
+        name: value
+      }, 'af-revenue').then(res => {
+        console.log(res)
+        this.areaList = res
+      })
+    },
+    handleChange (value) {
+      this.form.f_residential_area = this.areaList.find(item => item.value === value).label
+      console.log(this.form.f_residential_area)
+    },
+    addressSubmit () {
+      if (!this.form.f_residential_area) {
+        this.$message.warning('请选择小区')
+        return
+      }
+      this.deleteAddressData()
+      runLogic('addAddress', Object.assign({}, this.form, {
+        f_address: this.generateAddressString()
+      }, {
+        orgid: this.currUser.orgid,
+        f_orgid: this.currUser.orgid,
+        f_orgname: this.currUser.orgs,
+        f_depid: this.currUser.depids,
+        f_depname: this.currUser.deps,
+        f_operatorid: this.currUser.id,
+        f_operator: this.currUser.name,
+        f_filialeid: this.currUser.orgid
+      }), 'af-revenue').then(res => {
+        if (res) {
+          this.$message.success(`${this.addAddressMsg}成功`)
+          this.addAddressFlag = false
+          this.refresh()
+        }
+      })
+    },
+    // 删除 addressData 中存在 addressModel 不存在的字段
+    deleteAddressData () {
+      // 目前只需要检查这几个key
+      const keys = ['f_building', 'f_unit', 'f_floor', 'f_room']
+      Object.keys(this.form).forEach(key => {
+        if (keys.includes(key) && !this.formItems.some(item => item.value === key)) {
+          this.form[key] = ''
+          this.form[`${key}_suffix`] = ''
+        }
+      })
+    },
+    generateAddressString () {
+      const selectedModel = this.addressModel.find(item => item.value === this.form.f_address_type)
+      if (selectedModel) {
+        let addressString = selectedModel.expression
+        this.formItems.forEach(item => {
+          const value = this.form[item.value]
+          addressString = addressString.replace(`{${item.value}}`, value)
+        })
+        return addressString
+      }
+      return ''
+    },
+  },
+  computed: {
+    inputWidth () {
+      if (this.formItems.length === 1) {
+        return '85%'
+      }
+      return this.formItems.length ? `${65 / this.formItems.length}%` : '85%'
+    },
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+}
+
+</script>
+
+<template>
+  <div>
+    <!-- 地址弹出框 -->
+    <a-modal
+      v-model="selectAddressVisible"
+      :dialog-style="{ top: '30px' }"
+      :bodyStyle="{height:'70vh',overflowY:'scroll'}"
+      :destroy-on-close="true"
+      :z-index="1002"
+      title="选择地址"
+      :footer="null"
+      width="80vw">
+      <x-form-table
+        title="选择地址"
+        queryParamsName="userfiles_sel_address"
+        @action="selAddress"
+        serviceName="af-revenue"
+        :extraHeight="225"
+        ref="selAddressXFormTable">
+        <template #leftButton="{selectedRows}">
+          <a-button
+            type="primary"
+            :disabled="selectedRows?.length !== 1"
+            @click="selAddress(selectedRows[0])"> 选择地址</a-button>
+          <a-button
+            type="primary"
+            @click="addAddress"> 新建地址
+          </a-button>
+        </template>
+      </x-form-table>
+    </a-modal>
+    <!--  添加地址  -->
+    <a-modal
+      v-model="addAddressFlag"
+      :dialog-style="{ top: '30px' }"
+      :z-index="1005"
+      @ok="addressSubmit"
+      @cancel="addAddressFlag = false"
+      title="新增地址信息"
+      :destroyOnClose="true">
+      <a-form-model :model="form" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-form-model-item label="小区">
+          <a-select
+            show-search
+            placeholder="请选择小区"
+            option-filter-prop="children"
+            @search="handleSearch"
+            style="width: 200px"
+            @change="handleChange"
+          >
+            <a-select-option v-for="item in areaList" :value="item.value" :key="item">
+              {{ item.label }}
+            </a-select-option>
+          </a-select>
+        </a-form-model-item>
+        <a-form-model-item label="地址类型">
+          <a-radio-group v-model="form.f_address_type">
+            <a-radio :value="item.value" v-for="(item, index) in addressModel" :key="index">
+              {{ item.label }}
+            </a-radio>
+          </a-radio-group>
+        </a-form-model-item>
+        <a-form-model-item label="详细地址">
+          <div v-for="(item, index) in formItems" :key="index" style="display: inline;white-space: nowrap">
+            <a-input v-model="form[item.value]" style="display: inline;" :style="{ width: inputWidth }"/>
+            <span>{{ item.label }}</span>
+          </div>
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+  </div>
+</template>
+
+<style>
+
+</style>

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

@@ -55,6 +55,7 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
+  // component: () => import('@vue2-client/pages/addressSelect/addressDemo.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'),

package/.history/public/his/editor/editor_20250606134713.html

@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8"/>
-        <link rel="shortcut icon" href="./favicon.svg" type="image/svg+xml"/>
-        <link rel="stylesheet" href="./vender/jquery/zTreeStyle/zTreeStyle.css" type="text/css">
-        <script src = "./vender/jquery/jquery.js"></script>
-        <script src = "./vender/date97/WdatePicker.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.core.min.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.exedit.min.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.exhide.min.js"></script>
-        <script src = "./vender/codemirror.js"></script>
-        <script src = "./vender/fabric.js"></script>
-        <script src="./vender/editor.js"></script>
-        <script>
-          $(function() {
-            //配置项可以不设置，会使用默认设置
-            let option = {
-                license:'QO1pepfLYwDNqGvW21ensj0psE9CxBxf5MSRD1q2sCvclYGGtk6clTZEIth12i4SvvvDC04ZNcHe3uQuNtBUFcAk7sHUwAdYvffM2aZis/jpZqrm1rDGk1NHYsheD6DroF+m3jZ5Izh/LxRjzZJfaHHejfrn5InFoSqErfPm4gY=',
-                mode:'form',  //默认模式 form:表单模式，design:设计模式
-                pdfUrl:'https://www.x-emr.cn/pdf/post',  //pdf生成服务
-                dictionary: [  //知识库
-                    {name: '体征', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=20', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '症状', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=20', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '卫生信息数据元', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=40', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '电子病历数据集', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=50', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '国家医保标准', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=80', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '省数据平台标准', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=90', itemUrl:'https://www.x-emr.cn/dictitem'},
-                ]
-            }
-
-            //从模块的Editor组件中获取mode，doc，lang属性 (该段代码可删除)
-            let mode = window.frameElement.getAttribute('mode')
-            let doc = window.frameElement.getAttribute('doc')
-            let lang = window.frameElement.getAttribute('lang')
-            mode? option.mode = mode: null
-            lang? option.lang = lang: null
-
-            //初始化编辑器（初始化代码可以放入组件的load事件中）
-            editor.init(option).then(()=>{
-                doc? editor.loadUrl(doc) : null
-            })
-
-          })
-      </script>
-    </head>
-    <body>
-        <!-- 默认id 为editor -->
-        <div id="editor" style="width:100%; height:100%;"></div>
-    </body>
-</html>