Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/views/common-settings/ItemType.vue

@@ -145,6 +145,9 @@ export default {
         isMergeAsbitem: [
           { required: true, message: "请选择合并组合", trigger: "blur" },
         ],
+        isWrap: [
+          { required: true, message: "请选择结果是否换行", trigger: "blur" },
+        ],
         checkTypeFlag: [
           { required: true, message: "请选择检查类别", trigger: "blur" },
         ],
@@ -199,7 +202,7 @@ export default {
         id:'',
         displayName: "",
         parentId: "",
-        isMergeAsbitem: "",
+        isMergeAsbitem: "N",
         checkTypeFlag: "",
         guidTypeId: "",
         medicalReportTypeId: "",

src/views/user-list/AuditLog.vue

@@ -50,7 +50,7 @@
       </el-table>
         </div>
       </div>
-            <el-pagination
+      <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :page-sizes="[10, 20, 30, 50]"