Merge remote-tracking branch 'origin/static_copy' into test

src/components/cdssManage/AddMedicinePrompt.vue

@@ -36,7 +36,7 @@
           </el-form-item>
           <el-form-item label="已选择标准术语：" label-width="160px">{{form.selectedTermName}}</el-form-item>
           <el-form-item
-            v-if="form.selectedTerm&&(form.typeId==1||form.typeId==3||form.typeId==4||form.typeId==5)"
+            v-if="form.selectedTerm&&(form.typeId==1||form.typeId==3||form.typeId==4||form.typeId==5||form.typeId==6)"
             :label="titleChange"
             prop="titleChange"
             label-width="160px"
@@ -249,7 +249,7 @@ export default {
               this.form.titleChange =
                 data.type == 1
                   ? data.clinicalPathwayName
-                  : data.type == 3 || data.type == 4 || data.type == 5
+                  : data.type == 3 || data.type == 4 || data.type == 5 || data.type == 6
                   ? data.noticeName
                   : '';
               this.form.selectedTermName =
@@ -346,14 +346,6 @@ export default {
     handleMouseleave() {
       this.isShowTip = false;
     },
-    deleteWord(){
-      this.showType = -1;
-      this.form.selectedTermName ='';
-      this.form.selectedTerm = '';
-      this.form.name = '';
-      this.form.typeId = '';
-      this.titleChange ='';
-    },
     changeWord(newVal) {
       // console.log(newVal, '选中');
       this.showType = newVal.type || -1;
@@ -371,7 +363,7 @@ export default {
       this.titleChange =
         type == 1
           ? '临床路径标题：'
-          : type == 3 || type == 4 || type == 5
+          : type == 3 || type == 4 || type == 5 || type == 6
           ? '注意事项标题：'
           : '';
       this.form.fileTitle = '';
@@ -476,7 +468,7 @@ export default {
       let isDiagFlag = positionArr.some(item => item === 3);
       // console.log(isVisFlag, 'isVisFlag');
       if (
-        (this.showType == 3 || this.showType == 4 || this.showType == 5) &&
+        (this.showType == 3 || this.showType == 4 || this.showType == 5 || this.showType == 6) &&
         isVisFlag
       ) {
         //若医学术语为检验/检查，且内容类型选择了注意事项，此时“注意事项标题”是必填项
@@ -487,6 +479,7 @@ export default {
           trigger: 'change'
         });
         this.$refs.groups.validateField('titleChange');
+        this.$refs.groups.validateField('selectedTerm');
         this.rules.titleChange = this.rules.titleChange.slice(0, 1);
 
         if (this.form.titleChange.trim() !== '') {
@@ -509,6 +502,7 @@ export default {
           trigger: 'change'
         });
         this.$refs.groups.validateField('titleChange');
+        this.$refs.groups.validateField('selectedTerm');
         this.rules.titleChange = this.rules.titleChange.slice(0, 1);
 
         if (this.form.titleChange.trim() !== '') {
@@ -612,7 +606,7 @@ export default {
         paramsAll.id = this.conceptId;
         paramsAll.name = this.form.name;
         paramsAll.noticeName =
-          types == 3 || types == 4 || types == 5 ? this.form.titleChange : '';
+          types == 3 || types == 4 || types == 5 || types == 6 ? this.form.titleChange : '';
         paramsAll.type = this.form.typeId;
         paramsAll.details = tempArr;
         param = paramsAll;
@@ -638,7 +632,7 @@ export default {
     },
 
     //保存编辑 接口
-    sendSaveOrEdit(param) {console.log(this.$route.params,param);
+    sendSaveOrEdit(param) {
       this.isCopy&&(param.id=undefined);
       api.saveTermPrompts(param).then(res => {
           if (res.data.code === '0') {