Merge branch 'ChronicMag' into dev

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"></quillEditor>
+                <quillEditor v-model="item.content" :options="editorOption" v-if="item.val == 0" class="ql-editor"></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,
+        "tagName": this.region.trim(),
         "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,25 +88,9 @@
       }
     },
     created() {
-      this.getDropList().then(() => {
-        this.getDataList()
-      })
+      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) => {

src/components/icss/DiagnosisList.vue

@@ -117,28 +117,12 @@ export default {
         }
     },
     created() {
-        this.getDropList().then(() => {
-            this.getDataList()
-        })
-        
+      this.getDataList()
     },
     methods: {
         getValue(val) {
             console.log('changeVal', val, this.filter.tagAdscription)
         },
-        getDropList() {
-            return api.getDropList().then((res) =>{
-                // console.log('dropList', res)
-                if(res.data.code === '0') {
-                    this.Adscriptions = res.data.data[7];
-                    this.tagTypes =  res.data.data[3];
-                    for (var i = 0; i < this.tagTypes.length; i++) {
-                        this.tagTypesList.push(this.tagTypes[i].val)
-                    }
-                }
-                 
-            })
-        },
         getDataList() {
             const param = this.getFilterItems();
             api.getTagList(param).then((res) => {

src/components/icss/InfoParagraph.vue

@@ -17,7 +17,7 @@
                 <el-input v-model="data.title"></el-input>
             </el-form-item>
             <el-form-item label="内容" prop="content" label-width="130px">
-                <quillEditor v-model="data.content" :options="editorOption"></quillEditor>
+                <quillEditor v-model="data.content" :options="editorOption"  class="ql-editor"></quillEditor>
             </el-form-item>
             <el-form-item label-width="130px">
                 <el-button @click="addEmit">添加段落</el-button>

src/components/icss/MedicineInfoPg.vue

@@ -16,8 +16,8 @@
         <el-form-item label="标题名称：" prop="title" label-width="160px">
             <el-input v-model="data.title" :disabled="isEdit&&index<len"></el-input>
         </el-form-item>
-        <el-form-item label="内容：" prop="content" label-width="160px">
-            <quillEditor v-model="data.content" :options="editorOption"></quillEditor>
+        <el-form-item label="内容" prop="content" label-width="160px">
+            <quillEditor v-model="data.content" :options="editorOption"  class="ql-editor"></quillEditor>
         </el-form-item>
         <!--<el-form-item label-width="130px">
             <el-button @click="addEmit">添加段落</el-button>

src/components/icss/PubTemplateGroup.vue

@@ -145,10 +145,10 @@ export default {
       if(newVal != preVal){
         if(newVal == 1){
           let tmpDeptDTOS = this.deptDis.deptDTOS
-          let obj = {id:-1,name:'通用'}
-          if(tmpDeptDTOS[0].id != 0){
-            tmpDeptDTOS.unshift(obj)
-          }
+          // let obj = {id:-1,name:'通用'}
+          // if(tmpDeptDTOS[0].id != 0){
+          //   tmpDeptDTOS.unshift(obj)
+          // }
           this.sonLis = tmpDeptDTOS
           if(!this.form.id){
             this.form.region4 = ''
@@ -156,10 +156,10 @@ export default {
           }
         }else if(newVal == 2){
           let tmpDisDTOS = this.deptDis.disDTOS
-          let obj = {id:-1,name:'通用'}
-          if(tmpDisDTOS[0].id != 0){
-            tmpDisDTOS.unshift(obj)
-          }
+          // let obj = {id:-1,name:'通用'}
+          // if(tmpDisDTOS[0].id != 0){
+          //   tmpDisDTOS.unshift(obj)
+          // }
           this.sonLis = tmpDisDTOS
           if(!this.form.id){
             this.form.region4 = ''