Merge branch 'knowledgeExtra_0521' into test

src/components/basicKnow/AddTerm.vue

@@ -258,7 +258,7 @@
               class="ages"
             >
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klLisVO.qualitative"
                 :Maincontent="'Maincontent'"
                 title="输入结果内容以顿号隔开,例如:阴性、阳性"
@@ -293,7 +293,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="药品类型：" v-if="data.type=='药品通用名'" class="marT is-required">
-              <el-select v-model="drug">
+              <el-select v-model="klDrugVO.drug">
                 <el-option v-for="(it,i) in drugTypeList" :key="i" :label="it.name" :value="it.val"></el-option>
               </el-select>
             </el-form-item>
@@ -313,7 +313,7 @@
               class="marT"
             >
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klPacsVO.checkMethod"
                 :Maincontent="'checkMethod'"
                 title="请输入"
@@ -325,7 +325,7 @@
               class="marT"
             >
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klPacsVO.checkSkillful"
                 :Maincontent="'checkSkillful'"
                 title="请输入"
@@ -339,7 +339,7 @@
               <el-input
                 class="txt"
                 type="textarea"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 v-model.trim="klPacsVO.definition"
                 placeholder="请输入"
                 maxlength="500"
@@ -352,7 +352,7 @@
             >
               <el-input
                 type="textarea"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 v-model.trim="klPacsVO.checkObjective"
                 placeholder="请输入"
                 maxlength="500"
@@ -365,7 +365,7 @@
             >
               <el-input
                 type="textarea"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 v-model.trim="klPacsVO.condLimit"
                 placeholder="请输入"
                 maxlength="500"
@@ -378,7 +378,7 @@
             >
               <el-input
                 type="textarea"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 v-model.trim="klPacsVO.interventional"
                 placeholder="请输入"
                 maxlength="500"
@@ -391,7 +391,7 @@
             >
               <el-input
                 type="textarea"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 v-model.trim="klPacsVO.checkPrepare"
                 placeholder="请输入"
                 maxlength="500"
@@ -404,7 +404,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="英文名称：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klSymptomVO.enName"
                 :Maincontent="'enNamekl'"
                 title="请输入"
@@ -412,7 +412,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="就诊科室：" prop="description" class="marT">
               <searchTerm
-                v-if="hackReset" 
+                v-if="hackReset"
                 :refbool.sync="klSymptomVO.deptList"
                 :id="id"
                 :type="115"
@@ -420,7 +420,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="发病部位：" prop="description" class="marT">
               <searchTerm
-                v-if="hackReset" 
+                v-if="hackReset"
                 :refbool.sync="klSymptomVO.partList"
                 :id="id"
                 :type="122"
@@ -428,7 +428,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="常见伴随症状：" prop="description" class="marT">
               <searchTerm
-                v-if="hackReset" 
+                v-if="hackReset"
                 :refbool.sync="klSymptomVO.conSymptomList"
                 :id="id"
                 :type="103"
@@ -436,7 +436,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="性质：" prop="description" class="marT">
               <searchTerm
-                v-if="hackReset" 
+                v-if="hackReset"
                 :refbool.sync="klSymptomVO.natureList"
                 :id="id"
                 :type="126"
@@ -444,7 +444,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="缓解因素：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klSymptomVO.mitigatingFac"
                 :Maincontent="'mitigatingFac'"
                 title="请输入"
@@ -452,7 +452,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="加重因素：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klSymptomVO.aggravateFac"
                 :Maincontent="'aggravateFac'"
                 title="请输入"
@@ -460,7 +460,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="通俗解释：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klSymptomVO.commonExplain"
                 :Maincontent="'commonExplain'"
                 title="请输入"
@@ -469,7 +469,7 @@
             <el-form-item v-if="data.type=='症状'" label="定义：" prop="description" class="marT">
               <el-input
                 type="textarea"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 v-model.trim="klSymptomVO.definition"
                 placeholder="请输入"
                 maxlength="500"
@@ -478,7 +478,7 @@
             <el-form-item v-if="data.type=='症状'" label="症状起因：" prop="description" class="marT">
               <el-input
                 type="textarea"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 v-model.trim="klSymptomVO.cause"
                 placeholder="请输入"
                 maxlength="500"
@@ -487,7 +487,7 @@
             <el-form-item v-if="data.type=='症状'" label="常见疾病：" prop="description" class="marT">
               <el-input
                 type="textarea"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 v-model.trim="klSymptomVO.commonDis"
                 placeholder="请输入"
                 maxlength="500"
