Merge branch 'huli0422' into test

src/components/basicKnow/AddTerm.vue

@@ -1134,7 +1134,7 @@ td {
     display: inline-block;
     width: auto;
     .el-input__inner {
-      width: 60px;
+      width: 80px;
       padding: 0 5px;
       text-align: center;
     }
@@ -1152,9 +1152,6 @@ td {
   }
   .inp{
     margin-left: 20px;
-    /deep/ .el-input__inner{
-      width: 80px;
-    }
   }
 }
 /deep/ .marT {

src/components/cdssManage/nursing/Addnursing.vue

@@ -91,11 +91,11 @@ export default {
       },
       rules: {
         hisName: [
-          { required: true, message: '请输入科室名称', trigger: 'change' },
-          { max: 80, message: '科室名称最多80字', trigger: 'change' }
+          { required: true, message: '请输入护理名称', trigger: 'change' },
+          { max: 80, message: '护理名称最多80字', trigger: 'change' }
         ],
         searchText: [
-          { required: true, message: '请选择科室名称', trigger: 'change' }
+          { required: true, message: '请选择护理名称', trigger: 'change' }
         ]
       },
       saveDisable: false, //保存按钮禁止点击

src/components/knowledgeExtra/DevInfo.vue

@@ -162,7 +162,7 @@ export default {
           {
             validator: (rule, value, callback) => {
               if (!value.trim()) {
-                callback(new Error('请输入段落内容'));
+                callback(new Error('请输入段落标题'));
               } else {
                 callback();
               }