vue2-client 1.15.101 → 1.15.103

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

@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <a-spin :spinning="loading">
+      <XHisEditor
+        ref="editor"
+        :file-url="fileUrl"
+        :res-id="resId"
+        :curr-res-data="currResData"
+        :bind-object="bindObject"
+        :save-data-logic-name="saveDataLogicName"
+        :service-name="serviceName"
+        :logic-extra-params="logicExtraParams"
+        :drop-down-box-params="dropDownBoxParams"
+        @init="handleEditorInit"
+      />
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import XHisEditor from '@vue2-client/base-client/components/his/XHisEditor/XHisEditor.vue'
+
+export default {
+  name: 'Test',
+  components: { XHisEditor },
+  data () {
+    return {
+      loading: false,
+      fileUrl: '/resource/af-his/html/bd40c834fcf94303a5db43e56852c6f2.html',
+      resId: '',
+      currResData: {
+        f_file_name: '测试文书'
+      },
+
+      bindObject: {
+        lxrdh: null,
+        yjs: null,
+        hys: null,
+        tw: null,
+        jws: null,
+        zyh: 381,
+        xbs: null,
+        pid: 506,
+        gms: null,
+        bq: '3楼',
+        hx: null,
+        hy: null,
+        mb: null,
+        lxrdz: null,
+        ssy: null,
+        jzys: '心血管内科医生2',
+        tgjc: null,
+        blh: 643,
+        ch: '13床',
+        ks: '心血管内科',
+        jlsj: null,
+        jts: null,
+        grs: null,
+        xb: 1,
+        rysj: '2025-07-01 14:36:00',
+        mz: '',
+        lxrxm: null,
+        hzgx: null,
+        szy: null,
+        xm: '张阿德',
+        csd: null,
+        hzxm: '张阿德',
+        gzdw: '',
+        xzz: null,
+        zs: null,
+        nl: 18,
+        rq: null
+      },
+      saveDataLogicName: 'saveMedicalRecordFile',
+      serviceName: 'af-his',
+      logicExtraParams: {
+        admissionId: 643,
+        templateId: 429
+      },
+      dropDownBoxParams: [],
+      initAttempts: 0,
+      maxInitAttempts: 10
+    }
+  },
+  mounted () {
+    this.$nextTick(() => {
+      this.waitForEditorReady().then(() => {
+        this.initEditor()
+      }).catch(error => {
+        console.error('编辑器初始化失败:', error)
+        this.loading = false
+      })
+    })
+  },
+  beforeDestroy () {
+    window.removeEventListener('unhandledrejection')
+  },
+  methods: {
+    waitForEditorReady () {
+      return new Promise((resolve, reject) => {
+        const checkInterval = setInterval(() => {
+          const editor = this.$refs.editor
+
+          if (editor && editor.editorRef && editor.editorRef.document) {
+            console.log('编辑器已完全初始化')
+            clearInterval(checkInterval)
+            resolve()
+          } else {
+            this.initAttempts++
+            console.log(`等待编辑器初始化...尝试次数: ${this.initAttempts}`)
+
+            if (this.initAttempts >= this.maxInitAttempts) {
+              clearInterval(checkInterval)
+              reject(new Error('编辑器初始化超时'))
+            }
+          }
+        }, 300)
+      })
+    },
+
+    initEditor () {
+      // this.loading = true
+      console.log('开始初始化编辑器...')
+
+      this.$refs.editor.init({
+        fileUrl: this.fileUrl,
+        resId: this.resId,
+        currResData: this.currResData,
+        bindObject: this.bindObject,
+        saveDataLogicName: this.saveDataLogicName,
+        serviceName: this.serviceName,
+        logicExtraParams: this.logicExtraParams,
+        dropDownBoxParams: this.dropDownBoxParams,
+        modeType: 'form'
+      })
+    },
+
+    handleEditorInit () {
+      this.loading = false
+      console.log('编辑器初始化完成，可以安全操作')
+    }
+  }
+}
+</script>

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

