From 8fbf0fed81a529002316bf47389c78d727a5545a Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Mon, 21 Jul 2025 17:34:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/foodManage/purchaseReport.js          | 46 +++++++++++++-
 .../correlationReport/index.vue               | 26 ++++----
 .../supplierManage/supplierRating/index.vue   | 61 ++++++++++++++++++-
 3 files changed, 118 insertions(+), 15 deletions(-)

diff --git a/src/api/foodManage/purchaseReport.js b/src/api/foodManage/purchaseReport.js
index ce23dfbf..274abb19 100644
--- a/src/api/foodManage/purchaseReport.js
+++ b/src/api/foodManage/purchaseReport.js
@@ -33,4 +33,48 @@ export function purchasePlanReportPageApi(data) {
   })
 }
 
-
+//采购关联报表-查询生产计划主列表
+export function productionPlanCorrelationPageApi(data) {
+  return request({
+    url: '/smart-canteen/report/ims_production_plan/correlation/list',
+    method: 'post',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    data:data,
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
+  })
+}
+//采购关联报表-查询采购计划列表
+export function purchasePlanCorrelationPageApi(data) {
+  return request({
+    url: '/smart-canteen/report/ims_purchase_plan/correlation/list',
+    method: 'post',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    data:data,
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
+  })
+}
+//采购关联报表-查询采购订单主列表
+export function goodsOrderCorrelationPageApi(data) {
+  return request({
+    url: '/smart-canteen/report/ims_order_goods/correlation/list',
+    method: 'post',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    data:data,
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
+  })
+}
diff --git a/src/views/foodManage/purchaseReport/correlationReport/index.vue b/src/views/foodManage/purchaseReport/correlationReport/index.vue
index a24348e5..a87e1fb6 100644
--- a/src/views/foodManage/purchaseReport/correlationReport/index.vue
+++ b/src/views/foodManage/purchaseReport/correlationReport/index.vue
@@ -15,8 +15,8 @@
                 :picker-options="pickerOptions" >
             </el-date-picker>
         </el-form-item>
-        <el-form-item label="生产计划单号" prop="productPlanCode">
-            <el-input v-model="queryParams.productPlanCode" placeholder="请输入生产计划单号" maxlength="50" clearable style="width: 100%"/>
+        <el-form-item label="生产计划单号" prop="productionPlanCode">
+            <el-input v-model="queryParams.productionPlanCode" placeholder="请输入生产计划单号" maxlength="50" clearable style="width: 100%"/>
         </el-form-item>
          <el-form-item label="采购计划单号" prop="purchasePlanCode">
             <el-input v-model="queryParams.purchasePlanCode" placeholder="请输入采购计划单号" maxlength="50" clearable style="width: 100%"/>
@@ -29,7 +29,7 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
     </el-form> 
-    <div>
+    <div style="margin-bottom: 20px;">
         <el-table v-loading="loading" :data="tableListData1" height="300">
             <el-table-column label="序号" align="center" width="80" type="index">
                 <template slot-scope="scope">
@@ -70,7 +70,7 @@
         @pagination="getList1"
         /> 
     </div>
-    <div>
+    <div  style="margin-bottom: 20px;">
         <el-table v-loading="loading" :data="tableListData2" height="300">
             <el-table-column label="序号" align="center" width="80" type="index">
                 <template slot-scope="scope">
@@ -177,8 +177,8 @@
   </div>
 </template>
 
