Merge remote-tracking branch 'origin/develop' into zhaoyun

2026-06-17 18:05:43 +08:00
parent db83b97839 dbb4504be9
commit 687c6dfef4
11 changed files with 54 additions and 55 deletions
--- a/healthlink-his-ui/src/views/catalog/medicine/index.vue
+++ b/healthlink-his-ui/src/views/catalog/medicine/index.vue
@@ -239,8 +239,8 @@
            align="center"
            field="totalVolume"
            show-overflow="title"
-            min-width="200px"
-            width="200px"
+            min-width="200"
+            width="200"
          />
          <vxe-column
            key="statusEnum_enumText"
--- a/healthlink-his-ui/src/views/doctorstation/components/inspection/inspectionApplication.vue
+++ b/healthlink-his-ui/src/views/doctorstation/components/inspection/inspectionApplication.vue
@@ -127,7 +127,7 @@
          <vxe-column
            title="检验项目"
            field="itemName"
-            min-width="170px"
+            min-width="170"
            align="center"
            header-align="center"
          >
--- a/healthlink-his-ui/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientList.vue
+++ b/healthlink-his-ui/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientList.vue
@@ -14,17 +14,17 @@
      <vxe-column
        title="姓名"
        field="name"
-        min-width="90px"
+        min-width="90"
      />
      <vxe-column
        title="年龄"
        field="age"
-        width="60px"
+        width="60"
      />
      <vxe-column
        title="费别"
        field="feeType"
-        width="60px"
+        width="60"
      />
      <vxe-column
        title="病区"
--- a/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/accomplishList.vue
+++ b/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/accomplishList.vue
@@ -59,7 +59,7 @@
      <vxe-table
        ref="tableRef"
        :data="treatHospitalizedData"
-        min-width="1600px"
+        min-width="1600"
        show-overflow="title"
        @radio-change="handleRadioChange"
      >
--- a/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue
+++ b/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue
@@ -50,7 +50,7 @@
    <div class="table-container">
      <vxe-table
        :data="treatHospitalizedData"
-        min-width="900px"
+        min-width="900"
        show-overflow="title"
      >
        <vxe-column
--- a/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/drugDistributionList.vue
+++ b/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/drugDistributionList.vue
@@ -121,7 +121,7 @@
        <vxe-column
          title="类型"
          field="name"
-          min-width=" 60px"
+          min-width="60"
        >
          <template #default="{ row }">
            <span v-if="!row.children">长期</span>
@@ -134,7 +134,7 @@
        <vxe-column
          title="医嘱内容"
          field="content"
-          min-width="220px"
+          min-width="220"
        >
          <template #default="{ row }">
            <span v-if="row.children">{{ row.content }}</span>
@@ -144,9 +144,9 @@
          v-if="searchForm.drugType == '1' || searchForm.drugType == '3'"
          title="用法/频次"
          field="gender"
-          min-width="120px"
+          min-width="120"
        >
-          <template #default="{ row }">
+          <template #default>
            <span>注射/qd</span>
          </template>
        </vxe-column>
@@ -154,7 +154,7 @@
          v-if="searchForm.drugType == '3'"
          title="领药数量"
          field="gender"
-          min-width="120px"
+          min-width="120"
        >
          <template #default="{ row }">
            <el-input-number
@@ -169,27 +169,27 @@
          v-if="searchForm.drugType == '1' || searchForm.drugType == '2'"
          title="领药总量"
          field="gender"
-          min-width="100px"
+          min-width="100"
        >
-          <template #default="{ row }">
+          <template #default>
            <span>2 支</span>
          </template>
        </vxe-column>
        <vxe-column
          title="参考金额"
          field="gender"
-          min-width="100px"
+          min-width="100"
        >
-          <template #default="{ row }">
+          <template #default>
            <span>20.00</span>
          </template>
        </vxe-column>
        <vxe-column
          title="取药科室"
          field="gender"
-          min-width="140px"
+          min-width="140"
        >
-          <template #default="{ row }">
+          <template #default>
            <span>儿科</span>
          </template>
        </vxe-column>
@@ -198,7 +198,7 @@
          title="领药次数"
          field="gender"
          fixed="right"