@@ -496,7 +496,7 @@
             <el-form-item v-if="data.type=='症状'" label="预防措施：" prop="description" class="marT">
               <el-input
                 type="textarea"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 v-model.trim="klSymptomVO.preMeasures"
                 placeholder="请输入"
                 maxlength="500"
@@ -505,7 +505,7 @@
             <el-form-item v-if="data.type=='症状'" label="饮食禁忌：" prop="description" class="marT">
               <el-input
                 type="textarea"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 v-model.trim="klSymptomVO.foodProhibition"
                 placeholder="请输入"
                 maxlength="500"
@@ -525,7 +525,7 @@
               prop="description"
               class="marT description"
             >
-              <el-input v-model.trim="klDiseaseVO.incidence" placeholder="请输入"></el-input>
+              <el-input v-model.trim="klDiseaseVO.incidence" type="number" oninput="if(value.length>6)value=value.slice(0,6)" placeholder="请输入"></el-input>
             </el-form-item>
 
             <el-form-item label="遗传性：" v-if="data.type=='疾病'" class="marT">
@@ -548,7 +548,7 @@
             </el-form-item>
             <el-form-item label="疾病就诊科室：" v-if="data.type=='疾病'" class="marT">
               <searchTerm
-                v-if="hackReset" 
+                v-if="hackReset"
                 :refbool.sync="klDiseaseVO.deptList"
                 :id="id"
                 :type="115"
@@ -556,7 +556,7 @@
             </el-form-item>
             <el-form-item label="疾病发病部位：" v-if="data.type=='疾病'" class="marT">
               <searchTerm
-                v-if="hackReset" 
+                v-if="hackReset"
                 :refbool.sync="klDiseaseVO.partList"
                 :id="id"
                 :type="122"
@@ -564,7 +564,7 @@
             </el-form-item>
             <el-form-item label="疾病系统分类：" v-if="data.type=='疾病'" class="marT">
               <searchTerm
-                v-if="hackReset" 
+                v-if="hackReset"
                 :refbool.sync="klDiseaseVO.systemTypeList"
                 :id="id"
                 :type="307"
@@ -572,7 +572,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="肿瘤/细胞类型：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.tumorCellType"
                 :Maincontent="'tumorCellType'"
                 title="请输入"
@@ -580,7 +580,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="形态学分类代码：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.morphology"
                 :Maincontent="'morphology'"
                 title="请输入"
@@ -588,7 +588,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="英文名称：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.enName"
                 :Maincontent="'enNamej'"
                 title="请输入"
@@ -596,7 +596,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="英文简称：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.enNameSimple"
                 :Maincontent="'enNameSimple'"
                 title="请输入"
@@ -604,7 +604,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="疾病简称：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.nameSimple"
                 :Maincontent="'nameSimple'"
                 title="请输入"
@@ -612,7 +612,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="好发人群：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.vulCrowd"
                 :Maincontent="'vulCrowd'"
                 title="请输入"
@@ -620,7 +620,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="好发地区：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.vulArea"
                 :Maincontent="'vulArea'"
                 title="请输入"
@@ -628,7 +628,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="病程：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.course"
                 :Maincontent="'course'"
                 title="请输入"
@@ -636,7 +636,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="危害性：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.pernicious"
                 :Maincontent="'pernicious'"
                 title="请输入"
@@ -644,7 +644,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="治愈性：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.healing"
                 :Maincontent="'healing'"
                 title="请输入"
@@ -652,7 +652,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="诱因：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klDiseaseVO.inducement"
                 :Maincontent="'inducement'"
                 title="请输入"
@@ -663,7 +663,7 @@
                 v-model.trim="klDiseaseVO.disType"
                 maxlength="500"
                 placeholder="请输入"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 type="textarea"
               ></el-input>
             </el-form-item>
@@ -672,7 +672,7 @@
                 v-model.trim="klDiseaseVO.complication"
                 maxlength="500"
                 placeholder="请输入"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 type="textarea"
               ></el-input>
             </el-form-item>
@@ -681,7 +681,7 @@
                 v-model.trim="klDiseaseVO.clinicType"
                 maxlength="500"
                 placeholder="请输入"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 type="textarea"
               ></el-input>
             </el-form-item>
