vue2-client 1.14.82 → 1.14.84

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

@@ -3,15 +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" @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>
@@ -36,56 +42,35 @@ export default {
       originalData: [],
       // 配置参数
       configData: {},
+      // 当前显示的周次日期
+      currentWeekDates: [],
+      weekDays: [...['周一', '周二', '周三', '周四', '周五', '周六', '周日'].map((title, index) => {
+        const key = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'][index]
+        return { title, key }
+      })],
       // 排班时间表
       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'
+          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
+          }
+        }),
         {
-          title: '周六',
-          key: 'Saturday',
-          dataIndex: 'Saturday',
-          scopedSlots: { customRender: 'Saturday' },
-          align: 'center'
-        },
-        {
-          title: '周日',
-          key: 'Sunday',
-          dataIndex: 'Sunday',
-          scopedSlots: { customRender: 'Sunday' },
-          align: 'center'
+          dataIndex: 'nextWeek',
+          key: 'nextWeek',
+          slots: { title: 'nextWeek' },
+          scopedSlots: { customRender: 'nextWeekTitle' },
+          align: 'center',
+          width: 80
         },
         {
           title: '排班数',
@@ -119,7 +104,9 @@ export default {
       }
     }
   },
-  mounted () {},
+  mounted () {
+    this.initWeekDates()
+  },
   methods: {
     handleShiftChange (day, index, record) {
       // 找到当前记录在data中的索引
@@ -194,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: {
@@ -208,7 +228,7 @@ export default {
 }
 </script>
 
-<style scoped type="less">
+<style scoped>
 .time-title {
   display: flex !important;
   flex-direction: column !important;

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

@@ -1,207 +1,207 @@
-<template>
-  <div>
-    <div class="text-card">
-      <div
-        v-for="(item, index) in displayItems"
-        :key="index"
-        class="text-item"
-        @click="handleItemClick(index, item.id)"
-        @contextmenu.prevent="handleContextMenu(index, item.id)">
-        <div class="text-content" :class="{ 'is-empty': !item.content }">
-          {{ item.content || '+' }}
-        </div>
-      </div>
-      <!-- 编辑弹出框 -->
-      <div
-        v-if="showEdit"
-        class="edit-overlay"
-        @click.self="handleOverlayClick">
-        <div class="edit-card">
-          <a-textarea
-            v-model="editingContent"
-            :autoSize="{ minRows: 3 }"
-            @keyup.enter="handleSave"
-            ref="textarea"/>
-        </div>
-      </div>
-      <!-- 删除确认弹框 -->
-      <a-modal
-        v-model="showDeleteModal"
-        title="确认删除"
-        okText="确认"
-        cancelText="取消"
-        @ok="handleDeleteConfirm">
-        <p>确定要删除这条内容吗？</p>
-      </a-modal>
-    </div>
-  </div>
-</template>
-
-<script>
-import { runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XTextCard',
-  props: {
-    // logic配置名,要求返回一个数组[{ id: , content: }]
-    queryParamsName: {
-      type: String,
-      default: 'memorandumLOGIC'
-    },
-    queryParams: {
-      type: Object,
-      default: () => { return {} }
-    },
-    // 请求参数
-    parameter: {
-      type: Object,
-      default: () => { return {} }
-    }
-  },
-  data () {
-    return {
-      localItems: [], // 本地数据
-      showEdit: false, // 是否显示编辑框
-      editingIndex: -1, // 当前编辑的索引
-      editingContent: '', // 编辑框的内容
-      showDeleteModal: false, // 是否显示删除确认框
-      deleteIndex: -1, // 要删除的项目索引
-      ID: 0
-    }
-  },
-  computed: {
-    // 显示的列表，始终保持一个空行
-    displayItems () {
-      const items = [...this.localItems]
-      // 如果最后一项不是空的，添加一个空项
-      if (!items.length || items[items.length - 1].content) {
-        items.push({ content: '' })
-      }
-      return items
-    }
-  },
-  methods: {
-    // 点击项目
-    handleItemClick (index, id) {
-      this.ID = id
-      this.editingIndex = index
-      this.editingContent = this.displayItems[index].content
-      this.showEdit = true
-      this.$nextTick(() => {
-        this.$refs.textarea?.focus()
-      })
-    },
-    // 点击遮罩层保存
-    handleOverlayClick () {
-      this.handleSave()
-    },
-    // 保存内容
-    handleSave () {
-      if (this.editingContent.trim()) {
-        if (this.editingIndex === this.localItems.length) {
-          // 如果是在最后一个空行添加，push新内容
-          this.localItems.push({ content: this.editingContent.trim() })
-        } else {
-          // 否则更新现有内容
-          this.localItems[this.editingIndex].content = this.editingContent.trim()
-        }
-        const addData = { data: this.editingContent.trim(), ID: this.ID }
-        // 触发更新事件
-        this.$emit('add', addData)
-      }
-      this.showEdit = false
-      this.editingIndex = -1
-      this.editingContent = ''
-    },
-    // 初始化数据
-    async initData (data, parameter) {
-      // 从配置中获取数据
-      const resData = await runLogic(data, parameter, 'af-his')
-      this.localItems = resData
-      return resData
-    },
-    // 处理右键菜单
-    handleContextMenu (index, id) {
-      // 如果是最后一个空行，不显示删除框
-      if (index === this.localItems.length) {
-        return
-      }
-      this.ID = id
-      this.deleteIndex = index
-      this.showDeleteModal = true
-    },
-    // 确认删除
-    handleDeleteConfirm () {
-      if (this.deleteIndex > -1) {
-        this.localItems.splice(this.deleteIndex, 1)
-        const deleteData = { data: [...this.localItems][this.deleteIndex], ID: this.ID }
-        this.$emit('deleteData', deleteData)
-        this.deleteIndex = -1
-      }
-      this.showDeleteModal = false
-    }
-  },
-  watch: {
-    queryParamsName: {
-      immediate: true,
-      handler (newVal) {
-        this.initData(newVal, this.parameter)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.text-card {
-  position: relative;
-  width: 100%;
-  .text-item {
-    padding: 8px 12px;
-    border-bottom: 1px solid #f0f0f0;
-    cursor: pointer;
-    transition: all 0.3s;
-    user-select: none;
-
-    &:hover {
-      background-color: #f5f5f5;
-    }
-
-    .text-content {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      line-height: 1.5;
-
-      &.is-empty {
-        color: #5D5C5C;
-        font-weight: 400;
-      }
-    }
-  }
-  .edit-overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.45);
-    z-index: 1000;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    .edit-card {
-      background: white;
-      padding: 16px;
-      border-radius: 8px;
-      width: 90%;
-      max-width: 500px;
-      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12);
-      .ant-input {
-        width: 100%;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div>
+    <div class="text-card">
+      <div
+        v-for="(item, index) in displayItems"
+        :key="index"
+        class="text-item"
+        @click="handleItemClick(index, item.id)"
+        @contextmenu.prevent="handleContextMenu(index, item.id)">
+        <div class="text-content" :class="{ 'is-empty': !item.content }">
+          {{ item.content || '+' }}
+        </div>
+      </div>
+      <!-- 编辑弹出框 -->
+      <div
+        v-if="showEdit"
+        class="edit-overlay"
+        @click.self="handleOverlayClick">
+        <div class="edit-card">
+          <a-textarea
+            v-model="editingContent"
+            :autoSize="{ minRows: 3 }"
+            @keyup.enter="handleSave"
+            ref="textarea"/>
+        </div>
+      </div>
+      <!-- 删除确认弹框 -->
+      <a-modal
+        v-model="showDeleteModal"
+        title="确认删除"
+        okText="确认"
+        cancelText="取消"
+        @ok="handleDeleteConfirm">
+        <p>确定要删除这条内容吗？</p>
+      </a-modal>
+    </div>
+  </div>
+</template>
+
+<script>
+import { runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XTextCard',
+  props: {
+    // logic配置名,要求返回一个数组[{ id: , content: }]
+    queryParamsName: {
+      type: String,
+      default: 'memorandumLOGIC'
+    },
+    queryParams: {
+      type: Object,
+      default: () => { return {} }
+    },
+    // 请求参数
+    parameter: {
+      type: Object,
+      default: () => { return {} }
+    }
+  },
+  data () {
+    return {
+      localItems: [], // 本地数据
+      showEdit: false, // 是否显示编辑框
+      editingIndex: -1, // 当前编辑的索引
+      editingContent: '', // 编辑框的内容
+      showDeleteModal: false, // 是否显示删除确认框
+      deleteIndex: -1, // 要删除的项目索引
+      ID: 0
+    }
+  },
+  computed: {
+    // 显示的列表，始终保持一个空行
+    displayItems () {
+      const items = [...this.localItems]
+      // 如果最后一项不是空的，添加一个空项
+      if (!items.length || items[items.length - 1].content) {
+        items.push({ content: '' })
+      }
+      return items
+    }
+  },
+  methods: {
+    // 点击项目
+    handleItemClick (index, id) {
+      this.ID = id
+      this.editingIndex = index
+      this.editingContent = this.displayItems[index].content
+      this.showEdit = true
+      this.$nextTick(() => {
+        this.$refs.textarea?.focus()
+      })
+    },
+    // 点击遮罩层保存
+    handleOverlayClick () {
+      this.handleSave()
+    },
+    // 保存内容
+    handleSave () {
+      if (this.editingContent.trim()) {
+        if (this.editingIndex === this.localItems.length) {
+          // 如果是在最后一个空行添加，push新内容
+          this.localItems.push({ content: this.editingContent.trim() })
+        } else {
+          // 否则更新现有内容
+          this.localItems[this.editingIndex].content = this.editingContent.trim()
+        }
+        const addData = { data: this.editingContent.trim(), ID: this.ID }
+        // 触发更新事件
+        this.$emit('add', addData)
+      }
+      this.showEdit = false
+      this.editingIndex = -1
+      this.editingContent = ''
+    },
+    // 初始化数据
+    async initData (data, parameter) {
+      // 从配置中获取数据
+      const resData = await runLogic(data, parameter, 'af-his')
+      this.localItems = resData
+      return resData
+    },
+    // 处理右键菜单
+    handleContextMenu (index, id) {
+      // 如果是最后一个空行，不显示删除框
+      if (index === this.localItems.length) {
+        return
+      }
+      this.ID = id
+      this.deleteIndex = index
+      this.showDeleteModal = true
+    },
+    // 确认删除
+    handleDeleteConfirm () {
+      if (this.deleteIndex > -1) {
+        this.localItems.splice(this.deleteIndex, 1)
+        const deleteData = { data: [...this.localItems][this.deleteIndex], ID: this.ID }
+        this.$emit('deleteData', deleteData)
+        this.deleteIndex = -1
+      }
+      this.showDeleteModal = false
+    }
+  },
+  watch: {
+    queryParamsName: {
+      immediate: true,
+      handler (newVal) {
+        this.initData(newVal, this.parameter)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.text-card {
+  position: relative;
+  width: 100%;
+  .text-item {
+    padding: 8px 12px;
+    border-bottom: 1px solid #f0f0f0;
+    cursor: pointer;
+    transition: all 0.3s;
+    user-select: none;
+
+    &:hover {
+      background-color: #f5f5f5;
+    }
+
+    .text-content {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      line-height: 1.5;
+
+      &.is-empty {
+        color: #5D5C5C;
+        font-weight: 400;
+      }
+    }
+  }
+  .edit-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.45);
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .edit-card {
+      background: white;
+      padding: 16px;
+      border-radius: 8px;
+      width: 90%;
+      max-width: 500px;
+      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12);
+      .ant-input {
+        width: 100%;
+      }
+    }
+  }
+}
+</style>