-<script>
-import { productionPlanPageApi,purchasePlanPageApi,purchaseOrderPageApi } from "@/api/foodManage/purchaseManage";   
+<script> 
+import { productionPlanCorrelationPageApi,purchasePlanCorrelationPageApi,goodsOrderCorrelationPageApi } from "@/api/foodManage/purchaseReport";   
 export default {
     name: "",
     dicts: [],
@@ -201,7 +201,7 @@ export default {
             tableListData: [], 
             // 查询参数
             queryParams: {
-                productPlanCode:null,
+                productionPlanCode:null,
                 purchasePlanCode:null,
                 orderGoodsCode:null, 
             },
@@ -285,7 +285,7 @@ export default {
                 "pageNum": this.queryParams1.pageNum, 
                 "pageSize": this.queryParams1.pageSize,  
                 "goodsType":1,
-                "productPlanCode": this.queryParams.productPlanCode
+                "productionPlanCode": this.queryParams.productionPlanCode
             }
             if(this.dateRange&&this.dateRange.length>0){
                 param.startDateTime=this.formatDateTime(this.dateRange[0])
@@ -294,7 +294,7 @@ export default {
                 param.startDateTime=undefined;
                 param.endDateTime=undefined;
             } 
-            productionPlanPageApi(param).then(response => {
+            productionPlanCorrelationPageApi(param).then(response => {
                 this.tableListData1 = response.rows;
                 this.total1 = Number(response.total);
                 this.loading = false;
@@ -306,7 +306,7 @@ export default {
             let param = {
                 "pageNum": this.queryParams2.pageNum, 
                 "pageSize": this.queryParams2.pageSize,  
-                "productPlanCode": this.queryParams.productPlanCode,        
+                "productionPlanCode": this.queryParams.productionPlanCode,        
                 "purchasePlanCode": this.queryParams.purchasePlanCode,    
             }
             if(this.dateRange&&this.dateRange.length>0){
@@ -316,7 +316,7 @@ export default {
                 param.startDateTime=undefined;
                 param.endDateTime=undefined;
             } 
-            purchasePlanPageApi(param).then(response => {
+            purchasePlanCorrelationPageApi(param).then(response => {
                 this.tableListData2 = response.rows;
                 this.total2 = Number(response.total);
                 this.loading = false;
@@ -328,7 +328,7 @@ export default {
             let param = {
                 "pageNum": this.queryParams3.pageNum, 
                 "pageSize": this.queryParams3.pageSize,  
-                "productPlanCode": this.queryParams.productPlanCode,        
+                "productionPlanCode": this.queryParams.productionPlanCode,        
                 "purchasePlanCode": this.queryParams.purchasePlanCode,   
                 "orderGoodsCode": this.queryParams.orderGoodsCode,   
             }
@@ -339,7 +339,7 @@ export default {
                 param.startDateTime=undefined;
                 param.endDateTime=undefined;
             } 
-            purchaseOrderPageApi(param).then(response => {
+            goodsOrderCorrelationPageApi(param).then(response => {
                 this.tableListData3 = response.rows;
                 this.total3 = Number(response.total);
                 this.loading = false;
diff --git a/src/views/foodManage/supplierManage/supplierRating/index.vue b/src/views/foodManage/supplierManage/supplierRating/index.vue
index 1c79d391..5fedcdd2 100644
--- a/src/views/foodManage/supplierManage/supplierRating/index.vue
+++ b/src/views/foodManage/supplierManage/supplierRating/index.vue
@@ -262,8 +262,67 @@ export default {
                     ],
                     unitName:'个',
                     setScore:null,
+                },
+                {
+                    ruleName:"注册资金（万元）",
+                    sectionListDTO:[
+                        {
+                            leftValue:0,
+                            rightValue:null,
+                            sectionScore:null,
+                        }
+                    ],
+                    unitName:'万元',
+                    setScore:null,
+                },
+                {
+                    ruleName:"上一年度营业额（万元）",
+                    sectionListDTO:[
+                        {
+                            leftValue:0,
+                            rightValue:null,
+                            sectionScore:null,
+                        }
+                    ],
+                    unitName:'万元',
+                    setScore:null,
+                },
+                {
+                    ruleName:"员工数（人）",
+                    sectionListDTO:[
+                        {
+                            leftValue:0,
+                            rightValue:null,
+                            sectionScore:null,
+                        }
+                    ],
+                    unitName:'人',
+                    setScore:null,
+                },
+                {
+                    ruleName:"订单数量（个）",
+                    sectionListDTO:[
+                        {
+                            leftValue:0,
+                            rightValue:null,
+                            sectionScore:null,
+                        }
+                    ],
+                    unitName:'个',
+                    setScore:null,
+                },
+                {
+                    ruleName:"订单金额（万元）",
+                    sectionListDTO:[
+                        {
+                            leftValue:0,
+                            rightValue:null,
+                            sectionScore:null,
+                        }
+                    ],
+                    unitName:'万元',
+                    setScore:null,
                 }
-                
             ], 
             openHistory: false, 
             dialogTableData:[],