Merge branch 'test' into ChronicMag_zxc

src/components/icss/AddMedicalName.vue

@@ -19,10 +19,10 @@
               <!-- 修改时标准词不能修改，修改了会当做新增处理 4-17 -->
               <p v-if="id">{{data.name}}</p>
               <!-- 4-18 需求变更 -->
-              <input v-else type="text" v-model="data.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(1)">
+              <input v-else type="text" v-model="data.name" placeholder="请输入术语" maxlength="50" @blur="handleBlur(1)">
             </td>
             <td>
-              <input type="text" v-model="data.spell" placeholder="请输入拼音" maxlength="30"  @input="handlePinyin">
+              <input type="text" v-model="data.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin">
             </td>
             <td>
               <el-select v-if="!id" v-model="data.type" filterable placeholder="请选择" size="small" @change="selectType">

src/components/icss/AddMedicinePrompt.vue

@@ -19,7 +19,7 @@
                                ref="termName"
                                placeholder="搜索"
                                :remote-method="searchTerms">
-                        <el-option v-for="term in terms" :key="term.conceptId" :label="term.name" :value="term" ></el-option>
+                        <el-option v-for="term in terms" :key="term.conceptId" :label="term.nameType" :value="term" ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="已选择标准术语：" label-width="160px">
@@ -91,7 +91,7 @@
     },
     watch:{
       'form.selectedTerm':function(newVal){
-        const name = newVal.name;
+        const name = newVal.nameType;
         this.form.selectedTermName = name;
         this.form.conceptId = newVal.conceptId;
       }

src/components/icss/MedicinePrompt.vue

@@ -30,7 +30,7 @@
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
-                        prop="libName"
+                        prop="nameType"
                         label="标准术语">
                 </el-table-column>
                 <el-table-column