提交merge1.3

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

@@ -101,86 +101,6 @@
           </el-col> -->
         </el-row>
 
-<<<<<<< HEAD
-        <!-- 添加外层滚动容器，确保表格可以水平滚动 -->
-        <div class="table-scroll-container">
-          <!-- 移除style="width: 100%"，让Element UI表格根据内容自动调整 -->
-          <el-table v-loading="loading" :data="diseaseList" @selection-change="handleSelectionChange" border resizable>
-            <el-table-column type="selection" width="50" align="center" />
-            <!-- 使用prop属性并设置合适的最小宽度，启用列宽调整 -->
-            <el-table-column label="编码" align="center" prop="conditionCode" min-width="150" />
-            <!-- 名称列使用标准配置 -->
-            <el-table-column
-              label="名称"
-              align="center"
-              prop="name"
-              min-width="280"
-            />
-            <!-- 其他列使用标准配置 -->
-            <el-table-column
-              label="疾病分类"
-              align="center"
-              prop="sourceEnum_enumText"
-              min-width="180"
-            />
-            <el-table-column
-              label="拼音助记码"
-              align="center"
-              prop="pyStr"
-              min-width="220"
-            />
-            <el-table-column
-              label="类型"
-              align="center"
-              prop="typeCode_dictText"
-              min-width="120"
-            />
-            <el-table-column
-              label="医保编码"
-              align="center"
-              prop="ybNo"
-              min-width="180"
-            />
-            <el-table-column
-              label="医保标记"
-              align="center"
-              prop="ybMatchFlag_enumText"
-              min-width="150"
-            />
-            <el-table-column
-              label="医保对码标志"
-              align="center"
-              prop="ybMatchFlag_enumText"
-              min-width="150"
-            />
-            <el-table-column
-              label="状态"
-              align="center"
-              prop="statusEnum_enumText"
-              min-width="150"
-            />
-            <el-table-column
-              label="描述"
-              align="center"
-              prop="description"
-              min-width="250"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              min-width="120"
-              class-name="small-padding"
-            >
-              <template #default="scope">
-                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                  >编辑</el-button
-                >
-              </template>
-            </el-table-column>
-          </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" />
@@ -259,7 +179,6 @@
           </el-table-column>
         </el-table>
         <pagination
->>>>>>> v1.3
           v-show="total > 0"
           :total="total"
           v-model:page="queryParams.pageNo"