Merge branch 'dev5.3.1Sup' of http://192.168.2.236:10080/zhouna/platformFront into dev5.3.1Sup

src/api/utils.js

@@ -274,7 +274,8 @@ export default {
       type:'region1',
       url:'region13',
       specFlag:'specFlag',
-      required: 'required'
+      required: 'required',
+      explains:'explains',
     };
     isDpt?maps.controlType = 'region2':maps.tagType = 'region2';
     let obj = {};

src/components/icss/DiagnosisTemplate.vue

@@ -201,7 +201,7 @@ export default {
         color: #f56c6c;
       }
       span {
-        color:#22ccc8;
+        color:@adminBase;
         font-size: 12px;
       }
     }

src/components/icss/MedicineInfoPg.vue

@@ -48,6 +48,15 @@
     },
     data(){
       return {
+        toolbars: [[
+          ['bold','underline', 'strike'],
+          [{'list': 'ordered'}, {'list': 'bullet'}],
+          [{'script': 'sub'}, {'script': 'super'}],
+          [{'color': []}, {'background': []}],
+          [{'align': []}],
+          ['image']
+        ]],
+        toolbarMode:0,
         editorOption: {
           modules: {
             ImageExtend: {
@@ -80,7 +89,7 @@
                 'image': function () {
                   QuillWatch.emit(this.quill.id)
                 }
-              }
+              },
             }
           }
         },
@@ -116,6 +125,9 @@
         this.data.text = this.$refs.quillEditor.quill.root.innerText;
       }
     },
+    created(){
+      this.editorOption.modules.toolbar.container = this.toolbars[this.toolbarMode]
+    },
     mounted(){
       //显示位置枚举列表
       const pos = localStorage.getItem("knowledgeEnumsData");

src/components/preTreat/AddCombinQuestion.vue

@@ -107,6 +107,7 @@
             "ageEnd": this.dataPub.region9,              //最大年龄
             "itemType" :this.dataPub.region12,           //是否为主要内容
             "url":this.dataPub.region13,                  //上传图片
+            'explains':this.dataPub.explains,           //症状解释
             //"questionDetails": this.options,                //明细项
             "questionMappings": this.options,      //映射关系,
           }

src/components/preTreat/AddSimpleQuestion.vue

@@ -14,11 +14,11 @@
                 ref="submitForm"
         ></PubIndeptQa>
         <div class="main">
-            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==3|| dataPub.region2==11">
+            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==3|| dataPub.region2==11|| dataPub.region2==8">
                 填写单明细：<span v-if="dataPub.region2==2">(互斥项与其他明细内容互斥，互斥项同时只可选择一个)</span>
             </p>
             <PubSelect
-                    v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==3 || dataPub.region2==11"
+                    v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==3 || dataPub.region2==11|| dataPub.region2==8"
                     :ascription="dataPub.region1"
                     :sexType="dataPub.region7"
                     :type="dataPub.region2"
@@ -50,7 +50,7 @@
         param:this.$route.params,
         imgList:[],
         dataPub: {},      //公用组件传的值都在这
-        itemsTypes:[1,2],            //有明细的类型
+        itemsTypes:[1,2,8],            //有明细的类型
         editData:{},                    //编辑数据
         options: [],           //标签明细右侧操作数据
       }

src/components/preTreat/PubIndeptQa.vue

@@ -192,6 +192,13 @@
                     <el-button slot="trigger" size="small" type="primary">上传图片</el-button>
                 </el-upload>
             </el-form-item>
+            <el-form-item
+                    v-if="qaType==2&&form.region1=='1'&&form.region2=='4'"
+                    label="医学教育说明："
+                    prop="explains"
+            >
+                <el-input type="textarea" v-model="form.explains" style="width: 500px;"></el-input>
+            </el-form-item>
         </el-form>
     </div>
 </template>
@@ -297,7 +304,7 @@
         showFileList:false,
         uploadUrl:config.urls.uploadImg,        //图片上传地址
         labelTypesMaps: {       // 归属和填写单类型限制
-          '1':['1','2','3','5','6','7'], //症状情况
+          '1':['1','2','3','5','6','7','8'], //症状情况
           '51':['1','2','3','4','5','6','7'],    //诊疗情况
           '3':['1','2','3','5','6','7'],         //其他史
           '52':['1','2','3','5','6','7']            //补充内容

src/components/preTreat/PubSelect.vue

@@ -3,10 +3,10 @@
         <el-form>
             <div class="operation-row">
                 <el-checkbox-group size="small">
-                    <el-checkbox-button :label="0" :disabled="disableBtn" @change="handlePlaceholder(0)">文字输入框占位符</el-checkbox-button>
+                    <el-checkbox-button :label="0" v-if="type!=8" :disabled="disableBtn" @change="handlePlaceholder(0)">文字输入框占位符</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small">
-                    <el-checkbox-button :label="0" :disabled="disableBtn" @change="handlePlaceholder(1)">数字输入框占位符</el-checkbox-button>
+                    <el-checkbox-button :label="0" v-if="type!=8" :disabled="disableBtn" @change="handlePlaceholder(1)">数字输入框占位符</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small" v-if="type==2" v-model="checkedExc">
                     <el-checkbox-button :label="0" @change="handleExclu">互斥项</el-checkbox-button>
@@ -19,6 +19,7 @@
                     <span><i>*</i>填写单医生界面展示标准内容</span>
                     <span>填写单患者界面展示通俗内容</span>
                 </el-col>
+                <p class="static-tip" v-if="type==8">默认展示有/无</p>
                 <el-col v-for="(it,i) in rows" :key="i">
                     <div class="inps">
                         <el-input v-model="rows[i].name"
@@ -57,6 +58,19 @@
 </template>
 <style lang="less">
     @import "../../less/common.less";
+    .main-area{
+        position: relative;
+    }
+    .main-area .static-tip{
+        border:1px solid #dcdfe6;
+        height: 38px;
+        width: 150px;
+        position: absolute;
+        top:29px;
+        left: -150px;
+        line-height: 38px;
+        text-align: center;
+    }
     .main-area .el-col .el-input.red .el-input__inner{
         border-color: red;
     }
@@ -89,7 +103,7 @@
         margin-left: 150px;
     }
     .tip {
-        color: #22ccc8;
+        color: #48C5D7;
     }
     }
     .main-area{