From 7e31add571253c24d4df3e0f956365979bdfe2c8 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 29 Apr 2025 13:58:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dish/nutritionInfo.js                 |  5 +-
 src/utils/request.js                          |  9 +--
 .../account/accountManager/index.vue          |  4 +-
 .../account/tradeRecords/index.vue            |  6 +-
 src/views/accountCenter/butie/butie/index.vue | 56 +++++++++++++------
 src/views/dish/dish/index.vue                 | 21 ++++---
 .../material/components/MaterialDialog.vue    |  8 +--
 src/views/dish/menu/detail.vue                |  4 +-
 src/views/dish/menu/edit.vue                  |  4 +-
 src/views/dish/menu/index.vue                 | 44 ++++++++-------
 src/views/dish/nutritionInfo/index.vue        | 56 +++++++++----------
 11 files changed, 126 insertions(+), 91 deletions(-)

diff --git a/src/api/dish/nutritionInfo.js b/src/api/dish/nutritionInfo.js
index b8e8b851..f006b1a7 100644
--- a/src/api/dish/nutritionInfo.js
+++ b/src/api/dish/nutritionInfo.js
@@ -43,7 +43,10 @@ export function listNutrition(query) {
     url: '/smart-canteen/menu_nutrition/list',
     method: 'post',
     data: query,
-    params:query
+    params:{
+      pageNum:query.pageNum,
+      pageSize:query.pageSize
+    }
   })
 }
 
