From f7d472caa79504791ad498f4dc4905d16b7bdcf8 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 28 May 2024 11:02:58 +0800
Subject: [PATCH 01/29] =?UTF-8?q?WMS=201.=E5=8F=91=E6=96=99=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86->=E8=A1=A5=E6=96=99->=E8=A1=A5=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E3=80=81=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1=E3=80=81?=
 =?UTF-8?q?=E8=A1=A5=E6=96=99=E8=AE=B0=E5=BD=95=20=E8=BF=99=E4=B8=89?=
 =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=8E=BB=E6=8E=89=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=92=8C=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=A1=8C=20=E8=A1=A5=E6=96=99=E8=AE=B0=E5=BD=95=E4=B8=AD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E4=B8=BA=E5=B7=B2=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=202.=E5=8F=91=E6=96=99=E7=AE=A1=E7=90=86->=E5=8F=91=E6=96=99->?=
 =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7=E3=80=81=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=81=E5=8F=91=E6=96=99=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=20=E8=BF=99=E4=B8=89=E4=B8=AA=E9=A1=B5=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E8=A1=8C=20=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=8A=B6=E6=80=81=E5=8F=98=E4=B8=BA?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=203.=202.=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86->=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99->?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99=E4=BB=BB=E5=8A=A1=E3=80=81?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E8=BF=99=E4=B8=A4=E4=B8=AA=E4=B8=AA=E9=A1=B5=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E8=A1=8C=20=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=94=B6=E6=96=99=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=8F=98=E4=B8=BA=E5=B7=B2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/issueManage/issue/issueJobMain/issueJobMain.data.ts   | 2 ++
 .../issueManage/issue/issueRecordMain/issueRecordMain.data.ts | 4 +++-
 .../issue/issueRequestMain/issueRequestMain.data.ts           | 2 ++
 .../productionreceiptJobMain/productionreceiptJobMain.data.ts | 2 ++
 .../productionreceiptRecordMain.data.ts                       | 4 +++-
 .../repleinsh/repleinshJobMain/repleinshJobMain.data.ts       | 2 ++
 .../repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts | 4 +++-
 .../repleinshRequestMain/repleinshRequestMain.data.ts         | 2 ++
 8 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index d38f1c7a2..51ccae003 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -748,6 +748,7 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:2,
   },
   {
@@ -757,6 +758,7 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:2,
   },
   {
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index 96ae7d5bd..8918e8d2a 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -21,7 +21,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.JOB_STATUS,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -507,6 +507,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:2,
   },
   {
@@ -516,6 +517,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:3,
   },
   {
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 285d977f4..0db28c2e5 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -745,6 +745,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:1,
   },
   {
@@ -754,6 +755,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:2,
   },
   {
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
index 590a3eeec..c2f3e38f5 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@@ -683,6 +683,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:2,
   },
   {
@@ -692,6 +693,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:2,
   },
   {
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index 5cdc61cf4..80498d31c 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -21,7 +21,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'status',
     dictType: DICT_TYPE.JOB_STATUS,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -491,6 +491,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:2,
   },
   {
@@ -500,6 +501,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:3,
   },
   {
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index 07e268b41..87e23beae 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -724,6 +724,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:2,
   },
   {
@@ -733,6 +734,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:2,
   },
   {
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
index 95b6c3299..fb29cee65 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@@ -21,7 +21,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.JOB_STATUS,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -478,6 +478,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:2,
   },
   {
@@ -487,6 +488,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     sortTableDefault:3,
   },
   {
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 351536e30..0d9fa4793 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -758,6 +758,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     sortTableDefault:1,
   },
@@ -768,6 +769,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     sortTableDefault:2,
   },

From f94800ed6b2b594390583b3764d14306f4669c3f Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Tue, 28 May 2024 11:46:44 +0800
Subject: [PATCH 02/29] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorychangeRequestMain/index.vue      | 75 +++++++++++++------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 3d4aae62f..f18878d4b 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -1,23 +1,31 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...InventorychangeRequestMain.allSchemas.searchSchema,...InventorychangeRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="[
+        ...InventorychangeRequestMain.allSchemas.searchSchema,
+        ...InventorychangeRequestDetail.allSchemas.searchSchema
+      ]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="InventorychangeRequestMain.allSchemas"
-      :detailAllSchemas="InventorychangeRequestDetail.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="InventorychangeRequestMain.allSchemas"
+    :detailAllSchemas="InventorychangeRequestDetail.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table  v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -28,13 +36,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #number="{row}">
+      <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row, $index }">
+        <ButtonBase
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -74,8 +85,15 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/inventorychange-request-main/import" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/inventorychange-request-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
 </template>
 
 <script setup lang="ts">
@@ -411,14 +429,23 @@ const flag = ref()
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
-  let isExist = false
-  tableData.value.forEach(item => {
-   let rs =  tableData.value.filter(filterItem => (filterItem.packingNumber == item.packingNumber))
-   if(rs.length > 1) isExist = true
-  })
-  if (isExist) {
+  const duplicateItems = tableData.value.filter((item, index) => {
+  return tableData.value.findIndex((el) => el.itemCode === item.itemCode) !== index;
+  });
+  // tableData.value.forEach(item => {
+  //  let rs =  tableData.value.filter(filterItem => (filterItem.packingNumber == item.packingNumber && filterItem.itemCode!=item.itemCode))
+  // //  let same =  tableData.value.filter(filterItem => (filterItem.packingNumber == item.packingNumber && filterItem.itemCode==item.itemCode))
+  // //  debugger
+  // //  if(same.length!=tableData.value.length) isSameExist = true
+  //  if(rs.length > 1) isExist = true
+  // })
+  // if (isSameExist) {
+  //   formRef.value.formLoading = false
+  //   return message.warning('包装号1重复')
+  // }
+  if (duplicateItems.length>0) {
     formRef.value.formLoading = false
-    return message.warning('包装号重复')
+    return message.warning('物料代码重复')
   }
   data.subList.forEach(obj => {
     if(obj.toQty == 0){

From eb05d4dea148b169e6ec97392a971f64d86ecce2 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Tue, 28 May 2024 14:01:47 +0800
Subject: [PATCH 03/29] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81WMS?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E4=B8=AD?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81=E5=90=8E?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=B8=A6=E5=87=BA=E8=AE=A1=E9=87=8F=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E4=B8=94=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/basicDataManage/itemManage/itempackage/index.vue   | 3 ++-
 .../itemManage/itempackage/itempackage.data.ts             | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index e2bdd9751..815a31436 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -210,6 +210,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    setV['uom'] = val[0]['uom']
     formRef.setValues(setV)
   })
 }
@@ -281,4 +282,4 @@ onMounted(async () => {
   importTemplateData.templateUrl = await ItempackagingApi.importTemplate()
 })
 </script>
-@/api/wms/itempackage
\ No newline at end of file
+@/api/wms/itempackage
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index f1ca43fe7..fc23cf2ec 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -47,6 +47,11 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 120
+    },form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
@@ -236,4 +241,4 @@ export const ItempackagingRules = reactive({
   packUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }],
   packQty: [{ required: true, message: '包装数量不能为空', trigger: 'change' }],
   available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
-})
\ No newline at end of file
+})

From ff7980cb5642e7f3c01c648277113d97c3b70531 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 28 May 2024 14:11:09 +0800
Subject: [PATCH 04/29] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 10 +++
 src/components/BasicForm/src/BasicForm.vue    |  6 ++
 .../customerreturnRequestMain.data.ts         | 65 +++++++++++--------
 .../customerreturnRequestMain/index.vue       | 33 +++++++++-
 4 files changed, 87 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 314704f75..1fe27a989 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,16 @@ form: {
           message: '请选择生产线信息！', // 当前置条件为空时 弹出信息提示
           isMainValue: true // 表示查询条件是主表的字段的值
         },
+        {
+          key: 'customerCode', // 查询列表中字段
+          value: 'customerCode', // 指查询具体值
+          action: '==', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+          isFormModel:true, // filters中添加筛选的数据--取于formModel
+          required:true, // 前置添加必有，和isFormModel结合使用
+          message: '请选择客户代码！', // 前置添加没填的提示语
+        }
         {
           key:'available', // 查询列表中字段
           value:'TRUE', // 指查询具体值
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 4157195f5..714c529a0 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -396,6 +396,12 @@ const opensearchTable = (
         if (searchCondition[i].isSearch) {
           if (searchCondition[i].isFormModel) {
             //用formModel中的值
+            if(searchCondition[i].required){
+              if (formRef.value.formModel[searchCondition[i].value] == '' ||formRef.value.formModel[searchCondition[i].value] == undefined) {
+                  message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+                  return
+              }
+            }
             filters.push({
               action: searchCondition[i].action,
               column: searchCondition[i].key,
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index e58df3e48..cfa5c326c 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -78,6 +78,32 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
   {
     label: '发货记录单号',
     field: 'deliverRecordNumber',
@@ -107,35 +133,22 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           action: 'betweeen', // 查询拼接条件
           isSearch: true, // 使用自定义拼接条件
           isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
-        }]
-      }
-    }
-  },
-  {
-    label: '客户代码',
-    field: 'customerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '客户信息', // 查询弹窗标题
-        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
-        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        },
+        {
+          key: 'customerCode', // 查询列表中字段
+          value: 'customerCode', // 指查询具体值
+          action: '==', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isFormModel:true, // filters中添加筛选的数据--取于formModel
+          required:true, // 前置添加必有
+          message: '请选择客户代码！', // 前置添加没填的提示语
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+        }
+        ]
       }
     }
   },
