From 857f5201a864c39c0427900c382ca5f5659ccb8d Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 13 Aug 2025 14:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dish/material/components/MaterialDialog.vue    |  3 ++-
 src/views/foodManage/baseInfo/baseSetting.vue      |  2 +-
 .../supplierManage/goodsSupplier/index.vue         | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/canteen/dish/material/components/MaterialDialog.vue b/src/views/canteen/dish/material/components/MaterialDialog.vue
index 19225513..dc58254b 100644
--- a/src/views/canteen/dish/material/components/MaterialDialog.vue
+++ b/src/views/canteen/dish/material/components/MaterialDialog.vue
@@ -76,7 +76,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="12">
+              <el-col :span="12">
                 <el-form-item label="原料进价" prop="unitPrice">
                   <el-input
                     v-model="form.unitPrice"
@@ -88,6 +88,7 @@
                   </el-input>
                 </el-form-item>
               </el-col>
+              <!-- 
               <el-col :span="12">
                 <el-form-item label="条码" prop="barCode">
                   <el-input
diff --git a/src/views/foodManage/baseInfo/baseSetting.vue b/src/views/foodManage/baseInfo/baseSetting.vue
index 1faf5e94..e5346343 100644
--- a/src/views/foodManage/baseInfo/baseSetting.vue
+++ b/src/views/foodManage/baseInfo/baseSetting.vue
@@ -22,7 +22,7 @@
                         <span class="item-label">采购计划参考价:</span>
                         <el-select v-model="purchase_plan_reference_price" placeholder="请选择" style="width: 240px;">
                             <el-option label="参考上次采购价格" value="0"></el-option>
-                            <el-option label="参考采集的市场价格" value="1"></el-option>  
+                            <el-option label="参考原料进价" value="1"></el-option>  
                         </el-select>  
                     </div>
                     <div style="color: #999;font-size: 14px;margin-top: 10px">采购计划中将按照设定的方式展示货品的参考价</div>
diff --git a/src/views/foodManage/supplierManage/goodsSupplier/index.vue b/src/views/foodManage/supplierManage/goodsSupplier/index.vue
index 34f6bddf..7d7d000a 100644
--- a/src/views/foodManage/supplierManage/goodsSupplier/index.vue
+++ b/src/views/foodManage/supplierManage/goodsSupplier/index.vue
@@ -86,11 +86,11 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="供应商名称" align="center" prop="supplierName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="最近一次供货时间" align="center" prop="lastOrderGoodsDate" :show-overflow-tooltip="true"> 
+                    <el-table-column label="最近一次供货时间" align="center" prop="purchaseGoodsTime" :show-overflow-tooltip="true"> 
                     </el-table-column>  
-                    <el-table-column label="价格" align="center" prop="lastOrderGoodsPrice" width="120" :show-overflow-tooltip="true" >
+                    <el-table-column label="价格" align="center" prop="singlePrice" width="120" :show-overflow-tooltip="true" >
                         <template slot-scope="scope">
-                            <!-- <span>{{ (scope.row.lastOrderGoodsPrice/100).toFixed(2)||0 }}</span> -->
+                            <span>{{ (scope.row.singlePrice/100).toFixed(2)||0 }}</span>
                         </template>
                     </el-table-column>
                 </el-table> 
@@ -340,13 +340,13 @@ export default {
             systemMaterialTreeApi(param).then((response) => {
                 this.treeTypeOptions = response.data;
             });
-        }, 
+        },
           /** 查询供应商下拉结构 */
         getSupplierData() { 
             supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => {
                 this.supplierOptions = response.rows||[]; 
             }); 
-        }, 
+        },
         handleTabClick(){
             if(this.activeName=='material'){
                 this.queryParams={
@@ -385,7 +385,7 @@ export default {
             }
             this.resetForm("queryForm");
             this.handleQuery();
-        }, 
+        },
         /** 查询列表 */
         getList() {
             this.loading = true;
@@ -566,7 +566,7 @@ export default {
                 }
             })
         },
-        
+
         //弹窗select操作
         dialogChangeSupplier(e){
             console.log(e)