Merge branch 'test' into ChronicMag_zxc

src/components/icss/DiagnosisPubTag.vue

@@ -204,12 +204,15 @@ import utils from '@api/utils.js';
 export default {
   props:['editData'],
   data() {
+    var validatePass1 = (rule, value, callback) => {
+        this.validateSystomName(value,callback,1)
+    };
     var validatePass2 = (rule, value, callback) => {
         const editData = this.$props.editData;
         if(editData.id && value == editData.tagName){ //修改系统名称没变就不再校验
-          callback();    
+          callback();
         }else{
-          this.validateSystomName(value,callback)
+          this.validateSystomName(value,callback,2)
         }
     };
     return {
@@ -226,7 +229,7 @@ export default {
         region10: '1',        //是否复制主标签
         region11: '0',       //是否复制当前模块
         region12:'1',        //是否为症状
-        region13:'',        //诊断归属
+        region13:'0',        //诊断归属
         tagPool:[],          //标签池数据
         order:[],            //排序方式
         tipLis:[],           //提示列表
@@ -246,7 +249,8 @@ export default {
           { validator: validatePass2, trigger: 'blur' },
         ],
         region4: [
-          { required: true, message: '请输入标签界面名称', trigger: 'change' }
+          { required: true, message: '请输入标签界面名称', trigger: 'change' },
+          { validator: validatePass1, trigger: 'blur' },
         ],
         region6: [
           { required: true, message: '请输入能否当项目检索', trigger: 'change' }
@@ -349,22 +353,24 @@ export default {
         }
       })
     },
-    validateSystomName(name,callback) {
-      if(this.form.region3.trim() == ''){ return }
-      let param = {
-        "existName": this.form.region3,     
-        "type": this.form.region1,  
-        "notTagType":[8,10],        //去掉文字标签查重
-      }
-      api.validateSystomName(param).then((res) => {
-        if (res.data.code === '0') {
-          if(res.data.data && res.data.data.length != 0){
-            callback(new Error('该系统名称已存在'));
-          }else{
-            callback();
-          }
+    validateSystomName(name,callback,flg) {
+      if(flg == 1){
+        let tmpVal = this.form.region4
+        if(tmpVal.trim() == ''){
+          callback(new Error('标签界面名称不能为空'));
+        }else{
+          this.form.region4 = tmpVal.trim()
+          callback();
         }
-      })
+      }else if(flg == 2){
+        let tmpVal = this.form.region3
+        if(tmpVal.trim() == ''){
+          callback(new Error('标签系统名称不能为空'));
+        }else{
+          this.form.region3 = tmpVal.trim()
+          callback();
+        }
+      }
     },
     sendData() {
       this.$emit('changeVal', this.form, false)

src/components/icss/PubIndeptTag.vue

@@ -239,9 +239,17 @@
 
   export default {
     props:['editData'],
-    data() {
+    data() { 
+      var validatePass1 = (rule, value, callback) => {
+          this.validateSystomName(value,callback,1)
+      };
       var validatePass2 = (rule, value, callback) => {
-        this.validateSystomName(value,callback)
+          const editData = this.$props.editData;
+          if(editData.id && value == editData.tagName){ //修改系统名称没变就不再校验
+            callback();
+          }else{
+            this.validateSystomName(value,callback,2)
+          }
       };
       return {
         form: {
@@ -280,7 +288,8 @@
             { validator: validatePass2, trigger: 'blur' },
           ],
           region4: [
-            { required: true, message: '请输入标签界面名称', trigger: 'change' }
+            { required: true, message: '请输入标签界面名称', trigger: 'change' },
+            { validator: validatePass1, trigger: 'blur' },
           ],
           region6: [
             { required: true, message: '请输入能否当项目检索', trigger: 'change' }
@@ -356,24 +365,24 @@
           }
         })
       },
-      validateSystomName(name,callback) {
-        if(this.form.region3.trim() == ''){ return }
-        let param = {
-          "existName": this.form.region3,
-          "type": this.form.region1,
-          "notTagType":[8,10],        //去掉文字标签查重
-          "notIds":[this.$props.editData.id]
-        };
-        api.validateSystomName(param).then((res) => {
-          if (res.data.code === '0') {
-            if(res.data.data && res.data.data.length != 0){
-              this.warning('标签系统名称已重复，无法建立');
-              // callback(new Error('该系统名称已存在'));
-            }else{
-              callback();
-            }
+      validateSystomName(name,callback,flg) {
+        if(flg == 1){
+          let tmpVal = this.form.region4
+          if(tmpVal.trim() == ''){
+            callback(new Error('标签界面名称不能为空'));
+          }else{
+            this.form.region4 = tmpVal.trim()
+            callback();
           }
-        })
+        }else if(flg == 2){
+          let tmpVal = this.form.region3
+          if(tmpVal.trim() == ''){
+            callback(new Error('标签系统名称不能为空'));
+          }else{
+            this.form.region3 = tmpVal.trim()
+            callback();
+          }
+        }
       },
       sendData() {
         this.$emit('changeVal', this.form, false)

src/components/icss/PubTagGroup.vue

@@ -210,12 +210,15 @@ import utils from '@api/utils.js';
 export default {
   props:['editData'],
   data() {
+    var validatePass1 = (rule, value, callback) => {
+        this.validateSystomName(value,callback,1)
+    };
     var validatePass2 = (rule, value, callback) => {
         const editData = this.$props.editData;
         if(editData.id && value == editData.tagName){ //修改系统名称没变就不再校验
-          callback();    
+          callback();
         }else{
-          this.validateSystomName(value,callback)
+          this.validateSystomName(value,callback,2)
         }
     };
     return {
@@ -258,10 +261,11 @@ export default {
         ],
         region3: [
           { required: true, message: '请输入标签系统名称', trigger: 'change' },
-          // { validator: validatePass2, trigger: 'blur' },
+          { validator: validatePass2, trigger: 'blur' },
         ],
         region4: [
-          { required: true, message: '请输入标签界面名称', trigger: 'change' }
+          { required: true, message: '请输入标签界面名称', trigger: 'change' },
+          { validator: validatePass1, trigger: 'blur' },
         ],
         region6: [
           { required: true, message: '请输入能否当项目检索', trigger: 'change' }
@@ -370,22 +374,24 @@ export default {
         }
       })
     },
-    validateSystomName(name,callback) {
-      if(this.form.region3.trim() == ''){ return }
-      let param = {
-        "existName": this.form.region3,     
-        "type": this.form.region1,  
-        "notTagType":[8,10],        //去掉文字标签查重
-      }
-      api.validateSystomName(param).then((res) => {
-        if (res.data.code === '0') {
-          if(res.data.data && res.data.data.length != 0){
-            callback(new Error('该系统名称已存在'));
-          }else{
-            callback();
-          }
+    validateSystomName(name,callback,flg) {
+      if(flg == 1){
+        let tmpVal = this.form.region4
+        if(tmpVal.trim() == ''){
+          callback(new Error('标签界面名称不能为空'));
+        }else{
+          this.form.region4 = tmpVal.trim()
+          callback();
         }
-      })
+      }else if(flg == 2){
+        let tmpVal = this.form.region3
+        if(tmpVal.trim() == ''){
+          callback(new Error('标签系统名称不能为空'));
+        }else{
+          this.form.region3 = tmpVal.trim()
+          callback();
+        }
+      }
     },
     sendData() {
       this.$emit('changeVal', this.form, false)

src/components/icss/PubTemplateGroup.vue

@@ -93,6 +93,9 @@ import utils from '@api/utils.js';
 export default {
   props:['editData'],
   data() {
+    var validatePass2 = (rule, value, callback) => {
+        this.validateSystomName(value,callback)
+    };
     return {
       numWord:0,
       Adscriptions:[],
@@ -110,6 +113,7 @@ export default {
         ],
         region2: [
           { required: true, message: '请输入模板名称', trigger: 'change' },
+          { validator: validatePass2, trigger: 'blur' },
         ],
         region3: [
           { required: true, message: '请选择模板类型', trigger: 'change' },
@@ -247,6 +251,15 @@ export default {
         }
       });
     },
+    validateSystomName(name,callback,flg) {
+        let tmpVal = this.form.region2
+        if(tmpVal.trim() == ''){
+          callback(new Error('模板名称不能为空'));
+        }else{
+          this.form.region2 = tmpVal.trim()
+          callback();
+        }
+    },
   }
 }
 </script>