From 8e087200803e71a96c4d9c4fdc5f9a3bab4bf33f Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Tue, 10 Jun 2025 15:20:39 +0800
Subject: [PATCH] 2025/6/10

---
 src/views/modules/part/bomManagement.vue                        | 2 +-
 src/views/modules/part/recipeManagement.vue                     | 2 +-
 src/views/modules/project/projectInfo/projectInfo.vue           | 1 +
 .../technicalSpecificationDetail/com_bm_routing.vue             | 2 +-
 .../modules/sampleManagement/technicalSpecificationList.vue     | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index c6da40d..602770d 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -1605,7 +1605,7 @@ export default {
           columnWidth: 100
         },
         {
-          columnProp: 'productGroupName4',
+          columnProp: 'productGroupId4',
           headerAlign: "center",
           align: "left",
           columnLabel: '计划人',
diff --git a/src/views/modules/part/recipeManagement.vue b/src/views/modules/part/recipeManagement.vue
index f1c2b05..23317a2 100644
--- a/src/views/modules/part/recipeManagement.vue
+++ b/src/views/modules/part/recipeManagement.vue
@@ -1535,7 +1535,7 @@ export default {
           columnWidth: 100
         },
         {
-          columnProp: 'productGroupName4',
+          columnProp: 'productGroupId4',
           headerAlign: "center",
           align: "left",
           columnLabel: '计划人',
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index 87d00fa..e5bbede 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -2000,6 +2000,7 @@
       projectInfoSearchByAnyField(params){
         params.no = this.pageIndex
         params.size = this.pageSize
+        params.site = this.$store.state.user.site
         projectInfoSearchByAnyField(params).then(({data})=>{
           if (data && data.code === 0){
             this.dataList1 = data.page.list
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index ccc2f6c..2689ee2 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -235,7 +235,7 @@
               <el-input v-model="sheetData.goodsRollWidth" style="width: 120px" ></el-input>
             </el-form-item>
             <el-form-item  label="是新刀具吗">
-              <el-input v-model="sheetData.newCutter" style="width: 120px" ></el-input>
+              <dict-data-select :site="searchData.newCutter" v-if="searchData.site" clearable v-model="sheetData.newCutter" dict-type="bm_new_cutter" style="width: 120px"></dict-data-select>
             </el-form-item>
             <el-form-item  label="尺寸公差">
               <el-input v-model="sheetData.dimensionTolerance" style="width: 120px" ></el-input>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 6cd0e79..4fbacf3 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -1559,6 +1559,7 @@
       queryByAnyField(params){
         params.no = this.pageIndex
         params.size = this.pageSize
+        params.site = this.$store.state.user.site
         technicalSpecificationListSearchByAnyField(params).then(({data})=>{
           if (data && data.code === 0){
             this.dataList1 = data.page.list