解决合并冲突并优化代码结构

openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue

@@ -2,7 +2,6 @@
   <div>
     <el-row :gutter="24">
       <el-col :span="4" :xs="24">
-<<<<<<< HEAD
         <el-input
           v-model="diagnosis"
           placeholder="诊断名称"
@@ -24,18 +23,6 @@
           :filter-node-method="filterNode"
           @node-click="handleNodeClick"
         >
-=======
-        <div style="height: 44px; display: flex; align-items: center; flex: none">
-          <el-input v-model="diagnosis" placeholder="诊断名称" clearable style="width: 100%"
-            @keyup.enter="queryDiagnosisUse">
-            <template #append>
-              <el-button icon="Search" @click="queryDiagnosisUse" />
-            </template>
-          </el-input>
-        </div>
-        <el-tree ref="treeRef" :data="tree" node-key="id" :props="{ label: 'name', children: 'children' }"
-          highlight-current default-expand-all :filter-node-method="filterNode" @node-click="handleNodeClick">
->>>>>>> upstream/develop
           <template #default="{ node, data }">
             <div class="custom-tree-node">
               <span>{{ node.label }}</span>
@@ -118,7 +105,6 @@
             <el-table-column label="诊断代码" align="center" prop="ybNo" width="180" />
             <el-table-column label="诊断类型" align="center" prop="maindiseFlag" width="120">
               <template #default="scope">
-<<<<<<< HEAD
               <div style="display:flex;flex-direction:column;align-items:center;gap:5px;">
                 <el-checkbox
                   label="主诊断"
@@ -141,14 +127,6 @@
                     :label="item.label"
                     :value="item.value"
                   />
-=======
-                <el-checkbox label="主诊断" :trueLabel="1" :falseLabel="0" v-model="scope.row.maindiseFlag" border
-                  size="small" @change="(value) => handleMaindise(value, scope.$index)" />
-                <el-select v-model="scope.row.verificationStatusEnum" placeholder=" "
-                  style="width: 40%; padding-bottom: 5px; padding-left: 10px" size="small">
-                  <el-option v-for="item in diagnosisOptions" :key="item.value" :label="item.label"
-                    :value="item.value" />
->>>>>>> upstream/develop
                 </el-select>
               </div>
               </template>
@@ -164,7 +142,6 @@
         </el-form>
       </el-col>
     </el-row>
-<<<<<<< HEAD
     <diagnosisdialog
       :openDiagnosis="openDiagnosis"
       @close="closeDiagnosisDialog"
@@ -175,11 +152,6 @@
       :patientInfo="props.patientInfo"
       @close="closeDiagnosisDialog"
     />
-=======
-    <diagnosisdialog :openDiagnosis="openDiagnosis" @close="closeDiagnosisDialog" :radio="orgOrUser" />
-    <AddDiagnosisDialog :openAddDiagnosisDialog="openAddDiagnosisDialog" :patientInfo="patientInfo"
-      @close="closeDiagnosisDialog" />
->>>>>>> upstream/develop
   </div>
 </template>