-          min-width="340px"
+          min-width="340"
        >
          <template #default="{ row }">
            <template v-if="!row.children">
@@ -235,7 +235,7 @@
        <vxe-column
          title="医嘱内容"
          field="content"
-          min-width="220px"
+          min-width="220"
        >
          <template #default="{ row }">
            <span v-if="!row.children">{{ row.content }}</span>
@@ -247,27 +247,27 @@
        <vxe-column
          title="领药数量"
          field="gender"
-          min-width="120px"
+          min-width="120"
        >
-          <template #default="{ row }">
+          <template #default>
            <span>2 支</span>
          </template>
        </vxe-column>
        <vxe-column
          title="单价"
          field="gender"
-          min-width="100px"
+          min-width="100"
        >
-          <template #default="{ row }">
+          <template #default>
            <span>20.00</span>
          </template>
        </vxe-column>
        <vxe-column
          title="参考金额"
          field="gender"
-          min-width="140px"
+          min-width="140"
        >
-          <template #default="{ row }">
+          <template #default>
            <span>40.00</span>
          </template>
        </vxe-column>
--- a/healthlink-his-ui/src/views/inpatientNurse/medicalOrderManagement/components/execute/MedicalOrderManagement.vue
+++ b/healthlink-his-ui/src/views/inpatientNurse/medicalOrderManagement/components/execute/MedicalOrderManagement.vue
@@ -124,7 +124,7 @@
        <vxe-column
          title="执行时间"
          field="gender"
-          min-width="200px"
+          min-width="200"
        >
          <template #default="{ row }">
            <template v-if="!row.children">
--- a/healthlink-his-ui/src/views/inpatientNurse/medicineCollect/index.vue
+++ b/healthlink-his-ui/src/views/inpatientNurse/medicineCollect/index.vue
@@ -133,7 +133,7 @@
        <vxe-column
          title="医嘱内容"
          field="content"
-          min-width="300px"
+          min-width="300"
        >
          <template #default="{ row }">
            <span v-if="row.children">{{ row.content }}</span>
--- a/healthlink-his-ui/src/views/inpatientNurse/tprsheet/components/addAttr.vue
+++ b/healthlink-his-ui/src/views/inpatientNurse/tprsheet/components/addAttr.vue
@@ -32,7 +32,6 @@
            placeholder="请选择"
            clearable
            filterable
-            @change=""
          >
            <el-option
              v-for="item in temOptions"
@@ -220,7 +219,7 @@
              </el-form-item>
            </template>
          </vxe-column>
-          <!-- <vxe-column width="200px" title="血氧">
+          <!-- <vxe-column width="200" title="血氧">
            <template #default="scoped">
              <el-form-item size="normal" :prop="`fillTableData.${scoped.rowIndex}.bloodOxygen`">
                <div style="margin-left: -80px">
@@ -232,7 +231,7 @@
              </el-form-item>
            </template>
          </vxe-column>
-          <vxe-column width="200px" title="血糖">
+          <vxe-column width="200" title="血糖">
            <template #default="scoped">
              <el-form-item size="normal" :prop="`fillTableData.${scoped.rowIndex}.bloodGlucose`">
                <div style="margin-left: -80px">
@@ -241,7 +240,7 @@
              </el-form-item>
            </template>
          </vxe-column>
-          <vxe-column width="200px" title="物理降温">
+          <vxe-column width="200" title="物理降温">
            <template #default="scoped">
              <el-form-item size="normal" :prop="`fillTableData.${scoped.rowIndex}.physicalCooling`">
                <div style="margin-left: -80px">
@@ -250,7 +249,7 @@
              </el-form-item>
            </template>
          </vxe-column>
-          <vxe-column width="200px" title="CCU心率">
+          <vxe-column width="200" title="CCU心率">
            <template #default="scoped">
              <el-form-item size="normal" :prop="`fillTableData.${scoped.rowIndex}.ccuHeartRate`">
                <div style="margin-left: -80px">
@@ -259,7 +258,7 @@
              </el-form-item>
            </template>
          </vxe-column>
-          <vxe-column width="200px" title="新生儿箱温">
+          <vxe-column width="200" title="新生儿箱温">
            <template #default="scoped">
              <el-form-item
                size="normal"