@@ -690,7 +690,7 @@
                 v-model.trim="klDiseaseVO.pathogeny"
                 maxlength="500"
                 placeholder="请输入"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 type="textarea"
               ></el-input>
             </el-form-item>
@@ -699,7 +699,7 @@
                 v-model.trim="klDiseaseVO.hazard"
                 maxlength="500"
                 placeholder="请输入"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 type="textarea"
               ></el-input>
             </el-form-item>
@@ -708,7 +708,7 @@
                 v-model.trim="klDiseaseVO.foodProhibition"
                 maxlength="500"
                 placeholder="请输入"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 type="textarea"
               ></el-input>
             </el-form-item>
@@ -719,7 +719,7 @@
               class="marT"
             >
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klLisVO.enName"
                 :Maincontent="'enName'"
                 title="请输入"
@@ -732,7 +732,7 @@
               class="marT"
             >
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klLisVO.category"
                 :Maincontent="'category'"
                 title="请输入"
@@ -745,7 +745,7 @@
               class="marT"
             >
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klLisVO.checkSpecimen"
                 :Maincontent="'checkSpecimen'"
                 title="请输入"
@@ -761,7 +761,7 @@
                 v-model.trim="klLisVO.clinicalSig"
                 maxlength="500"
                 placeholder="请输入"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 type="textarea"
               ></el-input>
             </el-form-item>
@@ -775,7 +775,7 @@
                 v-model.trim="klLisVO.influenceFac"
                 maxlength="500"
                 placeholder="请输入"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 type="textarea"
               ></el-input>
             </el-form-item>
@@ -789,13 +789,13 @@
                 v-model.trim="klLisVO.checkMethod"
                 maxlength="500"
                 placeholder="请输入"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 type="textarea"
               ></el-input>
             </el-form-item>
             <el-form-item v-if="data.type=='体格检查结果'" label="科室：" prop="description" class="marT">
               <searchTerm
-                v-if="hackReset" 
+                v-if="hackReset"
                 :refbool.sync="klVitalResultVO.deptList"
                 :id="id"
                 :type="115"
@@ -803,7 +803,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='体格检查结果'" label="部位：" prop="description" class="marT">
               <searchTerm
-                v-if="hackReset" 
+                v-if="hackReset"
                 :refbool.sync="klVitalResultVO.partList"
                 :id="id"
                 :type="122"
@@ -811,7 +811,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='体格检查结果'" label="不适宜人群：" prop="description" class="marT">
               <div-editable
-               v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klVitalResultVO.suitablePopNo"
                 :Maincontent="'Maincontent1'"
                 title="请输入"
@@ -822,7 +822,7 @@
                 v-model.trim="klVitalResultVO.checkMethod"
                 maxlength="500"
                 placeholder="请输入"
-                row="3"
+                :autosize="{minRows: 1,maxRows: 3}"
                 type="textarea"
               ></el-input>
             </el-form-item>
@@ -838,7 +838,7 @@
             </el-form-item>
             <el-form-item v-if="data.type=='手术和操作'" label="手术操作代码：" prop="description" class="marT">
               <div-editable
-                v-if="hackReset" 
+                v-if="hackReset"
                 v-model="klOperationVO.operationCode"
                 :Maincontent="'Maincontent'"
                 title="请输入"