+  
   {
     label: '发货计划单号',
     field: 'deliverPlanNumber',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 9dde767ca..47618055c 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -58,6 +58,8 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     :isShowButton = isShowButton
+    @onEnter="onEnter"
+
   />
 
   <!-- 详情 -->
@@ -88,6 +90,7 @@
     :isShowReduceButton="false"
     @submitForm="submitFormLabel"
     @searchTableSuccess="searchTableSuccess"
+
   />
   <!-- 标签打印 -->
   <SearchTable style="width:905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" />
@@ -104,6 +107,7 @@ import { CustomerreturnRequestMain,CustomerreturnRequestMainRules,Customerreturn
 import * as CustomerreturnRequestMainApi from '@/api/wms/customerreturnRequestMain'
 import * as CustomerreturnRequestDetailApi from '@/api/wms/customerreturnRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { DeliverRecordMain,DeliverRecordDetail } from '../../deliver/deliverRecordMain/deliverRecordMain.data'
 import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
 import {
   SupplierdeliverRequestPackage
@@ -129,7 +133,34 @@ const isShowButton = ref(true)
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-
+const onEnter = async (field,value)=>{
+  console.log('onEnter',field,value)
+  const dateTime = new Date().getTime()
+  if(field=='customerCode'){
+    //客户代码---》发货记录单号
+    formRef.value.opensearchTable('deliverRecordNumber', 'number', '发货记录信息', DeliverRecordMain.allSchemas, DeliverRecordDetailApi.getDeliverRecordDetailPage,[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'createTime', // 查询列表中字段
+          value: dateTime - 30  * 24 * 60 * 60 * 1000 + "," + dateTime, // 指查询具体值
+          action: 'betweeen', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+        },
+        {
+          key: 'customerCode', // 查询列表中字段
+          value: 'customerCode', // 指查询具体值
+          action: '==', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isFormModel:true,
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+        }
+        ],undefined,undefined,null,true,DeliverRecordDetail.allSchemas)
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {

From 9cb269e5206b00de1c3c5c38facf41ec54497bff Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 28 May 2024 14:19:46 +0800
Subject: [PATCH 05/29] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1fe27a989..52d41693e 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,14 @@ form: {
           isFormModel:true, // filters中添加筛选的数据--取于formModel
           required:true, // 前置添加必有，和isFormModel结合使用
           message: '请选择客户代码！', // 前置添加没填的提示语
-        }
+        },
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isTableRowValue: true, //查询当前searchTable表中行数据的值
+          isMainValue:false
+        },
         {
           key:'available', // 查询列表中字段
           value:'TRUE', // 指查询具体值

From d3c4c97b377f17f2b3e8d31bca3a6115655a3c0d Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 28 May 2024 15:11:32 +0800
Subject: [PATCH 06/29] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnRequestMain/index.vue       | 58 ++++++++++++++++---
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 47618055c..7859e1a17 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -57,10 +57,11 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
-    :isShowButton = isShowButton
     @onEnter="onEnter"
 
   />
+  <!-- 添加明细：采购收货记录单号 -->
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
 
   <!-- 详情 -->
   <Detail
@@ -127,7 +128,6 @@ const genLabelId = ref(); //主表ID
 routeName.value = route.name
 const tableColumns = ref([...CustomerreturnRequestMain.allSchemas.tableColumns,...CustomerreturnRequestDetail.allSchemas.tableMainColumns])
 
-const isShowButton = ref(true)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -201,9 +201,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       setV['deliverPlanNumber'] = val[0]['deliverPlanNumber']
       setV['customerCode'] = val[0]['customerCode']
       setV['customerDockCode'] = val[0]['customerDockCode']
-      if(setV['deliverRecordNumber'] != null){
-          isShowButton.value = false
-        }
+     
         // 获取子表数据 
         DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['id']})
         .then(res => {
@@ -221,7 +219,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             }
             })
           })
-          if (res) tableData.value = res.list
+          if (res) {
+            tableData.value = [...res.list]
+            originTableData.value = [...res.list]
+          }
         }).catch(err => {
           console.log(err)
           message.error('错误')
@@ -480,6 +481,7 @@ const labelPrint = async (row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
+  originTableData.value = []
   if(type == "update"){
     CustomerreturnRequestMain.allSchemas.formSchema.forEach((item) => {
       if(item.field == 'deliverRecordNumber'){
@@ -589,10 +591,52 @@ CustomerreturnRequestDetail.allSchemas.tableFormColumns.forEach(item => {
   tableFormKeys[item.field] = item.default ? item.default : ''
 })
 const tableData = ref([])
+const originTableData = ref([])
+const searchTableRef = ref()
 
 // 添加明细
+// const handleAddTable = () => {
+//   tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+// }
 const handleAddTable = () => {
-  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  console.log('originTableData.value',originTableData.value)
+  console.log('tableData.value',tableData.value)
+  const subTableDFata = originTableData.value.filter(item=> !tableData.value.find(item1=>item1.id == item.id))
+  if(subTableDFata.length==0){
+    message.warning('暂无可选择数据!')
+    return 
+  }
+
+  const tableObject = {
+    // 当前页
+    currentPage: 1,
+    // 导出加载中
+    exportLoading: false,
+    // 加载中
+    loading: false,
+    // 页数
+    pageSize: subTableDFata.length,
+    params:null,
+    // 排序
+    sort: {
+      order: '', // 排序规则
+      prop: '' // 排序字段
+    },
+    // 总条数
+    total: subTableDFata.length,
+    // 表格数据
+    tableList: subTableDFata,
+    currentRow:null
+  }
+  const tableColumns = CustomerreturnRequestDetail.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("收货明细",tableObject,{tableColumns},true)
+}
+const searchTableSuccess1 = (formField, searchField, val, formRef, type, row) => {
+  console.log(val)
+  tableData.value = [...tableData.value,...val]
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {

From d9c455f331cf4fdcf87d853dfee09f35688cc9df Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 28 May 2024 15:23:02 +0800
Subject: [PATCH 07/29] bug

---
 .../customerreturn/customerreturnRequestMain/index.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 7859e1a17..2fd8a1768 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -199,7 +199,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField == 'deliverRecordNumber') {
       setV['deliverRecordNumber'] = val[0]['number']
       setV['deliverPlanNumber'] = val[0]['deliverPlanNumber']
-      setV['customerCode'] = val[0]['customerCode']
+      // setV['customerCode'] = val[0]['customerCode']
       setV['customerDockCode'] = val[0]['customerDockCode']
      
         // 获取子表数据 

From 919f41f456943c9ad76b8e97e9f57ef6bc387724 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 28 May 2024 16:30:57 +0800
Subject: [PATCH 08/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processproductionRequest/index.vue        | 130 +++++++----
 .../processproductionRequestMain.data.ts      | 202 ++++++++++++++++--
 2 files changed, 266 insertions(+), 66 deletions(-)

diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index 5637b4620..19c9f77d0 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -21,16 +21,14 @@
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
-      :pagination="{
-        total: tableObject.total
-      }"
+      :pagination="{total: tableObject.total}"
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row,$index }">
@@ -42,15 +40,20 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
-    @success="formsSuccess"
+    @submitForm="submitForm"
+    :isBusiness="true"
     :rules="ProcessproductionRequestMainRules"
     :formAllSchemas="ProcessproductionRequestMain.allSchemas"
     :apiUpdate="ProcessproductionRequestMainApi.updateProcessproductionRequestMain"
     :apiCreate="ProcessproductionRequestMainApi.createProcessproductionRequestMain"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="true"
     :tableAllSchemas="ProcessproductionRequestDetail.allSchemas"
     :tableFormRules="ProcessproductionRequestDetailRules"
+    @searchTableSuccess="searchTableSuccess"
+    :tableData="tableData"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
   />
 
   <!-- 详情 -->
@@ -94,11 +97,26 @@ routeName.value = route.name
 const tableColumns = ref([...ProcessproductionRequestMain.allSchemas.tableColumns,...ProcessproductionRequestDetail.allSchemas.tableMainColumns])
 
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+    if (type == 'tableForm') {
+      if(formField === 'productionLine'){
+        row['productionLine']=val[0]['productionLineCode']
+      }
+      if(formField === 'processCode'){
+        row['processCode']=val[0]['code']
+      }
+      if(formField === 'locationCode'){
+        row['locationCode']=val[0]['code']
+      }
+      if(formField === 'componentItemCode'){
+        row['componentItemCode']=val[0]['componentItemCode']
+      }
+    }else{
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
   })
 }
 
@@ -107,7 +125,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-
 const { tableObject, tableMethods } = useTable({
   getListApi: ProcessproductionRequestDetailApi.getProcessproductionRequestDetailPage // 分页接口
 })
@@ -123,14 +140,6 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
 // 头部按钮事件
@@ -149,7 +158,6 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -162,7 +170,6 @@ const butttondata = (row,$index) => {
   ]
 }
 
-
 const buttondataTable = ref()
 
 // 列表-操作按钮事件
@@ -181,28 +188,39 @@ const openForm = (type: string, row?: any) => {
 }
 
 
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =ProcessproductionRequestMain.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await ProcessproductionRequestMainApi.createProcessproductionRequestMain(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await ProcessproductionRequestMainApi.updateProcessproductionRequestMain(data)
-    message.success(t('common.updateSuccess'))
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+      if (formType === 'create') {
+        if(data.subList.length == 0){
+          message.warning("请添加子列表数据")
+          return;
+        }
+        let flag = false;
+        data.subList.forEach((item) => {
+            if(item.componentItemcodeQty == 0){
+              message.warning("子物料数量不能为0")
+              flag = true;
+              return;
+            }
+        })
+        if(flag){
+          basicFormRef.value.formLoading = false
+          return
+        }
+        await ProcessproductionRequestMainApi.createProcessproductionRequestMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ProcessproductionRequestMainApi.updateProcessproductionRequestMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 // 获取部门 用于详情 部门回显
@@ -277,6 +295,28 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   })
 }
 
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProcessproductionRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
+
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
index 2c2685894..631539002 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
@@ -4,23 +4,21 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import * as ProcessApi from '@/api/wms/process'
+import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
+import * as BomApi from "@/api/wms/bom";
 import { fa } from 'element-plus/es/locale'
 
 export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false,
-    isTable:false,
-    isTableForm:false,
-  },
   {
     label: '单据号',
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 200
     },
     isForm: false,
     isSearch: true,
@@ -60,7 +58,7 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6
       },
     },
@@ -75,7 +73,7 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6
       },
     },
@@ -120,6 +118,8 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     isSearch: false,
     isTable:false,
     isForm:false,
+    isTableForm:false,
+    isDetail:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -143,6 +143,7 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     isSearch: false,
     isTable:false,
     isForm: false,
+    isDetail:false,
   },
   {
     label: '扩展属性',
@@ -159,6 +160,7 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     isSearch: false,
     isTable:false,
     isForm: false,
+    isDetail:false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -171,11 +173,13 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     isSearch: false,
     isForm: false,
     isTable:false,
+    isDetail:false,
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
+    isDetail:false,
     table: {
       width: 150,
       fixed: 'right'
@@ -188,8 +192,6 @@ export const ProcessproductionRequestMainRules = reactive({
   itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }],
   completedQuantity: [{ required: true, message: '完工数量不能为空', trigger: 'change' }],
   scrapQuantity: [{ required: true, message: '报废数量不能为空', trigger: 'change' }],
-  available: [required],
-  concurrencyStamp: [required],
 })
 
 
@@ -205,6 +207,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     table: {
       width: 150
     },
