From f273ae537b3e58fbf32165f1ad0de79da3c0377d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 10 Oct 2024 15:39:43 +0800
Subject: [PATCH] =?UTF-8?q?HL-6202=E7=BA=BF=E8=BE=B9=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=AD=E6=98=8E=E7=BB=86=E8=A1=A8=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E6=8B=BF=E5=88=B0?=
 =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E4=B8=8A=EF=BC=8C=E5=B0=B1=E6=98=AF=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0=E4=BB=A3=E7=A0=81=EF=BC=8C=E8=BD=A6=E9=97=B4=E9=82=A3?=
 =?UTF-8?q?=E4=B8=80=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain/index.vue      |  6 +++
 .../productionscrapRequestMain.data.ts        | 51 +++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 68a12bbec..a28b46726 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -720,7 +720,13 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  
   data.subList = tableData.value // 拼接子表数据参数
+  if(data.projectCode){
+    data.subList.forEach(item => {
+      item.projectCode = data.projectCode
+    });
+  }
   let isZC = true // 数量和标包数量 是否整除
   data.subList.forEach(item => {
     item.productionLineCode = data.productionLineCode
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 25826a97c..463c272e5 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -726,6 +726,55 @@ export const ProductionscrapRequestMain = useCrudSchemas(
         ]
       }
     },
+    {
+      // HL-6202 还是子表数据，只是放在form中用来新增选择数据
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isDetail:false,
+      isTable:false,
+      isForm:true,
+      tableForm: {
+        enterSearch: true,
+        isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择QAD项目信息',
+        searchField: 'projectCode',
+        searchTitle: '选择项目代码',
+        searchAllSchemas: QadProject.allSchemas,
+        searchPage: QadProjectApi.getQadProjectPage,
+        verificationParams: [{
+          key: 'projectCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
+          searchField: 'projectCode', // 查询弹窗赋值字段
+          searchTitle: '选择项目代码', // 查询弹窗标题
+          searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+          searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+          verificationParams: [{
+            key: 'projectCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '申请时间',
       field: 'requestTime',
@@ -1545,12 +1594,14 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false,
   },
   {
+    //HL-6202 还是子表数据
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTableForm:false,
     tableForm: {
       enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