merge 'test' to 'dev'

src/components/icss/AddChemicalAndCommonMapping.vue

@@ -59,10 +59,10 @@
                       <li 
                         v-for="item in mealNameList" 
                         class="mealNameItem ellipsis"
-                        :title="item.conceptName"
+                        :title="item.name"
                         @click="selectMealName(item)"
-                        :key="item.conceptId">
-                        {{item.conceptName}}
+                        :key="item.id">
+                        {{item.name}}
                       </li>
                     </ul>
                     
@@ -83,10 +83,10 @@
                       <li 
                         v-for="item in itemNameList" 
                         class="mealNameItem ellipsis"
-                        :title="item.conceptName"
+                        :title="item.name+'-'+item.tagName"
                         @click="selectItemName(item)"
-                        :key="item.conceptId">
-                        {{item.conceptName}}
+                        :key="item.id">
+                        {{item.name}}-{{item.tagName}}
                       </li>
                     </ul>
                 </div>
@@ -159,15 +159,15 @@ export default {
             
         },
         getTagList(type) {
-            let param = {
-                relationPosition: 3
-            }
+            let param = {}
             if (type == 1) {
                 param.name = this.mealText
-                param.typeId = 12
+                param.tagType = [7]
+                param.type = 5
             } else if (type == 2) {
                 param.name = this.itemText
-                param.typeId = 13
+                param.tagType = [1]
+                param.type = 5
             }
             api.searchTagList(param).then((res) => {
                 if (res.data.code === '0') {
@@ -236,16 +236,16 @@ export default {
             this.form.uniqueName = ''
         },
         submitForm() {
-        const { itemId, mealId, uniqueId } = this.form
-        if (!mealId || !uniqueId) {
+        const { mealName, itemName, uniqueName } = this.form
+        if (!mealName || !uniqueName) {
             this.warning('请填写相关数据')
             return
         }
         //通过必填验证，提交保存
         const param = {
-            "itemId": itemId,
-            "mealId": mealId,
-            "uniqueId": uniqueId
+            "itemName": itemName,
+            "mealName": mealName,
+            "uniqueName": uniqueName
         }
         this.showSaveDialog(param);
       },

src/components/icss/MedicineInfoPg.vue

@@ -6,12 +6,12 @@
                 <el-checkbox v-for="it in positions" :key="it.key" :label="it.key">{{it.name}}</el-checkbox>
             </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="是否属于诊断依据：" prop="isReason" label-width="160px">
+        <!-- <el-form-item label="是否属于诊断依据：" prop="isReason" label-width="160px">
             <el-select v-model="data.isReason" placeholder="请选择">
                 <el-option label="否" :value="0"></el-option>
                 <el-option label="是" :value="1"></el-option>
             </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="标题名称：" prop="title" label-width="160px">
             <el-input v-model="data.title"></el-input>
         </el-form-item>
@@ -99,9 +99,9 @@
         },
         positions:[],               //位置列表
         rules:{
-          isReason: [
-            { required: true, message: '请选择是否属于诊断', trigger: 'change' }
-          ],
+          // isReason: [
+          //   { required: true, message: '请选择是否属于诊断', trigger: 'change' }
+          // ],
           position: [
             { required: true, message: '请选择显示位置', trigger: 'change' }
           ],