@@ -452,7 +452,7 @@ export default {
 .demo-infinite-container{
   overflow-x: hidden;
   overflow-y: auto;
-  height: 80vh;
+  height: 85vh;
 }
 .card-row{
   height: 100%;

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

@@ -1,29 +1,50 @@
 <template>
-  <a-table
-    :columns="columns"
-    :data-source="data"
-    :rowSelection="rowSelection"
-    :scroll="{ y: '70vh' }">
-    <span slot="time" class="time-title">
-      <span v-for="(item, index) in configData.timePeriod" :key="index">{{ item }}</span>
-    </span>
-    <div v-for="(item, index) in weekDays" :key="index" :slot="item.key" class="week_last_next_btn">
-      <a-button slot="lastWeek" icon="left" size="large" @click="handleLastWeek" v-if="item.title == '周一'" />
-      <div class="time-title">
-        <span>{{ item.title }}</span>
-        <span>{{ currentWeekDates[index].toLocaleDateString() }}</span>
+  <div v-if="pattern == 'schedule'">
+    <a-table
+      :columns="columns"
+      :data-source="data"
+      :rowSelection="rowSelection"
+      :scroll="{ y: '70vh' }">
+      <span slot="time" class="time-title">
+        <span v-for="(item, index) in configData.timePeriod" :key="index">{{ item }}</span>
+      </span>
+      <div v-for="(item, index) in weekDays" :key="index" :slot="item.key" class="week_last_next_btn">
+        <a-button slot="lastWeek" icon="left" size="large" @click="handleLastWeek" v-if="item.title == '周一'" />
+        <div class="time-title">
+          <span>{{ item.title }}</span>
+          <span>{{ currentWeekDates[index].toLocaleDateString() }}</span>
+        </div>
+        <a-button slot="nextWeek" icon="right" size="large" @click="handleNextWeek" v-if="item.title == '周日'"/>
       </div>
-      <a-button slot="nextWeek" icon="right" size="large" @click="handleNextWeek" v-if="item.title == '周日'"/>
-    </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>
+      <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>
+  </div>
+  <div v-else-if="pattern == 'form'">
+    <a-table :columns="columns" :data-source='data' :row-selection="rowSelection" bordered>
+      <template v-for="(n, i) in inputColumns" :slot="n.dataIndex" slot-scope="text, record">
+        <div class="a-div" :key="i">
+          <a-input
+            v-for="(item, index) in n.row"
+            :key="index"
+            placeholder=""
+            class="ant-input"
+            v-model="record[n.dataIndex][index + 1]"
+            @input="handleInputChange(record, n.dataIndex, index + 1, $event.target.value)"
+          />
+        </div>
+      </template>
+      <div class="a-div" v-for="(n, i) in numberColumns" :slot="n.dataIndex" :key="i">
+        <div v-for="(item, index) in n.row" :key="index" class="number">{{item}}</div>
       </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>
+    </a-table>
+  </div>
 </template>
 <script>
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
@@ -31,6 +52,10 @@ import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 export default {
   data () {
     return {
+      // 输入框数据
+      inputData: [],
+      // 模式
+      pattern: 'schedule',
       data: [],
       // 列配置
       columns: [],
@@ -87,6 +112,12 @@ export default {
           this.onSelectChange(selectedRowKeys, selectedRows)
         }
       }
+    },
+    inputColumns () {
+      return this.columns.filter(col => col.type === 'input')
+    },
+    numberColumns () {
+      return this.columns.filter(col => col.type === 'number')
     }
   },
   mounted () {
@@ -109,8 +140,32 @@ export default {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
     },
+    // 处理输入框数据变化
+    handleInputChange (record, field, index, value) {
+      // 更新数据
+      this.$set(record[field], index, value)
+    },
     // 获取选中的行数据
     getSelectedRowData () {
+      if (this.pattern === 'form') {
+        // 在form模式下，返回包含输入框数据的完整信息
+        return this.selectedRows.map(row => {
+          const result = { ...row }
+          // 将对象格式的输入框数据转换为数组格式
+          this.inputColumns.forEach(col => {
+            if (row[col.dataIndex] && typeof row[col.dataIndex] === 'object') {
+              const fieldData = row[col.dataIndex]
+              const arrayData = []
+              // 将对象转换为数组，保持键的顺序
+              Object.keys(fieldData).forEach(key => {
+                arrayData.push(fieldData[key])
+              })
+              result[col.dataIndex] = arrayData
+            }
+          })
+          return result
+        })
+      }
       return this.selectedRows
     },
     // 获取全部数据
@@ -124,25 +179,50 @@ export default {
         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.pattern = result.pattern
+          if (this.pattern == 'schedule') {
+            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))
+            }
+          } else if (this.pattern == 'form') {
+            const inputFields = this.configData.columns
+              .filter(col => col.type === 'input')
+              .map(col => col.dataIndex)
             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)
+              const newItem = { ...item }
+              inputFields.forEach(field => {
+                const column = this.configData.columns.find(col => col.dataIndex === field)
+                if (column && column.type === 'input' && column.row) {
+                  const rowCount = column.row.length || 1 // 默认长度1
+                  // 创建对象格式的数据，键为1,2,3...，值为空字符串
+                  const fieldData = {}
+                  for (let i = 1; i <= rowCount; i++) {
+                    fieldData[i] = ''
+                  }
+                  newItem[field] = fieldData
+                } else {
+                  newItem[field] = item[field] || ''
+                }
               })
-              return scheduleData
+              return newItem
             })
-            // 保存原始数据
-            this.originalData = JSON.parse(JSON.stringify(this.data))
           }
         })
       })
@@ -173,7 +253,6 @@ export default {
       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)
@@ -231,4 +310,30 @@ export default {
   padding: 8px 16px !important;
   overflow-wrap: break-word;
 }
+.ant-input {
+  width: 100%;
+}
+.a-div{
+  display: flex;
+  flex-direction: column;
+}
+.number{
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  font-variant: tabular-nums;
+  list-style: none;
+  font-feature-settings: 'tnum';
+  position: relative;
+  display: inline-block;
+  width: 100%;
+  height: 32px;
+  padding: 4px 11px;
+  color: rgba(0, 0, 0, 0.65);
+  font-size: 14px;
+  line-height: 1.5;
+  background-image: none;
+  border-radius: 4px;
+  transition: all 0.3s;
+}
 </style>

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

@@ -1,8 +1,7 @@
 <template>
   <XShiftSchedule
     :query-params-name="queryParamsName"
-    :service-name="serviceName"
-  >
+    :service-name="serviceName">
   </XShiftSchedule>
 </template>
 
@@ -16,7 +15,8 @@ export default {
   },
   data () {
     return {
-      queryParamsName: 'schedulingRuleConfigurationConfig',
+      // 排班模式：schedulingRuleConfigurationConfig， 表模式：accusationRulesConfig
+      queryParamsName: 'accusationRulesConfig',
       serviceName: 'af-his'
     }
   }