提交merge1.3

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

@@ -46,6 +46,21 @@
               />
             </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>
@@ -86,6 +101,7 @@
           </el-col> -->
         </el-row>
 
+<<<<<<< HEAD
         <!-- 添加外层滚动容器，确保表格可以水平滚动 -->
         <div class="table-scroll-container">
           <!-- 移除style="width: 100%"，让Element UI表格根据内容自动调整 -->
@@ -164,6 +180,86 @@
           </el-table>
         </div>
           <pagination
+=======
+        <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
+>>>>>>> v1.3
           v-show="total > 0"
           :total="total"
           v-model:page="queryParams.pageNo"
@@ -211,7 +307,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"