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

src/views/manage/propaganda/index.vue

@@ -185,6 +185,7 @@
             label="宣教ID"
             align="center"
             prop="propagandaCode"
+            :show-overflow-tooltip="true"
           />
           <el-table-column
             label="宣教状态"
@@ -283,8 +284,6 @@
       </el-col>
     </el-row>
 
- 
-
     <!-- 添加或修改患者宣教信息对话框 -->
     <el-dialog
       :title="title"
@@ -348,7 +347,6 @@
         </el-form-item>
 
         <el-form-item label="科室名称" prop="departmentId">
-     
           <el-select
             v-model="form.departmentName"
             filterable
@@ -1498,7 +1496,6 @@ export default {
 }
 
 .leftpro {
-
   height: 760px;
   overflow: auto;
   .name {

src/views/manage/servicepackage/index.vue

@@ -205,6 +205,7 @@
             prop="diseaseTypeName"
           />
           <el-table-column
+          width="180"
             label="操作"
             align="center"
             class-name="small-padding fixed-width"
@@ -1494,7 +1495,7 @@ export default {
   width: 204px !important;
 }
 .leftserv {
-  height: 1000px;
+  height: 857px;
   overflow: auto;
   .name {
     font-weight: 700;

src/views/system/department/index.vue

@@ -724,6 +724,9 @@ export default {
         departmentName: [
           { required: true, message: "科室名称不能为空", trigger: "blur" },
         ],
+        departmentCode: [
+          { required: true, message: "科室代码不能为空", trigger: "blur" },
+        ],
         departmentPhone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,

src/views/system/departmentDisease/index.vue

@@ -205,8 +205,6 @@
             </template>
           </el-table-column>
         </el-table>
-      </el-col>
-    </el-row>
         <pagination
           v-show="total > 0"
           :total="total"
@@ -214,6 +212,8 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+      </el-col>
+    </el-row>
 
     <!-- 添加或修改科室病种信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -518,7 +518,6 @@ export default {
         ],
         diseaseTypeName: [
           { required: true, message: "病种名称不能为空", trigger: "blur" },
-        
         ],
       },
     };