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

# Conflicts:
#	src/components/icss/AddMedicinePrompt.vue
#	src/components/icss/ChronicDiseaseAdd.vue
#	src/components/icss/ChronicDiseaseManage.vue
#	src/components/icss/DiagnosisList.vue
#	src/components/icss/MedicineInfoPg.vue
#	src/components/icss/PromptDetail.vue
#	src/components/icss/PubTemplateGroup.vue

src/components/icss/ChronicDiseaseAdd.vue

@@ -47,7 +47,7 @@
             <div class="contentDetail clearfix" v-for="(item,idx) in contentPool" :class="selectRightPart.order == item.order?'selectDom':null" :key="item.order" @click="selectPart(item,2)">
               <span>{{item.name}}：</span>
               <div class="contentDetails">
-                <quillEditor v-model="item.content" :options="editorOption" v-if="item.val == 0" class="ql-editor"></quillEditor>
+                <quillEditor v-model="item.content" :options="editorOption" v-if="item.val == 0"></quillEditor>
               </div>
             </div>
           </div>
@@ -101,7 +101,7 @@ export default {
       selectId:'',
       AdscriptionsType: [],
       editData: {},
-      minTitle:'量表维护-添加量表内容',
+      minTitle:'量表维护-添加量表',
       showLis:false,
       parts:[],
       selectLeftPart:{},//左侧选中
@@ -117,7 +117,7 @@ export default {
     let tmpEditData = this.$route.params
     if (tmpEditData.isEdit) {      //修改
       this.editData = tmpEditData
-      this.minTitle='量表维护-修改量表内容'
+      this.minTitle='量表维护-修改量表'
       this.selectName = tmpEditData.data.name
       this.selectId = tmpEditData.data.id
       let tmpScale = tmpEditData.data.scale
@@ -216,7 +216,7 @@ export default {
     },
     searchTagList() {
       let param = {
-        "tagName": this.region.trim(),
+        "tagName": this.region,
         "type": "21",
         "filterList":[
           "scale"
@@ -268,7 +268,7 @@ export default {
         });
         return
       }
-      this.showConfirmDialog('是否保存该量表内容？', () => {
+      this.showConfirmDialog('是否保存该标签组？', () => {
         api.insertOrUpdate(param).then((res) => {
           if (res.data.code === '0') {
             this.warning(res.data.msg || '保存成功', 'success');

src/components/icss/ChronicDiseaseManage.vue

@@ -88,9 +88,25 @@
       }
     },
     created() {
-      this.getDataList()
+      this.getDropList().then(() => {
+        this.getDataList()
+      })
     },
     methods: {
+      getDropList() {
+        let templateOwn = localStorage.getItem('icssEnumsData') ? JSON.parse(localStorage.getItem('icssEnumsData')).moduleTypeEnum : []
+        let templateType = localStorage.getItem('icssEnumsData') ? JSON.parse(localStorage.getItem('icssEnumsData')).moduleInfoTypeEnum : []
+        this.Adscriptions = templateOwn;
+        this.AdscriptionsType = templateType
+        return api.getDropList().then((res) =>{
+          if(res.data.code === '0') {
+            this.tagTypes =  res.data.data[6];
+            for (var i = 0; i < this.tagTypes.length; i++) {
+              this.tagTypesList.push(this.tagTypes[i].val)
+            }
+          }
+        })
+      },
       getDataList() {
         const param = this.getFilterItems();
         api.queryEvaluationModulePages(param).then((res) => {
@@ -177,4 +193,4 @@
     .delete:hover {
         color: red;
     }
-</style>
+</style>