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

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

@@ -139,8 +139,9 @@
             <el-table-column label="诊断医生" align="center" prop="diagnosisDoctor" width="120" />
             <el-table-column label="诊断时间" align="center" prop="diagnosisTime" width="150" />
             <el-table-column label="诊断代码" align="center" prop="ybNo" width="180" />
-            <el-table-column label="诊断类型" align="center" prop="maindiseFlag">
+            <el-table-column label="诊断类型" align="center" prop="maindiseFlag" width="120">
               <template #default="scope">
+              <div style="display:flex;flex-direction:column;align-items:center;gap:5px;">
                 <el-checkbox
                   label="主诊断"
                   :trueLabel="1"
@@ -153,7 +154,7 @@
                 <el-select
                   v-model="scope.row.verificationStatusEnum"
                   placeholder=" "
-                  style="width: 40%; padding-bottom: 5px; padding-left: 10px"
+                  style="width: 100%; padding-bottom: 5px; padding-left: 10px"
                   size="small"
                 >
                   <el-option
@@ -163,6 +164,7 @@
                     :value="item.value"
                   />
                 </el-select>
+              </div>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="130">