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