Merge remote-tracking branch 'origin/test'

src/api/config.js

@@ -3,7 +3,7 @@ const testUrl = ''
 
 export default {
   // host:'http://192.168.2.241:5050',
-  imgHost:'http://192.168.2.121:82',      //富文本编辑器图片回传地址
+  imgHost:'http://192.168.2.241:82',      //富文本编辑器图片回传地址
   // imgHost:'http://192.168.2.241:82',      //富文本编辑器图片回传地址
   delayTime: 500,
   urls: {

src/components/icss/disease/AddChemicalAndCommonMapping.vue

@@ -61,6 +61,7 @@
                     class="searchListNone"
                     :value="item.name"
                     :title="item.name"
+                    @click="handleSelectOption(item)"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -147,10 +148,13 @@ export default {
       });
     },
     changeWord(newValue) {
-      this.form.searchText = newValue.name;
-      this.form.icdCode = newValue.icd10Code;
+      // this.form.searchText = newValue.name;
+      // this.form.icdCode = newValue.icd10Code;
+    },
+    handleSelectOption(item){
+      this.form.searchText = item.name;
+      this.form.icdCode = item.icd10Code;
     },
-
     handleVisible(flag) {
       if (!flag) {
         this.uniqueNameList = [];

src/components/icss/lis/AddLis.vue

@@ -68,9 +68,9 @@
                     v-for="(item,idx) in uniqueNameList"
                     :key="idx"
                     :label="searchType == 2 ? `${item.uniqueName}(${item.name})` : item"
-                    :value="searchType == 2 ? `${item.uniqueName}(${item.name})` : item"
+                    :value="searchType == 2 ? `${item.uniqueName}` : item"
                     :title="searchType == 2 ? `${item.uniqueName}(${item.name})` : item"
-                    @click.native="handleChoose(searchType == 2 ? item.uniqueName : item)"
+                    @click.native="handleChoose(searchType == 2 ? `${item.uniqueName}` : item)"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -129,9 +129,9 @@ export default {
       this.isEdit = isEdit;
       this.editId = data.id;
       this.form.hisName = data.hisName;
-      this.form.searchText = data.uniqueName;
       this.form.hisDetailName = data.hisDetailName||'';
       this.form.searchTextPre = data.uniqueName;
+      this.form.searchText = data.uniqueName;
     }
     if (isEdit && data.hisName !='' && !data.hisDetailName) {
       this.searchType = 1;
@@ -179,7 +179,8 @@ export default {
       this.form.searchTextPre = '';
     },
     handleChoose(val) {
-      // console.log('点击选中option', val);
+      console.log('点击选中option', val);
+      console.log(this.searchType)
       this.form.searchTextPre = val;
       this.form.searchText = val;
     },
@@ -193,7 +194,6 @@ export default {
 
     // 建立关联-参数处理
     submitForm() {
-
       this.$refs.relationForm.validate(valid => {
         if (valid) {
           const { searchText, hisName, hisDetailName } = this.form;