@@ -900,7 +900,7 @@ export default {
     return {
       radio: 1,
       minTitle: '基础术语维护-添加',
-      hackReset:true,
+      hackReset: true,
       data: {
         libName: '',
         type: '',
@@ -911,6 +911,9 @@ export default {
         libId: '',
         isHasCommon: ''
       },
+      klDrugVO: {
+        drug: ''
+      },
       klOperationVO: {
         conceptId: null,
         remark: null,
@@ -1252,7 +1255,10 @@ export default {
               this.klTcmSyndromeVO = redata.klTcmSyndromeDTO
                 ? redata.klTcmSyndromeDTO
                 : this.klTcmSyndromeVO;
-              
+              this.klDrugVO = redata.klDrugDTO
+                ? redata.klDrugDTO
+                : this.klDrugVO;
+
               this.singleword = redata.libName;
               this.synonymous = redata.otherNames;
               this.allwords = redata.libName.concat(redata.otherNames);
@@ -1530,7 +1536,7 @@ export default {
       }
       if (
         this.data.type == '药品通用名' &&
-        (this.drug === '' || this.drug === null)
+        (this.klDrugVO.drug === '' || this.klDrugVO.drug === null)
       ) {
         this.warning('请选择药品类型');
         return;
@@ -1703,6 +1709,16 @@ export default {
               minAge: this.minAge,
               status: this.data.status || 1
             }
+          : this.data.libType == 101
+          ? {
+              ...this.data,
+              klDrugVO: this.klDrugVO,
+              klConceptSub: detailList || [],
+              sexType: sexCode,
+              maxAge: this.maxAge,
+              minAge: this.minAge,
+              status: this.data.status || 1
+            }
           : {
               ...this.data,
               klConceptSub: detailList || [],
@@ -1746,7 +1762,7 @@ export default {
           this.data.libType = v.code;
           this.data.isHasCommon = v.isHasCommon;
           this.conceptList = [];
-          this.destroyed()
+          this.destroyed();
         }
       });
       if (e == '诊断') {
@@ -1826,8 +1842,8 @@ el-select-dropdown {
 .titl {
   margin: 25px 0 10px;
 }
-input:focus{
-  border-color: #48C5D7!important;
+input:focus {
+  border-color: #48c5d7 !important;
 }
 .deptbox {
   // width: 100%;

src/components/basicKnow/DivEditable.vue

@@ -56,7 +56,7 @@ export default {
       let len = text.length;
       this.onshow = len > 0 ? false : true;
       this.valueHandle(event, text);
-      this.$emit('input', text);
+      
     },
     valueHandle(event, strVale) {
       let _this = this;
@@ -70,6 +70,7 @@ export default {
         this.$refs[this.Maincontent].innerHTML = text.substr(0, 200);
         this.$refs[this.Maincontent].focus();
       }
+      this.$emit('input', this.$refs[this.Maincontent].innerHTML);
       setTimeout(() => {
         _this.keepLastIndex(event.target);
       }, 5);

src/components/knowledgeExtra/RegisteredDrug.vue

@@ -2,13 +2,13 @@
   <div>
     <crumbs title="注册药品维护" :minWidth="titleWidth" class="knowledgeTitle">
       <el-form :inline="true" class="demo-form-inline">
-        <el-form-item label="通用名：">
-          <el-input size="mini" v-model="filter.commonName" placeholder="输入通用名" clearable></el-input>
+        <el-form-item label="关联的通用名：">
+          <el-input size="mini" v-model="filter.commonName" placeholder="输入关联的通用名" clearable></el-input>
         </el-form-item>
         <el-form-item label="注册/商品名称：">
           <el-input size="mini" v-model="filter.name" placeholder="输入注册/商品名称" clearable></el-input>
         </el-form-item>
-        <el-form-item label="企业：">
+        <el-form-item label="企业名称：">
           <el-input size="mini" v-model="filter.company" placeholder="输入企业名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
@@ -26,16 +26,16 @@
         <el-table-column type="index" :index="indexMethod" label="编号" width="60"></el-table-column>
         <el-table-column prop="drugCode" label="药品代码" show-overflow-tooltip></el-table-column>
         <el-table-column prop="name" label="注册名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="drugName" label="关联的通用名" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="drugName" label="关联的通用名" width="110" show-overflow-tooltip></el-table-column>
         <el-table-column prop="enName" label="英文名称" show-overflow-tooltip></el-table-column>
         <el-table-column prop="tradeName" label="商品名称" show-overflow-tooltip></el-table-column>
         <el-table-column prop="form" label="药品剂型" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="specification" label="注册规格" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="minPackQuantity" label="最小包装量" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="minPackUnit" label="最小包单位" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="specification" label="注册规格" width="70" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="minPackQuantity" label="最小包装数量" width="80" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="minPackUnit" label="最小包装单位" width="80" show-overflow-tooltip></el-table-column>
         <el-table-column prop="company" label="药品企业" show-overflow-tooltip></el-table-column>
         <el-table-column prop="approval" label="批准文号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="standardCode" label="药品本位码" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="standardCode" label="药品本位码" width="100" show-overflow-tooltip></el-table-column>
         <el-table-column prop="insuranceType" label="医保类型" show-overflow-tooltip></el-table-column>
         <el-table-column prop="insuranceRemrk" label="医保备注" show-overflow-tooltip></el-table-column>
         <el-table-column prop="modifier" label="操作人" show-overflow-tooltip></el-table-column>
@@ -278,6 +278,9 @@ export default {
   position: relative;
   top: -1px;
 }
+/deep/ .cell{
+  line-height: 20px;
+}
 .delete {
   color: red;
 }