Merge remote-tracking branch 'origin/testedMerge'

src/components/icss/AddMedicalName.vue

@@ -185,7 +185,7 @@
         </table>
         <div class="moreInfo" v-if="showMore==1">
           <p>更多信息：</p>
-          <el-form>
+          <el-form  label-width="150px">
             <el-form-item label="性别：">
                 <el-select v-model="sexType">
                     <el-option v-for="(it,i) in sex" :label="it.name" :value="it.name"></el-option>
@@ -224,6 +224,26 @@
                     <el-option v-for="(it,i) in dioTypeList" :label="it.name" :value="it.val"></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item
+                    v-if="data.type=='症状'"
+                    label="填写单患者界面展示通俗内容："
+                    prop="description"
+                    class="marT description"
+            >
+                <span class="necess">*</span>
+                <el-input
+                        v-model.trim="description"
+                        placeholder="请输入填写单患者界面展示通俗内容"
+                ></el-input>
+            </el-form-item>
+             <el-form-item
+                    v-if="data.type=='症状'"
+                    label="医学教育说明："
+                    prop="explains"
+                    class="marT"
+            >
+                <el-input type="textarea" v-model.trim="explains" maxLength ='100' style="width: 500px;"></el-input>
+            </el-form-item>
           </el-form> 
         </div>
         <div class="btn">
@@ -295,7 +315,9 @@ import SimilarListDrag from './SimilarListDrag'
         dept:'',  //默认展示全科
         similarList: [], //相似词列表
         searchIndex: -1, //展示哪个的同义词
-        searchType: ''
+        searchType: '',
+        description:'',
+        explains:''
       }
     },
     created(){
@@ -412,7 +434,10 @@ import SimilarListDrag from './SimilarListDrag'
               this.showMore = result.data.isHasCommon;
               this.maxAge = result.data.maxAge;
               this.minAge = result.data.minAge;
+              this.description = result.data.description;
+               this.explains = result.data.explains;
               const type = result.data.type;
+              
               if(type == '诊断'){
                 this.dioType = result.data.classify || "Ⅰ"; //类型，默认展示Ⅰ类
                 const deptConptId = result.data.deptId;
@@ -676,6 +701,10 @@ import SimilarListDrag from './SimilarListDrag'
             break
           }
         }
+        if(this.data.type == '症状' && !this.description){
+          this.warning('请输入填写单患者界面展示通俗内容');
+          return
+        }
         
         let params;
         if(this.showMore==1){
@@ -716,7 +745,11 @@ import SimilarListDrag from './SimilarListDrag'
               'conceptId':this.copy?'':this.id,//复制当新增，把id置空
               'sexType':sexCode,
               'maxAge':this.maxAge,
-              'minAge':this.minAge
+              'minAge':this.minAge,
+              'symptomExtVO': {
+                'description': this.description,
+                'explains': this.explains
+              }
             }
           }
           
@@ -917,4 +950,19 @@ import SimilarListDrag from './SimilarListDrag'
   /deep/ .marT{
     margin-top: 20px;
   }
+  /deep/.description{
+    position: relative;
+    .necess{
+      position: absolute;
+      left: -158px;
+      z-index: 2;
+    }
+    .el-input__inner {
+         width: 200px;
+         height: 40px;
+         line-height: 40px;
+        //  text-align: center;
+    }
+  }
+
 </style>

src/components/icss/MedicineInfoPg.vue

@@ -131,7 +131,8 @@
     mounted(){
       //显示位置枚举列表
       const pos = localStorage.getItem("knowledgeEnumsData");
-      this.positions = JSON.parse(pos)&&JSON.parse(pos).positionTypeEnum;
+      const positions = JSON.parse(pos)&&JSON.parse(pos).positionTypeEnum;
+      this.positions = positions.filter(item => item.key != 7 ) //隐去描述信息
     },
     methods:{
       reOrder(i){

src/components/preTreat/PubIndeptQa.vue

@@ -109,7 +109,7 @@
               <el-checkbox v-if="(form.region2=='1'||form.region2=='2')&&form.region1!='51'" :disabled="form.flag==='1'" v-model="form.flag" label="诱因类型" true-label="2" false-label=""  @change="sendData"></el-checkbox>
               <!-- <el-checkbox v-if="form.region2=='8'" v-model="form.flag" label="伴随类型" true-label="3" false-label=""  @change="sendData"></el-checkbox> -->
           </el-form-item>
-            <el-form-item
+            <!-- <el-form-item
                     v-if="qaType==2"
                     label="填写单患者界面展示通俗内容："
                     prop="region5"
@@ -120,7 +120,7 @@
                         placeholder="请输入填写单患者界面展示通俗内容"
                         @change="sendData"
                 ></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item
                     label="性别："
                     prop="region7"
@@ -188,13 +188,13 @@
                     <el-button slot="trigger" size="small" type="primary">上传图片</el-button>
                 </el-upload>
             </el-form-item>
-            <el-form-item
+            <!-- <el-form-item
                     v-if="qaType==2&&form.region1=='1'&&form.region2=='4'"
                     label="医学教育说明："
                     prop="explains"
             >
                 <el-input type="textarea" @input="sendData" v-model="form.explains" maxLength ='100' style="width: 500px;"></el-input>
-            </el-form-item>
+            </el-form-item> -->
         </el-form>
     </div>
 </template>

vue.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
-// const proxy_path = 'http://192.168.2.236:80';
+const proxy_path = 'http://192.168.2.236:80';
 // const proxy_path = 'http://192.168.2.241:88';
-const proxy_path = 'http://223.93.170.82:23650';
+// const proxy_path = 'http://223.93.170.82:23650';
 //  const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