+    isForm:false,
     hiddenInMain:true,
   },
   {
@@ -219,7 +222,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchField: 'productionLineCode', // 查询弹窗赋值字段
         searchTitle: '生产线物料关系信息', // 查询弹窗标题
         searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
@@ -239,7 +242,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
       multiple:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchField: 'productionLineCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
       searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
       searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
@@ -262,6 +265,43 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工序代码',
+      searchField: 'code',
+      searchTitle: '工序信息',
+      searchAllSchemas: Process.allSchemas,
+      searchPage: ProcessApi.getProcessPage,
+      searchCondition: [{
+        key: 'productionLineCode',
+        value: 'productionLine',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择工序代码',
+        searchField: 'code',
+        searchTitle: '工序信息',
+        searchAllSchemas: Process.allSchemas,
+        searchPage: ProcessApi.getProcessPage,
+        searchCondition: [{
+          key: 'productionLineCode',
+          value: 'productionLine',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '库位代码',
@@ -270,6 +310,37 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     table: {
       width: 150
     },
+    tableForm:{
+      multiple:true,//多选
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位基础信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        multiple:true,//多选
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位基础信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '子物料代码',
@@ -279,6 +350,45 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     table: {
       width: 150
     },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择子物料代码版本', // 输入框占位文本
+      searchField: 'componentItemCode', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'componentItemCode', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
   },
   {
     label: '批次',
@@ -295,21 +405,42 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
   },
   {
     label: '生效日期',
     field: 'effectiveDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    table: {
+      width: 150
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     },
-    table: {
-      width: 150
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
     },
   },
   {
@@ -318,6 +449,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     sort: 'custom',
     isTable:false,
     isTableForm:false,
+    isForm:false,
     table: {
       width: 150
     },
@@ -345,6 +477,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     formatter: dateFormatter,
     isSearch: false,
     isTable:false,
+    isForm: false,
     isTableForm: false,
     table: {
       width: 150
@@ -371,6 +504,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     sort: 'custom',
     isSearch: false,
     isTable:false,
+    isForm: false,
     isTableForm: false,
     table: {
       width: 150
@@ -382,6 +516,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     sort: 'custom',
     isSearch: false,
     isTable:false,
+    isForm: false,
     isTableForm: false,
   },
   {
@@ -390,6 +525,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     sort: 'custom',
     isSearch: false,
     isTable:false,
+    isForm: false,
     isTableForm: false,
     form: {
       component: 'InputNumber',
@@ -402,6 +538,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     sort: 'custom',
     isSearch: false,
     isTable:false,
+    isForm: false,
     isTableForm: false,
   },
   {
@@ -411,6 +548,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     hiddenInMain:true,
     isTable:false,
     isTableForm:false,
+    isForm: false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -420,6 +558,8 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     label: '操作',
     field: 'action',
     isForm: false,
+    isTable:false,
+    isTableForm:false,
     hiddenInMain:true,
     table: {
       width: 150,
@@ -430,5 +570,25 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
 
 // 表单校验
 export const ProcessproductionRequestDetailRules = reactive({
- 
+  productionLine: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
+  processCode: [
+    { required: true, message: '请选择工序代码', trigger: 'change' }
+  ],
+  locationCode: [
+    { required: true, message: '请选择库位代码', trigger: 'change' }
+  ],
+  componentItemCode:[
+    { required: true, message: '请选择子物料代码', trigger: 'change' }
+  ],
+  componentItemcodeQty:[
+    { required: true, message: '请输入子物料数量', trigger: 'change' }
+  ],
+  batch:[
+    { required: true, message: '请输入批次', trigger: 'change' }
+  ],
+  effectiveDate:[
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
 })
\ No newline at end of file

From 265a01cba7d2fa9075e479d6932e32d3f321f237 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Tue, 28 May 2024 16:34:30 +0800
Subject: [PATCH 09/29] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparepartsrequisitionRequestMain/index.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index 31482c978..8cc95d37f 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -69,7 +69,7 @@
     :detailAllSchemasRules="UnplannedissueRequestDetailRules"
     :apiCreate="UnplannedissueRequestDetailApi.createUnplannedissueRequestDetail"
     :apiUpdate="UnplannedissueRequestDetailApi.updateUnplannedissueRequestDetail"
-    :apiPage="UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPage"
+    :apiPage="UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPageSpare"
     :apiDelete="UnplannedissueRequestDetailApi.deleteUnplannedissueRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"

From 27bd41da7c7141206ae767644069cfe89780d7ab Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Tue, 28 May 2024 16:40:33 +0800
Subject: [PATCH 10/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BFid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/purchasereceiptManage/putaway/putawayJobMain/index.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 524fd6a1e..2c7d02847 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -280,7 +280,7 @@ const buttonTableClick = async (val, row) => {
 }
 
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/954878108028801024?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/955350408322154496?token=' + getAccessToken())
 const handleDocumentPrint = async (row) => {
   window.open(src.value+'&id='+row.masterId)
 }

From 77928ed270f887d60b0416dacc8a6d5d17ba8270 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Tue, 28 May 2024 16:41:58 +0800
Subject: [PATCH 11/29] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AF=A6=E7=BB=86=E6=95=B0=E6=8D=AE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparepartsrequisitionRecordMain/index.vue                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
index e2b52a2f2..f3fa14b88 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
@@ -57,7 +57,7 @@
     :allSchemas="UnplannedissueRecordMain.allSchemas"
     :detailAllSchemas="UnplannedissueRecordDetail.allSchemas"
     :detailAllSchemasRules="UnplannedissueRecordDetailRules"
-    :apiPage="UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPage"
+    :apiPage="UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPageSpare"
   />
 </template>
 

From 12e7754d0d8e173a55f53d2e2d5b25c5648956d5 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Tue, 28 May 2024 17:01:04 +0800
Subject: [PATCH 12/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturn/customerreturnRequestMain/index.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 2fd8a1768..639e766d7 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -203,7 +203,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       setV['customerDockCode'] = val[0]['customerDockCode']
      
         // 获取子表数据 
-        DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['id']})
+        DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['masterId']})
         .then(res => {
           
           res.list.forEach(obj => {

From a5e7cf00d8b4d8727a14eebe94a6640bef10ae5f Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 28 May 2024 17:03:37 +0800
Subject: [PATCH 13/29] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processproductionRequest/index.vue                 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index 19c9f77d0..a32c96128 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -72,7 +72,15 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/request/processproduction-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm 
+    ref="importFormRef" 
+    url="/request/processproduction-request-main/import" 
+    :importTemplateData="importTemplateData" 
+    @success="importSuccess" 
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+    />
 </template>
 
 <script setup lang="ts">

From e4a866cae29f82b23961a4db59a223c25db036fd Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 28 May 2024 17:37:45 +0800
Subject: [PATCH 14/29] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueRequestMain/issueRequestMain.data.ts | 18 ----
 .../repleinshRequestMain.data.ts              |  3 -
 .../purchasereceiptReport/index.vue           | 98 ++++++++++++++++++-
 3 files changed, 97 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 0db28c2e5..8dfbaf3ca 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -455,24 +455,6 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     },
   },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:7,
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:8,
-  },
 ]))
 
 export const IssueRequestMainRules = reactive({
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 0d9fa4793..49273b604 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -518,7 +518,6 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
-    isSearch: true,
     sortTableDefault:6,
     sortSearchDefault:4,
   },
@@ -530,7 +529,6 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTableForm: false,
-    isSearch: true,
     sortTableDefault:5,
     sortSearchDefault:3,
   },
@@ -564,7 +562,6 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTableForm: false,
-    isSearch: true,
   },
   {
     label: '单据号',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue
index 2c26037f1..81ed6e386 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue
@@ -28,6 +28,7 @@
 </template>
 <script lang="ts" setup>
 // 查看质检报告
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import {queryQualityInspection} from '@/api/wms/supplierdeliverInspectionDetail'
 import Annex from '@/components/Annex/src/Annex.vue'
 defineOptions({ name: 'purchasereceiptReport' })
@@ -45,9 +46,104 @@ onMounted(() => {
 const getAnnexList = async () => {
     let res = await queryQualityInspection(route.query.asnNumber as string)
     reportAnnex.annexList =  res.fileList
+    let tableColumns = [
+    {
+        "label": "物料代码",
+        "field": "itemCode",
+        "sort": "custom",
+        "isForm": false,
+        "isSearch": true,
+        "form": {
+        "componentProps": {
+            "disabled": true
+        }
+        },
+        "tableForm": {
+        "disabled": true
+        }
+    },
+    {
+        "label": "供应商批次",
+        "field": "batch",
+        "sort": "custom",
+        "isForm": false,
+        "isSearch": true,
+        "form": {
+        "componentProps": {
+            "disabled": true
+        }
+        },
+        "tableForm": {
+        "disabled": true
+        }
+    },
+    {
+        "label": "发货数量",
+        "field": "planQty",
+        "sort": "custom",
+        "isForm": false,
+        "isSearch": true,
+        "form": {
+        "componentProps": {
+            "disabled": true
+        }
+        },
+        "tableForm": {
+        "disabled": true,
+        "type": "InputNumber",
+        "min": 0,
+        "precision": 6
+        }
+    },
+    {
+        "width": 150,
+        "label": "计量单位",
+        "field": "uom",
+        "dictType": "uom",
+        "dictClass": "string",
+        "isTable": true,
+        "isForm": false,
+        "sort": "custom",
+        "table": {
+        "width": 150
+        },
+        "tableForm": {
+        "type": "Select",
+        "disabled": true
+        },
+        "form": {
+        "componentProps": {
+            "disabled": true
+        }
+        }
+    },
+    {
+        label: '创建时间',
+        field: 'createTime',
+        formatter: dateFormatter,
+        detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+        },
+        sort: 'custom',
+        table: {
+        width: 180
+        },
+        isTable: false,
+        form: {
+        component: 'DatePicker',
+        componentProps: {
+            type: 'datetime',
+            dateFormat: 'YYYY-MM-DD HH:mm:ss',
+            valueFormat: 'x',
+            
+        }
+        },
+        
+    }
+    ]
     subDetailTableData.value = {
         tableList: res.inspectionDetailRespVOList,
-        tableColumns:[{"label":"物料代码","field":"itemCode","sort":"custom","isForm":false,"isSearch":true,"form":{"componentProps":{"disabled":true}},"tableForm":{"disabled":true}},{"label":"供应商批次","field":"batch","sort":"custom","isForm":false,"isSearch":true,"form":{"componentProps":{"disabled":true}},"tableForm":{"disabled":true}},{"label":"发货数量","field":"planQty","sort":"custom","isForm":false,"isSearch":true,"form":{"componentProps":{"disabled":true}},"tableForm":{"disabled":true,"type":"InputNumber","min":0,"precision":6}},{"width":150,"label":"计量单位","field":"uom","dictType":"uom","dictClass":"string","isTable":true,"isForm":false,"sort":"custom","table":{"width":150},"tableForm":{"type":"Select","disabled":true},"form":{"componentProps":{"disabled":true}}},{"label":"创建时间","field":"createTime","sort":"custom","isSearch":true,"search":{"component":"DatePicker","componentProps":{"valueFormat":"YYYY-MM-DD HH:mm:ss","type":"daterange","defaultTime":["2000-12-31T16:00:00.000Z","2001-01-01T15:59:59.000Z"]}},"isTableForm":false,"isForm":false}],
+        tableColumns:tableColumns
     }
     console.log('tableColumns',JSON.stringify(subDetailTableData.value.tableColumns))
 }

From a9f1943400ffd6ba73540479f63ca51471066bf8 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Tue, 28 May 2024 17:58:08 +0800
Subject: [PATCH 15/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=BA=E4=B8=8D=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productdismantleRequestMain.data.ts                  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 41de2864c..c40d77a5f 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -45,7 +45,7 @@ const queryParams = {
  // id 转str 否则form回显匹配不到
  userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
- 
+
 /**
  * @returns {Array} 制品拆解申请主表
  */
@@ -833,7 +833,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       }
     }
   },
-  
+
   {
     label: '物料名称',
     field: 'itemName',
@@ -874,7 +874,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     isTableForm: false,
     isForm: false,
   },
-  
+
   {
     label: '计量单位',
     field: 'uom',
@@ -1059,7 +1059,7 @@ export const ProductdismantleRequestDetailaRules = reactive({
   ],
   bomVersion: [
     { required: true, message: '请选择Bom版本', trigger: 'change' }
-  ], 
+  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
@@ -1273,6 +1273,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     label: '数量',
     field: 'qty',
     tableForm: {
+      disabled: true,
       type: 'InputNumber',
       min: 0,
       precision: 6

From 11db1325eeb7523b37e02bb6fea0f962d31bea00 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 28 May 2024 18:33:33 +0800
Subject: [PATCH 16/29] =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinsh/repleinshJobMain/repleinshJobMain.data.ts          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index 87e23beae..20f1fc762 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -665,7 +665,6 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
     sortTableDefault:5,
   },
   {

From 941f439fc0caf9b196ad8b17fb6451f48abddf50 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Tue, 28 May 2024 18:43:04 +0800
Subject: [PATCH 17/29] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81WMS?=
 =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7=E4=B8=AD=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=98=BE=E7=A4=BA=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8D=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinshRequestMain.data.ts                | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 49273b604..98581baa7 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -17,7 +17,8 @@ const { t } = useI18n() // 国际化
 const queryParams = {
   pageSize:10,
   pageNo:1,
-  code:'RepleinmentRequest'
+  code:'RepleinmentRequest',
+  businessTypeCode: 'Repleinment'
 }
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
@@ -31,7 +32,7 @@ import {getLocationPageRepleinsh} from "@/api/wms/location";
  // id 转str 否则form回显匹配不到
  userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
- 
+
 /**
  * @returns {Array} 补料申请主表
  */
@@ -542,7 +543,12 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       value: 'OK',
       componentProps: {
-        disabled: true
+        disabled: true,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     },
     table: {
@@ -579,7 +585,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '物料代码1',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -615,6 +621,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
+      },{
+        key : 'businessTypeCode',
+        value: queryParams.businessTypeCode
       }]
     },
   },

From 637c8cc09cd7e9d2ec47dfce9b2677ec1c3b956b Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Tue, 28 May 2024 19:20:10 +0800
Subject: [PATCH 18/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/packageunit/packageunit.data.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index d8aa930bf..9dba024a8 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -14,14 +14,14 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '父包装代码',
-    field: 'parentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '父包装代码',
+  //   field: 'parentCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '包装名称',
     field: 'name',
@@ -566,4 +566,4 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
\ No newline at end of file
+]))

From 353072d6d18a2dbd0a6afe28d5fb6e97765dddeb Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 28 May 2024 19:34:25 +0800
Subject: [PATCH 19/29] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processproduction/processproductionRequest/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index a32c96128..e5b6d824d 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -74,7 +74,7 @@
   <!-- 导入 -->
   <ImportForm 
     ref="importFormRef" 
-    url="/request/processproduction-request-main/import" 
+    url="/wms/processproduction-request-main/import" 
     :importTemplateData="importTemplateData" 
     @success="importSuccess" 
     :updateIsDisable="true"

From 8560ad639f730f3a49a3f349db5a40e3a855eedb Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 28 May 2024 19:56:15 +0800
Subject: [PATCH 20/29] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E4=BF=9D?=
 =?UTF-8?q?=E5=85=BB=E5=B7=A5=E5=8D=95=20=E5=AD=90=E4=BF=9D=E5=85=BB?=
 =?UTF-8?q?=E9=A1=B9=E6=96=B0=E5=A2=9E=20=E4=BF=AE=E6=94=B9=E3=80=82?=
 =?UTF-8?q?=E4=B8=BB=E5=B7=A5=E5=8D=95=E4=BF=9D=E5=85=BB=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=B5=81=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/equipmentMaintenanceDetail/index.ts   |   7 +-
 src/api/eam/equipmentMaintenanceMain/index.ts |   7 +-
 src/hooks/web/useMessage.ts                   |   8 +
 src/utils/disposition/defaultButtons.ts       |  26 ++
 .../equipmentMaintenanceMain/DetailEam.vue}   | 322 ++++++++++++++----
 .../equipmentMaintenanceMain.data.ts          | 121 +++++--
 .../eam/equipmentMaintenanceMain/index.vue    | 136 +++++++-
 7 files changed, 524 insertions(+), 103 deletions(-)
 rename src/{components/Detail/src/DetailQmsNumber.vue => views/eam/equipmentMaintenanceMain/DetailEam.vue} (68%)

diff --git a/src/api/eam/equipmentMaintenanceDetail/index.ts b/src/api/eam/equipmentMaintenanceDetail/index.ts
index 81a8696e1..0869a000d 100644
--- a/src/api/eam/equipmentMaintenanceDetail/index.ts
+++ b/src/api/eam/equipmentMaintenanceDetail/index.ts
@@ -43,6 +43,11 @@ export const createEquipmentMaintenanceDetail = async (data: EquipmentMaintenanc
   return await request.post({ url: `/eam/equipment-maintenance-detail/create`, data })
 }
 
+// 新增设备保养工单 通过主表添加
+export const createItemEquipmentMaintenanceDetail = async (data: EquipmentMaintenanceDetailVO) => {
+  return await request.post({ url: `/eam/equipment-maintenance-detail/createItem`, data })
+}
+
 // 修改设备保养工单子
 export const updateEquipmentMaintenanceDetail = async (data: EquipmentMaintenanceDetailVO) => {
   return await request.put({ url: `/eam/equipment-maintenance-detail/update`, data })
@@ -61,4 +66,4 @@ export const exportEquipmentMaintenanceDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/eam/equipment-maintenance-detail/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/eam/equipmentMaintenanceMain/index.ts b/src/api/eam/equipmentMaintenanceMain/index.ts
index a3ba8d8db..5bc59771d 100644
--- a/src/api/eam/equipmentMaintenanceMain/index.ts
+++ b/src/api/eam/equipmentMaintenanceMain/index.ts
@@ -79,7 +79,12 @@ export const updateEnableCode = async (data: EquipmentMainPartVO) => {
   return await request.post({ url: `/eam/equipment-maintenance-main/ables` , data })
 }
 
-// 执行保养工单
+// 修改保养工单状态
+export const updateMaintenanceOrder = async (data: EquipmentMainPartVO) => {
+  return await request.post({ url: `/eam/equipment-maintenance-main/updateOrder`, data  })
+}
+
+//执行保养工单
 export const executeMaintenanceOrder = async (data: EquipmentMainPartVO) => {
   return await request.post({ url: `/eam/equipment-maintenance-main/execute`, data  })
 }
diff --git a/src/hooks/web/useMessage.ts b/src/hooks/web/useMessage.ts
index ac2b552e0..373f39245 100644
--- a/src/hooks/web/useMessage.ts
+++ b/src/hooks/web/useMessage.ts
@@ -59,6 +59,14 @@ export const useMessage = () => {
         type: 'warning'
       })
     },
+    // 确认窗体
+    confirmPassword(content: string, tip?: string) {
+      return ElMessageBox.confirm(content, tip ? tip : t('common.confirmTitle'), {
+        confirmButtonText: t('通过'),
+        cancelButtonText: t('不通过'),
+        type: 'warning'
+      })
+    },
     // 删除窗体
     delConfirm(content?: string, tip?: string) {
       return ElMessageBox.confirm(
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index b32418e0a..69927ae74 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -325,6 +325,19 @@ export function mainListReceiveBtn(option:any) {
   })
 }
 
+// 主列表-接单按钮
+export function mainListReceiveOrderBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.接单`).replace('ts.', ''),
+    name: 'receive',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
 // 主列表-执行按钮
 export function mainListExecuteBtn(option:any) {
   return __defaultBtnOption(option,{
@@ -351,6 +364,19 @@ export function mainListFinishBtn(option:any) {
   })
 }
 
+// 主列表-验证按钮
+export function mainListValidateBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.验证`).replace('ts.', ''),
+    name: 'validate',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
 // 主列表-绑定
 export function mainListBindBtn(option:any) {
   return __defaultBtnOption(option,{
diff --git a/src/components/Detail/src/DetailQmsNumber.vue b/src/views/eam/equipmentMaintenanceMain/DetailEam.vue
similarity index 68%
rename from src/components/Detail/src/DetailQmsNumber.vue
rename to src/views/eam/equipmentMaintenanceMain/DetailEam.vue
index 424b6c479..73d717f9e 100644
--- a/src/components/Detail/src/DetailQmsNumber.vue
+++ b/src/views/eam/equipmentMaintenanceMain/DetailEam.vue
@@ -2,17 +2,18 @@
   <div>
     <el-drawer
       v-model="isShowDrawer"
-      title="详情"
+      :title="t(`ts.详情`).replace('ts.','')"
       direction="rtl"
       size="80%"
       v-loading="detailLoading"
     >
       <template #header>
         <div class="font-size-18px">
-          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ t(`ts.${titleNameRef}`).replace('ts.','') }}</span>
         </div>
       </template>
-      <ContentWrap v-if="!isBasic">
+      <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change" />
+      <ContentWrap v-if="!isBasic" v-show="tabsList[current].label=='主数据'">
         <Descriptions
           :data="detailData"
           labelClassName="label-class-name"
@@ -24,11 +25,9 @@
           width="200px"
         />
       </ContentWrap>
-
-      <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change" />
       <div class="flex">
         <!-- 详情 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!='附件'&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'">          <!-- 列表头部 -->
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!=annexAlias.label&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'&&tabsList[current].label!='主数据'&&!annexTableData.some(item=>item.label==tabsList[current].label)">          <!-- 列表头部 -->
           <TableHead
             v-if="!isBasic"
             :HeadButttondata="HeadButttondata"
@@ -54,6 +53,7 @@
             :pagination="{ total: tableObjectRef.total }"
             v-model:pageSize="tableObjectRef.pageSize"
             v-model:currentPage="tableObjectRef.currentPage"
+            v-model:sort="tableObjectRef.sort"
           >
             <!-- <template #action="{ row }">
               <ButtonBase
@@ -70,9 +70,10 @@
             :pagination="{ total: tableObjectRef.total }"
             v-model:pageSize="tableObjectRef.pageSize"
             v-model:currentPage="tableObjectRef.currentPage"
+            v-model:sort="tableObjectRef.sort"
           >
-          <template #photos="{ row }">
-            <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>            </template>
+            <template #photos="{ row }">
+              <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>            </template>
             <template #action="{ row }">
               <ButtonBase
                 :Butttondata="buttondata"
@@ -96,32 +97,77 @@
             </template>
           </DetailTable>
         </ContentWrap>
+        <!-- other附件组件:如质检明细 -->
+        <div  v-for="(annexItem ,index) in annexTableData" :key="index" v-show="annexItem.label==tabsList[current].label"  class="w-[100%]" :style="{height:annexItem.hasSubDetail?'100%':remarkHeight+'px'}">
+          <ContentWrap  class="w-[100%]">
+            <ElScrollbar ref="scrollbar" :style="{height:annexItem.hasSubDetail?'100%':(remarkHeight-40)+'px'}">
+              <Annex v-show="tabsList[current].label==annexItem.label"
+                     :annexData="annexItem"
+                     :fileType="annexItem.fileType"
+                     :showPreview="annexItem.showPreview"
+                     :showDownload = "annexItem.showDownload"
+                     :hiddenDelete = "annexItem.hiddenDelete"
+                     @handleAnnexSuccess="updateAnnexTableHandle"
+                     @deleteAnnexSuccess="updateAnnexTableHandle"
+                     :upData="{...remarksData.data,tableName:annexItem.tableName}"
+              />
+            </ElScrollbar>
+          </ContentWrap>
+          <ContentWrap class="w-[100%]" v-if="annexItem.subDetailTableData">
+            <Table
+              v-if="!isBasic && fromeWhere != 'countPlan'"
+              :align="annexItem.align?annexItem.align:'center'"
+              :columns="annexItem.subDetailTableData.tableColumns"
+              :data="annexItem.subDetailTableData.tableList"
+              :loading="annexItem.subDetailTableData.loading"
+              :pagination="{ total: annexItem.subDetailTableData.tableList.length }"
+              v-model:pageSize="tableObjectRef.pageSize"
+              v-model:currentPage="tableObjectRef.currentPage"
+              v-model:sort="tableObjectRef.sort"
+            />
+          </ContentWrap>
+
+        </div>
         <!-- 附件/备注/变更记录 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='附件'||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
           <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
-            <Annex  v-show="tabsList[current].label=='附件'"
+            <Annex
               :annexData="annexData"
+              :showDownload = "annexAlias.showDownload"
+              :hiddenDelete = "annexAlias.hiddenDelete"
               @handleAnnexSuccess="handleAnnexSuccess"
               @deleteAnnexSuccess="deleteAnnexSuccess"
               :upData="remarksData.data"
+              :key="count"
             />
+          </ElScrollbar>
+        </ContentWrap>
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='备注'" :style="{height:remarkHeight+'px'}">
+          <!-- 附件组件 -->
+          <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <!-- 备注组件 -->
-            <Remarks v-show="tabsList[current].label=='备注'"
+            <Remarks
               :remarksData="remarksData"
               class="mt-20px"
               @remarksSubmitScuess="remarksSubmitScuess"
+              :key="count"
             />
+          </ElScrollbar>
+        </ContentWrap>
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
+          <!-- 附件组件 -->
+          <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <!-- 变更记录组件 -->
-            <ChangeRecord v-show="tabsList[current].label=='变更记录'" :changeRecordData="changeRecordData" class="mt-20px" />
-          </ElScrollbar> 
+            <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px"  :key="count"/>
+          </ElScrollbar>
         </ContentWrap>
       </div>
     </el-drawer>
     <!-- 表格弹窗 -->
     <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess1" />
     <!-- 表单弹窗：添加/修改 -->
-    <BasicFormQmsNumber
+    <BasicForm
       ref="formRef"
       @success="submitForm"
       :rules="detailAllSchemasRules"
@@ -140,7 +186,6 @@
       @onChange="detailBasicFormOnChange"
       @onBlur="onBlur"
       @formFormDateChange="formFormDateChange"
-      :myFuncTypeSign="myFuncTypeSign"
     />
   </div>
 </template>
@@ -154,12 +199,15 @@ import Tabs from '@/components/Tabs/src/Tabs.vue'
 import * as RemarkApi from '@/api/wms/remark'
 import * as FileApi from '@/api/wms/file'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import BasicFormQmsNumber from '@/components/BasicForm/src/BasicFormQmsNumber.vue'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
 import { SearchTable } from '@/components/SearchTable'
+import {
+  EquipmentMaintenanceDetail, EquipmentMaintenanceDetailRules,
+} from "@/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data";
 
-defineOptions({ name: 'DetailQmsNumber' })
+defineOptions({ name: 'Detail' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -177,6 +225,24 @@ const props = defineProps({
     required: true,
     default: null
   },
+  //展示附件组件的tab标签
+  annexTable: {
+    type: Array,
+    required: false,
+    default: ()=>[]
+  },
+  //展示附件组件的tab标签
+  annexAlias: {
+    type: Object,
+    required: false,
+    default: ()=>({
+      label: '附件',
+      showDownload:false,
+      showPreview:false,
+      hiddenDelete:false
+    })
+  },
+
   // 是否是基础数据 展现详情顶部表单
   isBasic: {
     type: Boolean,
@@ -311,16 +377,15 @@ const props = defineProps({
     required: false,
     default: false
   },
-  //个性化功能标志
-  myFuncTypeSign:{
-    type: String,
+  //扩展其他按钮
+  otherHeadButttonData:{
+    type:Array,
     required: false,
-    default: null
-  },
+    default: () => []
+  }
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
-const myFuncTypeSign = props.myFuncTypeSign
 const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
 
 if (props.isBasic == true) {
@@ -342,23 +407,38 @@ if (props.isBasic == true) {
   }
 }
 
-const otherList = []
-
+const otherList = [...props.annexTable,{
+  label:props.annexAlias.label,
+  prop:'Annex'
+},{
+  label:'备注',
+  prop:'Remarks'
+},{
+  label:'变更记录',
+  prop:'ChangeRecord'
+}]
 tabsList.value = [...tabsList?.value,...otherList]
 
 if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) {
   tabsList.value.unshift({
-      label: '明细',
-      prop: 'Detail'
+    label: '明细',
+    prop: 'Detail'
+  })
+}
+if(!props.isBasic){
+  tabsList.value.unshift({
+    label: '主数据',
+    prop: 'Descriptions'
   })
 }
 
-//  Tabs 
+
+//  Tabs
 const tabRef = ref()
 //滚动条
-const scrollbar = ref() 
+const scrollbar = ref()
 //附件 备注 变更记录 高度计算
-const remarkHeight = computed(() => { 
+const remarkHeight = computed(() => {
   const tab = unref(tabRef)
   const tabTop = tab?.$el.getBoundingClientRect().top
   const tabHeight = tab?.$el.getBoundingClientRect().height
@@ -372,6 +452,8 @@ const remarkHeight = computed(() => {
 const annexData = reactive({
   annexList: []
 })
+// // 其他附件默认数据数组
+const annexTableData = ref<Array<any>>([])
 
 // 备注数据
 const remarksData = reactive({
@@ -393,6 +475,48 @@ const getFileList = async () => {
     detailLoading.value = false
   }
 }
+// 获取其他附件列表篇
+const getAnnexFileList =  async (row) => {
+  props.annexTable?.forEach(async (item) => {
+    let requstData = {...remarksData.data,tableName: item?.tableName}
+    if(item?.queryParams){
+      item?.queryParams?.forEach(queryItem => {
+        requstData[queryItem.queryField] = row[queryItem.rowField]
+      });
+    }
+    const annexList = await FileApi.getFileList(requstData)
+    const annexData = annexTableData.value.find(annex=>annex.label === item.label)
+    if(annexData){
+      annexData.annexList = annexList
+    }else{
+      annexTableData.value.push({
+        align:item.align,
+        label: item.label,
+        tableName: item?.tableName || '',
+        annexList,
+        hasSubDetail:item.hasSubDetail||false,
+        subDetailTableData:item.subDetailTableData,
+        fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
+        showPreview:item.showPreview||false, // 是否展示预览按钮
+        showDownload:item.showDownload||false, // 是否展示下载按钮
+        hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
+      })
+      if(item?.subDetailTableData){
+        const { tableObject:subTableObject, tableMethods:subTableMethods } = useTable({
+          getListApi: item.subDetailTableData.getSubList // 分页接口
+        })
+        const {getList:getSubList} = subTableMethods
+        subTableObject.params= {}
+        item.subDetailTableData.queryParams.forEach(queryItem => {
+          subTableObject.params[queryItem.queryField] = row[queryItem.rowField]
+        });
+        await getSubList()
+        item.subDetailTableData.tableList = subTableObject.tableList
+        console.log('subTableObject',annexTableData.value)
+      }
+    }
+  })
+}
 /** 添加附件 */
 const handleAnnexSuccess = () => {
   getFileList()
@@ -403,6 +527,11 @@ const deleteAnnexSuccess = async () => {
   getFileList()
   getChangeRecordList()
 }
+/** 追加的附件 */
+const updateAnnexTableHandle  = () => {
+  getAnnexFileList(detailData.value)
+  getChangeRecordList()
+}
 
 // Tabs当前选择
 const current = ref(0)
@@ -413,14 +542,14 @@ const change = (item, index) => {
     // 附件/备注/变更记录 -- 点击回到顶部
     scrollbar.value.scrollTo({ top: 0});
   }
-      
+
 }
 
 //主表所需的参数
 const masterParmas = ref({
   masterId: '', //主表id
   number: '', //主表单据号
-  status: '', //主表状态 用于控制子表新增编辑按钮显示情况
+  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
 })
 
 // 列表头部按钮
@@ -455,17 +584,23 @@ const searchTableFormType = ref('') // 表单的类型：create - 新增；updat
 const formRef = ref()
 const titleNameRef = ref()
 const titleValueRef = ref()
+const count  =ref(0)
 const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
   titleNameRef.value = titleName
   titleValueRef.value = titleValue
+  remarksData.data = {
+    tableId:  row.masterId||row.id,
+    tableName: tableName
+  }
+  count.value++
   // 加载明细列表
   if (!props.isBasic) {
     // 设置主表id
-    masterParmas.value.masterId = row.id
+    masterParmas.value.masterId = row.masterId||row.id
     masterParmas.value.number = row.number
     masterParmas.value.status = row.status
     tableObjectRef.value.params = {
-      masterId: row.id
+      masterId: row.masterId||row.id
     }
     await getList()
   }
@@ -474,9 +609,10 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     detailLoading.value = true
     try {
       detailData.value = row
-      // getRemarkList()
-      // getFileList()
-      // getChangeRecordList()
+      getRemarkList()
+      getFileList()
+      getAnnexFileList(row)
+      getChangeRecordList()
       // 判断详情按钮是否显示
       let detailButtonFilter: any = []
       let detailButtonAdd: any = []
@@ -502,7 +638,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
           defaultButtons.defaultFilterBtn(null) // 筛选
         ]
       }
-
+      HeadButttondata.value = [...HeadButttondata.value,...props.otherHeadButttonData]
       let detailButtonEdit: any = []
       let detailButtonDelete: any = []
       if (props.detailButtonIsShowEdit) {
@@ -564,11 +700,6 @@ detailAllSchemasRef.value = props.detailAllSchemas
 
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row, val) => {
-  // if (val.indexOf(row.status) > -1) {
-  //   return false
-  // } else {
-  //   return true
-  // }
   return false
 }
 
@@ -588,13 +719,13 @@ const buttonBaseClick = (val, item) => {
       })
       const item = props.detailAllSchemas.formSchema[0]
       opensearchTable(
-          item.field, item?.componentProps?.searchField,
-          item?.componentProps?.searchTitle, 
-          item?.componentProps?.searchAllSchemas, 
-          item?.componentProps?.searchPage,
-          item?.componentProps?.searchCondition,
-          item?.componentProps?.multiple,
-          undefined,undefined
+        item.field, item?.componentProps?.searchField,
+        item?.componentProps?.searchTitle,
+        item?.componentProps?.searchAllSchemas,
+        item?.componentProps?.searchPage,
+        item?.componentProps?.searchCondition,
+        item?.componentProps?.multiple,
+        undefined,undefined
       )
     }else{
       openForm('create')
@@ -613,6 +744,7 @@ const buttonBaseClick = (val, item) => {
   } else {
     // 其他按钮
     console.log('其他按钮', item)
+    emit('buttonBaseClick',val, item)
   }
 }
 
@@ -643,8 +775,6 @@ const opensearchTable = (
       }
     }
   }
-  console.log(searchCondition)
-  console.log(_searchCondition)
   searchTableRef.value.open(
     searchTitle,
     searchAllSchemas,
@@ -674,13 +804,13 @@ const buttonTableClick = async (val, row) => {
       }
       const item = props.detailAllSchemas.formSchema[0]
       opensearchTable(
-          item.field, item?.componentProps?.searchField,
-          item?.componentProps?.searchTitle, 
-          item?.componentProps?.searchAllSchemas, 
-          item?.componentProps?.searchPage,
-          item?.componentProps?.searchCondition,
-          item?.componentProps?.multiple,
-          undefined,undefined
+        item.field, item?.componentProps?.searchField,
+        item?.componentProps?.searchTitle,
+        item?.componentProps?.searchAllSchemas,
+        item?.componentProps?.searchPage,
+        item?.componentProps?.searchCondition,
+        item?.componentProps?.multiple,
+        undefined,undefined
       )
     }else{
       openForm('update', row)
@@ -694,8 +824,69 @@ const buttonTableClick = async (val, row) => {
 }
 /** 添加/修改操作 */
 const openForm = async (type: string, row?: number) => {
+
+
   formRef.value.open(type, row, masterParmas.value)
-  emit('detailOpenForm', type, row, masterParmas.value)
+  emit('detailOpenForm', type, row)
+  if(type == "create"){
+    EquipmentMaintenanceDetail.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'peoples'){
+        item.componentProps.disabled = true
+        EquipmentMaintenanceDetailRules.peoples[0].required = false
+      }
+      if(item.field == 'estimatedMinutes'){
+        EquipmentMaintenanceDetailRules.estimatedMinutes[0].required = true
+      }
+      if(item.field == 'actualMinutes'){
+        item.componentProps.disabled = true
+        EquipmentMaintenanceDetailRules.actualMinutes[0].required = false
+      }
+      if(item.field == 'completionTime'){
+        item.componentProps.disabled = true
+        EquipmentMaintenanceDetailRules.completionTime[0].required = false
+      }
+      if(item.field == 'result'){
+        item.componentProps.disabled = true
+        EquipmentMaintenanceDetailRules.result[0].required = false
+      }
+      if(item.field == 'uncompletedCause'){
+        item.componentProps.disabled = true
+        EquipmentMaintenanceDetailRules.uncompletedCause[0].required = false
+      }
+      if(item.field == 'name'){
+        EquipmentMaintenanceDetailRules.name[0].required = true
+      }
+    })
+  }else{
+    EquipmentMaintenanceDetail.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'peoples'){
+        item.componentProps.disabled = false
+        EquipmentMaintenanceDetailRules.peoples[0].required = true
+      }
+      if(item.field == 'estimatedMinutes'){
+        EquipmentMaintenanceDetailRules.estimatedMinutes[0].required = false
+      }
+      if(item.field == 'actualMinutes'){
+        item.componentProps.disabled = false
+        EquipmentMaintenanceDetailRules.actualMinutes[0].required = true
+      }
+      if(item.field == 'completionTime'){
+        item.componentProps.disabled = false
+        EquipmentMaintenanceDetailRules.completionTime[0].required = true
+      }
+      if(item.field == 'result'){
+        item.componentProps.disabled = false
+        EquipmentMaintenanceDetailRules.result[0].required = true
+      }
+      if(item.field == 'uncompletedCause'){
+        item.componentProps.disabled = false
+        EquipmentMaintenanceDetailRules.uncompletedCause[0].required = false
+      }
+      if(item.field == 'name'){
+        EquipmentMaintenanceDetailRules.name[0].required = true
+      }
+    })
+  }
 }
 // form 提交
 const submitForm = async (formType, data) => {
@@ -710,6 +901,7 @@ const submitForm = async (formType, data) => {
       await props.apiUpdate(data)
       message.success(t('common.updateSuccess'))
     }
+    emit('handleMainFefresh')
     formRef.value.dialogVisible = false
     // 刷新当前列表
     await getList()
@@ -740,7 +932,8 @@ const emit = defineEmits([
   'openImage',
   'onBlur',
   'detailBasicFormOnChange',
-  'formFormDateChange'
+  'formFormDateChange',
+  'buttonBaseClick'
 ])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -752,6 +945,7 @@ const handleDelete = async (id: number) => {
     await props.apiDelete(id)
     tableObject.loading = false
     message.success(t('common.delSuccess'))
+    emit('handleMainFefresh')
     // 刷新列表
     await getList()
     updateKey.value += 1
@@ -796,16 +990,16 @@ const openImage=(item)=>{
  * @param field 当前操作字段
  * @param cur 改变后值
  */
- const detailBasicFormOnChange = (field, cur) => {
+const detailBasicFormOnChange = (field, cur) => {
   emit('detailBasicFormOnChange', field, cur)
 }
 
 /**
  * 监听失焦事件
  * @param field 当前操作字段
- * @param e 
+ * @param e
  */
- const onBlur = (field, e) => {
+const onBlur = (field, e) => {
   emit('onBlur', field, e)
 }
 
diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
index 08f0a4438..b6a83c179 100644
--- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
@@ -4,6 +4,9 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
 import * as WorkshopApi from "@/api/wms/workshop";
+import {MaintenanceItem} from "@/views/eam/maintenanceItem/maintenanceItem.data";
+import * as ItemApi from "@/api/eam/maintenanceItem";
+import {validateInteger, validateroundNumber} from "@/utils/validator";
 
 // 表单校验
 export const EquipmentMaintenanceMainRules = reactive({
@@ -355,7 +358,55 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 export const EquipmentMaintenanceDetailRules = reactive({
   number: [required],
-  contents: [required],
+  masterId: [required],
+  peoples: [
+    {
+      required:false ,
+      message:'该项为必填项',
+      tagger:['blur']
+    },
+    {
+      validator:validateroundNumber,
+      message: '请输入正确的正整数',
+      trigger: 'blur'}],
+  estimatedMinutes: [
+    {
+      required:false ,
+      message:'该项为必填项',
+      tagger:['blur']
+    },
+    {
+      validator:validateroundNumber,
+      message: '请输入正确的正整数',
+      trigger: 'blur'}],
+  actualMinutes: [
+    {
+      required:false ,
+      message:'该项为必填项',
+      tagger:['blur']
+    },
+    {
+      validator:validateroundNumber,
+      message: '请输入正确的正整数',
+      trigger: 'blur'}],
+  completionTime: [
+    {
+      required:false ,
+      message:'该项为必填项',
+      tagger:['blur']
+    }],
+  result: [
+    {
+      required:false ,
+      message:'该项为必填项',
+      tagger:['blur']
+    }],
+  name: [required],
+  uncompletedCause:[{
+    required:false ,
+    message:'该项为必填项',
+    tagger:['blur','change']
+  }]
 })
 
 export const EquipmentMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
@@ -373,38 +424,41 @@ export const EquipmentMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     isSearch: true,
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '主表id',
     field: 'masterId',
     sort: 'custom',
     isSearch: true,
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '人数',
     field: 'peoples',
     sort: 'custom',
     isSearch: true,
+    isForm: true,
   },
   {
     label: '预计分钟',
     field: 'estimatedMinutes',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
   },
   {
     label: '实际分钟',
     field: 'actualMinutes',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
   },
   {
     label: '责任人多选',
@@ -445,25 +499,43 @@ export const EquipmentMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'result',
     sort: 'custom',
     isSearch: true,
+    dictType: DICT_TYPE.IS_COMPLETED,
+    dictClass: 'string',
   },
   {
-    label: '保养名称',
+    label: '保养项名称',
     field: 'name',
     sort: 'custom',
     isSearch: true,
+    isForm: true,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择 类别编码',
+        searchTitle: '保养项信息', // 查询弹窗标题
+        searchAllSchemas: MaintenanceItem.allSchemas, // 查询弹窗所需类
+        searchField: 'name', // 查询弹窗赋值字段
+        searchPage: ItemApi.getMaintenanceItemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '=='
+        }]
+      }
+    }
   },
-  {
-    label: '保养内容',
-    field: 'content',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '保养部位',
-    field: 'equipmentParts',
-    sort: 'custom',
-    isSearch: true,
-  },
+  // {
+  //   label: '保养内容',
+  //   field: 'content',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '保养部位',
+  //   field: 'equipmentParts',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -508,7 +580,10 @@ export const EquipmentMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
   },
diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue
index 7317de2b2..f0606d3fb 100644
--- a/src/views/eam/equipmentMaintenanceMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceMain/index.vue
@@ -55,10 +55,19 @@
   <Detail ref="detailRef"
           :isBasic="false"
           :allSchemas="EquipmentMaintenanceMain.allSchemas"
+          :detailAllSchemasRules="EquipmentMaintenanceDetailRules"
           :detailAllSchemas="EquipmentMaintenanceDetail.allSchemas"
           :apiPage="EquipmentMaintenanceDetailApi.getEquipmentMaintenanceDetailPage"
+          :apiCreate="EquipmentMaintenanceDetailApi.createItemEquipmentMaintenanceDetail"
+          :apiUpdate="EquipmentMaintenanceDetailApi.updateEquipmentMaintenanceDetail"
+          :apiDelete="EquipmentMaintenanceDetailApi.deleteEquipmentMaintenanceDetail"
+          :detailButtonIsShowAdd=statusBtn
+          :detailButtonIsShowEdit=statusBtn
+          :detailButtonIsShowDelete=statusBtn
+          @handleMainFefresh="handleMainFefresh"
           @searchTableSuccessDetail="searchTableSuccessDetail"
-
+          @detailBasicFormOnChange="detailBasicFormOnChange"
+          :key="count"
   />
 
   <!-- 导入 -->
@@ -67,30 +76,28 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { EquipmentMaintenanceMain,EquipmentMaintenanceMainRules,EquipmentMaintenanceDetail } from './equipmentMaintenanceMain.data'
+import { EquipmentMaintenanceMain,EquipmentMaintenanceMainRules,EquipmentMaintenanceDetail,EquipmentMaintenanceDetailRules } from './equipmentMaintenanceMain.data'
 import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain'
 import * as EquipmentMaintenanceDetailApi from '@/api/eam/equipmentMaintenanceDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '@/views/eam/equipmentMaintenanceMain/DetailEam.vue'
 import {Maintenance} from "@/views/eam/maintenance/maintenance.data";
 import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
-import * as ReworkBatchApi from "@/api/mes/reworkBatch";
-import {mainListExecuteBtn} from "@/utils/disposition/defaultButtons";
 
 defineOptions({ name: 'EquipmentMaintenanceMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(EquipmentMaintenanceMain.allSchemas.tableColumns)
+const statusBtn = ref(false);
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -167,9 +174,10 @@ const isShowStatusButton = (row,val) => {
 const butttondata = (row) => {
   return [
     defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑
-    //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMaintenanceMain:delete'}), // 删除
-    defaultButtons.mainListReceiveBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:maintenance:update'}), // 领取
+    defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:maintenance:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:maintenance:update'}), // 执行
+    defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:maintenance:update'}), // 完成保养
+    defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:maintenance:update'}), // 验证
     defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:maintenance:update'}),
     defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:maintenance:update'}),
   ]
@@ -181,13 +189,23 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
-  } else if (val == 'receive') { // 领取
+  } else if (val == 'receive') { // 接单
     handleReceive(row.id)
   } else if (val == 'execute') { // 执行
     handleExecute(row.id)
+  } else if (val == 'finish') { // 完成
+    handleFinish(row.id)
+  } else if (val == 'validate') { // 完成
+    handleValidate(row.id)
   }
 }
 
+let count = ref(0)
+const handleMainFefresh = async()=>{
+  count.value++
+  getList()
+}
+
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
@@ -232,9 +250,30 @@ const formsSuccess = async (formType,data) => {
   getList()
 }
 
+// 子页面查询字典页面返回
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    let result = '';
+    for (var i = 0; i < val.length; i++) {
+      result += val[i].name + ',';
+    }
+    if(result.endsWith(',')){
+      result = result.substring(0,result.length -1)
+    }
+    setV[formField] = result;
+    formRef.setValues(setV)
+  })
+}
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  if('5' === row.status){
+    statusBtn.value=true
+  }else {
+    statusBtn.value=false
+  }
   detailRef.value.openDetail(row, titleName, titleValue, 'basicEquipmentMaintenanceMain')
 }
 
@@ -255,7 +294,7 @@ const handleDelete = async (id: number) => {
 const handleReceive = async (id: number) => {
   try {
     // 中止的二次确认
-    await message.delConfirm('是否领取所选中任务？');
+    await message.delConfirm('是否接单？');
     const params = ref({
       id: '',
       status:'',
@@ -263,8 +302,8 @@ const handleReceive = async (id: number) => {
     params.value.id = id
     params.value.status = '4'
     // 发起删除
-    await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
-    message.success(t('领取成功'))
+    await EquipmentMaintenanceMainApi.updateMaintenanceOrder(params.value)
+    message.success(t('接单成功'))
     // 刷新列表
     await getList()
   } catch {}
@@ -289,6 +328,53 @@ const handleExecute = async (id: number) => {
   } catch {}
 }
 
+/** 完成按钮操作 */
+const handleFinish = async (id: number) => {
+  try {
+    // 中止的二次确认
+    await message.delConfirm('是否完成所选中工单？');
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    params.value.id = id
+    params.value.status = '5'
+    // 发起删除
+    await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
+    message.success(t('工单已完成'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 验证按钮操作 */
+const handleValidate = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    // 中止的二次确认
+    message.confirmPassword(t('')).then(async () => {
+        params.value.id = id
+        params.value.status = '7'
+        await EquipmentMaintenanceMainApi.updateMaintenanceOrder(params.value)
+        message.success(t('工单已流转'))
+        // 刷新列表
+        await getList()
+    }).catch (async () => {
+        params.value.id = id
+        params.value.status = '5'
+        await EquipmentMaintenanceMainApi.updateMaintenanceOrder(params.value)
+        message.success(t('工单已流转'))
+        // 刷新列表
+        await getList()
+    })
+
+
+  } catch {}
+}
+
 /** 启用 */
 const handleEnable = async (id: number) => {
   try {
@@ -320,13 +406,34 @@ const handleDisable = async (id: number) => {
   } catch {}
 }
 
+const detailBasicFormOnChange = (field, item) => {
+  //未完成
+  if(field == 'result' && item == '1'){
+    EquipmentMaintenanceDetail.allSchemas.formSchema.forEach((items) => {
+      if (items.field == 'uncompletedCause') {
+        EquipmentMaintenanceDetailRules.uncompletedCause[0].required = true
+      }
+    })
+  }
+  //完成
+  if(field == 'result' && item == '0'){
+    EquipmentMaintenanceDetail.allSchemas.formSchema.forEach((items) => {
+      if (items.field == 'uncompletedCause') {
+        EquipmentMaintenanceDetailRules.uncompletedCause[0].required = false
+        detailRef.value.formRef.formRef.setValues({
+          uncompletedCause:''
+        })
+      }
+    })
+  }
+}
+
 const onChange = (field, item) => {
-  console.log(field)
-  console.log(item)
   //设备
   if(field == 'type' && item == 'DEVICE'){
     Maintenance.allSchemas.formSchema.forEach((items) => {
       if (items.field == 'equipmentCode') {
+        //清空字段
         basicFormRef.value.formRef.setValues({
           equipmentCode:''
         })
@@ -339,6 +446,7 @@ const onChange = (field, item) => {
   if(field == 'type' && item == 'EQUIPMENT'){
     Maintenance.allSchemas.formSchema.forEach((items) => {
       if (items.field == 'equipmentCode') {
+        console.log(basicFormRef.value.formRef)
         basicFormRef.value.formRef.setValues({
           equipmentCode:''
         })

From f96e608900c172ee7ae055ea15d647d03c2b964d Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 29 May 2024 08:38:11 +0800
Subject: [PATCH 21/29] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/inventoryManage/balance/index.vue     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index d7fd2b8da..bc9a950bc 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{
 }
 // 列表-操作按钮
 const butttondata = [
-  {
-    label: '标签信息',
-    name: 'bqxx',
-    hide: false,
-    type: 'primary',
-    icon: '',
-    color: '',
-    link: true,
-    float:'right',
-    hasPermi: ''
-  },
+  // {
+  //   label: '标签信息',
+  //   name: 'bqxx',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: '',
+  //   color: '',
+  //   link: true,
+  //   float:'right',
+  //   hasPermi: ''
+  // },
   defaultButtons.mainListPointBtn(null), // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除

From 085786baf3991d2491b62ba933dd21cade7e43da Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 29 May 2024 08:57:19 +0800
Subject: [PATCH 22/29] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E6=96=B0=E5=A2=9E=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productreceiptRecordMain/index.ts |  9 +++++++++
 .../productreceiptRecordMain/index.vue        | 20 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
index 79b5699c9..102bef055 100644
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -110,4 +110,13 @@ export const exportProductreceiptRecordAssembleMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productreceipt-record-main/get-import-template' })
+}
+// 创建上架申请
+export const createPutawayRequest = async (number:string) => {
+  return await request.post({ url: `/wms/productreceipt-record-main/createPutawayRequest?number=`+number })
+}
+
+// 创建检验申请
+export const createInspectRequest = async (number:string) => {
+  return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number })
 }
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index c3456bdd5..56f7ea46a 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -177,12 +177,15 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-  defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
-  ]
+  defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
+]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if(val == 'inspectRequest'){//生成到货检验申请
+    handleCreateInspectRequest(row.number)
+  }
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
@@ -194,6 +197,19 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,'recordProductreceiptMain')
 }
 
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number:string) => {
+  try{
+    await message.confirm(t('ts.确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await ProductreceiptRecordMainApi.createInspectRequest(number)
+    message.success(t('ts.到货检验申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {

From 9f4e27236a298434f11966b9fc29c8a09c798d11 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 29 May 2024 09:18:32 +0800
Subject: [PATCH 23/29] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B=E5=8C=96=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=82=B9=E5=A4=84=E7=90=86=E5=90=8E=E9=A1=B5=E9=9D=A2=E9=81=AE?=
 =?UTF-8?q?=E7=BD=A9=E6=B2=A1=E6=9C=89=E5=85=B3=E9=97=ADBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryinitial/inventoryinitRequestMain/index.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index 326564896..6d1591bfa 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -285,9 +285,9 @@ const handleHandle = async (id: number) => {
     tableObject.loading = true
     await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id)
     message.success(t('common.handleSuccess'))
-    tableObject.loading = false
     await getList()
   } catch {}
+  tableObject.loading = false
 }
 
 

From 81848fbe80c4e053282c26a8ed7018c9068747ae Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Wed, 29 May 2024 09:41:01 +0800
Subject: [PATCH 24/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue           |  1 +
 src/views/qms/sampleCode/sampleCode.data.ts          |  4 ++--
 .../supplierdeliverRequestMain/index.vue             |  1 +
 .../supplierdeliverRequestMain.data.ts               | 12 +++++++++---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 714c529a0..5ca7737c2 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -725,6 +725,7 @@ const inpuFocus = (headerItem, row, index) => {
  * @param cur 改变后值
  */
 const onChange = (field, cur) => {
+  console.log(2222222222222)
   emit('onChange', field, cur, formRef)
 }
 
diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts
index 4d1228a15..5c9b96ee3 100644
--- a/src/views/qms/sampleCode/sampleCode.data.ts
+++ b/src/views/qms/sampleCode/sampleCode.data.ts
@@ -19,7 +19,7 @@ export const SampleCodeRules = reactive({
 const samplingSchemeList = await getSamplingScheme()
 export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '采样方案',
+    label: '采样方案编码',
     field: 'code',
     sort: 'custom',
     isSearch: true,
@@ -28,7 +28,7 @@ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         options: samplingSchemeList,
         optionsAlias: {
-          labelField: 'description',
+          labelField: 'code',
           valueField: 'code'
         },
       }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 7433e2f4d..02cda2ab7 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -342,6 +342,7 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+      SupplierdeliverRequestDetailRules.secondPackQty[0].required = true
       }
     } 
   })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index fd000436c..501469f91 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1114,6 +1114,13 @@ export const SupplierdeliverRequestDetailRules = reactive({
   packUnit: [
     { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
+  secondPackUnit: [
+    { required: false, message: '请选择包装规格2', trigger: 'change' }
+  ],
+  secondPackQty: [
+    { required: false, message: '请输入包装数量2', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }
   ],
@@ -1123,7 +1130,7 @@ export const SupplierdeliverRequestDetailRules = reactive({
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
+  // secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
 })
 
 export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
@@ -1157,6 +1164,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
+        
       }
     },
     tableForm: {
@@ -1526,7 +1534,6 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       }
     },
     tableForm: {
-      // disabled: true,
     }
   },
   {
@@ -1595,7 +1602,6 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       }
     },
     tableForm: {
-      // disabled: true,
     }
   },
   {

From 90714a766d2328f5ef08a50bc72a6add06ae2450 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 29 May 2024 10:19:59 +0800
Subject: [PATCH 25/29] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=B7=A5=E6=AE=B5=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentMaintenanceMain.data.ts                      | 8 +-------
 .../equipmentMaintenanceRecordMain.data.ts                | 7 ++-----
 src/views/eam/maintenance/maintenance.data.ts             | 6 ------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
index b6a83c179..9090ba7dc 100644
--- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
@@ -6,7 +6,7 @@ import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/wor
 import * as WorkshopApi from "@/api/wms/workshop";
 import {MaintenanceItem} from "@/views/eam/maintenanceItem/maintenanceItem.data";
 import * as ItemApi from "@/api/eam/maintenanceItem";
-import {validateInteger, validateroundNumber} from "@/utils/validator";
+import {validateroundNumber} from "@/utils/validator";
 
 // 表单校验
 export const EquipmentMaintenanceMainRules = reactive({
@@ -243,12 +243,6 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '工段编号',
-    field: 'workshopSectionCode',
-    sort: 'custom',
-    isSearch: true,
-  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
index c1e9f3d37..199b71234 100644
--- a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
@@ -45,12 +45,9 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema
     label: '班次枚举',
     field: 'classes',
     sort: 'custom',
-    dictType: DICT_TYPE.SHIFT_TYPE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // dictType: DICT_TYPE.SHIFT_TYPE,
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-    form: {
-      component: 'SelectV2'
-    }
   },
   {
     label: '保养计划工单',
diff --git a/src/views/eam/maintenance/maintenance.data.ts b/src/views/eam/maintenance/maintenance.data.ts
index c9fa1e18d..480ae1d0e 100644
--- a/src/views/eam/maintenance/maintenance.data.ts
+++ b/src/views/eam/maintenance/maintenance.data.ts
@@ -248,12 +248,6 @@ export const Maintenance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '工段编号',
-    field: 'workshopSectionCode',
-    sort: 'custom',
-    isSearch: true,
-  },
   {
     label: '创建时间',
     field: 'createTime',

From 02575fca7d4f7bff86057db2605311c29e8a9ca6 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 29 May 2024 10:38:26 +0800
Subject: [PATCH 26/29] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E4=BF=9D?=
 =?UTF-8?q?=E5=85=BB=E5=B7=A5=E5=8D=95=E5=AD=90=E6=98=8E=E7=BB=86=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/equipmentMaintenanceMain/DetailEam.vue      |  8 +++++---
 .../equipmentMaintenanceMain.data.ts                | 13 +++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/eam/equipmentMaintenanceMain/DetailEam.vue b/src/views/eam/equipmentMaintenanceMain/DetailEam.vue
index 73d717f9e..98d3c3939 100644
--- a/src/views/eam/equipmentMaintenanceMain/DetailEam.vue
+++ b/src/views/eam/equipmentMaintenanceMain/DetailEam.vue
@@ -825,9 +825,9 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const openForm = async (type: string, row?: number) => {
 
-
   formRef.value.open(type, row, masterParmas.value)
   emit('detailOpenForm', type, row)
+
   if(type == "create"){
     EquipmentMaintenanceDetail.allSchemas.formSchema.forEach((item) => {
       if(item.field == 'peoples'){
@@ -843,7 +843,6 @@ const openForm = async (type: string, row?: number) => {
       }
       if(item.field == 'completionTime'){
         item.componentProps.disabled = true
-        EquipmentMaintenanceDetailRules.completionTime[0].required = false
       }
       if(item.field == 'result'){
         item.componentProps.disabled = true
@@ -858,8 +857,12 @@ const openForm = async (type: string, row?: number) => {
       }
     })
   }else{
+    row.peoples = row.peoples.toString()
+    row.estimatedMinutes = row.estimatedMinutes.toString()
+    row.actualMinutes = row.actualMinutes.toString()
     EquipmentMaintenanceDetail.allSchemas.formSchema.forEach((item) => {
       if(item.field == 'peoples'){
+        console.log(item);
         item.componentProps.disabled = false
         EquipmentMaintenanceDetailRules.peoples[0].required = true
       }
@@ -872,7 +875,6 @@ const openForm = async (type: string, row?: number) => {
       }
       if(item.field == 'completionTime'){
         item.componentProps.disabled = false
-        EquipmentMaintenanceDetailRules.completionTime[0].required = true
       }
       if(item.field == 'result'){
         item.componentProps.disabled = false
diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
index 9090ba7dc..baa6e75c2 100644
--- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
@@ -383,12 +383,13 @@ export const EquipmentMaintenanceDetailRules = reactive({
       validator:validateroundNumber,
       message: '请输入正确的正整数',
       trigger: 'blur'}],
-  completionTime: [
-    {
-      required:false ,
-      message:'该项为必填项',
-      tagger:['blur']
-    }],
+  completionTime: [required],
+    // [
+    // {
+    //   required:false ,
+    //   message:'该项为必填项',
+    //   tagger:['blur']
+    // }],
   result: [
     {
       required:false ,

From f767583f55c0fc54bbaf934b90d519e6e1d6d04f Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 29 May 2024 10:39:15 +0800
Subject: [PATCH 27/29] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/error/404.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index f6a08de2f..2e3f078a2 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -1,5 +1,6 @@
 <template>
   <Error @error-click="push('/')" />
+  <div>哈哈哈哈</div>
 </template>
 <script lang="ts" setup>
 defineOptions({ name: 'Error404' })

From 160805c8c58694c92f3baeb99668b74a190b042d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 29 May 2024 10:44:42 +0800
Subject: [PATCH 28/29] =?UTF-8?q?tableform=E6=B7=BB=E5=8A=A0clear=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue                | 8 +++++++-
 src/components/TableForm/src/TableForm.vue                | 8 ++++++--
 .../supplierdeliver/supplierdeliverRequestMain/index.vue  | 7 +++++++
 .../supplierdeliverRequestMain.data.ts                    | 1 +
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5ca7737c2..257250012 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -96,6 +96,7 @@
         @inputNumberChange="inputNumberChange"
         @tableFormSelectOnBlur="tableFormSelectOnBlur"
         @formFormDateChange="formFormDateChange"
+      @clearInput='clearInput'
       >
       <template v-slot="{row}">
         <slot :row="row"></slot>
@@ -443,6 +444,7 @@ const opensearchTable = (
     searchDetailSchemas
   )
 }
+
 //修改 searchTable 弹窗宽度
 const changeDialogWidth = (width)=>{
   searchTableRef.value.changeDialogWidth(width)
@@ -650,7 +652,8 @@ const emit = defineEmits([
   'inputNumberChange',
   'formFormDateChange',
   'footButtonClick',
-  'clearSearchInput'
+  'clearSearchInput',
+  'clearInput'
 ])
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {
@@ -719,6 +722,9 @@ const inpuFocus = (headerItem, row, index) => {
     headerItem.tableForm?.searchDetailSchemas
   )
 }
+const clearInput = (field, row, index) => {
+  emit('clearInput',field, row, index)
+}
 /**
  * 监听改变事件
  * @param field 当前操作字段
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index df2adca3f..f298ae8ec 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -69,6 +69,7 @@
               style="flex:1" 
               @blur="inputStringBlur(headerItem.field, row[headerItem.field], row)"
             />
+            <Icon icon="ep:circle-close"  v-if="headerItem?.tableForm?.isInpuFocusShow && headerItem?.tableForm?.disabled&& headerItem?.tableForm?.clearable" style='position:absolute;right:50px;cursor: pointer;' @click="clearInput(headerItem.field,row,index)"/>
             <el-button  :key="headerItem.field+$index+'button'" v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
           </el-form-item>
           <el-form-item  v-if="headerItem?.tableForm?.type == 'slot'">
@@ -414,7 +415,8 @@ const emit = defineEmits([
   'buttonOperationClick',
   'inputStringBlur',
   'tableFormSelectOnBlur',
-  'formFormDateChange'
+  'formFormDateChange',
+  'clearInput'
 ])
 // 获取下拉列表 | type = radio | type = select
 const initSelectOptions = (item) => {
@@ -511,7 +513,9 @@ const inpuFocus = (headerItem, row, index)=>{
 const inputStringBlur = (field, val,row) => {
   emit('inputStringBlur', field, val,row)
 }
-
+const clearInput= (field, row, index) => {
+  emit('clearInput',field, row, index)
+}
 //点击table操作列按钮
 const buttonOperationClick = (row, label, index)=> {
   emit("buttonOperationClick", row, label, index);
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 02cda2ab7..feda09164 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -132,6 +132,7 @@
     @searchTableSuccess="searchTableSuccessLabel"
     @submitForm="submitFormLabel"
     :isShowReduceButton="false"
+    @clearInput='clearInput'
   />
   <!-- 上传质量报告 -->
   <BasicForm
@@ -798,6 +799,12 @@ const submitFormLabel = async (formType, data) => {
     formLabelRef.value.dialogVisible = false
   }
 }
+const clearInput = async (field,row,index) => {
+  row[field]=''
+  row['secondPackQty']=''
+  
+  SupplierdeliverRequestDetailRules.secondPackQty[0].required = false
+}
 
 
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 501469f91..acad3e1fd 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1568,6 +1568,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       }
     },
     tableForm: {
+      clearable: true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',

From 145efcce12b7ee40c4741b24c923fb7856209544 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 29 May 2024 10:57:36 +0800
Subject: [PATCH 29/29] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B=E5=8C=96=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=82=B9=E5=A4=84=E7=90=86=E5=90=8E=E9=A1=B5=E9=9D=A2=E9=81=AE?=
 =?UTF-8?q?=E7=BD=A9=E6=B2=A1=E6=9C=89=E5=85=B3=E9=97=ADBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 98581baa7..0fa431456 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -585,7 +585,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码1',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     table: {