diff --git a/src/utils/request.js b/src/utils/request.js
index f5ebacec..bae61fb9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -83,10 +83,11 @@ service.interceptors.request.use(config => {
     const requestObj = { url: config.url, data: data, time: Date.now() }
     console.log(sessionObj)
     console.log(requestObj)
-
-    if (sessionObj.data === requestObj.data && requestObj.time - sessionObj.time < 5000 && sessionObj.url === requestObj.url) {
-      console.warn(`[${sessionObj.url}]: 数据正在处理，请勿重复提交`)
-      return Promise.reject(new Error('数据正在处理，请勿重复提交'))
+    if(requestObj.data&&requestObj.data.indexOf('pageNum')==-1){
+      if (sessionObj.data === requestObj.data && requestObj.time - sessionObj.time < 3000 && sessionObj.url === requestObj.url) {
+        console.warn(`[${sessionObj.url}]: 数据正在处理，请勿重复提交`)
+        return Promise.reject(new Error('数据正在处理，请勿重复提交'))
+      }
     }
     cache.session.setJSON('sessionObj', requestObj)
   }
diff --git a/src/views/accountCenter/account/accountManager/index.vue b/src/views/accountCenter/account/accountManager/index.vue
index 7483e0b7..4efe9b8a 100644
--- a/src/views/accountCenter/account/accountManager/index.vue
+++ b/src/views/accountCenter/account/accountManager/index.vue
@@ -21,14 +21,14 @@
         <el-form-item label="关键字" prop="searchValue">
             <el-input v-model="queryParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
-        <el-form-item label="钱包类型" prop="walletType">
+        <!-- <el-form-item label="钱包类型" prop="walletType">
             <el-select v-model="queryParams.walletType" style="width: 240px" clearable> 
                 <el-option label="账户总余额" value="0"></el-option>
                 <el-option label="个人钱包" value="1"></el-option>
                 <el-option label="补贴钱包" value="2"></el-option> 
                 <el-option label="红包" value="3"></el-option> 
             </el-select>   
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item label="最小金额" prop="walletMinAmount">
             <el-input
                 v-model="queryParams.walletMinAmount"
diff --git a/src/views/accountCenter/account/tradeRecords/index.vue b/src/views/accountCenter/account/tradeRecords/index.vue
index e7c12b33..ea1d6d88 100644
--- a/src/views/accountCenter/account/tradeRecords/index.vue
+++ b/src/views/accountCenter/account/tradeRecords/index.vue
@@ -17,8 +17,8 @@
         </el-form-item>
         <el-form-item label="操作事件" prop="type">
             <el-select v-model="queryParams.type" style="width: 240px" clearable> 
-                <el-option label="启用" value="1"></el-option>
-                <el-option label="停用" value="2"></el-option> 
+                <el-option label="正常" value="0"></el-option>
+                <el-option label="停用" value="1"></el-option> 
             </el-select>   
         </el-form-item>
         <el-form-item label="操作员">
@@ -84,7 +84,7 @@
         <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true" />
         <el-table-column label="操作员事件" align="center" prop="type" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.type==0">启用</span>
+            <span v-if="scope.row.type==0">正常</span>
             <span v-if="scope.row.type==1">停用</span>
           </template>
         </el-table-column> 
diff --git a/src/views/accountCenter/butie/butie/index.vue b/src/views/accountCenter/butie/butie/index.vue
index 3276e523..e50a7d97 100644
--- a/src/views/accountCenter/butie/butie/index.vue
+++ b/src/views/accountCenter/butie/butie/index.vue
@@ -138,11 +138,13 @@
                  
                 <el-descriptions-item>
                     <template slot="label">账户状态</template>
-                    {{ form.accStatusName }}
+                    <!-- {{ form.accStatusName }} -->
+                    <span v-if="form.accStatus==0">正常</span>
+                    <span v-if="form.accStatus==1">停用</span>
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">用户类别</template>
-                    {{ form.userTypeName }}
+                    <dict-tag :options="dict.type.sys_user_type" :value="form.userType"/> 
                 </el-descriptions-item>
 
                
@@ -224,8 +226,8 @@
                   }" clearable collapse-tags >
                   </el-cascader> 
               </el-form-item> 
-              <el-form-item label="" prop="psnType">
-                  <el-select v-model="dialogParams.psnType" placeholder="用户类别" style="width: 240px" clearable> 
+              <el-form-item label="" prop="userType">
+                  <el-select v-model="dialogParams.userType" placeholder="用户类别" style="width: 240px" clearable> 
                     <el-option
                         v-for="dict in dict.type.sys_user_type"
                         :key="dict.value"
@@ -243,8 +245,12 @@
               <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  />
               <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
               <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
-              <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" />
-              <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/>
+              <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" /> 
+              <el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
+                </template>
+              </el-table-column>
             </el-table>
             <pagination
               v-show="dialogTotal>0"
@@ -291,8 +297,12 @@
             <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
             <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
             <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
-            <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" />
-            <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/>
+            <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" /> 
+            <el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
+              </template>
+            </el-table-column>
             <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
@@ -332,11 +342,13 @@
                  
                 <el-descriptions-item>
                     <template slot="label">账户状态</template>
-                    {{ form.accStatusName }}
+                    <!-- {{ form.accStatusName }} -->
+                    <span v-if="form.accStatus==0">正常</span>
+                    <span v-if="form.accStatus==1">停用</span>
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">用户类别</template>
-                    {{ form.userTypeName }}
+                    <dict-tag :options="dict.type.sys_user_type" :value="form.userType"/> 
                 </el-descriptions-item>
 
                
@@ -410,8 +422,8 @@
                   }" clearable collapse-tags >
                   </el-cascader> 
               </el-form-item> 
-              <el-form-item label="" prop="psnType">
-                  <el-select v-model="dialogParams.psnType" placeholder="用户类别" style="width: 240px" clearable> 
+              <el-form-item label="" prop="userType">
+                  <el-select v-model="dialogParams.userType" placeholder="用户类别" style="width: 240px" clearable> 
                     <el-option
                         v-for="dict in dict.type.sys_user_type"
                         :key="dict.value"
@@ -429,8 +441,12 @@
               <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  />
               <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
               <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
-              <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" />
-              <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/>
+              <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" /> 
+              <el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
+                </template>
+              </el-table-column>
             </el-table>
             <pagination
               v-show="dialogTotal>0"
