diff --git a/src/views/foodManage/baseInfo/baseSetting.vue b/src/views/foodManage/baseInfo/baseSetting.vue
index e5346343..0659d560 100644
--- a/src/views/foodManage/baseInfo/baseSetting.vue
+++ b/src/views/foodManage/baseInfo/baseSetting.vue
@@ -29,7 +29,7 @@
                 </div>
             </div> 
 
-            <div class="item">
+            <!-- <div class="item">
                 <div>
                     <div>
                         <span class="item-label">货品临期天数设置:</span>
@@ -41,7 +41,7 @@
                     </div>
                     <div style="color: #999;font-size: 14px;margin-top: 10px;">设置临期天数后，系统将根据货品的有效日期自动进行货品临期提醒</div>
                 </div> 
-            </div>
+            </div> -->
             <div class="item">
                 <div>
                     <div>
@@ -84,7 +84,7 @@ export default {
         return { 
             material_conversion_rounding_method:null, 
             purchase_plan_reference_price:null,
-            goods_expireing_day_reminder:null, 
+            // goods_expireing_day_reminder:null, 
             qualification_certificates_expiring_day_reminder:null, 
             goods_lacking_number_reminder:null,
             
@@ -107,9 +107,9 @@ export default {
                     if(item.itemName=='purchase_plan_reference_price'){
                         this.purchase_plan_reference_price = item.itemValue
                     }
-                    if(item.itemName=='goods_expireing_day_reminder'){
-                        this.goods_expireing_day_reminder = item.itemValue
-                    }
+                    // if(item.itemName=='goods_expireing_day_reminder'){
+                    //     this.goods_expireing_day_reminder = item.itemValue
+                    // }
                     if(item.itemName=='qualification_certificates_expiring_day_reminder'){
                         this.qualification_certificates_expiring_day_reminder = item.itemValue
                     }
@@ -123,7 +123,7 @@ export default {
             let param = [
                 {"itemName": "material_conversion_rounding_method","itemValue":this.material_conversion_rounding_method},
                 {"itemName": "purchase_plan_reference_price","itemValue":this.purchase_plan_reference_price},
-                {"itemName": "goods_expireing_day_reminder","itemValue":this.goods_expireing_day_reminder},
+                // {"itemName": "goods_expireing_day_reminder","itemValue":this.goods_expireing_day_reminder},
                 {"itemName": "qualification_certificates_expiring_day_reminder","itemValue":this.qualification_certificates_expiring_day_reminder},
                 {"itemName": "goods_lacking_number_reminder","itemValue":this.goods_lacking_number_reminder},
             ]
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/detail.vue b/src/views/foodManage/purchaseManage/goodsInquiry/detail.vue
index e2213163..7c57bf84 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/detail.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/detail.vue
@@ -144,7 +144,7 @@ export default {
                 return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
             }
         },
-        materialLis:[],
+        materialList:[],
         openDialog:false,
         materialTreeOptions:[],
         // 查询参数
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/detail.vue b/src/views/foodManage/purchaseManage/purchaseOrder/detail.vue
index ebd2279d..029a6e71 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/detail.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/detail.vue
@@ -85,7 +85,7 @@
                 </div> 
             </div>
             <div style="width: 100%;height: 400px;overflow-y: auto;">
-                <el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
+                <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
                     <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
                     <el-table-column label="序号" align="center" width="80" type="index" />
                     <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
@@ -171,7 +171,7 @@ export default {
                 return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
             }
         },
-        materialLis:[],  
+        materialList:[],  
         openDialog:false,
         materialTreeOptions:[], 
         // 查询参数
@@ -219,7 +219,7 @@ export default {
             //查询查询食堂下拉结构
             getPurchaseOrderInfoApi(param).then((response) => {
                 this.baseInfo = response.data;
-                this.materialLis = this.baseInfo.orderGoodsDetailList;  
+                this.materialList = this.baseInfo.orderGoodsDetailList;  
             }); 
         },  
         // 多选框选中数据
diff --git a/src/views/foodManage/stockManage/inventoryCount/detail.vue b/src/views/foodManage/stockManage/inventoryCount/detail.vue
index 5ad9921c..5ffd5393 100644
--- a/src/views/foodManage/stockManage/inventoryCount/detail.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/detail.vue
@@ -36,7 +36,7 @@
                 </div> 
             </div>
             <div style="width: 100%;height: 400px;overflow-y: auto;">
-                <el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
+                <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
                     <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
                     <el-table-column label="序号" align="center" width="80" type="index" />
                     <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
@@ -60,7 +60,7 @@
                     </el-table-column>   
                     <el-table-column label="实盘总额（元）" align="center" prop="" :show-overflow-tooltip="true" width="120">
                         <template slot-scope="scope"> 
-                             <span>{{ scope.row.actualNum*(scope.row.price/100) }}</span>
+                             <span>{{ (scope.row.actualNum*(scope.row.price/100)).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
                     <el-table-column label="差异数" align="center" prop="" :show-overflow-tooltip="true">
@@ -142,7 +142,7 @@ export default {
                 return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
             }
         },
-        materialLis:[],  
+        materialList:[],  
         openDialog:false,
         materialTreeOptions:[], 
         // 查询参数
diff --git a/src/views/foodManage/stockManage/inventoryCount/edit.vue b/src/views/foodManage/stockManage/inventoryCount/edit.vue
index c30bb220..e2e31a32 100644
--- a/src/views/foodManage/stockManage/inventoryCount/edit.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/edit.vue
@@ -85,7 +85,7 @@
                     </el-table-column>   
                     <el-table-column label="实盘总额（元）" align="center" prop="" :show-overflow-tooltip="true" width="120">
                         <template slot-scope="scope"> 
-                             <span>{{ scope.row.actualNum*(scope.row.price/100) }}</span>
+                             <span>{{ (scope.row.actualNum*(scope.row.price/100)).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
                     <el-table-column label="差异数" align="center" prop="" :show-overflow-tooltip="true">
diff --git a/src/views/foodManage/stockManage/warehouseIn/detail.vue b/src/views/foodManage/stockManage/warehouseIn/detail.vue
index 392e43a0..bc1e76da 100644
--- a/src/views/foodManage/stockManage/warehouseIn/detail.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/detail.vue
@@ -43,7 +43,7 @@
                 </div> 
             </div>
             <div style="width: 100%;height: 400px;overflow-y: auto;">
-                <el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
+                <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
                     <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
                     <el-table-column label="序号" align="center" width="80" type="index" />
                     <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
@@ -130,7 +130,7 @@ export default {
                 return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
             }
         },
-        materialLis:[],  
+        materialList:[],  
         openDialog:false,
         materialTreeOptions:[], 
         // 查询参数
@@ -178,7 +178,7 @@ export default {
             //查询查询食堂下拉结构
             getWarehouseInInfoApi(param).then((response) => {
                 this.baseInfo = response.data;
-                this.materialLis = this.baseInfo.imsIntoInventoryDetailVOList;  
+                this.materialList = this.baseInfo.imsIntoInventoryDetailVOList;  
             }); 
         },  
         // 多选框选中数据
diff --git a/src/views/foodManage/stockManage/warehouseOut/detail.vue b/src/views/foodManage/stockManage/warehouseOut/detail.vue
index b880489f..b151c705 100644
--- a/src/views/foodManage/stockManage/warehouseOut/detail.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/detail.vue
@@ -54,7 +54,7 @@
                 </div> 
             </div>
             <div style="width: 100%;height: 400px;overflow-y: auto;">
-                <el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
+                <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
                     <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
                     <el-table-column label="序号" align="center" width="80" type="index" />
                     <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
@@ -140,7 +140,7 @@ export default {
                 return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
             }
         },
-        materialLis:[],  
+        materialList:[],  
         openDialog:false,
         materialTreeOptions:[], 
         // 查询参数
@@ -188,7 +188,7 @@ export default {
             //查询查询食堂下拉结构
             getWarehouseOutInfoApi(param).then((response) => {
                 this.baseInfo = response.data;
-                this.materialLis = this.baseInfo.imsOutInventoryDetailVOList;  
+                this.materialList = this.baseInfo.imsOutInventoryDetailVOList;  
             }); 
         },  
         // 多选框选中数据
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index 5b270a2b..a6c802df 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -69,8 +69,11 @@
                     <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"> 
                     </el-table-column> 
-                    <el-table-column label="金额(元)" align="center" prop="" :show-overflow-tooltip="true">
-                    </el-table-column> 
+                    <el-table-column label="金额(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
+                           <template slot-scope="scope"> 
+                            <span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
+                        </template>
+                    </el-table-column>   
                     <el-table-column label="入库时间" align="center" prop="createTime" :show-overflow-tooltip="true"/> 
                     <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
                     <el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
@@ -125,13 +128,18 @@
                     <el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" /> 
                     <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" /> 
-                    <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
                     <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
                         <!-- <template slot-scope="scope">
                             <span v-if="scope.row.salesMode==1">按份</span>
                             <span v-if="scope.row.salesMode==2">称重</span>
                         </template> -->
                     </el-table-column> 
+                    <el-table-column label="单价" align="center" prop="unitPrice" :show-overflow-tooltip="true" >
+                        <template slot-scope="scope"> 
+                            <span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
+                        </template>
+                    </el-table-column>  
                     <el-table-column label="货品库存" align="center" prop="materialNum" :show-overflow-tooltip="true" />  
                     
                 </el-table>
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue b/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue
index 2daaac77..8142e383 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue
@@ -52,7 +52,7 @@
                 </div> 
             </div>
             <div style="width: 100%;height: 400px;overflow-y: auto;">
-                <el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
+                <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
                     <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
                     <el-table-column label="序号" align="center" width="80" type="index" />
                     <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
@@ -136,7 +136,7 @@ export default {
                 return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
             }
         },
-        materialLis:[],  
+        materialList:[],  
         openDialog:false,
         materialTreeOptions:[], 
         // 查询参数
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
index 276ed7e9..4c437fcc 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
@@ -460,7 +460,7 @@ export default {
                     this.loadingBtn=true;
                     console.log("param",param)
                     editGoodsQuotationApi(param).then((response) => {
-                        this.$modal.msgSuccess("修改成功");
+                        this.$modal.msgSuccess("报价成功");
                         this.loadingBtn=false
                         this.jumpList()
                     }).catch(() => {
diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue
index 95e2d6f0..f9b4962b 100644
--- a/src/views/foodManage/supplierManage/supplierList/index.vue
+++ b/src/views/foodManage/supplierManage/supplierList/index.vue
@@ -337,13 +337,13 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="去年度营业收入" prop="lastYearOperatingIncome">
-                                    <el-input  v-model="form.lastYearOperatingIncome" placeholder="请输入去年度营业收入" maxlength="10" clearable 
+                                    <el-input  v-model="form.lastYearOperatingIncome" placeholder="请输入去年度营业收入" maxlength="8" clearable 
                                     @input="(v)=>(form.lastYearOperatingIncome=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
                                 </el-form-item> 
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="前年度营业收入" prop="beforeYearOperatingIncome">
-                                    <el-input  v-model="form.beforeYearOperatingIncome" placeholder="请输入前年度营业收入" maxlength="10" clearable 
+                                    <el-input  v-model="form.beforeYearOperatingIncome" placeholder="请输入前年度营业收入" maxlength="8" clearable 
                                     @input="(v)=>(form.beforeYearOperatingIncome=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
                                 </el-form-item> 
                             </el-col>