vue2-client 1.14.82 → 1.14.83

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

@@ -0,0 +1,183 @@
+<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="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">
+      <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: [
+        ...['周一', '周二', '周三', '周四', '周五', '周六', '周日'].map((title, index) => {
+          const key = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'][index]
+          return {
+            title,
+            key,
+            dataIndex: key,
+            scopedSlots: { customRender: key },
+            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/.history/src/base-client/components/his/XShiftSchedule/XShiftSchedule_20250612181609.vue

@@ -0,0 +1,206 @@
+<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" />
+    <div v-for="(item, index) in weekDays" :key="index" >
+      <span>{{item}}</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" />
+    <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: {},
+      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
+        },
+        ...this.weekDays.map(({ title, key }) => ({
+          title,
+          key,
+          dataIndex: key,
+          scopedSlots: { customRender: key },
+          slots: { title: key },
+          align: 'center'
+        })),
+        {
+          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 () {},
+  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/.history/src/base-client/components/his/XShiftSchedule/XShiftSchedule_20250612181629.vue

@@ -0,0 +1,209 @@
+<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" />
+    <div v-for="(item, index) in weekDays" :key="index" >
+      <span>{{item}}</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" />
+    <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: {},
+      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 {
+            title,
+            key,
+            dataIndex: key,
+            scopedSlots: { customRender: key },
+            slots: { title: key },
+            align: 'center'
+          }
+        }),
+        {
+          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 () {},
+  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/Users/objecrt/af-vue2-client/src/base-client/components/his/XShiftSchedule/XShiftSchedule.vue

@@ -0,0 +1,36 @@
+<script>
+export default {
+  props: {
+    weekDays: {
+      type: Array,
+      default: () => []
+    }
+  },
+  computed: {
+    columns () {
+      const baseColumns = [
+        { title: '序号', dataIndex: 'index', width: 60 },
+        { title: '科室', dataIndex: 'department', width: 120 },
+        { title: '医生', dataIndex: 'doctor', width: 100 },
+        { title: '上/下/晚', dataIndex: 'shiftType', width: 80 },
+      ]
+
+      // 增加防御判断，确保 weekDays 存在
+      const dayColumns = this.weekDays.length > 0
+        ? this.weekDays.map((day, dayIndex) => ({
+            title: `${day.label} ${day.date}`,
+            dataIndex: `shifts-${dayIndex}`, // 改为字符串形式
+            dayIndex: dayIndex,
+            width: 120,
+          }))
+        : []
+
+      const tailColumns = [
+        { title: '排班数', dataIndex: 'count', width: 80 }
+      ]
+
+      return [...baseColumns, ...dayColumns, ...tailColumns]
+    }
+  }
+}
+</script>

package/docs/Logic/345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -11,6 +11,7 @@
 - ENV 对应 一个 org.json.JSONObject {tenantName:"租户名称",orgName:"分公司名称",applicationName:"应用名称",dbType:"数据库类型"}
 - logic 对应 LogicService 类，其中有方法
   * logic.run(logicName,param) 执行logic / logicName 执行的业务逻辑名称，param 参数 返回 org.json.JSONObject
+  * logic.remoteRun("服务名","logicName", "param")
 - sql 对应 [SqlService]() 类，其中有方法
   * sql.query(sql别名 string，sql参数 string) 执行已经注册的sql  返回 org.json.JSONArray
   * sql.query(sql别名 string，sql参数 string，页数 int，每页行数 int) 执行已经注册的sql 返回 org.json.JSONArray

package/docs//345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -10,11 +10,12 @@
 - openDialog(configName, selectedId, mixinData, outEnv, attr)：打开一个对话框：
 - setColSpanByName(slotRef, colSpan)：设置栅格的宽度
 - openDrawer(configName, selectedId, mixinData)：打开一个对话框，例如：this.openDialog('xxx', 5, {})
-- openDrawer(configName, selectedId, mixinData, outEnv, attr)：打开一个对话框：
+- openDrawer(configName, selectedId, mixinData, outEnv, attr, showButton)：打开一个对话框：
   - selectId：id号，formtable选择时，用selectId过滤数据 可以传递 json {a_id: 1} 或者 传递 1  ，传递数值会默认拼接查询条件 {selected_id:1}
   - mixinData: form表单需要的数据
   - outEnv: 传递给打开的界面的数据，在打开界面的js中通过this.outEnv可以访问
   - attr: 用于传递参数绑定到 modal 弹框上
+  - showButton: true/false 是否显示提交按钮 默认：true
 - getOutEnv 获取获取 outEnv
 - this.getRealKeyData(obj) 获取真实的数据 传递 {a_a:"1"} 返回 {a:"1"}
 - this.currUser.operaInfo 获取当前用户信息
@@ -60,7 +61,8 @@ this.openDialog('xxx', 5, {}, {}, {})
     afterDelete( res (删除接口返回数据)) 删除后触发
     action(record (当前记录), id （当前记录主键）, actionType （操作类型）) 操作按钮触发
   - expandedGrid:"栅格名"
-
+- json配置相关
+  - "pageMaxSize": (int) num,
 # x-report 插槽 使用说明
 
 - init(configName,configData) 配置名称 / 报表数据

package/package.json

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