From 77fc68316f8bd82498f4447591eaeac9905374fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 26 Dec 2023 15:55:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=A1=A8=E5=8D=95=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8Ftableform=20=E5=88=A0=E9=99=A4=E5=88=97?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  6 ++++
 src/components/TableForm/src/TableForm.vue    |  3 +-
 .../productdismantleRequestMain.data.ts       | 36 +++++++++----------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index a34f2ebe8..6b281649d 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -68,6 +68,7 @@
         :tableData="tableData"
         :tableFormRules="tableFormRules"
         :isShowButton="isShowButton"
+        :isShowReduceButton="isShowReduceButton"
         @handleAddTable="handleAddTable"
         @handleDeleteTable="handleDeleteTable"
         @tableSelectionChange="tableSelectionChange"
@@ -113,6 +114,11 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
+  // 是否显示tableForm 删除按钮
+  isShowReduceButton: {
+    type: Boolean,
+    default: true
+  },
   // 校验rules
   rules: {
     type: Object,
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 12d0190d2..7a37be94e 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -269,7 +269,7 @@
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 const props = defineProps({
-  // 是否显示删除按钮
+  // 是否显示添加按钮
   isShowButton: {
     type: Boolean,
     default: true,
@@ -284,6 +284,7 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  // 是否显示删除按钮
   isShowReduceButton:{
     type: Boolean,
     default: true,
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 9dc642fc5..f4bd20ff0 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -440,7 +440,7 @@ export const ProductdismantleRequestMainRules = reactive({
  */
 export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
+    label: '拆解生产线代码',
     field: 'productionLineCode',
     sort: 'custom',
     table: {
@@ -485,7 +485,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '工位代码',
+    label: '拆解工位代码',
     field: 'workStationCode',
     sort: 'custom',
     table: {
@@ -610,6 +610,22 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       disabled: true
     }
   },
+  {
+    label: '成品库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '数量',
     field: 'qty',
@@ -769,22 +785,6 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     isTableForm: false,
     isForm: false,
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps:{
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
   {
     label: '单据号',
     field: 'number',

From 2512652329577de311e6ec83f31bf4c6258b2603 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 26 Dec 2023 16:54:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=92=8C=E5=88=B0=E5=BA=93=E4=BD=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturn/purchasereturnRequestMain/index.vue        | 4 ++++
 .../purchasereturnRequestMain.data.ts                         | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 47beb2fc4..3a4c6ac36 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -187,6 +187,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             if (item.field == 'remark') {
               item.tableForm.disabled = false
             }
+            if (item.field == 'qty') {
+              item.tableForm.disabled = false
+            }
             if (item.field == 'reason') {
               item.tableForm.disabled = false
             }
@@ -330,6 +333,7 @@ const buttonTableClick = async (val, row) => {
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
+  isShowButton.value = true
   formRef.value.open(type, row)
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 4d0515eb7..dbf2b437e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -735,6 +735,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     }, 
+    isTableForm:false,
     tableForm:{
       disabled:true
     }

From 1742b997ebabda0ab5555d0cc53a8ef709eceb44 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 26 Dec 2023 16:57:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreceiptRecordMain.data.ts         | 16 +++++-----
 .../inventorymoveRequestMain/index.vue        | 32 +++++++++++++++++++
 .../inventorymoveRequestMain.data.ts          |  6 ++--
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
index 8643f50b2..4b05dd042 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
@@ -460,14 +460,14 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '从包装号',
     field: 'fromPackingNumber',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 1d82a833f..c26bf5022 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -167,6 +167,38 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
       item.tableForm.disabled = false
     }
   }
+  if(item.field == "toLocationCode"){
+    if (toInventoryStatus.value == 'HOLD') {
+      item.tableForm.searchCondition = [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'type',
+        value: 'HOLD',
+        isMainValue: false
+      }]
+    }
+    if (toInventoryStatus.value == 'SCRAP') {
+      item.tableForm.searchCondition = [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'type',
+        value: 'SCRAP',
+        isMainValue: false
+      }]
+    }else {
+      item.tableForm.searchCondition = {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }
+    }
+  }
 })
 
 // 字段设置 更新主列表字段
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 4ddbadab5..030cf8b62 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -839,9 +839,9 @@ export const InventorymoveRequestDetailRules = reactive({
   // toBatch: [
   //   { required: true, message: '请输入到批次', trigger: 'blur' }
   // ],
-  // toLocationCode: [
-  //   { required: true, message: '请选择到库位代码', trigger: 'change' }
-  // ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
   // toInventoryStatus: [
   //   { required: true, message: '请选择到库存状态', trigger: 'change' }
   // ],