修正前端问题

openhis-ui-vue3/src/views/catalog/device/index.vue

@@ -103,7 +103,7 @@
           :data="deviceList"
           @selection-change="handleSelectionChange"
           width="90%"
-        >
+        />
         <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange" width="90%" border resizable-column>
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column

openhis-ui-vue3/src/views/catalog/disease/index.vue

@@ -46,21 +46,6 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="诊断类型" prop="typeCode">
-            <el-select
-              v-model="queryParams.typeCode"
-              placeholder="请选择"
-              style="width: 240px"
-              clearable
-            >
-              <el-option
-                v-for="dict in condition_type_code"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
           <!-- <el-form-item>
                   <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                   <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -101,84 +86,6 @@
           </el-col> -->
         </el-row>
 
-        <el-table v-loading="loading" :data="diseaseList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="编码" align="center" key="conditionCode" prop="conditionCode" />
-          <el-table-column
-            label="名称"
-            align="center"
-            key="name"
-            prop="name"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="疾病分类"
-            align="center"
-            key="sourceEnum_enumText"
-            prop="sourceEnum_enumText"
-            :show-overflow-tooltip="true"
-          />
-          <!-- <el-table-column
-            label="拼音助记码"
-            align="center"
-            key="pyStr"
-            prop="pyStr"
-            :show-overflow-tooltip="true"
-          /> -->
-          <el-table-column
-            label="类型"
-            align="center"
-            key="typeCode_dictText"
-            prop="typeCode_dictText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="医保编码 "
-            align="center"
-            key="ybNo"
-            prop="ybNo"
-            :show-overflow-tooltip="true"
-          />
-          <!-- <el-table-column
-            label="医保标记"
-            align="center"
-            key="ybMatchFlag"
-            prop="ybMatchFlag_enumText"
-          />
-          <el-table-column
-            label="医保对码标志"
-            align="center"
-            key="ybMatchFlag"
-            prop="ybMatchFlag_enumText"
-          /> -->
-          <el-table-column
-            label="状态"
-            align="center"
-            key="statusEnum_enumText"
-            prop="statusEnum_enumText"
-            width="160"
-          />
-          <el-table-column
-            label="描述"
-            align="center"
-            key="description"
-            prop="description"
-            width="160"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            width="150"
-            class-name="small-padding fixed-width"
-          >
-            <template #default="scope">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                >编辑</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
         <!-- 添加外层滚动容器，确保表格可以水平滚动 -->
         <div class="table-scroll-container">
           <!-- 移除style="width: 100%"，让Element UI表格根据内容自动调整 -->
@@ -304,7 +211,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="诊断类型" prop="typeCode">
+            <el-form-item label="类型" prop="typeCode">
               <el-select v-model="form.typeCode" placeholder="请选择" clearable>
                 <el-option
                   v-for="dict in condition_type_code"

openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue

@@ -350,7 +350,6 @@
 </template>
 
 <script setup name="PatientAddDialog">
-import { watch } from 'vue';
 import { watch, defineProps } from "vue";
 import pcas from 'china-division/dist/pcas-code.json';
 import { addPatient, patientlLists, getOutpatientRegistrationList } from './outpatientregistration';

openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue

@@ -765,8 +765,6 @@ const patientInfoList = ref(undefined);
 // 费用性质
 const contractList = ref(undefined);
 // const locationOptions = ref(undefined); // 地点树选项
-const doctorList = ref(undefined); // 医生选项
-const healthcareList = ref([]); // 挂号项目选项
 const doctorList = ref(undefined); // 医生选项（过滤后的）
 const allDoctorList = ref(undefined); // 所有医生选项（用于过滤）
 const healthcareList = ref(undefined); // 挂号项目选项

openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue

@@ -211,26 +211,26 @@ watch(
   { deep: true }
 );
 
-getList();
-function getList() {
-  queryParams.value.organizationId = props.patientInfo.orgId;
-  getAdviceBaseInfo(queryParams.value).then((res) => {
-    if (res.data.records.length > 0) {
-      adviceBaseList.value = res.data.records.filter((item) => {
-        if (item.adviceType == 1 || item.adviceType == 2) {
-          return handleQuantity(item) != 0;
-        } else {
-          return true;
-        }
-      });
-      total.value = res.data.total;
-      nextTick(() => {
-        currentIndex.value = 0;
-        // adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
-      });
-    }
-  });
-}
+getList();  
+// function getList() {
+//   queryParams.value.organizationId = props.patientInfo.orgId;
+//   getAdviceBaseInfo(queryParams.value).then((res) => {
+//     if (res.data.records.length > 0) {
+//       adviceBaseList.value = res.data.records.filter((item) => {
+//         if (item.adviceType == 1 || item.adviceType == 2) {
+//           return handleQuantity(item) != 0;
+//         } else {
+//           return true;
+//         }
+//       });
+//       total.value = res.data.total;
+//       nextTick(() => {
+//         currentIndex.value = 0;
+//         // adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
+//       });
+//     }
+//   });
+// }
 // 从priceList列表中获取价格
 function getPriceFromInventory(row) {
   if (row.priceList && row.priceList.length > 0) {

openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue

@@ -202,7 +202,6 @@
                         <el-form-item
                           label="数量："
                           prop="minUnitQuantity"
-                          prop="minUnitQuantity"
                           class="required-field"
                           data-prop="minUnitQuantity"
                         >
@@ -463,7 +462,6 @@ const unitCodeList = ref([]);
 const adviceTableRef = ref([]);
 const organization = ref([]);
 const conditionDefinitionId = ref('');
-const encounterDiagnosisId = ref('');
 const diagnosisName = ref('');
 const diagnosisInfo = ref({});
 const rateCode = ref('');