@@ -468,8 +484,12 @@
             <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
             <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
             <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
-            <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" />
-            <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/>
+            <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" /> 
+            <el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
+              </template>
+            </el-table-column>
             <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
@@ -551,7 +571,7 @@
           deptIdList:[],
           hasSum:true,
           searchValue:null,
-          psnType:null
+          userType:null
         },
         dialogTableData:[],
         dialogTotal: 0,
@@ -759,7 +779,7 @@
               "deptIdList": this.dialogParams.deptIdList,
               // "hasSum": this.dialogParams.hasSum,
               "searchValue": this.dialogParams.searchValue,
-              "psnType": this.dialogParams.psnType
+              "userType": this.dialogParams.userType
             } 
             accInfoPageApi(param).then(response => {
                 this.dialogTableData = response.rows;
diff --git a/src/views/dish/dish/index.vue b/src/views/dish/dish/index.vue
index 317ac138..3697a202 100644
--- a/src/views/dish/dish/index.vue
+++ b/src/views/dish/dish/index.vue
@@ -604,8 +604,15 @@
            
             </el-form>
           </el-tab-pane>
-          <!-- 组成成分 -->
-          <el-tab-pane label="组成成分" name="2" style="height: 600px;overflow-y: auto;" :disabled="baseForm.weight==null&&baseForm.largeWeight==null&&baseForm.littleWeight==null">
+          <!-- 组成成分 --> 
+         
+          
+          <el-tab-pane label="组成成分" name="2" style="height: 600px;overflow-y: auto;" :disabled="(baseForm.weight==null||baseForm.weight=='')&&(baseForm.largeWeight==null||baseForm.largeWeight=='')&&(baseForm.littleWeight==null||baseForm.littleWeight=='')">
+              <template #label>
+                <el-tooltip content="请先填写份量" placement="top">
+                  <span>组成成分</span>
+                </el-tooltip>
+              </template>
               <div>
                 <el-button type="primary" icon="el-icon-plus" size="mini" v-if="materialList.length==0" @click="addDishMaterial">增加</el-button>
                 <div v-else style="font-size: 18px;font-weight: bold;color: #606266;">
@@ -637,7 +644,7 @@
                 </el-table-column>
 
 
-                <el-table-column label="大份克数" align="center" key="weight" prop="weight" width="180"  v-if="baseForm.sizeType==1">
+                <el-table-column label="克数" align="center" key="weight" prop="weight" width="180"  v-if="baseForm.sizeType==1">
                   <template slot-scope="scope">
                     <el-input  v-model="scope.row.weight" placeholder="克数" maxlength="9" style="width: 170px;margin-right: 20px;" clearable @input="(v)=>(scope.row.weight=v.replace(/[^\d]/g,''))">
                       <template slot="append">g</template>
@@ -695,10 +702,10 @@
                   <el-button type="primary" icon="el-icon-plus" size="mini" v-if="index==(materialList.length-1)" @click="addDishMaterial">增加</el-button>
                   <el-button type="danger" icon="el-icon-delete" size="mini" @click="delDishMaterial(index)">删除</el-button>
                 </div> 
-              </div> -->
-
-            
-          </el-tab-pane>
+              </div> --> 
+      
+          
+          </el-tab-pane> 
           <el-tab-pane label="营养信息" name="3" style="height: 600px;overflow-y: auto;" v-if="title=='修改'">
             <div v-if="baseForm.sizeType==1" style="font-size: 18px;font-weight: bold;color: #606266;">每{{ baseForm.weight }}g 含营养信息</div>
             <el-descriptions v-if="baseForm.sizeType==1" title="" :column="2" size="small" border labelStyle="width:150px;">  
diff --git a/src/views/dish/material/components/MaterialDialog.vue b/src/views/dish/material/components/MaterialDialog.vue
index 31c10f53..e9940274 100644
--- a/src/views/dish/material/components/MaterialDialog.vue
+++ b/src/views/dish/material/components/MaterialDialog.vue
@@ -379,9 +379,9 @@ export default {
         // unitId: [{ required: true, message: '请选择原料单位', trigger: 'change' }]
       },
       nutritionFields: [
-        { label: '可食部分', prop: 'ediblePart', unit: 'g/100g' },
+        { label: '可食部分', prop: 'edible', unit: 'g/100g' },
         { label: '水分', prop: 'water', unit: 'g/100g' },
-        { label: '热量', prop: 'heat', unit: '千卡/100g' },
+        { label: '热量', prop: 'calories', unit: '千卡/100g' },
         { label: '蛋白质', prop: 'protein', unit: 'g/100g' },
         { label: '脂肪', prop: 'fat', unit: 'g/100g' },
         { label: '碳水化合物', prop: 'carbohydrate', unit: 'g/100g' },
@@ -538,9 +538,9 @@ export default {
     },
     //选中营养信息
     chosenNutrition(){
-      console.log("选中营养信息",this.form.nutritionId)
-      
+      console.log("选中营养信息",this.form.nutritionId) 
       getNutrition({nutritionId: this.form.nutritionId}).then((response) => {
+
         this.form.menuMaterialNutritionDTO = response.data
       });
     },
diff --git a/src/views/dish/menu/detail.vue b/src/views/dish/menu/detail.vue
index 8d86549a..766cbcae 100644
--- a/src/views/dish/menu/detail.vue
+++ b/src/views/dish/menu/detail.vue
@@ -875,8 +875,8 @@ export default {
             let index = this.dishesList.findIndex(v=>v.dishesId==obj.dishesId)
             if(index==-1){
                 let dish = Object.assign({}, obj)
-                this.$set(dish,'salePrice',Number(dish.unitPrice/100)||Number(dish.unitPrice/100))
-                this.$set(dish,'price',Number(dish.unitPrice/100)) 
+                this.$set(dish,'salePrice',Number(dish.price/100)||Number(dish.price/100))
+                this.$set(dish,'price',Number(dish.price/100)) 
                 this.$set(dish,'supplyNum',dish.supplyNum||99999)
                 this.$set(dish,'restrictNum',dish.restrictNum||99999)
                 this.dishesList.push(dish)
diff --git a/src/views/dish/menu/edit.vue b/src/views/dish/menu/edit.vue
index f02c7ccf..7f01fe56 100644
--- a/src/views/dish/menu/edit.vue
+++ b/src/views/dish/menu/edit.vue
@@ -1059,8 +1059,8 @@ export default {
             let index = this.dishesList.findIndex(v=>v.dishesId==obj.dishesId)
             if(index==-1){//新-加入
                 let dish = Object.assign({}, obj)  
-                this.$set(dish,'salePrice',Number(dish.unitPrice/100)||Number(dish.unitPrice/100))
-                this.$set(dish,'price',Number(dish.unitPrice/100)) 
+                this.$set(dish,'salePrice',Number(dish.price/100)||Number(dish.price/100))
+                this.$set(dish,'price',Number(dish.price/100)) 
                 this.$set(dish,'supplyNum',dish.supplyNum||99999)
                 this.$set(dish,'restrictNum',dish.restrictNum||99999) 
                 this.dishesList.push(dish)
diff --git a/src/views/dish/menu/index.vue b/src/views/dish/menu/index.vue
index 599a668e..adf312f1 100644
--- a/src/views/dish/menu/index.vue
+++ b/src/views/dish/menu/index.vue
@@ -145,26 +145,30 @@
             </el-table-column>
             <el-table-column label="用户范围" align="center" prop="effName" v-if="activeName=='pageRecipe'"/>
             
-            <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right">
-            <template slot-scope="scope">
-                <el-button
-                size="mini"
-                type="text" v-if="activeName=='currentRecipe'" 
-                @click="handleDevice(scope.row)" 
-                >设备详情</el-button>
-                <el-button
-                size="mini"
-                type="text" v-if="activeName=='pageRecipe'"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)" 
-                >编辑</el-button>
-                <el-button
-                size="mini"
-                type="text" v-if="activeName=='pageRecipe'"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)" 
-                >删除</el-button>
-            </template>
+            <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right"  v-if="activeName=='currentRecipe'&&queryParams.key=='2'" >
+                <template slot-scope="scope">
+                    <el-button
+                    size="mini"
+                    type="text"
+                    @click="handleDevice(scope.row)" 
+                    >设备详情</el-button> 
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right" v-if="activeName=='pageRecipe'">
+                <template slot-scope="scope"> 
+                    <el-button
+                    size="mini"
+                    type="text" 
+                    icon="el-icon-edit"
+                    @click="handleUpdate(scope.row)" 
+                    >编辑</el-button>
+                    <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.row)" 
+                    >删除</el-button>
+                </template>
             </el-table-column>
         </el-table>
   
diff --git a/src/views/dish/nutritionInfo/index.vue b/src/views/dish/nutritionInfo/index.vue
index 36a69ebb..6c4df8ed 100644
--- a/src/views/dish/nutritionInfo/index.vue
+++ b/src/views/dish/nutritionInfo/index.vue
@@ -227,7 +227,7 @@
             <el-form-item label="加工时间（min）">
               <el-input
                 v-model="form.processingTime"
-                @input="handleNumericInput('processingTime')"
+                @input="handleNumericInput('processingTime', $event)"
                 @blur="formatNumericValue('processingTime')"
                 placeholder="请输入加工时间"
               ></el-input>
@@ -238,7 +238,7 @@
             <el-form-item label="可食部分（g/100g）" prop="edible">
               <el-input
                 v-model="form.edible"
-                @input="handleNumericInput('edible')"
+                @input="handleNumericInput('edible', $event)"
                 @blur="formatNumericValue('edible')"
                 placeholder="请输入可食部分"
               ></el-input>
@@ -251,7 +251,7 @@
             <el-form-item label="水分（g/100g）" prop="water">
               <el-input
                 v-model="form.water"
-                @input="handleNumericInput('water')"
+                @input="handleNumericInput('water', $event)"
                 @blur="formatNumericValue('water')"
                 placeholder="请输入水分"
               ></el-input>
@@ -262,7 +262,7 @@
             <el-form-item label="热量（千卡/100g）" prop="calories">
               <el-input
                 v-model="form.calories"
-                @input="handleNumericInput('calories')"
+                @input="handleNumericInput('calories', $event)"
                 @blur="formatNumericValue('calories')"
                 placeholder="请输入热量"
               ></el-input>
@@ -275,7 +275,7 @@
             <el-form-item label="蛋白质（g/100g）" prop="protein">
               <el-input
                 v-model="form.protein"
-                @input="handleNumericInput('protein')"
+                @input="handleNumericInput('protein', $event)"
                 @blur="formatNumericValue('protein')"
                 placeholder="请输入蛋白质"
               ></el-input>
@@ -286,7 +286,7 @@
             <el-form-item label="脂肪（g/100g）" prop="fat">
               <el-input
                 v-model="form.fat"
-                @input="handleNumericInput('fat')"
+                @input="handleNumericInput('fat', $event)"
                 @blur="formatNumericValue('fat')"
                 placeholder="请输入脂肪"
               ></el-input>
@@ -299,7 +299,7 @@
             <el-form-item label="碳水化合物（g/100g）" prop="carbohydrate">
               <el-input
                 v-model="form.carbohydrate"
-                @input="handleNumericInput('carbohydrate')"
+                @input="handleNumericInput('carbohydrate', $event)"
                 @blur="formatNumericValue('carbohydrate')"
                 placeholder="请输入碳水化合物"
               ></el-input>
@@ -310,7 +310,7 @@
             <el-form-item label="膳食纤维（g/100g）" prop="dietaryFiber">
               <el-input
                 v-model="form.dietaryFiber"
-                @input="handleNumericInput('dietaryFiber')"
+                @input="handleNumericInput('dietaryFiber', $event)"
                 @blur="formatNumericValue('dietaryFiber')"
                 placeholder="请输入膳食纤维"
               ></el-input>
@@ -323,7 +323,7 @@
             <el-form-item label="胆固醇（mg/100g）" prop="cholesterol">
               <el-input
                 v-model="form.cholesterol"
-                @input="handleNumericInput('cholesterol')"
+                @input="handleNumericInput('cholesterol', $event)"
                 @blur="formatNumericValue('cholesterol')"
                 placeholder="请输入胆固醇"
               ></el-input>
@@ -334,7 +334,7 @@
             <el-form-item label="灰分（g/100g）" prop="ash">
               <el-input
                 v-model="form.ash"
-                @input="handleNumericInput('ash')"
+                @input="handleNumericInput('ash', $event)"
                 @blur="formatNumericValue('ash')"
                 placeholder="请输入灰分"
               ></el-input>
@@ -347,7 +347,7 @@
             <el-form-item label="维生素A（μg/100g）" prop="vitaminA">
               <el-input
                 v-model="form.vitaminA"
-                @input="handleNumericInput('vitaminA')"
+                @input="handleNumericInput('vitaminA', $event)"
                 @blur="formatNumericValue('vitaminA')"
                 placeholder="请输入维生素A"
               ></el-input>
@@ -358,7 +358,7 @@
             <el-form-item label="胡萝卜素（μg/100g）" prop="carotene">
               <el-input
                 v-model="form.carotene"
-                @input="handleNumericInput('carotene')"
+                @input="handleNumericInput('carotene', $event)"
                 @blur="formatNumericValue('carotene')"
                 placeholder="请输入胡萝卜素"
               ></el-input>
@@ -371,7 +371,7 @@
             <el-form-item label="视黄醇（μg/100g）" prop="retinol">
               <el-input
                 v-model="form.retinol"
-                @input="handleNumericInput('retinol')"
+                @input="handleNumericInput('retinol', $event)"
                 @blur="formatNumericValue('retinol')"
                 placeholder="请输入视黄醇"
               ></el-input>
@@ -382,7 +382,7 @@
             <el-form-item label="硫胺素（mg/100g）" prop="thiamine">
               <el-input
                 v-model="form.thiamine"
-                @input="handleNumericInput('thiamine')"
+                @input="handleNumericInput('thiamine', $event)"
                 @blur="formatNumericValue('thiamine')"
                 placeholder="请输入硫胺素"
               ></el-input>
@@ -396,7 +396,7 @@
             <el-form-item label="核黄素（mg/100g）" prop="riboflavin">
               <el-input
                 v-model="form.riboflavin"
-                @input="handleNumericInput('riboflavin')"
+                @input="handleNumericInput('riboflavin', $event)"
                 @blur="formatNumericValue('riboflavin')"
                 placeholder="请输入核黄素"
               ></el-input>
@@ -407,7 +407,7 @@
             <el-form-item label="	烟酸/尼克酸（mg/100g）" prop="niacin">
               <el-input
                 v-model="form.niacin"
-                @input="handleNumericInput('niacin')"
+                @input="handleNumericInput('niacin', $event)"
                 @blur="formatNumericValue('niacin')"
                 placeholder="请输入烟酸/尼克酸"
               ></el-input>
@@ -420,7 +420,7 @@
             <el-form-item label="维生素C（mg/100g）" prop="vitaminC">
               <el-input
                 v-model="form.vitaminC"
-                @input="handleNumericInput('vitaminC')"
+                @input="handleNumericInput('vitaminC', $event)"
                 @blur="formatNumericValue('vitaminC')"
                 placeholder="请输入维生素C"
               ></el-input>
@@ -431,7 +431,7 @@
             <el-form-item label="维生素D（μg/100g）" prop="vitaminD">
               <el-input
                 v-model="form.vitaminD"
-                @input="handleNumericInput('vitaminD')"
+                @input="handleNumericInput('vitaminD', $event)"
                 @blur="formatNumericValue('vitaminD')"
                 placeholder="请输入维生素D"
               ></el-input>
@@ -444,7 +444,7 @@
             <el-form-item label="维生素E（mg/100g）" prop="vitaminE">
               <el-input
                 v-model="form.vitaminE"
-                @input="handleNumericInput('vitaminE')"
+                @input="handleNumericInput('vitaminE', $event)"
                 @blur="formatNumericValue('vitaminE')"
                 placeholder="请输入维生素E"
               ></el-input>
@@ -455,7 +455,7 @@
             <el-form-item label="钙（mg/100g）" prop="calcium">
               <el-input
                 v-model="form.calcium"
-                @input="handleNumericInput('calcium')"
+                @input="handleNumericInput('calcium', $event)"
                 @blur="formatNumericValue('calcium')"
                 placeholder="请输入钙"
               ></el-input>
@@ -468,7 +468,7 @@
             <el-form-item label="磷（mg/100g）" prop="phosphorus">
               <el-input
                 v-model="form.phosphorus"
-                @input="handleNumericInput('phosphorus')"
+                @input="handleNumericInput('phosphorus', $event)"
                 @blur="formatNumericValue('phosphorus')"
                 placeholder="请输入磷"
               ></el-input>
@@ -479,7 +479,7 @@
             <el-form-item label="	钾（mg/100g）" prop="kalium">
               <el-input
                 v-model="form.kalium"
-                @input="handleNumericInput('kalium')"
+                @input="handleNumericInput('kalium', $event)"
                 @blur="formatNumericValue('kalium')"
                 placeholder="请输入钾"
               ></el-input>
@@ -492,7 +492,7 @@
             <el-form-item label="钠 （mg/100g）" prop="sodium">
               <el-input
                 v-model="form.sodium"
-                @input="handleNumericInput('sodium')"
+                @input="handleNumericInput('sodium', $event)"
                 @blur="formatNumericValue('sodium')"
                 placeholder="请输入钠"
               ></el-input>
@@ -503,7 +503,7 @@
             <el-form-item label="	镁（mg/100g）" prop="magnesium">
               <el-input
                 v-model="form.magnesium"
-                @input="handleNumericInput('magnesium')"
+                @input="handleNumericInput('magnesium', $event)"
                 @blur="formatNumericValue('magnesium')"
                 placeholder="请输入镁"
               ></el-input>
@@ -516,7 +516,7 @@
             <el-form-item label="铁 （mg/100g）" prop="iron">
               <el-input
                 v-model="form.iron"
-                @input="handleNumericInput('iron')"
+                @input="handleNumericInput('iron', $event)"
                 @blur="formatNumericValue('iron')"
                 placeholder="请输入铁"
               ></el-input>
@@ -527,7 +527,7 @@
             <el-form-item label="锌（mg/100g）" prop="zinc">
               <el-input
                 v-model="form.zinc"
-                @input="handleNumericInput('zinc')"
+                @input="handleNumericInput('zinc', $event)"
                 @blur="formatNumericValue('zinc')"
                 placeholder="请输入锌"
               ></el-input>
@@ -540,7 +540,7 @@
             <el-form-item label="硒（μg/100g）" prop="selenium">
               <el-input
                 v-model="form.selenium"
-                @input="handleNumericInput('selenium')"
+                @input="handleNumericInput('selenium', $event)"
                 @blur="formatNumericValue('selenium')"
                 placeholder="请输入硒"
               ></el-input>
@@ -748,7 +748,7 @@ export default {
       this.$modal
         .confirm("是否确认删除数据项？")
         .then(function () {
-          return nutritionTypeDelApi({ids:[data.value]});
+          return nutritionTypeDelApi({ids:[data.id]});
         })
         .then(() => {
           this.$modal.msgSuccess("删除成功");