wangyang 5 jaren geleden
bovenliggende
commit
31925d7479
2 gewijzigde bestanden met toevoegingen van 13 en 8 verwijderingen
  1. 9 4
      src/views/food/nutrient.vue
  2. 4 4
      src/views/nutrientTemplate/detail.vue

+ 9 - 4
src/views/food/nutrient.vue

@@ -57,7 +57,7 @@
         <el-autocomplete
           class="inline-input"
           v-model="params.unit"
-          :fetch-suggestions="queryNutrientUnits"
+          :fetch-suggestions="(query, cb) => {queryNutrientUnits(query, params.nutrientId, cb)}"
           @input="handleUnitChanged"
           placeholder="单位关键词"
         />
@@ -165,7 +165,12 @@
       <el-table-column label="计量单位" align="center" width="150">
         <template slot-scope="{row}">
           <template v-if="row.edit">
-            <el-autocomplete v-model="row.unit" @input="handleRowUnitChanged(row)" :fetch-suggestions="queryUnits" placeholder="单位关键词" />
+            <el-autocomplete
+              v-model="row.unit"
+              @input="handleRowUnitChanged(row)"
+              :fetch-suggestions="(query, cb) => {queryNutrientUnits(query, row.nutrientId, cb)}"
+              placeholder="单位关键词"
+            />
             <el-select
               clearable
               v-show="showRowNutrientSource"
@@ -418,9 +423,9 @@ export default {
         this.nutrients = []
       })
     },
-    queryNutrientUnits(query, cb) {
+    queryNutrientUnits(query, nutrientId, cb) {
       let units = []
-      getNutrientUnits(this.params.nutrientId, { query }).then(res => {
+      getNutrientUnits(nutrientId, { query }).then(res => {
         res.data.forEach(item => units.push({ value: item }))
         cb(units)
       })

+ 4 - 4
src/views/nutrientTemplate/detail.vue

@@ -20,7 +20,7 @@
         <el-autocomplete
           class="inline-input"
           v-model="params.unit"
-          :fetch-suggestions="queryNutrientUnits"
+          :fetch-suggestions="queryNutrientUnits(params.nutrientId)"
           @input="handleUnitChanged"
           placeholder="单位关键词"
         />
@@ -90,7 +90,7 @@
                 class="inline-input"
                 v-model="row.unit"
                 @input="handleRowUnitChanged(row)"
-                :fetch-suggestions="queryUnits"
+                :fetch-suggestions="queryNutrientUnits(row.nutrientId)"
                 placeholder="单位关键词"
               />
               <el-select
@@ -308,9 +308,9 @@ export default {
         return (restaurant.value.toLowerCase().indexOf(query.toLowerCase()) === 0);
       };
     },
-    queryNutrientUnits(query, cb) {
+    queryNutrientUnits(query, nutrientId, cb) {
       let units = []
-      getNutrientUnits(this.params.nutrientId, { query }).then(res => {
+      getNutrientUnits(nutrientId, { query }).then(res => {
         res.data.forEach(item => units.push({ value: item }))
         cb(units)
       })