@@ -271,7 +270,7 @@
              </el-form-item>
            </template>
          </vxe-column>
-          <vxe-column width="200px" title="血酮">
+          <vxe-column width="200" title="血酮">
            <template #default="scoped">
              <el-form-item size="normal" :prop="`fillTableData.${scoped.rowIndex}.bloodKetone`">
                <div style="margin-left: -80px">
--- a/healthlink-his-ui/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
+++ b/healthlink-his-ui/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
@@ -171,14 +171,14 @@
    >
      <vxe-column
        type="checkbox"
-        width="50px"
+        width="50"
        align="center"
      />
      <vxe-column
        key="busNo"
        title="门诊号"
        align="center"
-        min-width="150px"
+        min-width="150"
        show-overflow="title"
        resizable
      >
@@ -204,7 +204,7 @@
        title="姓名"
        align="center"
        field="name"
-        width="90px"
+        width="90"
        show-overflow="title"
        resizable
      />
@@ -213,7 +213,7 @@
        title="医保号"
        align="center"
        field="ybCode"
-        min-width="200px"
+        min-width="200"
        show-overflow="title"
        resizable
      />
@@ -230,7 +230,7 @@
        title="医保码"
        align="center"
        field="ybNo"
-        min-width="250px"
+        min-width="250"
        show-overflow="title"
        resizable
      />
--- a/healthlink-his-ui/src/views/tool/gen/editTable.vue
+++ b/healthlink-his-ui/src/views/tool/gen/editTable.vue
@@ -23,17 +23,17 @@
          <vxe-column
            title="序号"
            type="seq"
-            min-width="5%"
+            width="5%"
          />
          <vxe-column
            title="字段列名"
            field="columnName"
-            min-width="10%"
+            width="10%"
            show-overflow="title"
          />
          <vxe-column
            title="字段描述"
-            min-width="10%"
+            width="10%"
          >
            <template #default="scope">
              <el-input v-model="scope.row.columnComment" />
@@ -42,12 +42,12 @@
          <vxe-column
            title="物理类型"
            field="columnType"
-            min-width="10%"
+            width="10%"
            show-overflow="title"
          />
          <vxe-column
            title="Java类型"
-            min-width="11%"
+            width="11%"
          >
            <template #default="scope">
              <el-select v-model="scope.row.javaType">
@@ -84,7 +84,7 @@
          </vxe-column>
          <vxe-column
            title="java属性"
-            min-width="10%"
+            width="10%"
          >
            <template #default="scope">
              <el-input v-model="scope.row.javaField" />
@@ -93,7 +93,7 @@

          <vxe-column
            title="插入"
-            min-width="5%"
+            width="5%"
          >
            <template #default="scope">
              <el-checkbox
@@ -105,7 +105,7 @@
          </vxe-column>
          <vxe-column
            title="编辑"
-            min-width="5%"
+            width="5%"
          >
            <template #default="scope">
              <el-checkbox
@@ -117,7 +117,7 @@
          </vxe-column>
          <vxe-column
            title="列表"
-            min-width="5%"
+            width="5%"
          >
            <template #default="scope">
              <el-checkbox
@@ -129,7 +129,7 @@
          </vxe-column>
          <vxe-column
            title="查询"
-            min-width="5%"
+            width="5%"
          >
            <template #default="scope">
              <el-checkbox
@@ -141,7 +141,7 @@
          </vxe-column>
          <vxe-column
            title="查询方式"
-            min-width="10%"
+            width="10%"
          >
            <template #default="scope">
              <el-select v-model="scope.row.queryType">
@@ -182,7 +182,7 @@
          </vxe-column>
          <vxe-column
            title="必填"
-            min-width="5%"
+            width="5%"
          >
            <template #default="scope">
              <el-checkbox
@@ -194,7 +194,7 @@
          </vxe-column>
          <vxe-column
            title="显示类型"
-            min-width="12%"
+            width="12%"
          >
            <template #default="scope">
              <el-select v-model="scope.row.htmlType">
@@ -239,7 +239,7 @@
          </vxe-column>
          <vxe-column
            title="字典类型"
-            min-width="12%"
+            width="12%"
          >
            <template #default="scope">
              <el-select