vue2-client 1.14.41 → 1.14.44

package/package.json

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

package/src/base-client/components/common/XReport/XReport.vue

@@ -808,7 +808,7 @@ export default {
         this.config = res
         if (this.config.designMode === 'json') {
           if (this.configData !== undefined) {
-            this.config.data = Object.assign({},this.config.data, this.configData)
+            this.config.data = Object.assign({}, this.config.data, this.configData)
           }
           this.jsonConfigInit()
         } else {

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -25,7 +25,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule','x-charge'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -63,7 +63,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule','x-charge'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -125,7 +125,8 @@ export default {
     XSelect: () => import('@vue2-client/base-client/components/his/XSelect/XSelect.vue'),
     XTreeRows: () => import('@vue2-client/base-client/components/his/XTreeRows/XTreeRows.vue'),
     XThreeTestOrders: () => import('@vue2-client/base-client/components/his/threeTestOrders/threeTestOrders.vue'),
-    XShiftSchedule: () => import('@vue2-client/base-client/components/his/XShiftSchedule/XShiftSchedule.vue')
+    XShiftSchedule: () => import('@vue2-client/base-client/components/his/XShiftSchedule/XShiftSchedule.vue'),
+    XCharge: () => import('@vue2-client/base-client/components/his/XCharge/XCharge.vue')
   },
   props: {
     // 每一行的配置

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

@@ -0,0 +1,226 @@
+<template>
+  <div class="xcharge-wrapper">
+    <!-- 顶部金额信息区（表单行风格，宽度固定，每行4个） -->
+    <a-row :gutter="0" class="amount-info">
+      <a-col v-for="item in config.amountFields" :key="item.field" :span="6" class="form-row">
+        <label class="form-label">{{ item.label }}</label>
+        <a-input
+          :value="data[item.field]"
+          disabled
+          class="form-input"
+        />
+      </a-col>
+    </a-row>
+
+    <a-divider/>
+
+    <!-- 支付方式选择区 -->
+    <div class="payment-methods">
+      <a-button
+        v-for="method in config.paymentMethods"
+        :key="method.key"
+        :class="['payment-btn', { active: selectedMethod === method.key }]"
+        @click="selectMethod(method.key)"
+      >
+        <div>
+          <div class="pay-label">{{ method.label }}</div>
+        </div>
+      </a-button>
+    </div>
+
+    <a-divider/>
+
+    <!-- 底部金额和操作区（表单行风格，宽度固定） -->
+    <a-row :gutter="0" class="bottom-info">
+      <a-col v-for="item in config.bottomFields" :key="item.field" :span="8" class="form-row">
+        <label class="form-label">{{ item.label }}</label>
+        <a-input
+          v-model="data[item.field]"
+          :disabled="item.disabled"
+          class="form-input"
+        />
+      </a-col>
+    </a-row>
+    <a-row class="actions-row" justify="center">
+      <a-button
+        v-for="btn in config.actionButtons"
+        :key="btn.key"
+        @click="handleAction(btn.key)"
+        :icon="btn.icon"
+        style="margin: 0 8px"
+      >
+        {{ btn.label }}
+      </a-button>
+    </a-row>
+  </div>
+</template>
+
+<script>
+import { getConfigByName, runLogic } from '@/services/api/common'
+
+export default {
+  name: 'XCharge',
+  props: {
+    configName: {
+      type: String,
+      default: '收费组件Config'
+    },
+    parameter: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data () {
+    return {
+      config: {
+        amountFields: [],
+        paymentMethods: [],
+        bottomFields: [],
+        actionButtons: []
+      },
+      data: {},
+      selectedMethod: '',
+    }
+  },
+  created () {
+    this.getConfig(this.configName, {})
+  },
+  methods: {
+    getConfig (configName, param) {
+      getConfigByName(configName, 'af-his', res => {
+        this.config = res
+        this.selectedMethod = res.paymentMethods?.[0]?.key || ''
+        // 初始化数据
+        runLogic(res.dataSourceConfig, param, 'af-his').then(resData => {
+          this.data = { ...resData }
+        })
+      })
+    },
+    refreshList (param) {
+      this.getConfig(this.configName, param)
+    },
+    handleAction (key) {
+      console.warn('选择的的方法 ====》' + key)
+      console.warn('页面数据 ====》' + JSON.stringify(this.data))
+      console.warn('选择的支付方式 ====》' + this.selectedMethod)
+      this.$emit('action', { key, data: this.data, method: this.selectedMethod })
+    }
+  },
+  watch: {
+    configName (val) {
+      this.getConfig()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.xcharge-wrapper {
+  background: #fff;
+  padding: 24px;
+  border-radius: 8px;
+}
+
+.amount-info {
+  margin-bottom: 20px;
+  display: flex;
+  flex-wrap: wrap;
+  row-gap: 16px;
+}
+
+.form-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30px;
+}
+
+.form-label {
+  width: 100px;
+  font-size: 18px;
+  color: #333;
+  font-weight: bold;
+  text-align: left;
+  letter-spacing: 1px;
+  flex-shrink: 0;
+}
+
+.form-input {
+  width: 180px;
+  height: 40px;
+  font-size: 18px;
+  border-radius: 8px;
+  border: 1.5px solid #dcdfe6;
+  background: #fff;
+  color: #333;
+  padding-left: 12px;
+}
+
+.form-input[disabled] {
+  color: #999;
+  background: #f5f5f5;
+}
+
+.payment-methods {
+  display: flex;
+  justify-content: space-around;
+  margin: 32px 0;
+}
+
+.payment-btn {
+  width: 180px;
+  height: 120px;
+  margin: 0 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #f7f8fa;
+  border: 1.5px solid #e4e7ed;
+  color: #333;
+  font-weight: bold;
+  font-size: 24px;
+  transition: all 0.2s;
+  box-shadow: none;
+  border-radius: 12px;
+}
+
+.payment-btn.active {
+  background: #409eff;
+  border-color: #409eff;
+  color: #fff;
+}
+
+.pay-label {
+  font-size: 24px;
+  font-weight: bold;
+}
+
+.pay-shortcut {
+  font-size: 16px;
+  color: #888;
+}
+
+.bottom-info {
+  margin-top: 24px;
+  display: flex;
+  flex-wrap: wrap;
+  row-gap: 16px;
+}
+
+.actions-row {
+  margin-top: 32px;
+  display: flex;
+  justify-content: center;
+}
+
+.actions-row .ant-btn {
+  margin: 0 8px;
+  background: #444;
+  color: #fff;
+  border-radius: 6px;
+  border: none;
+  font-size: 16px;
+  font-weight: 500;
+  height: 38px;
+  min-width: 90px;
+}
+</style>

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

@@ -58,9 +58,6 @@ export default {
     this.getData(this.queryParamsName, this.fixedQueryForm)
   },
   methods: {
-    click11 (val) {
-      Object.assign(this.fixedQueryForm, { condition: val })
-    },
     async getData (config, param) {
       const that = this
       getConfigByName(config, 'af-his', res => {

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

@@ -5,44 +5,44 @@
     :rowSelection="rowSelection"
     :scroll="{ y: '75vh' }">
     <span slot="time" class="time-title">
-      <span v-for="(item, index) in configData.timePeriod" :key=index>{{item}}</span>
+      <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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">
+    <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>