From 4c193b670f0b8819f43f00015e79eb097676698a Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 10 Jan 2025 16:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8D=A2=E8=B4=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue          |  4 +++-
 .../purchaseBarterRequest/index.vue           |  5 ++--
 .../purchaseBarterRequestMain.data.ts         | 23 +++++++++++++++++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 4e4dea19f..35cc4c04b 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -1338,5 +1338,7 @@ defineExpose({ openDetail, formRef ,updateList,submitUpdateList,changeTabCurrent
 ::v-deep(.label-class-name) {
   color: #dedede;
 }
+.el-descriptions__body .el-descriptions__table .el-descriptions__cell{
+  word-break: break-all!important;
+}
 </style>
-<style scoped lang="scss"></style>
diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue
index 7ffdc1d2e..460e3d347 100644
--- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue
@@ -168,6 +168,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           let tfk = JSON.parse(JSON.stringify(tableFormKeys))
           tfk['itemCode'] = item['itemCode']
           tfk['itemName'] = item['itemName']
+          tfk['itemDesc1'] = item['itemDesc1']
           tfk['uom'] = item['uom']
           tfk['batch'] = item['batch']
           tfk['inventoryQty'] = item['qty']
@@ -603,9 +604,9 @@ const submitForm = async (formType, submitData) => {
       }
       formRef.value.formLoading = true
       data.intexContactBegin = data.intexContact[0]
-      data.intexContactEnd = data.intexContact[0]
+      data.intexContactEnd = data.intexContact[1]
       data.supplierContactBegin = data.supplierContact[0]
-      data.supplierContactEnd = data.supplierContact[0]
+      data.supplierContactEnd = data.supplierContact[1]
       await PurchaseBarterRequestMainApi.createPurchaseBarterRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
index 7c7d90de3..fa689da6e 100644
--- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
@@ -206,6 +206,18 @@ export const PurchaseBarterRequestMain = useCrudSchemas(
       },
       sortTableDefault: 1000
     },
+    // {
+    //   label: '不良内容',
+    //   field: 'badContent',
+    //   sort: 'custom',
+    //   isTable: true,
+    //   isDetail: true,
+    //   isSearch: false,
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+
     {
       label: '不良内容',
       field: 'badContent',
@@ -213,8 +225,12 @@ export const PurchaseBarterRequestMain = useCrudSchemas(
       isTable: true,
       isDetail: true,
       isSearch: false,
-      table: {
-        width: 150
+      form: {
+        componentProps: {
+          type:"textarea",
+          maxlength:200,
+          showWordLimit:true
+        }
       },
     },
     {
@@ -423,6 +439,9 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(
       table: {
         width: 150
       },
+      tableForm: {
+            disabled: true
+          },
       form: {
         componentProps: {
           disabled: true