vue2-client 1.14.46 → 1.14.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.46",
+  "version": "1.14.48",
   "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

@@ -75,10 +75,9 @@
         :column="{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 1, xs: 1 }"
       >
         <a-descriptions-item label="坐标" span="2"><span>{{ addressObj.lng_lat }}</span></a-descriptions-item>
-        <a-descriptions-item label="地址" span="2"><span>{{ addressObj.address }}</span></a-descriptions-item>
+        <a-descriptions-item label="地址" span="2" v-if="attr.type != 'coordinateSearch'"><span>{{ addressObj.address }}</span></a-descriptions-item>
       </a-descriptions>
     </a-modal>
-    <!--    -->
   </div>
 </template>
 <script>
@@ -315,18 +314,33 @@ export default {
       let result
       if (this.searchResultType !== 'Default') {
         if (this.searchResultType === 'Array') {
-          result = [_addstr || this.addressObj.address, this.addressObj.lng_lat]
+          // 如果是坐标搜索，只返回坐标
+          if (this.attr.type === 'coordinateSearch') {
+            result = [this.addressObj.lng_lat]
+          } else {
+            result = [_addstr || this.addressObj.address, this.addressObj.lng_lat]
+          }
         } else {
           result = {}
-          result[this.resultKeys.address] = _addstr || this.addressObj.address
-          result[this.resultKeys.coords] = this.addressObj.lng_lat
+          // 如果是坐标搜索，只返回坐标
+          if (this.attr.type === 'coordinateSearch') {
+            result[this.resultKeys.coords] = this.addressObj.lng_lat
+          } else {
+            result[this.resultKeys.address] = _addstr || this.addressObj.address
+            result[this.resultKeys.coords] = this.addressObj.lng_lat
+          }
         }
       }
       this.visible = false
       this.$emit('onSelect', JSON.stringify(result))
       // 如果传递了地址 是为了更新上级 不做省市区检验处理
       if (!_addstr) {
-        this.addressInput = this.addressObj.address
+        // 如果是坐标搜索，输入框显示坐标
+        if (this.attr.type === 'coordinateSearch') {
+          this.addressInput = this.addressObj.lng_lat
+        } else {
+          this.addressInput = this.addressObj.address
+        }
         this.$emit('onDivisionsChange', Object.assign({}, result, { divisions: this.divisions, vm: this }))
       }
     },

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -435,7 +435,7 @@
   </x-form-col>
   <!-- 地点搜索框 -->
   <x-form-col
-    v-else-if="attr.type === 'addressSearch' && show"
+    v-else-if="(attr.type === 'addressSearch' || attr.type === 'coordinateSearch') && show"
     :labelCol="labelCol"
     :occupyCol="attr.occupyCol"
     :flex="attr.flex">
@@ -898,7 +898,7 @@ export default {
           this.debouncedShowQueryFormItemFunc()
         }
         // 地址搜索框赋值
