From a049b66ca9b7959ae635b5b22ba7a52d777b158e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 5 Sep 2024 10:54:00 +0800
Subject: [PATCH] =?UTF-8?q?HL-5785=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRecordMain.data.ts            | 82 +++++++++----------
 .../productscrapRequestMain/index.vue         |  3 +
 2 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index fc5a31ada..2261f19a7 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -100,22 +100,22 @@ export const ProductscrapRecordMain = useCrudSchemas(
         width: 150
       }
     },
-    {
-      label: '班组',
-      field: 'team',
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '班次',
-      field: 'shift',
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
+    // {
+    //   label: '班组',
+    //   field: 'team',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   }
+    // },
+    // {
+    //   label: '班次',
+    //   field: 'shift',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   }
+    // },
     {
       label: '报废原因',
       field: 'scrappingReason',
@@ -270,15 +270,15 @@ export const ProductscrapRecordMain = useCrudSchemas(
       },
       isTable: false
     },
-    {
-      label: '备注',
-      field: 'remark',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      isTable: false
-    },
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false
+    // },
     {
       label: '是否已撤销',
       field: 'revokeFlag',
@@ -729,22 +729,22 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    search: {
-      component: 'Input',
-      componentProps: {
-        placeholder: '请输入备注'
-      }
-    },
-    isTable: true,
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: true,
+  //   search: {
+  //     component: 'Input',
+  //     componentProps: {
+  //       placeholder: '请输入备注'
+  //     }
+  //   },
+  //   isTable: true,
+  // },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index b92bb9d2b..51c90e5f1 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -390,6 +390,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // 明细查询页赋值
       if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
+        tableData.value = []
       }else if(formField == 'fromLocationCode'){
         // val.forEach(item=>{
           // const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
@@ -458,6 +459,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         //成本中心代码
         //成本中心类型
         setV['costCenterType'] = val[0]['costcentreType']
+      }else  if(formField == 'productionLineCode'){
+        tableData.value = []
       }
       formRef.setValues(setV)
     }