From 1c07be91b1b204a18e6c6b8d897ff817076f4f78 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 10:25:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionplan/productionMain/productionMain.data.ts         | 1 -
 .../productionMainAssemble/productionMainAssemble.data.ts        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index bc469c5ad..0a638064b 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -236,7 +236,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isSearch: true,
     sortTableDefault:1000,
     form: {
       component: 'DatePicker',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 466d2a4e5..0933ae0a5 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -235,7 +235,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isSearch: true,
     sortTableDefault:1000,
     form: {
       component: 'DatePicker',

From 1834914da05f1c3e84fbbb8f8b7498a716a31031 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 10:38:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionplan/productionMain/productionMain.data.ts       | 3 +++
 .../productionMainAssemble/productionMainAssemble.data.ts      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 0a638064b..d3f6e0e3e 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -730,6 +730,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isSearch: true,
+    isTableForm: false,
+    isForm: false,
+    // hiddenInMain: true,
     sortTableDefault:1000,
     form: {
       component: 'DatePicker',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 0933ae0a5..b6b85d8b5 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -729,6 +729,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isSearch: true,
+    isTableForm: false,
+    isForm: false,
+    // hiddenInMain: true,
     sortTableDefault:1000,
     form: {
       component: 'DatePicker',

From 2b3e9d0308152ffb58670a93389c19b45ad9ecef Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 5 Jul 2024 10:47:45 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B1=BB=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/mstr/index.ts                     |  56 +++++
 .../basicDataManage/subject/mstr/index.vue    | 236 ++++++++++++++++++
 .../basicDataManage/subject/mstr/mstr.data.ts |  67 +++++
 3 files changed, 359 insertions(+)
 create mode 100644 src/api/wms/mstr/index.ts
 create mode 100644 src/views/wms/basicDataManage/subject/mstr/index.vue
 create mode 100644 src/views/wms/basicDataManage/subject/mstr/mstr.data.ts

diff --git a/src/api/wms/mstr/index.ts b/src/api/wms/mstr/index.ts
new file mode 100644
index 000000000..f34bc2a89
--- /dev/null
+++ b/src/api/wms/mstr/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface MstrVO {
+  id: number
+  hflccHflcd: string
+  plProdLine: string
+  plDesc: string
+  plMvarAcct: string
+  plCchgAcct: string
+  type: string
+  remark: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询产品类信息列表
+export const getMstrPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/mstr/senior', data })
+  } else {
+    return await request.get({ url: `/wms/mstr/page`, params })
+  }
+}
+
+// 查询产品类信息详情
+export const getMstr = async (id: number) => {
+  return await request.get({ url: `/wms/mstr/get?id=` + id })
+}
+
+// 新增产品类信息
+export const createMstr = async (data: MstrVO) => {
+  return await request.post({ url: `/wms/mstr/create`, data })
+}
+
+// 修改产品类信息
+export const updateMstr = async (data: MstrVO) => {
+  return await request.put({ url: `/wms/mstr/update`, data })
+}
+
+// 删除产品类信息
+export const deleteMstr = async (id: number) => {
+  return await request.delete({ url: `/wms/mstr/delete?id=` + id })
+}
+
+// 导出产品类信息 Excel
+export const exportMstr = async (params) => {
+  return await request.download({ url: `/wms/mstr/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/mstr/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue
new file mode 100644
index 000000000..67ea231af
--- /dev/null
+++ b/src/views/wms/basicDataManage/subject/mstr/index.vue
@@ -0,0 +1,236 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Mstr.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Mstr.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :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>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="MstrRules"
+    :formAllSchemas="Mstr.allSchemas"
+    :apiUpdate="MstrApi.updateMstr"
+    :apiCreate="MstrApi.createMstr"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Mstr.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/mstr/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Mstr,MstrRules } from './mstr.data'
+import * as MstrApi from '@/api/wms/mstr'
+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'
+
+defineOptions({ name: 'Mstr' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Mstr.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: MstrApi.getMstrPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:mstr:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:mstr:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:mstr:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:mstr:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:mstr:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =Mstr.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if (formType === 'create') {
+    await MstrApi.createMstr(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await MstrApi.updateMstr(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicMstr')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await MstrApi.deleteMstr(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await MstrApi.exportMstr(tableObject.params)
+    download.excel(data, '产品类信息.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '产品类信息导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await MstrApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts
new file mode 100644
index 000000000..da3628962
--- /dev/null
+++ b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts
@@ -0,0 +1,67 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const MstrRules = reactive({
+  hflccHflcd: [required],
+  plProdLine: [required],
+  plMvarAcct: [required],
+  plCchgAcct: [required],
+  concurrencyStamp: [required],
+})
+
+export const Mstr = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '域代码',
+    field: 'hflccHflcd',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '产品类',
+    field: 'plProdLine',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '产品描述',
+    field: 'plDesc',
+    sort: 'custom',
+  },
+  {
+    label: '物料差异账户',
+    field: 'plMvarAcct',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '成本重估账户',
+    field: 'plCchgAcct',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From 5c126c4b3c9340a39e7232615cd8e0f8c82bc859 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 5 Jul 2024 11:08:37 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7=201.?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=90=8E=E5=88=A0=E9=99=A4=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E7=9B=B4=E6=8E=A5=E6=96=B0=E5=A2=9E=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=AF=A5=E6=95=B0=E6=8D=AE=202.=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E6=97=B6=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E9=A1=B9=20=E4=BD=86=E6=98=AF=E6=9C=AA=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86,=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E4=B8=AD=E5=BA=94=E8=AF=A5=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E6=84=8F=E4=B9=89=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |   4 +-
 .../issueRequestMain/issueRequestMain.data.ts |   3 +
 .../repleinshRequestMain.data.ts              | 254 +++++++++---------
 .../productreceiptRequestMain.data.ts         |   3 +
 .../productreceiptAssembleRequestMain.data.ts |   3 +
 .../productscrapRequestMain.data.ts           |   3 +
 6 files changed, 147 insertions(+), 123 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5fa0fbd9a..378a2ba07 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -615,14 +615,12 @@ const submitForm = async () => {
     formLoading.value = true
     if (formType.value == 'create') {
       const validateForm = await tableFormRef.value.validateForm()
-      if (!validateForm && props.tableFormDataLength) {
+      if (props.tableFormDataLength) {
         if (props.tableData.length == 0) {
           message.warning('请填写明细信息！')
           formLoading.value = false
           return
         }
-        formLoading.value = false
-        return
       }
       // 主子表——提交请求
       try {
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 4a7479093..4b131b1bb 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -560,6 +560,9 @@ export const IssueRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间代码', trigger: 'change' }
   ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
   // fromWarehouseCode: [
   //   { required: true, message: '请选择从仓库代码', trigger: 'change' }
   // ],
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index f18f34c0d..80e5d6536 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -471,6 +471,122 @@ export const RepleinshRequestMainRules = reactive({
  * @returns {Array} 补料申请子表
  */
 export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    sortSearchDefault:2,
+    sortTableDefault:3,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      enterSearch:true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '物料基础信息', // 查询弹窗标题
+      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key : 'businessTypeCode',
+        value: queryParams.businessTypeCode
+      }]
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    sortTableDefault:4,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -541,7 +657,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inventoryStatus',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
-    isTable: true,
+    isTableForm: false,
+    isTable:false,
     sort: 'custom',
     form: {
       value: 'OK',
@@ -557,6 +674,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm:false,
     tableForm: {
       type: 'Select',
       default: 'OK',
@@ -573,63 +691,23 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain:true,
     isTableForm: false,
+    isTable:false,
     form: {
       componentProps: {
         disabled: true
       }
     }
   },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    sortSearchDefault:2,
-    sortTableDefault:3,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '物料基础信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-    tableForm:{
-      enterSearch:true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '物料基础信息', // 查询弹窗标题
-      searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-      searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key : 'businessTypeCode',
-        value: queryParams.businessTypeCode
-      }]
-    },
-  },
+ 
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTableForm:false,
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
   },
   {
@@ -667,36 +745,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    sortTableDefault:4,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-  },
+
   {
     label: '项目代码',
     field: 'projectCode',
@@ -706,50 +755,10 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain:true,
     isTableForm: false,
+    isTable:false,
     isForm: false,
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:9,
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+
   {
     label: '采购订单号',
     field: 'poNumber',
@@ -760,6 +769,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
     isTableForm: false,
     sortTableDefault:1,
+    isTable:false,
   },
   {
     label: '订单行',
@@ -771,6 +781,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
     isTableForm: false,
     sortTableDefault:2,
+    isTable:false,
   },
 
   {
@@ -783,6 +794,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
     hiddenInMain:true,
+    isTable:false,
   },
   {
     label: '到货主代码',
@@ -794,6 +806,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
     hiddenInMain:true,
+    isTable:false, 
   },
   {
     label: '最后更新时间',
@@ -829,6 +842,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     hiddenInMain:true,
+    isTable:false,
     isForm: false
   },
   {
@@ -847,9 +861,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const RepleinshRequestDetailRules = reactive({
-  inventoryStatus: [
-    { required: true, message: '请选择库存状态', trigger: 'change' }
-  ],
+  // inventoryStatus: [
+  //   { required: true, message: '请选择库存状态', trigger: 'change' }
+  // ],
   toLocationCode: [
     { required: true, message: '请输入到库位代码', trigger: 'blur' }
   ],
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index eb64606c0..ad2d93277 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -535,6 +535,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
   autoCommit: [
     { required: true, message: '请选择是否自动提交', trigger: 'change' }
   ],
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 9e01199c7..84fb8ddaa 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -536,6 +536,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
   autoCommit: [
     { required: true, message: '请选择是否自动提交', trigger: 'change' }
   ],
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 5c7911793..b6902aa29 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -500,6 +500,9 @@ export const ProductscrapRequestMainRules = reactive({
   // dueTime: [
   //   { required: true, message: '请选择截止时间', trigger: 'change' }
   // ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],

From 73147b139f12f9443d1aaae11f80b583a428ef4f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 5 Jul 2024 11:33:23 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E6=96=B0=E5=A2=9E=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=E9=87=8C=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E4=B9=9F=E6=B2=A1=E6=9C=89=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE,=E5=BB=BA=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=E6=8A=A5=E4=BA=A7=E7=94=B3=E8=AF=B7=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=9C=89=E4=B8=8A=E6=AC=A1=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=9A=84=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue                  | 1 +
 .../processproduction/processproductionRequest/index.vue    | 1 +
 .../productrepair/productrepairRequestMain/index.vue        | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 28db8d9a7..88439dd30 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -551,6 +551,7 @@ const tableSelectionChange = (val) => {
 }
 const handleSelectionDelete = () => {
   emit('tableSelectionDelete', deleteTableData.value)
+  TableBaseComponents_Ref.value.clearSelection()
   nextTick(() => {
     deleteTableData.value.forEach((row) => {
       TableBaseComponents_Ref.value!.toggleRowSelection(row, false)
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index e62b08b73..fe2a491bb 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -292,6 +292,7 @@ const handleHandle = async (id: number) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  tableData.value = [] // 重置明细数据
   basicFormRef.value.open(type, row)
 }
 
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 5f291b7e7..a6ba77156 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -56,6 +56,8 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @buttonOperationClick="buttonOperationClick"
+    :isShowReduceButtonSelection="true"
+@tableSelectionDelete="tableSelectionDelete"
   />
 
   <!-- 详情 -->
@@ -686,7 +688,9 @@ const tableFormButton = async (val , row) => {
     await getDetailListBom()
   }
 }
-
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
 /** 初始化 **/
 onMounted(async () => {
   getList()