From 3629540ca7af6852ebe194d47d96c811cec70f6d Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Wed, 16 Apr 2025 18:39:47 +0800
Subject: [PATCH] =?UTF-8?q?YT-2415=E4=B8=8D=E8=89=AF=E5=93=81=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=95=B4=E4=BD=93=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapJobMain/scrapJobMain.data.ts   | 38 ++++++++++++++++++-
 .../scrapRecordMain/scrapRecordMain.data.ts   | 38 ++++++++++++++++++-
 .../scrapRequestMain/scrapRequestMain.data.ts |  2 +-
 .../index.vue                                 |  2 +-
 .../inventorymoveRequestMain.data.ts          |  3 ++
 5 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 1066eaf5b..f5e25169c 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -35,7 +35,7 @@ export const ScrapJobMain = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '成本中心代码',
+      label: '责任部门',
       field: 'costCenterCode',
       sort: 'custom',
       table: {
@@ -204,6 +204,42 @@ export const ScrapJobMain = useCrudSchemas(
         filterable: true
       }
     },
+    {
+      label: '责任',
+      field: 'duty',
+      dictType: DICT_TYPE.DUTY,
+      dictClass: 'string',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          filterable: true
+        }
+      },
+      tableForm: {
+        type: 'Select',
+        filterable: true
+      }
+    },
+    {
+      label: '责任明细',
+      field: 'dutyDetails',
+      dictType: DICT_TYPE.DUTY_DETAILS,
+      dictClass: 'string',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          filterable: true
+        }
+      },
+      tableForm: {
+        type: 'Select',
+        filterable: true
+      }
+    },
     {
       label: 'Q1通知单号',
       field: 'q1Number',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index fb8ee73db..b7a4f9f9c 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -44,7 +44,7 @@ export const ScrapRecordMain = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '成本中心代码',
+      label: '责任部门',
       field: 'costCenterCode',
       sort: 'custom',
       table: {
@@ -159,6 +159,42 @@ export const ScrapRecordMain = useCrudSchemas(
         filterable: true
       }
     },
+    {
+      label: '责任',
+      field: 'duty',
+      dictType: DICT_TYPE.DUTY,
+      dictClass: 'string',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          filterable: true
+        }
+      },
+      tableForm: {
+        type: 'Select',
+        filterable: true
+      }
+    },
+    {
+      label: '责任明细',
+      field: 'dutyDetails',
+      dictType: DICT_TYPE.DUTY_DETAILS,
+      dictClass: 'string',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          filterable: true
+        }
+      },
+      tableForm: {
+        type: 'Select',
+        filterable: true
+      }
+    },
     {
       label: '项目代码',
       field: 'projectCode',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index f424c43c5..18f751cbf 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -704,7 +704,7 @@ export const ScrapRequestMain = useCrudSchemas(
     },
     {
       label: '责任明细',
-      field: 'dutyDetail',
+      field: 'dutyDetails',
       dictType: DICT_TYPE.DUTY_DETAILS,
       dictClass: 'string',
       table: {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/index.vue
index 0518cea6d..d26743bdf 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/index.vue
@@ -782,7 +782,7 @@ const submitForm = async (formType, submitData) => {
     console.log(556565,item);
     if(fromInventoryStatus.value){
       //item.fromInventoryStatus = fromInventoryStatus.value
-      item.toInventoryStatus = toInventoryStatus.value
+      // item.toInventoryStatus = toInventoryStatus.value
     }
     if(item.qty == 0){
       message.error(`到数量不能为0!`)
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts
index 17f4f53d1..aae51c3be 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts
@@ -1044,6 +1044,9 @@ export const InventorymoveRequestDetailRules = reactive({
   toLocationCode: [
     { required: true, message: '请选择到库位代码', trigger: 'change' }
   ],
+  toInventoryStatus: [
+    { required: true, message: '请选择到库存状态', trigger: 'change' }
+  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],