vue2-client 1.16.21 → 1.16.23

package/package.json

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

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

@@ -1,164 +1,192 @@
-<template>
-  <div class="x-time-select">
-    <div class="time-select-container">
-      <span v-if="label" class="time-select-label">{{ label }}</span>
-
-      <div v-if="type === 'range'" class="picker-wrapper">
-        <a-range-picker
-          :value="dateRange"
-          :placeholder="['开始日期', '结束日期']"
-          separator="至"
-          :disabled="disabled"
-          :allowClear="allowClear"
-          :format="format"
-          @change="handleDateChange"
-        />
-      </div>
-      <div v-if="type === 'date'" class="picker-wrapper">
-        <a-date-picker
-          :value="dateRange"
-          :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,
-      default: null
-    },
-    value: {
-      type: Array,
-      default: () => []
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    allowClear: {
-      type: Boolean,
-      default: true
-    },
-    format: {
-      type: String,
-      default: 'YYYY/MM/DD'
-    }
-  },
-  data () {
-    return {
-      dateRange: [],
-      label: '请选择日期',
-      type: 'range'
-    }
-  },
-  watch: {
-    value: {
-      handler (newVal) {
-        this.convertValueToMoment(newVal)
-      },
-      immediate: true,
-      deep: true
-    },
-    type () {
-      this.convertValueToMoment(this.value)
-    }
-
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  methods: {
-    convertValueToMoment (value) {
-      if (this.type === 'range' && value?.length === 2) {
-        this.dateRange = [
-          value[0] ? moment(value[0]) : null,
-          value[1] ? moment(value[1]) : null
-        ]
-      } else if (this.type === 'date' && value?.length === 1) {
-        this.dateRange = [value[0] ? moment(value[0]) : null]
-      } else {
-        this.dateRange = []
-      }
-    },
-    handleDateChange (dates, dateStrings) {
-      this.dateRange = dates
-      console.warn(dateStrings)
-      this.$emit('change', dateStrings)
-    },
-    async getData (data) {
-      if (data) {
-        getConfigByName(data, 'af-his', res => {
-          if (['date', 'range'].includes(res.type)) {
-            this.type = res.type
-          }
-          if (res.label !== undefined) {
-            this.label = res.label
-          }
-          this.convertValueToMoment(this.value)
-        })
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.x-time-select {
-  position: relative;
-  width: 100%;
-  box-sizing: border-box;
-  display: block;
-}
-
-.time-select-container {
-  display: flex;
-  align-items: center;
-}
-
-.time-select-label {
-  white-space: nowrap;
-  color: rgba(0, 0, 0, 0.85);
-  padding-right: 8px;
-}
-
-.picker-wrapper {
-  flex: 1;
-}
-
-.x-time-select :deep(.ant-picker-range),
-.x-time-select :deep(.ant-picker) {
-  width: 100%;
-  height: 30px;
-  border-radius: 7px;
-  background: #FFFFFF;
-  border: 1px solid #E5E9F0;
-}
-.x-time-select :deep(.ant-calendar-picker) {
-  width: 100%;
-  display: block;
-}
-.x-time-select :deep(.ant-calendar-picker-input) {
-  width: 100%;
-  height: 30px;
-  border-radius: 7px;
-  background: #FFFFFF;
-  border: 1px solid #E5E9F0;
-}
-
-.x-time-select :deep(.ant-input) {
-  width: 100%;
-}
-</style>
+<template>
+  <div class="x-time-select">
+    <div class="time-select-container">
+      <div v-if="type === 'range'" class="picker-wrapper">
+        <a-range-picker
+          :value="dateRange"
+          :placeholder="['开始日期', '结束日期']"
+          separator="至"
+          :disabled="disabled"
+          :allowClear="allowClear"
+          :format="format"
+          @change="handleDateChange"
+        />
+      </div>
+      <div v-if="type === 'date'" class="picker-wrapper">
+        <a-date-picker
+          :value="dateRange[0]"
+          :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,
+      default: null
+    },
+    value: {
+      type: Array,
+      default: () => []
+    },
+    defaultTime: {
+      type: Array,
+      default: () => []
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    allowClear: {
+      type: Boolean,
+      default: true
+    },
+    format: {
+      type: String,
+      default: 'YYYY/MM/DD'
+    }
+  },
+  data () {
+    return {
+      dateRange: [],
+      type: 'range'
+    }
+  },
+  watch: {
+    value: {
+      handler (newVal) {
+        this.convertValueToMoment(newVal)
+      },
+      immediate: true,
+      deep: true
+    },
+    defaultTime: {
+      handler (newVal) {
+        // 只有在没有传入value时才使用defaultTime
+        if (!this.value || this.value.length === 0) {
+          this.convertValueToMoment(newVal)
+        }
+      },
+      immediate: true,
+      deep: true
+    },
+    type () {
+      this.convertValueToMoment(this.value)
+    }
+
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    convertValueToMoment (value) {
+      // 如果没有传入value或value为空，则使用defaultTime
+      const timeToUse = (value && value.length > 0) ? value : this.defaultTime
+      if (this.type === 'range' && timeToUse?.length === 2) {
+        this.dateRange = [
+          timeToUse[0] ? moment(timeToUse[0]) : null,
+          timeToUse[1] ? moment(timeToUse[1]) : null
+        ]
+      } else if (this.type === 'date' && timeToUse?.length === 1) {
+        this.dateRange = [timeToUse[0] ? moment(timeToUse[0]) : null]
+      } else {
+        this.dateRange = []
+      }
+    },
+    handleDateChange (dates, dateStrings) {
+      if (this.type === 'date') {
+        // 单个日期选择器，dates是一个moment对象或null
+        this.dateRange = [dates]
+      } else {
+        // 范围选择器，dates是一个数组
+        this.dateRange = dates
+      }
+      this.$emit('change', dateStrings)
+    },
+    async getData (data) {
+      if (data) {
+        getConfigByName(data, 'af-his', res => {
+          if (['date', 'range'].includes(res.type)) {
+            this.type = res.type
+          }
+          // 处理format配置
+          if (res.format !== undefined) {
+            this.format = res.format
+          }
+          // 处理defaultTime配置
+          if (res.defaultTime !== undefined) {
+            if (res.defaultTime === 'now') {
+              // 如果配置为'now'，设置当前时间
+              const now = moment().format(this.format)
+              if (this.type === 'range') {
+                this.defaultTime = [now, now]
+              } else if (this.type === 'date') {
+                this.defaultTime = [now]
+              }
+            } else if (Array.isArray(res.defaultTime)) {
+              // 如果配置为数组，直接使用
+              this.defaultTime = res.defaultTime
+            }
+          }
+          this.convertValueToMoment(this.value)
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.x-time-select {
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  display: block;
+}
+
+.time-select-container {
+  display: flex;
+  align-items: center;
+}
+
+.picker-wrapper {
+  flex: 1;
+}
+
+.x-time-select :deep(.ant-picker-range),
+.x-time-select :deep(.ant-picker) {
+  width: 100%;
+  height: 30px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
+.x-time-select :deep(.ant-calendar-picker) {
+  width: 100%;
+  display: block;
+}
+.x-time-select :deep(.ant-calendar-picker-input) {
+  width: 100%;
+  height: 30px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
+
+.x-time-select :deep(.ant-input) {
+  width: 100%;
+}
+</style>

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

@@ -2,7 +2,8 @@
   <!--    <Source src="/code/VitalSigns.vue"></Source>-->
   <div>
     <a-row class="box">
-      病历号&nbsp;&nbsp;<a-input v-model="vitalSignsId" style="width: 160px"></a-input>
+      <!-- 病历号输入框已隐藏，通过setMedicalRecordId方法设置vitalSignsId -->
+      <!-- 病历号&nbsp;&nbsp;<a-input v-model="vitalSignsId" style="width: 160px"></a-input> -->
       <a-button-group style="margin-left: 20px;">
         <a-button
           v-if="showCreateButton"
@@ -400,7 +401,7 @@ function mergeAndTransformData (records, patientInfo, id, date, operateDate) {
 // 设置病历号的方法
 function setMedicalRecordId (id) {
   vitalSignsId.value = id
-  console.log('病历号已设置为:', vitalSignsId.value)
+  // console.log('病历号已设置为:', vitalSignsId.value)
 }
 // 生命周期钩子
 onMounted(() => {