-        if (this.attr.type === 'addressSearch') {
+        if (this.attr.type === 'addressSearch' || this.attr.type === 'coordinateSearch') {
           this.$refs.addressSearchCombobox.addressInput = this.form[this.attr.model]
         }
         // 数据源来自人员联动时更新数据

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

@@ -4,7 +4,7 @@
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        config-name="收费组件Config"
+        config-name="openPrescriptionCover"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"

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

@@ -7,39 +7,9 @@
     <span slot="time" class="time-title">
       <span v-for="(item, index) in configData.timePeriod" :key="index">{{ item }}</span>
     </span>
-    <template slot="Monday" slot-scope="text, record">
-      <div class="time-title">
-        <a-button v-for="(item, index) in record.Monday" :key="index" @click="handleShiftChange('Monday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
-      </div>
-    </template>
-    <template slot="Tuesday" slot-scope="text, record">
-      <div class="time-title">
-        <a-button v-for="(item, index) in record.Tuesday" :key="index" @click="handleShiftChange('Tuesday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
-      </div>
-    </template>
-    <template slot="Wednesday" slot-scope="text, record">
-      <div class="time-title">
-        <a-button v-for="(item, index) in record.Wednesday" :key="index" @click="handleShiftChange('Wednesday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
-      </div>
-    </template>
-    <template slot="Thursday" slot-scope="text, record">
-      <div class="time-title">
-        <a-button v-for="(item, index) in record.Thursday" :key="index" @click="handleShiftChange('Thursday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
-      </div>
-    </template>
-    <template slot="Friday" slot-scope="text, record">
-      <div class="time-title">
-        <a-button v-for="(item, index) in record.Friday" :key="index" @click="handleShiftChange('Friday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
-      </div>
-    </template>
-    <template slot="Saturday" slot-scope="text, record">
-      <div class="time-title">
-        <a-button v-for="(item, index) in record.Saturday" :key="index" @click="handleShiftChange('Saturday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
-      </div>
-    </template>
-    <template slot="Sunday" slot-scope="text, record">
-      <div class="time-title">
-        <a-button v-for="(item, index) in record.Sunday" :key="index" @click="handleShiftChange('Sunday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
+    <template :slot="day.key" slot-scope="text, record" v-for="day in shiftTable">
+      <div class="time-title" :key="day.key">
+        <a-button v-for="(item, index) in record[day.key]" :key="index" @click="handleShiftChange(day.key, index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
       </div>
     </template>
     <template slot="sk_limit" slot-scope="text, record">

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

@@ -2,10 +2,11 @@
   <div class="x-time-select">
     <div class="time-select-container">
       <span v-if="label" class="time-select-label">{{ label }}</span>
-      <div class="picker-wrapper">
+
+      <div v-if="type === 'range'" class="picker-wrapper">
         <a-range-picker
           :value="dateRange"
-          :placeholder="['开始日期', '结束日期']"
+          :placeholder="['开始日期', '结束日期 ']"
           separator="至"
           :disabled="disabled"
           :allowClear="allowClear"
@@ -13,15 +14,26 @@
           @change="handleDateChange"
         />
       </div>
+      <div v-if="type === 'date'" class="picker-wrapper">
+        <a-date-picker
+          :format="format"
+          :disabled="disabled"
+          :allowClear="allowClear"
+          @change="handleDateChange"
+        />
+      </div>
+
     </div>
   </div>
 </template>
 
 <script>
 import moment from 'moment'
+import { getConfigByName } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XTimeSelect',
+  inject: ['getComponentByName'],
   props: {
     queryParamsName: {
       type: String,
@@ -47,7 +59,8 @@ export default {
   data () {
     return {
       dateRange: [],
-      label: ''
+      label: '',
+      type: 'range'
     }
   },
   watch: {
@@ -58,6 +71,8 @@ export default {
             newVal[0] ? moment(newVal[0]) : null,
             newVal[1] ? moment(newVal[1]) : null
           ]
+        } else if (newVal && this.type === 'date' && newVal.length === 1) {
+          this.dateRange = [newVal[0] ? moment(newVal[0]) : null]
         } else {
           this.dateRange = []
         }
@@ -75,8 +90,15 @@ export default {
       console.warn(dateStrings)
       this.$emit('change', dateStrings)
     },
-    getData (data) {
-      this.label = data
+    async getData (data) {
+      getConfigByName(data, 'af-his', res => {
+         if (['date', 'range'].includes(res.type)) {
+           this.type = res.type
+         }
+         if (res.label !== undefined) {
+           this.label = res.label
+         }
+      })
     }
   }
 }

package/src/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue

@@ -0,0 +1,23 @@
+<script>
+  import XTimeSelect from '@/base-client/components/his/XTimeSelect/XTimeSelect.vue'
+  export default {
+    name: 'XTimeSelectDemo',
+    components: {
+      XTimeSelect,
+    },
+    data () {
+      return {
+        queryParamsName: 'expenseManagementDatePicker'
+      }
+    }
+  }
+</script>
+
+<template>
+  <x-time-select :queryParamsName="queryParamsName">
+  </x-time-select>
+</template>
+
+<style scoped>
+
+</style>

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/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/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/utils/common.js

@@ -8,35 +8,3 @@ export async function blobValidate (data) {
     return true
   }
 }
-export function findComponentByName (instance, componentName, maxDepth = 50) {
-  // 基础判断：如果实例不存在或者已经超过最大深度，返回null
-  if (!instance || maxDepth <= 0) {
-    return null
-  }
-
-  // 检查当前实例是否有目标组件
-  try {
-    if (instance.getComponentByName && instance.getComponentByName(componentName)) {
-      return instance.getComponentByName(componentName)
-    }
-  } catch (e) {
-    console.warn('查找组件时发生错误:', e)
-  }
-
-  // 递归查找子组件
-  if (instance.$children && instance.$children.length) {
-    for (const child of instance.$children) {
-      const result = findComponentByName(child, componentName, maxDepth - 1)
-      if (result) {
-        return result
-      }
-    }
-  }
-
-  // 向上查找父组件
-  if (instance.$parent) {
-    return findComponentByName(instance.$parent, componentName, maxDepth - 1)
-  }
-
-  return null
-}

package/vue.config.js

@@ -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': {