vue2-client 1.14.33 → 1.14.35

package/package.json

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

@@ -118,7 +118,7 @@ export default {
       // 生成地址串中省市区街道信息禁止修改
       readOnlyDivisions: false,
       // cur 位置
-      curPosition: null,
+      curPosition: [108.878703, 34.223701],
       searchFlag: false,
     }
   },
@@ -291,7 +291,7 @@ export default {
 
       this.addressObj.address = addressMatch ? addressMatch[1].trim() : null
       const label = labelMatch ? labelMatch[1].trim() : null
-      this.addressObj.address = this.mergeAddressAndLabel(this.addressObj.address, label)
+      this.addressObj.address = this.addressObj.address != null ? this.mergeAddressAndLabel(this.addressObj.address, label) : labelMatch[1].trim()
       this.addressObj.lng_lat = coordinatesMatch ? coordinatesMatch[1] : ''
 
       // 更新地图中心和标记位置
@@ -436,7 +436,7 @@ export default {
 #addressSearchCombobox_map {
   margin: 1% 0;
   width: 100%;
-  height: 600px;
+  height: 50vh;
   text-align: center
 }
 

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

@@ -1,261 +1,252 @@
-<template>
-  <a-table
-    :columns="columns"
-    :data-source="data"
-    :rowSelection="rowSelection"
-  >
-    <span slot="time" class="time-title">
-      <span>上</span>
-      <span>下</span>
-      <span>晚</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>
-      </div>
-    </template>
-    <template slot="sk_limit"  slot-scope="text, record">
-      <a-input-number id="inputNumber" v-model="record.sk_limit" :min="1" :max="100" />
-    </template>
-  </a-table>
-</template>
-<script>
-import { runLogic } from '@vue2-client/services/api/common'
-
-const columns = [
-  {
-    title: '科室',
-    dataIndex: 'dept',
-    key: 'dept',
-    scopedSlots: { customRender: 'dept' },
-    align: 'center'
-  },
-  {
-    title: '人员',
-    dataIndex: 'personnel',
-    key: 'personnel',
-    align: 'center'
-  },
-  {
-    title: '职位',
-    dataIndex: 'position',
-    key: 'position',
-    align: 'center'
-  },
-  {
-    title: '上/下/晚',
-    dataIndex: 'time',
-    key: 'time',
-    scopedSlots: { customRender: 'time' },
-    align: 'center'
-  },
-  {
-    title: '周一',
-    key: 'Monday',
-    dataIndex: 'Monday',
-    scopedSlots: { customRender: 'Monday' },
-    align: 'center'
-  },
-  {
-    title: '周二',
-    key: 'Tuesday',
-    dataIndex: 'Tuesday',
-    scopedSlots: { customRender: 'Tuesday' },
-    align: 'center'
-  },
-  {
-    title: '周三',
-    key: 'Wednesday',
-    dataIndex: 'Wednesday',
-    scopedSlots: { customRender: 'Wednesday' },
-    align: 'center'
-  },
-  {
-    title: '周四',
-    key: 'Thursday',
-    dataIndex: 'Thursday',
-    scopedSlots: { customRender: 'Thursday' },
-    align: 'center'
-  },
-  {
-    title: '周五',
-    key: 'Friday',
-    dataIndex: 'Friday',
-    scopedSlots: { customRender: 'Friday' },
-    align: 'center'
-  },
-  {
-    title: '周六',
-    key: 'Saturday',
-    dataIndex: 'Saturday',
-    scopedSlots: { customRender: 'Saturday' },
-    align: 'center'
-  },
-  {
-    title: '周日',
-    key: 'Sunday',
-    dataIndex: 'Sunday',
-    scopedSlots: { customRender: 'Sunday' },
-    align: 'center'
-  },
-  {
-    title: '排班数',
-    key: 'sk_limit',
-    dataIndex: 'sk_limit',
-    scopedSlots: { customRender: 'sk_limit' },
-    align: 'center'
-  }
-]
-
-export default {
-  data () {
-    return {
-      data: [],
-      columns,
-      weekDate: [],
-      // 选中的行键值集合
-      selectedRows: [],
-      // 选中的行信息集合
-      selectedRowKeys: []
-    }
-  },
-  computed: {
-    rowSelection () {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: (selectedRowKeys, selectedRows) => {
-          this.onSelectChange(selectedRowKeys, selectedRows)
-        }
-      }
-    }
-  },
-  mounted () {
-    this.init()
-  },
-  methods: {
-    handleShiftChange (day, index, record) {
-      // 找到当前记录在data中的索引
-      const dataIndex = this.data.findIndex(item => item.id === record.id)
-      if (dataIndex === -1) return
-      // 获取当前状态
-      const currentValue = record[day][index]
-      const newValue = currentValue === 1 || currentValue === '1' ? 0 : 1
-      // 更新按钮显示
-      this.$set(record[day], index, newValue)
-      // 同步更新data中的数据
-      this.$set(this.data[dataIndex][day], index, newValue)
-      console.log('当前操作的行数据：', this.data[dataIndex])
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-      console.log('selectedRows changed: ', selectedRows)
-    },
-    // 获取选中的行数据
-    getSelectedRowData () {
-      return this.selectedRows
-    },
-    getAllTable() {
-      return this.data
-    },
-    init () {
-      runLogic('shiftSchedulingLOGIC', {}, 'af-his').then(res => {
-        if (res && Array.isArray(res)) {
-          let key = 0
-          this.data = res.map(item => {
-            // 转换排班数据格式
-            const scheduleData = {
-              key: key++,
-              id: item.id,
-              dept: item.dept,
-              personnel: item.personnel,
-              position: item.position || '',
-              selected_id: item.selected_id,
-              sk_limit: item.sk_limit || 0,
-              Monday: [
-                item.f_monday_am === '1' ? 1 : 0,
-                item.f_monday_pm === '1' ? 1 : 0,
-                item.f_monday_evening === '1' ? 1 : 0
-              ],
-              Tuesday: [
-                item.f_tuesday_am === '1' ? 1 : 0,
-                item.f_tuesday_pm === '1' ? 1 : 0,
-                item.f_tuesday_evening === '1' ? 1 : 0
-              ],
-              Wednesday: [
-                item.f_wednesday_am === '1' ? 1 : 0,
-                item.f_wednesday_pm === '1' ? 1 : 0,
-                item.f_wednesday_evening === '1' ? 1 : 0
-              ],
-              Thursday: [
-                item.f_thursday_am === '1' ? 1 : 0,
-                item.f_thursday_pm === '1' ? 1 : 0,
-                item.f_thursday_evening === '1' ? 1 : 0
-              ],
-              Friday: [
-                item.f_friday_am === '1' ? 1 : 0,
-                item.f_friday_pm === '1' ? 1 : 0,
-                item.f_friday_evening === '1' ? 1 : 0
-              ],
-              Saturday: [
-                item.f_saturday_am === '1' ? 1 : 0,
-                item.f_saturday_pm === '1' ? 1 : 0,
-                item.f_saturday_evening === '1' ? 1 : 0
-              ],
-              Sunday: [
-                item.f_sunday_am === '1' ? 1 : 0,
-                item.f_sunday_pm === '1' ? 1 : 0,
-                item.f_sunday_evening === '1' ? 1 : 0
-              ]
-            }
-            return scheduleData
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped type="less">
-.time-title {
-  display: flex !important;
-  flex-direction: column !important;
-  align-items: center !important;
-}
-::v-deep .ant-table-thead > tr > th,
-::v-deep .ant-table-tbody > tr > td {
-  padding: 8px 16px !important;
-  overflow-wrap: break-word;
-}
-</style>
+<template>
+  <a-table
+    :columns="columns"
+    :data-source="data"
+    :rowSelection="rowSelection"
+    :scroll="{ y: '75vh' }">
+    <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>
+      </div>
+    </template>
+    <template slot="sk_limit"  slot-scope="text, record">
+      <a-input-number id="inputNumber" v-model="record.sk_limit" :min="configData.sk_limitMin" :max="configData.sk_limitMax" />
+    </template>
+  </a-table>
+</template>
+<script>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  data () {
+    return {
+      data: [],
+      // 列配置
+      columns: [],
+      // 列名
+      columnNames: [],
+      // 选中的行键值集合
+      selectedRows: [],
+      // 选中的行信息集合
+      selectedRowKeys: [],
+      // 原始数据备份
+      originalData: [],
+      // 配置参数
+      configData: {},
+      // 排班时间表
+      shiftTable: [
+        {
+          title: '周一',
+          key: 'Monday',
+          dataIndex: 'Monday',
+          scopedSlots: { customRender: 'Monday' },
+          align: 'center'
+        },
+        {
+          title: '周二',
+          key: 'Tuesday',
+          dataIndex: 'Tuesday',
+          scopedSlots: { customRender: 'Tuesday' },
+          align: 'center'
+        },
+        {
+          title: '周三',
+          key: 'Wednesday',
+          dataIndex: 'Wednesday',
+          scopedSlots: { customRender: 'Wednesday' },
+          align: 'center'
+        },
+        {
+          title: '周四',
+          key: 'Thursday',
+          dataIndex: 'Thursday',
+          scopedSlots: { customRender: 'Thursday' },
+          align: 'center'
+        },
+        {
+          title: '周五',
+          key: 'Friday',
+          dataIndex: 'Friday',
+          scopedSlots: { customRender: 'Friday' },
+          align: 'center'
+        },
+        {
+          title: '周六',
+          key: 'Saturday',
+          dataIndex: 'Saturday',
+          scopedSlots: { customRender: 'Saturday' },
+          align: 'center'
+        },
+        {
+          title: '周日',
+          key: 'Sunday',
+          dataIndex: 'Sunday',
+          scopedSlots: { customRender: 'Sunday' },
+          align: 'center'
+        },
+        {
+          title: '排班数',
+          key: 'sk_limit',
+          dataIndex: 'sk_limit',
+          scopedSlots: { customRender: 'sk_limit' },
+          align: 'center'
+        }
+      ]
+    }
+  },
+  props: {
+    // 配置名
+    queryParamsName: {
+      type: String,
+      default: ''
+    },
+    // 服务名
+    serviceName: {
+      type: String,
+      default: 'af-his'
+    }
+  },
+  computed: {
+    rowSelection () {
+      return {
+        selectedRowKeys: this.selectedRowKeys,
+        onChange: (selectedRowKeys, selectedRows) => {
+          this.onSelectChange(selectedRowKeys, selectedRows)
+        }
+      }
+    }
+  },
+  mounted () {},
+  methods: {
+    handleShiftChange (day, index, record) {
+      // 找到当前记录在data中的索引
+      const dataIndex = this.data.findIndex(item => item.id === record.id)
+      if (dataIndex === -1) return
+      // 获取当前状态
+      const currentValue = record[day][index]
+      const newValue = currentValue === 1 || currentValue === '1' ? 0 : 1
+      // 更新按钮显示
+      this.$set(record[day], index, newValue)
+      // 同步更新data中的数据
+      this.$set(this.data[dataIndex][day], index, newValue)
+    },
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    },
+    // 获取选中的行数据
+    getSelectedRowData () {
+      return this.selectedRows
+    },
+    // 获取全部数据
+    getAllTable () {
+      return this.data
+    },
+    // 初始化数据
+    async init (queryParamsName) {
+      getConfigByName(queryParamsName, this.serviceName, result => {
+        this.configData = result
+        runLogic(result.dataSource, {}, this.serviceName).then(res => {
+          this.columns = []
+          this.columns = JSON.parse(JSON.stringify(this.configData.columns))
+          for (let i = 0; i < this.shiftTable.length; i++) {
+            this.columns.push(this.shiftTable[i])
+          }
+          if (res && Array.isArray(res)) {
+            const weekDays = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday']
+            const shifts = ['am', 'pm', 'evening']
+            let key = 0
+            this.data = res.map(item => {
+              const scheduleData = {
+                key: key++
+              }
+              this.configData.columnsName.forEach(columnName => { scheduleData[columnName] = item[columnName] })
+              weekDays.forEach(day => {
+                scheduleData[day.charAt(0).toUpperCase() + day.slice(1)] = shifts.map(shift => item[`f_${day}_${shift}`] === '1' ? 1 : 0)
+              })
+              return scheduleData
+            })
+            // 保存原始数据
+            this.originalData = JSON.parse(JSON.stringify(this.data))
+          }
+        })
+      })
+    },
+    // 查询数据函数
+    filterTableData (filters) {
+      if (!filters || Object.keys(filters).length === 0) {
+        // 如果没有过滤条件，恢复原始数据
+        this.data = JSON.parse(JSON.stringify(this.originalData))
+        return
+      }
+      // 从原始数据开始过滤
+      this.data = this.originalData.filter(item => {
+        // 检查每一项是否满足所有过滤条件
+        return Object.entries(filters).every(([key, value]) => {
+          // 如果过滤值是字符串，进行模糊匹配
+          if (typeof value === 'string') {
+            return item[key] && item[key].toString().toLowerCase().includes(value.toLowerCase())
+          }
+          // 如果过滤值是数字，进行精确匹配
+          return item[key] === value
+        })
+      })
+    }
+  },
+  watch: {
+    queryParamsName: {
+      handler (newValue) {
+        this.init(newValue)
+      },
+      deep: true,
+      immediate: true
+    }
+  }
+}
+</script>
+
+<style scoped type="less">
+.time-title {
+  display: flex !important;
+  flex-direction: column !important;
+  align-items: center !important;
+}
+::v-deep .ant-table-thead > tr > th,
+::v-deep .ant-table-tbody > tr > td {
+  padding: 8px 16px !important;
+  overflow-wrap: break-word;
+}
+</style>

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

@@ -1,23 +1,29 @@
-<template>
-  <XShiftSchedule>
-  </XShiftSchedule>
-</template>
-
-<script>
-
-import XShiftSchedule from './XShiftSchedule.vue'
-
-export default {
-  components: {
-    XShiftSchedule
-  },
-  data () {
-    return {}
-  }
-}
-
-</script>
-
-<style scoped lang="less">
-
-</style>
+<template>
+  <XShiftSchedule
+   :query-params-name="queryParamsName"
+   :service-name="serviceName"
+  >
+  </XShiftSchedule>
+</template>
+
+<script>
+
+import XShiftSchedule from './XShiftSchedule.vue'
+
+export default {
+  components: {
+    XShiftSchedule
+  },
+  data () {
+    return {
+      queryParamsName: 'schedulingRuleConfigurationConfig',
+      serviceName: 'af-his'
+    }
+  }
+}
+
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -0,0 +1,17 @@
+<script>
+  import ThreeTestOrders from './threeTestOrders.vue'
+  export default {
+    components: {
+      ThreeTestOrders
+    }
+  }
+</script>
+
+<template>
+  <three-test-orders>
+  </three-test-orders>
+</template>
+
+<style scoped lang="less">
+
+</style>