vue2-client 1.14.83 → 1.14.84

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

@@ -0,0 +1,250 @@
+<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>
+    <a-button slot="lastWeek" icon="left" size="large" @click="handleLastWeek" />
+    <div v-for="(item, index) in weekDays" :key="index" :slot="item.key" class="time-title">
+      <span>{{item.title}}</span>
+      <span>{{ currentWeekDates[index].toLocaleDateString() }}</span>
+    </div>
+    <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>
+    <a-button slot="nextWeek" icon="right" size="large" @click="handleNextWeek" />
+    <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: {},
+      // 当前显示的周次日期
+      currentWeekDates: [],
+      weekDays: [...['周一', '周二', '周三', '周四', '周五', '周六', '周日'].map((title, index) => {
+        const key = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'][index]
+        return { title, key }
+      })],
+      // 排班时间表
+      shiftTable: [
+        {
+          dataIndex: 'lastWeek',
+          key: 'lastWeek',
+          slots: { title: 'lastWeek' },
+          scopedSlots: { customRender: 'lastWeekTitle' },
+          align: 'center',
+          width: 80
+        },
+        ...['周一', '周二', '周三', '周四', '周五', '周六', '周日'].map((title, index) => {
+          const key = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'][index]
+          return {
+            key, dataIndex: key, scopedSlots: { customRender: key }, slots: { title: key }, align: 'center', width: 120
+          }
+        }),
+        {
+          dataIndex: 'nextWeek',
+          key: 'nextWeek',
+          slots: { title: 'nextWeek' },
+          scopedSlots: { customRender: 'nextWeekTitle' },
+          align: 'center',
+          width: 80
+        },
+        {
+          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 () {
+    this.initWeekDates()
+  },
+  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
+        })
+      })
+    },
+    // 初始化周次日期
+    initWeekDates () {
+      const today = new Date()
+      const currentDay = today.getDay() || 7 // 将周日的0转换为7
+      const monday = new Date(today)
+      monday.setDate(today.getDate() - currentDay + 1) // 设置为本周一
+
+      this.currentWeekDates = Array.from({ length: 7 }, (_, index) => {
+        const date = new Date(monday)
+        date.setDate(monday.getDate() + index)
+        return date
+      })
+    },
+    // 切换到上一周
+    handleLastWeek () {
+      const monday = new Date(this.currentWeekDates[0])
+      monday.setDate(monday.getDate() - 7)
+      this.updateWeekDates(monday)
+    },
+    // 切换到下一周
+    handleNextWeek () {
+      const monday = new Date(this.currentWeekDates[0])
+      monday.setDate(monday.getDate() + 7)
+      this.updateWeekDates(monday)
+    },
+    // 更新周次日期
+    updateWeekDates (monday) {
+      this.currentWeekDates = Array.from({ length: 7 }, (_, index) => {
+        const date = new Date(monday)
+        date.setDate(monday.getDate() + index)
+        return date
+      })
+    }
+  },
+  watch: {
+    queryParamsName: {
+      handler (newValue) {
+        this.init(newValue)
+      },
+      deep: true,
+      immediate: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.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;
+}
+
+::v-deep .ant-table-thead > tr > th .ant-btn {
+  margin: 0 4px;
+}
+
+::v-deep .ant-table-thead > tr > th .time-title {
+  margin: 0 -4px;
+}
+</style>

package/package.json

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

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

@@ -3,20 +3,21 @@
     :columns="columns"
     :data-source="data"
     :rowSelection="rowSelection"
-    :scroll="{ y: '75vh' }">
+    :scroll="{ y: '70vh' }">
     <span slot="time" class="time-title">
       <span v-for="(item, index) in configData.timePeriod" :key="index">{{ item }}</span>
     </span>
-    <a-button slot="lastWeek" icon="left" size="large" />
-    <div v-for="(item, index) in weekDays" :key="index" >
-      <span>{{item}}</span>
+    <a-button slot="lastWeek" icon="left" size="large" @click="handleLastWeek" />
+    <div v-for="(item, index) in weekDays" :key="index" :slot="item.key" class="time-title">
+      <span>{{item.title}}</span>
+      <span>{{ currentWeekDates[index].toLocaleDateString() }}</span>
     </div>
     <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>
-    <a-button slot="nextWeek" icon="right" size="large" />
+    <a-button slot="nextWeek" icon="right" size="large" @click="handleNextWeek" />
     <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>
@@ -41,6 +42,8 @@ export default {
       originalData: [],
       // 配置参数
       configData: {},
+      // 当前显示的周次日期
+      currentWeekDates: [],
       weekDays: [...['周一', '周二', '周三', '周四', '周五', '周六', '周日'].map((title, index) => {
         const key = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'][index]
         return { title, key }
@@ -58,12 +61,7 @@ export default {
         ...['周一', '周二', '周三', '周四', '周五', '周六', '周日'].map((title, index) => {
           const key = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'][index]
           return {
-            title,
-            key,
-            dataIndex: key,
-            scopedSlots: { customRender: key },
-            slots: { title: key },
-            align: 'center'
+            key, dataIndex: key, scopedSlots: { customRender: key }, slots: { title: key }, align: 'center', width: 120
           }
         }),
         {
@@ -106,7 +104,9 @@ export default {
       }
     }
   },
-  mounted () {},
+  mounted () {
+    this.initWeekDates()
+  },
   methods: {
     handleShiftChange (day, index, record) {
       // 找到当前记录在data中的索引
@@ -181,6 +181,39 @@ export default {
           return item[key] === value
         })
       })
+    },
+    // 初始化周次日期
+    initWeekDates () {
+      const today = new Date()
+      const currentDay = today.getDay() || 7 // 将周日的0转换为7
+      const monday = new Date(today)
+      monday.setDate(today.getDate() - currentDay + 1) // 设置为本周一
+
+      this.currentWeekDates = Array.from({ length: 7 }, (_, index) => {
+        const date = new Date(monday)
+        date.setDate(monday.getDate() + index)
+        return date
+      })
+    },
+    // 切换到上一周
+    handleLastWeek () {
+      const monday = new Date(this.currentWeekDates[0])
+      monday.setDate(monday.getDate() - 7)
+      this.updateWeekDates(monday)
+    },
+    // 切换到下一周
+    handleNextWeek () {
+      const monday = new Date(this.currentWeekDates[0])
+      monday.setDate(monday.getDate() + 7)
+      this.updateWeekDates(monday)
+    },
+    // 更新周次日期
+    updateWeekDates (monday) {
+      this.currentWeekDates = Array.from({ length: 7 }, (_, index) => {
+        const date = new Date(monday)
+        date.setDate(monday.getDate() + index)
+        return date
+      })
     }
   },
   watch: {
@@ -195,7 +228,7 @@ export default {
 }
 </script>
 
-<style scoped type="less">
+<style scoped>
 .time-title {
   display: flex !important;
   flex-direction: column !important;

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

@@ -66,7 +66,7 @@ routerResource.example = {
   // 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/base-client/components/his/XShiftSchedule/dome.vue'),
+  component: () => import('@vue2-client/base-client/components/his/XQuestionnaire/XQuestionnaireDemo.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'),