From 880f97f1b00c8f07709320e74fe770bf044a9951 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Thu, 15 Aug 2024 21:18:53 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5048?=
 =?UTF-8?q?=EF=BC=8CHL-5049=20=E4=BC=98=E5=8C=96=EF=BC=9A=E5=B0=86?=
 =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=E6=98=8E=E7=BB=86=E4=B8=AD?=
 =?UTF-8?q?mes=EF=BC=8Cbom=E5=8D=95=E7=8B=AC=E6=8F=90=E5=87=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E8=8F=9C=E5=8D=95=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E9=85=8D=E6=9C=89=E4=B8=BB=E8=A6=81=E5=AD=97=E6=AE=B5=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesRawMaterialConsumptionInfo/index.ts    |  46 ++++
 .../wms/rawMaterialConsumptionInfo/index.ts   |  46 ++++
 .../mesRawMaterialConsumptionInfo/index.vue   | 112 ++++++++
 .../mesRawMaterialConsumptionInfo.data.ts     | 173 ++++++++++++
 .../rawMaterialConsumptionInfo/index.vue      | 111 ++++++++
 .../rawMaterialConsumptionInfo.data.ts        | 260 ++++++++++++++++++
 6 files changed, 748 insertions(+)
 create mode 100644 src/api/wms/mesRawMaterialConsumptionInfo/index.ts
 create mode 100644 src/api/wms/rawMaterialConsumptionInfo/index.ts
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
 create mode 100644 src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts

diff --git a/src/api/wms/mesRawMaterialConsumptionInfo/index.ts b/src/api/wms/mesRawMaterialConsumptionInfo/index.ts
new file mode 100644
index 000000000..fbfaf7290
--- /dev/null
+++ b/src/api/wms/mesRawMaterialConsumptionInfo/index.ts
@@ -0,0 +1,46 @@
+import request from '@/config/axios'
+
+
+export const AssemblyFinishedMaterialConsumptionMesRespVO = {
+  finishPackingNumber: '',
+  finishBatch: '',
+  finishItemCode: '',
+  finishCreateTime: new Date(),
+  id: 0,
+  processCode: '',
+  bomVersion: '',
+  packingNumber: '',
+  batch: '',
+  inventoryStatus: '',
+  fromLocationCode: '',
+  fromLocationGroupCode: '',
+  fromAreaCode: '',
+  itemName: '',
+  itemDesc1: '',
+  itemDesc2: '',
+  projectCode: '',
+  qty: '',
+  uom: '',
+  number: '',
+  itemCode: '',
+  remark: '',
+  createTime: new Date(),
+  creator: '',
+  code: '',
+  interfaceType: '',
+  jobDetailId: ''
+};
+
+
+// 查询QAD项目信息列表
+export const getMesRawMaterialConsumptionInfoPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-detailb/getAssemblyMaterialUsageMesSenior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-detailb/getAssemblyMaterialUsageMes`, params })
+  }
+}
+
+
diff --git a/src/api/wms/rawMaterialConsumptionInfo/index.ts b/src/api/wms/rawMaterialConsumptionInfo/index.ts
new file mode 100644
index 000000000..38b62d2a9
--- /dev/null
+++ b/src/api/wms/rawMaterialConsumptionInfo/index.ts
@@ -0,0 +1,46 @@
+import request from '@/config/axios'
+
+
+export const AssemblyFinishedMaterialConsumptionRespVO = {
+  finishPackingNumber: '',
+  finishBatch: '',
+  finishItemCode: '',
+  finishCreateTime: new Date(),
+  id: 0,
+  processCode: '',
+  bomVersion: '',
+  packingNumber: '',
+  batch: '',
+  inventoryStatus: '',
+  fromLocationCode: '',
+  fromLocationGroupCode: '',
+  fromAreaCode: '',
+  itemName: '',
+  itemDesc1: '',
+  itemDesc2: '',
+  projectCode: '',
+  qty: '',
+  uom: '',
+  number: '',
+  itemCode: '',
+  remark: '',
+  createTime: new Date(),
+  creator: '',
+  code: '',
+  interfaceType: '',
+  jobDetailId: ''
+};
+
+
+// 查询QAD项目信息列表
+export const getRawMaterialConsumptionInfoPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/backflush-record-detailb/getAssemblyMaterialUsageSenior', data })
+  } else {
+    return await request.get({ url: `/wms/backflush-record-detailb/getAssemblyMaterialUsage`, params })
+  }
+}
+
+
diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
new file mode 100644
index 000000000..c0f82ff6a
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
@@ -0,0 +1,112 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...MesRawMaterialConsumptionInfo.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="MesRawMaterialConsumptionInfo.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :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 #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as MesRawMaterialConsumptionInfoApi from '@/api/wms/mesRawMaterialConsumptionInfo'
+import { getAccessToken } from '@/utils/auth'
+import {
+  MesRawMaterialConsumptionInfo
+} from './mesRawMaterialConsumptionInfo.data'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+
+// 装配收货记录主
+defineOptions({ name: 'RawMaterialConsumptionInfo' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...MesRawMaterialConsumptionInfo.allSchemas.tableColumns])
+
+const mesModelVisible = ref(false)
+const { tableObject: tableObject, tableMethods: tableMethods } =useTable({
+  getListApi: MesRawMaterialConsumptionInfoApi.getMesRawMaterialConsumptionInfoPage
+})
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    // handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
new file mode 100644
index 000000000..804384a66
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
@@ -0,0 +1,173 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+
+
+export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '成品包装号',
+    field: 'finishedPackingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '成品批次',
+    field: 'finishedBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '成品物料代码',
+    field: 'finishedItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '成品创建时间',
+    field: 'finishedCreateTime',
+    formatter: dateFormatter,
+    isSearch: true,
+    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')]
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '成品创建人',
+    field: 'finishedCreator',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '唯一码',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '客户物料号',
+    field: 'customerItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料旧包装号',
+    field: 'oldPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '原料批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料外部零件号',
+    field: 'outsideItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料外部生产日期',
+    field: 'outsideProduceDate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料外部流水号',
+    field: 'outsideSerialNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
new file mode 100644
index 000000000..ede928449
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
@@ -0,0 +1,111 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...RawMaterialConsumptionInfo.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RawMaterialConsumptionInfo.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :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 #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RawMaterialConsumptionInfoApi from '@/api/wms/rawMaterialConsumptionInfo'
+import { getAccessToken } from '@/utils/auth'
+import {
+  RawMaterialConsumptionInfo
+} from './rawMaterialConsumptionInfo.data'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+
+// 装配收货记录主
+defineOptions({ name: 'RawMaterialConsumptionInfo' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...RawMaterialConsumptionInfo.allSchemas.tableColumns])
+
+const mesModelVisible = ref(false)
+const { tableObject: tableObject, tableMethods: tableMethods } =useTable({
+  getListApi: RawMaterialConsumptionInfoApi.getRawMaterialConsumptionInfoPage
+})
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+ 
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    // handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
new file mode 100644
index 000000000..3fdd7de9d
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
@@ -0,0 +1,260 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货记录子表
+ */
+export const RawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>([
+
+  {
+    label: '成品包装号',
+    field: 'finishedPackingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '成品批次',
+    field: 'finishedBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '成品物料代码',
+    field: 'finishedItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '成品创建时间',
+    field: 'finishedCreateTime',
+    formatter: dateFormatter,
+    isSearch: true,
+    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')]
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '成品创建人',
+    field: 'finishedCreator',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料BOM版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '原料库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '原料物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '原料备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '原料创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '原料计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
\ No newline at end of file

From f4d4b8d1d66214364f34db20e54f1380b21d85cc Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 16 Aug 2024 09:34:06 +0800
Subject: [PATCH 02/11] =?UTF-8?q?Q3=E9=80=9A=E7=9F=A5=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=BC=A0=E4=B8=8D=E8=BF=87=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionQ3/index.vue | 48 +++-------------------------
 1 file changed, 4 insertions(+), 44 deletions(-)

diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue
index e414ef0b7..8fbbc3a33 100644
--- a/src/views/qms/inspectionQ3/index.vue
+++ b/src/views/qms/inspectionQ3/index.vue
@@ -71,13 +71,6 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @inputNumberChange="inputNumberChange"
-    :sumFormDataByTableCustom="
-      (formRef, formModel, tableData) => {
-        tableData.forEach((item) => {
-          item.qty = item.countQty * item.packQty
-        })
-      }
-    "
   >
     <!-- <template #default="{row}">
     <el-input-number disabled v-model="row.qty"></el-input-number>
@@ -146,43 +139,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'itemCode') {
-        // val.forEach(item=>{
-
-        // })
         const index1 = 0
         setTableFormsValues(val, index1)
-
-        // row['uom'] = val[0]['uom']
-        // console.log(formRef.formModel.qty)
-        // // let res = await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code)
-        //   ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code).then((res) => {
-        //   console.log(res)
-        //   if (res?.length > 0) {
-        //     formRef.formModel.defectLocation = res[0].productionLineCode
-        //      InspectionQ3Detail.allSchemas.formSchema.forEach(item=>{
-        //       if (item.field == 'defectLocation') {
-        //         item.componentProps.options = res
-        //       }
-        //     })
-        //   }
-        // })
-        // const params = {
-        //   by: "ASC",
-        //   filters: [{column: "itemCode", action: "==", value: val[0].code}],
-        //   pageNo: 1,
-        //   pageSize: 500,
-        //   sort: ""
-        // }
-        // params.isSearch = true
-        // StdcostpriceApi.getStdcostpricePage(params).then((res) => {
-        //   if (res.list?.length > 0) {
-        //     priceObj.value = res.list[0]
-        //     formRef.setValues({
-        //       amount: (parseFloat(formRef.formModel.qty) * parseFloat(priceObj.value.price)).toFixed(6)
-        //     })
-        //   }
-
-        // })
       }
       if (formField == 'costCode') {
         console.log(11111)
@@ -211,7 +169,6 @@ const setTableFormsValues = async (val, index1) => {
     const newRow = JSON.parse(JSON.stringify({ ...tableForm, ...val[index1] }))
     newRow['itemCode'] = val[index1]['itemCode']
     newRow['uom'] = val[index1]['uom']
-    newRow['qty'] = 0
     newRow.defectLocation = val[index1]['productionLineCode']
     await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[index1].itemCode).then(
       (res) => {
@@ -236,7 +193,9 @@ const setTableFormsValues = async (val, index1) => {
         newRow['amount']=(parseFloat(newRow['qty']) * parseFloat(priceObj.value.price)).toFixed(6)
       }
     })
+    newRow['qty'] = 0
     tableData.value.push(newRow)
+    console.log( tableData.value)
     index1++
     setTableFormsValues(val, index1)
   }
@@ -248,7 +207,7 @@ const inputNumberChange = (field, index, row, val) => {
   }
   formRef.value.formRef.formModel.summaryAmount =0
   tableData.value.forEach(item=>{
-formRef.value.formRef.formModel.summaryAmount += parseFloat(item.amount)
+  formRef.value.formRef.formModel.summaryAmount += parseFloat(item.amount)
   })
 }
 // 查询页面返回——详情
@@ -359,6 +318,7 @@ const handleFinish = async (id: number) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: any) => {
+  tableData.value = []
     formRef.value.open(type, row)
   if (type == 'create') {
     nextTick(() => {

From 1613f8ff92a1d9f385fadc0c370ed8f56577d0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 16 Aug 2024 09:42:11 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E4=B8=AD=E7=9A=84Q3?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=20=20HL-5263?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/inspectionQ3/inspectionQ3.data.ts     |  26 +-
 .../scrapRequestMain/scrapRequestMain.data.ts | 282 +++++++++---------
 .../productionscrapRecordMain.data.ts         |  92 +++---
 .../productionscrapRequestMain.data.ts        |  92 +++---
 .../productscrapJobMain.data.ts               |  92 +++---
 .../productscrapRecordMain.data.ts            |  92 +++---
 .../productscrapRequestMain.data.ts           |  92 +++---
 7 files changed, 384 insertions(+), 384 deletions(-)

diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index 325e55fb3..6492c298e 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -482,19 +482,19 @@ export const InspectionQ3Detail = useCrudSchemas(
       form: {
         component: 'Select'
       }
-    },
-    {
-      label: '操作',
-      field: 'action',
-      hiddenInMain: true,
-      isDetail: false,
-      isForm: false,
-      table: {
-        width: 200,
-        fixed: 'right'
-      },
-      isTableForm: false
     }
+    // {
+    //   label: '操作',
+    //   field: 'action',
+    //   hiddenInMain: true,
+    //   isDetail: false,
+    //   isForm: false,
+    //   table: {
+    //     width: 200,
+    //     fixed: 'right'
+    //   },
+    //   isTableForm: false
+    // }
   ])
 )
 
@@ -507,6 +507,6 @@ export const InspectionQ3DetailRules = reactive({
   costCode: [{ required: true, message: '请选择成本中心编码', trigger: 'change' }],
   defectLocation: [{ required: true, message: '请选择缺陷位置', trigger: 'change' }],
   defectType: [{ required: true, message: '请选择缺陷类型', trigger: 'change' }],
-  problemReason: [{ required: true, message: '请选择问题原因', trigger: 'change' }],
+  problemReason: [{ required: true, message: '请输入问题原因', trigger: 'change' }],
   defectCode: [{ required: true, message: '请选择缺陷编码', trigger: 'change' }]
 })
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index a05305f0f..e38c1ea26 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -8,14 +8,14 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
 import * as WarehouseApi from '@/api/wms/warehouse'
 
-// import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
-// import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
+import * as InspectionQ1Api from '@/api/qms/inspectionQ1'
+import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
 
-// import * as InspectionQ2Api from '@/api/qms/inspectionQ2'
-// import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
+import * as InspectionQ2Api from '@/api/qms/inspectionQ2'
+import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
 
-// import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-// import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 const { t } = useI18n() // 国际化
 
@@ -53,141 +53,141 @@ export const ScrapRequestMain = useCrudSchemas(
       isForm: false,
       isSearch: true
     },
-    // {
-    //   label: 'Q1通知单号',
-    //   field: 'q1Number',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isDetail: true,
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     // labelMessage: '信息提示说明！！！',
-    //     componentProps: {
-    //       enterSearch: true,
-    //       // multiple: true,
-    //       isSearchList: true, // 开启查询弹窗
-    //       searchListPlaceholder: '请选择Q1通知单号', // 输入框占位文本
-    //       searchField: 'number', // 查询弹窗赋值字段
-    //       searchTitle: 'Q1通知单号', // 查询弹窗标题
-    //       searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
-    //       searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
-    //       searchCondition: [
-    //         {
-    //           key: 'available',
-    //           value: 'TRUE',
-    //           isMainValue: false
-    //         },
-    //         {
-    //           key: 'status',
-    //           value: '0',
-    //           isMainValue: false
-    //         }
-    //       ],
-    //       verificationParams: [
-    //         {
-    //           key: 'number',
-    //           action: '==',
-    //           value: '',
-    //           isMainValue: false,
-    //           isSearch: true,
-    //           isFormModel: true
-    //         }
-    //       ] // 失去焦点校验参数
-    //     }
-    //   }
-    // },
-    // {
-    //   label: 'Q2通知单号',
-    //   field: 'q2Number',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isDetail: true,
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     // labelMessage: '信息提示说明！！！',
-    //     componentProps: {
-    //       enterSearch: true,
-    //       // multiple: true,
-    //       isSearchList: true, // 开启查询弹窗
-    //       searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
-    //       searchField: 'number', // 查询弹窗赋值字段
-    //       searchTitle: 'Q2通知单号', // 查询弹窗标题
-    //       searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
-    //       searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
-    //       searchCondition: [
-    //         {
-    //           key: 'available',
-    //           value: 'TRUE',
-    //           isMainValue: false
-    //         },
-    //         {
-    //           key: 'status',
-    //           value: '0',
-    //           isMainValue: false
-    //         }
-    //       ],
-    //       verificationParams: [
-    //         {
-    //           key: 'number',
-    //           action: '==',
-    //           value: '',
-    //           isMainValue: false,
-    //           isSearch: true,
-    //           isFormModel: true
-    //         }
-    //       ] // 失去焦点校验参数
-    //     }
-    //   }
-    // },
-    // {
-    //   label: 'Q3通知单号',
-    //   field: 'q3Number',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isDetail: true,
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     // labelMessage: '信息提示说明！！！',
-    //     componentProps: {
-    //       enterSearch: true,
-    //       // multiple: true,
-    //       isSearchList: true, // 开启查询弹窗
-    //       searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
-    //       searchField: 'number', // 查询弹窗赋值字段
-    //       searchTitle: 'Q3通知单号', // 查询弹窗标题
-    //       searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-    //       searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
-    //       searchCondition: [
-    //         {
-    //           key: 'available',
-    //           value: 'TRUE',
-    //           isMainValue: false
-    //         },
-    //         {
-    //           key: 'status',
-    //           value: '0',
-    //           isMainValue: false
-    //         }
-    //       ],
-    //       verificationParams: [
-    //         {
-    //           key: 'number',
-    //           action: '==',
-    //           value: '',
-    //           isMainValue: false,
-    //           isSearch: true,
-    //           isFormModel: true
-    //         }
-    //       ] // 失去焦点校验参数
-    //     }
-    //   }
-    // },
+    {
+      label: 'Q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q1通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q1通知单号', // 查询弹窗标题
+          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: 'Q2通知单号',
+      field: 'q2Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q2通知单号', // 查询弹窗标题
+          searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '状态',
       field: 'status',
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
index 67eb77b0f..c931b3c69 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@@ -1,8 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
-// import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-// import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 /**
  * @returns {Array} 生产退料记录主表
@@ -28,50 +28,50 @@ export const ProductionscrapRecordMain = useCrudSchemas(
       },
       isSearch: true
     },
-    // {
-    //   label: 'Q3通知单号',
-    //   field: 'q3Number',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isDetail: true,
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     // labelMessage: '信息提示说明！！！',
-    //     componentProps: {
-    //       enterSearch: true, // multiple: true,
-    //       isSearchList: true, // 开启查询弹窗
-    //       searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
-    //       searchField: 'number', // 查询弹窗赋值字段
-    //       searchTitle: 'Q3通知单号', // 查询弹窗标题
-    //       searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-    //       searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
-    //       searchCondition: [
-    //         {
-    //           key: 'available',
-    //           value: 'TRUE',
-    //           isMainValue: false
-    //         },
-    //         {
-    //           key: 'status',
-    //           value: '0',
-    //           isMainValue: false
-    //         }
-    //       ],
-    //       verificationParams: [
-    //         {
-    //           key: 'number',
-    //           action: '==',
-    //           value: '',
-    //           isMainValue: false,
-    //           isSearch: true,
-    //           isFormModel: true
-    //         }
-    //       ] // 失去焦点校验参数
-    //     }
-    //   }
-    // },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true, // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '车间代码',
       field: 'workshopCode',
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index a57a8ec83..52940a1dd 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -23,8 +23,8 @@ import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplie
 import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
 
-// import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-// import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 // import * as LocationApi from '@/api/wms/location'
 // import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
@@ -63,50 +63,50 @@ export const ProductionscrapRequestMain = useCrudSchemas(
       isForm: false,
       isSearch: true
     },
-    // {
-    //   label: 'Q3通知单号',
-    //   field: 'q3Number',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isDetail: true,
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     // labelMessage: '信息提示说明！！！',
-    //     componentProps: {
-    //       enterSearch: true, // multiple: true,
-    //       isSearchList: true, // 开启查询弹窗
-    //       searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
-    //       searchField: 'number', // 查询弹窗赋值字段
-    //       searchTitle: 'Q3通知单号', // 查询弹窗标题
-    //       searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-    //       searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
-    //       searchCondition: [
-    //         {
-    //           key: 'available',
-    //           value: 'TRUE',
-    //           isMainValue: false
-    //         },
-    //         {
-    //           key: 'status',
-    //           value: '0',
-    //           isMainValue: false
-    //         }
-    //       ],
-    //       verificationParams: [
-    //         {
-    //           key: 'number',
-    //           action: '==',
-    //           value: '',
-    //           isMainValue: false,
-    //           isSearch: true,
-    //           isFormModel: true
-    //         }
-    //       ] // 失去焦点校验参数
-    //     }
-    //   }
-    // },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true, // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '状态',
       field: 'status',
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
index a6f17e110..5b93fbace 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
@@ -1,8 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
-// import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-// import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 /**
  * @returns {Array} 制品报废任务主表
@@ -28,50 +28,50 @@ export const ProductscrapJobMain = useCrudSchemas(
       },
       isSearch: true
     },
-    // {
-    //   label: 'Q3通知单号',
-    //   field: 'q3Number',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isDetail: true,
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     // labelMessage: '信息提示说明！！！',
-    //     componentProps: {
-    //       enterSearch: true, // multiple: true,
-    //       isSearchList: true, // 开启查询弹窗
-    //       searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
-    //       searchField: 'number', // 查询弹窗赋值字段
-    //       searchTitle: 'Q3通知单号', // 查询弹窗标题
-    //       searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-    //       searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
-    //       searchCondition: [
-    //         {
-    //           key: 'available',
-    //           value: 'TRUE',
-    //           isMainValue: false
-    //         },
-    //         {
-    //           key: 'status',
-    //           value: '0',
-    //           isMainValue: false
-    //         }
-    //       ],
-    //       verificationParams: [
-    //         {
-    //           key: 'number',
-    //           action: '==',
-    //           value: '',
-    //           isMainValue: false,
-    //           isSearch: true,
-    //           isFormModel: true
-    //         }
-    //       ] // 失去焦点校验参数
-    //     }
-    //   }
-    // },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true, // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '从仓库代码',
       field: 'fromWarehouseCode',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 9ecc7ab9c..16a0a352d 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -1,8 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
-// import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-// import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 /**
  * @returns {Array} 制品报废记录主表
@@ -28,50 +28,50 @@ export const ProductscrapRecordMain = useCrudSchemas(
       },
       isSearch: true
     },
-    // {
-    //   label: 'Q3通知单号',
-    //   field: 'q3Number',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isDetail: true,
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     // labelMessage: '信息提示说明！！！',
-    //     componentProps: {
-    //       enterSearch: true, // multiple: true,
-    //       isSearchList: true, // 开启查询弹窗
-    //       searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
-    //       searchField: 'number', // 查询弹窗赋值字段
-    //       searchTitle: 'Q3通知单号', // 查询弹窗标题
-    //       searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-    //       searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
-    //       searchCondition: [
-    //         {
-    //           key: 'available',
-    //           value: 'TRUE',
-    //           isMainValue: false
-    //         },
-    //         {
-    //           key: 'status',
-    //           value: '0',
-    //           isMainValue: false
-    //         }
-    //       ],
-    //       verificationParams: [
-    //         {
-    //           key: 'number',
-    //           action: '==',
-    //           value: '',
-    //           isMainValue: false,
-    //           isSearch: true,
-    //           isFormModel: true
-    //         }
-    //       ] // 失去焦点校验参数
-    //     }
-    //   }
-    // },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true, // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '状态',
       field: 'status',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index e2c4e0af3..881153b74 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -21,8 +21,8 @@ import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/produ
 import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 import * as BomApi from '@/api/wms/bom'
 
-// import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-// import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 const { t } = useI18n() // 国际化
 
@@ -60,50 +60,50 @@ export const ProductscrapRequestMain = useCrudSchemas(
       isForm: false,
       isSearch: true
     },
-    // {
-    //   label: 'Q3通知单号',
-    //   field: 'q3Number',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isDetail: true,
-    //   table: {
-    //     width: 150
-    //   },
-    //   form: {
-    //     // labelMessage: '信息提示说明！！！',
-    //     componentProps: {
-    //       enterSearch: true, // multiple: true,
-    //       isSearchList: true, // 开启查询弹窗
-    //       searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
-    //       searchField: 'number', // 查询弹窗赋值字段
-    //       searchTitle: 'Q3通知单号', // 查询弹窗标题
-    //       searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-    //       searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
-    //       searchCondition: [
-    //         {
-    //           key: 'available',
-    //           value: 'TRUE',
-    //           isMainValue: false
-    //         },
-    //         {
-    //           key: 'status',
-    //           value: '0',
-    //           isMainValue: false
-    //         }
-    //       ],
-    //       verificationParams: [
-    //         {
-    //           key: 'number',
-    //           action: '==',
-    //           value: '',
-    //           isMainValue: false,
-    //           isSearch: true,
-    //           isFormModel: true
-    //         }
-    //       ] // 失去焦点校验参数
-    //     }
-    //   }
-    // },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true, // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q3通知单号', // 查询弹窗标题
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '状态',
       field: 'status',

From dccb316f2e23c05bb1380bc9dcbe436ed19ea4df Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 16 Aug 2024 10:22:09 +0800
Subject: [PATCH 04/11] =?UTF-8?q?HL-5375=E7=9B=98=E7=82=B9=20=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E8=AE=A1=E5=88=92=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=B1=BB=E5=9E=8B=E8=8C=83=E5=9B=B4=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=BA=93=E5=8C=BA=E4=BB=A3=E7=A0=81=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=94=BE=E5=A4=A7=E9=95=9C=E7=9A=84=E7=AD=9B=E9=80=89=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=B2=A1=E6=9C=89=E6=A0=A1=E9=AA=8C=E3=80=82?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=8A=A0=E4=B8=8A=E6=94=BE=E5=A4=A7=E9=95=9C?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TableFormCountPlan/src/TableFormCountPlan.vue    |  2 +-
 .../wms/countManage/count/countPlanMain/index.vue    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
index 99add9a1a..78866995b 100644
--- a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
+++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
@@ -61,7 +61,7 @@
               row.type == 'CUSTOMER' ||
               row.type == 'ITEM_CODE' ||
               row.type == 'WAREHOUSE_CODE' ||
-              row.type == 'AREABASIC_CODE' ||
+              row.type == 'AREA_CODE' ||
               row.type == 'LOCATIONGROUP_CODE' ||
               row.type == 'LOCATION_CODE'
             "
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 6a301f0f2..acc297ea5 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -473,7 +473,7 @@ const detailOpenForm = (type, row) => {
       row.type == 'ITEMS_GROUP' ||
       row.type == 'ITEM_CODE' ||
       row.type == 'WAREHOUSE_CODE' ||
-      row.type == 'AREABASIC_CODE' ||
+      row.type == 'AREA_CODE' ||
       row.type == 'LOCATIONGROUP_CODE' ||
       row.type == 'LOCATION_CODE'
     ) {
@@ -559,7 +559,7 @@ const detailOpenForm = (type, row) => {
             }
           })
           break
-        case 'AREABASIC_CODE':
+        case 'AREA_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
               item.componentProps.isInpuFocusShow = true
@@ -801,7 +801,7 @@ const selectChangeDetail = (field, val) => {
       val == 'ITEMS_GROUP' ||
       val == 'ITEM_CODE' ||
       val == 'WAREHOUSE_CODE' ||
-      val == 'AREABASIC_CODE' ||
+      val == 'AREA_CODE' ||
       val == 'LOCATIONGROUP_CODE' ||
       val == 'LOCATION_CODE'
     ) {
@@ -887,7 +887,7 @@ const selectChangeDetail = (field, val) => {
             }
           })
           break
-        case 'AREABASIC_CODE':
+        case 'AREA_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
               item.componentProps.isSearchList = true
@@ -938,7 +938,7 @@ const tableFormChange = async (field, val, row) => {
       row.type == 'ITEMS_GROUP' ||
       row.type == 'ITEM_CODE' ||
       row.type == 'WAREHOUSE_CODE' ||
-      row.type == 'AREABASIC_CODE' ||
+      row.type == 'AREA_CODE' ||
       row.type == 'LOCATIONGROUP_CODE' ||
       row.type == 'LOCATION_CODE'
     ) {
@@ -1018,7 +1018,7 @@ const tableFormChange = async (field, val, row) => {
             searchPage: WarehouseApi.getWarehousePage
           }
           break
-        case 'AREABASIC_CODE':
+        case 'AREA_CODE':
           row.searchTable = {
             isInpuFocusShow: true,
             searchTitle: '库区信息',

From 9ef6ae66ffe40ae77f48dc17ec046d4d4ad32427 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 11:06:02 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E6=96=B0=E7=89=88=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMainNew/index.vue    |  26 +-
 ...s => purchasereturnRequestMainNew.data.ts} | 467 ++----------------
 2 files changed, 65 insertions(+), 428 deletions(-)
 rename src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/{purchasereturnRequestMain.data.ts => purchasereturnRequestMainNew.data.ts} (64%)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index ab994d604..0b342081e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -54,10 +54,10 @@
   <BasicForm
     ref="formRef"
     @success="getList"
-    :rules="PurchasereturnRequestMainRules"
-    :formAllSchemas="PurchasereturnRequestMain.allSchemas"
-    :tableAllSchemas="PurchasereturnRequestDetail.allSchemas"
-    :tableFormRules="PurchasereturnRequestDetailRules"
+    :rules="PurchasereturnRequestMainRulesNew"
+    :formAllSchemas="PurchasereturnRequestMainNew.allSchemas"
+    :tableAllSchemas="PurchasereturnRequestDetailNew.allSchemas"
+    :tableFormRules="PurchasereturnRequestDetailRulesNew"
     :tableData="tableData"
     :apiUpdate="PurchasereturnRequestMainApi.updatePurchasereturnRequestMain"
     :apiCreate="PurchasereturnRequestMainApi.createPurchasereturnRequestMain"
@@ -140,15 +140,19 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {
+  PurchasereturnRequestMainNew,
+  PurchasereturnRequestMainRulesNew,
+  PurchasereturnRequestDetailNew,
+  PurchasereturnRequestDetailRulesNew,
+  PurchasereturnPurchasereceiptRecordNew
+} from './purchasereturnRequestMainNew.data'
 import {
   PurchasereturnRequestMain,
-  PurchasereturnRequestMainRules,
   PurchasereturnRequestDetail,
   PurchasereturnRequestDetailRules,
-  PurchasereReturnRequestDetailLabel,
-  PurchasereceiptRecordMain1,
-  PurchasereturnPurchasereceiptRecord
-} from './purchasereturnRequestMain.data'
+  PurchasereReturnRequestDetailLabel
+} from '../purchasereturnRequestMain/purchasereturnRequestMain.data'
 import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMain'
 import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail'
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
@@ -275,7 +279,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
         })
         console.log('物料供应商',res)
         if(res&&res.length>0){
-          PurchasereturnRequestMain.allSchemas.formSchema.forEach(item=>{
+          PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
             if(item.field == 'supplierCode'){
               item.componentProps.options = res
             }
@@ -604,7 +608,7 @@ const chooseReceiptList = ()=>{
   }
   searchTableRef.value.open(
     "收货单明细",
-    PurchasereturnPurchasereceiptRecord.allSchemas,
+    PurchasereturnPurchasereceiptRecordNew.allSchemas,
     PurchasereturnRequestDetailApi.getPurchasereturnPurchasereceiptRecordByItemCode,
     "hahaha",
     "hahaha",
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
similarity index 64%
rename from src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
rename to src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
index 444b562c1..4814a83f2 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
@@ -43,120 +43,10 @@ const userDept = userStore.userSelfInfo.dept
 userDept.id = userDept.id.toString()
 const userDeptArray: any = [userDept]
 
-// 采购收货记录展示列
-export const PurchasereceiptRecordMain1 = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '物料代码',
-      field: 'itemCode',
-      fixed: 'left',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      isSearch: true
-    },
-    {
-      label: '采购收货记录单号',
-      field: 'number',
-      fixed: 'left',
-      sort: 'custom',
-      table: {
-        width: 200
-      },
-      isSearch: true
-    },
-    {
-      label: '发货单号',
-      field: 'asnNumber',
-      sort: 'custom',
-      table: {
-        width: 180
-      },
-      sortTableDefault: 2,
-      isSearch: true
-    },
-    {
-      label: '采购订单号',
-      field: 'poNumber',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      isSearch: true
-    },
-    {
-      label: '订单行',
-      field: 'poLine',
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
-
-    {
-      label: '物料名称',
-      field: 'itemName',
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
-      field: 'fromBatch',
-      sort: 'custom',
-      isForm: false,
-      isTableForm: false,
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '计量单位',
-      field: 'uom',
-      dictType: DICT_TYPE.UOM,
-      dictClass: 'string',
-      isTable: true,
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
-    // {
-    //   label: '包装规格',
-    //   field: 'packUnit',
-    //   dictClass: 'string',
-    //   isTable: true,
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    // },
-    // {
-    //   label: '从库位代码',
-    //   field: 'fromLocationCode',
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    //
-    // },
-    {
-      label: '到库位代码',
-      field: 'toLocationCode',
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    }
-  ])
-)
-
 /**
  * @returns {Array} 采购退货申请主表
  */
-export const PurchasereturnRequestMain = useCrudSchemas(
+export const PurchasereturnRequestMainNew = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
       label: '物料代码',
@@ -431,9 +321,53 @@ export const PurchasereturnRequestMain = useCrudSchemas(
     }
   ])
 )
+//表单校验
+export const PurchasereturnRequestMainRulesNew = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'blur' }
+  ],
+  // purchaseReceiptRecordNumber: [
+  //   { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
+  // ],
+  carrierCode: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  vehiclePlateNumber: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
 
-
-export const PurchasereturnPurchasereceiptRecord = useCrudSchemas(
+export const PurchasereturnPurchasereceiptRecordNew = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
       label: '收货日期',
@@ -556,56 +490,12 @@ export const PurchasereturnPurchasereceiptRecord = useCrudSchemas(
   ])
 )
 
-//表单校验
-export const PurchasereturnRequestMainRules = reactive({
-  supplierCode: [
-    { required: true, message: '请输入供应商代码', trigger: 'blur' }
-  ],
-  dueTime: [
-    { required: true, message: '请选择截止时间', trigger: 'blur' }
-  ],
-  // purchaseReceiptRecordNumber: [
-  //   { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
-  // ],
-  carrierCode: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-  ],
-  vehiclePlateNumber: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-  ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  fromWarehouseCode: [
-    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
-  ],
-  fromAreaTypes: [
-    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
-  ],
-  departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
-  ],
-  autoCommit: [
-    { required: true, message: '请选择是否自动提交', trigger: 'change' }
-  ],
-  autoAgree: [
-    { required: true, message: '请选择是否自动通过', trigger: 'change' }
-  ],
-  autoExecute: [
-    { required: true, message: '请选择是否自动执行', trigger: 'change' }
-  ],
-  directCreateRecord: [
-    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
-  ],
-  businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
-  ],
-})
+
 
 /**
  * @returns {Array} 采购退货申请子表
  */
-export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+export const PurchasereturnRequestDetailNew = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '批次',
     field: 'batch',
@@ -731,264 +621,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
 ]))
 
 //表单校验
-export const PurchasereturnRequestDetailRules = reactive({
+export const PurchasereturnRequestDetailRulesNew = reactive({
 })
 
-export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      disabled:true
-    },
-    isTableForm: true,
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      disabled:true
-    },
-    isTableForm: true,
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isTableForm: false,
-    isForm: false
-  },
-  // {
-  //   label: '器具号',
-  //   field: 'containerNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: false,
-  //   isForm: false
-  // },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled:true,
-        min: 1,
-        precision: 6
-      },
-    },
-    tableForm: {
-      disabled:true,
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    }
-  },
-  {
-    label: '从库位代码1',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    tableForm:{
-      disabled:true,
-      type:'FormDate',
-      placeholder: '请选择生产日期',
-      valueFormat: 'x',
-    },
-  },
-
-  // {
-  //   label: '替代批次',
-  //   field: 'altBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: false,
-  //   isForm: false
-  // },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'Select'
-    }
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packQty',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-
-        ]
-      }
-    },
-    tableForm: {
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packQty',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    },
-    isTableForm: true,
-    isForm: true
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      disabled:true
-    },
-    isTableForm: true,
-    isForm: true
-  },
-]))
 

From f817a189a6cfb7a23611c5e245ed7a1f7de421d8 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 16 Aug 2024 11:09:46 +0800
Subject: [PATCH 06/11] =?UTF-8?q?HL-5312=20pda=E6=8F=90=E4=BA=A4=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8Cpc=E6=98=8E=E7=BB=86=E7=9A=84=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E6=98=AF=E7=9B=98=E7=82=B9=E7=9A=84=E6=95=B0=E9=87=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9B=98=E5=B9=B3=EF=BC=8C=E7=9B=B2=E7=9B=98?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countJobMain/index.vue  | 164 +++++++++++-------
 1 file changed, 102 insertions(+), 62 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index f7ccf55c2..7a6bcf25a 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -1,22 +1,27 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CountJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="CountJobMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="CountJobMain.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="CountJobMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,13 +32,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>
@@ -58,7 +66,7 @@
     ref="detailRef"
     :isBasic="false"
     :allSchemas="CountJobMain.allSchemas"
-    :detailAllSchemas="CountJobDetail.allSchemas"
+    :detailAllSchemas="countJobDetailTableColumns"
     :detailAllSchemasRules="CountJobDetailRules"
     :searchTableParams="searchTableParams"
     :apiPage="CountJobDetailApi.getCountJobDetailPage"
@@ -76,17 +84,21 @@
     :extend="rowMasterIdRef"
     :isShowDownloadBtn="true"
   />
-
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { CountJobMain,CountJobMainRules,CountJobDetail,CountJobDetailRules } from './countJobMain.data'
+import {
+  CountJobMain,
+  CountJobMainRules,
+  CountJobDetail,
+  CountJobDetailRules
+} from './countJobMain.data'
 import * as CountJobMainApi from '@/api/wms/countJobMain'
 import * as CountJobDetailApi from '@/api/wms/countJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import * as PackageunitApi from "@/api/wms/packageunit";
+import * as PackageunitApi from '@/api/wms/packageunit'
 import { formatDate } from '@/utils/formatTime'
 // 盘点任务主
 defineOptions({ name: 'CountJobMain' })
@@ -106,16 +118,16 @@ const updataTableColumns = (val) => {
 
 // 查询列表页面参数设置
 const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
+  //{
+  //  formField: 'productItemCode',
+  //  searchTableTitle: '物料信息',
+  //  searchTableAllSchemas: Itembasic.allSchemas,
+  //  searchTablePage: ItembasicApi.getItembasicPage
+  //}
 ])
 
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
@@ -141,7 +153,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 }
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
+const Echo = []
 
 const { tableObject, tableMethods } = useTable({
   getListApi: CountJobMainApi.getCountJobMainPage // 分页接口
@@ -152,10 +164,10 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:count-job-main:export'}), // 导出
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-job-main:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -168,24 +180,28 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'export') { // 导出
+  if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
-    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
       searchFormClick({
         filters: tableObject.params.filters
       })
     } else {
       getList()
     }
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.status) > -1) {
     return false
   } else {
@@ -194,15 +210,17 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row,$index) => {
-
+const butttondata = (row, $index) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1','2']),hasPermi:'wms:count-job-main:close'}), // 关闭
+    defaultButtons.mainListJobAccBtn({ hide: isShowMainButton(row, ['1']) }), // 承接
+    defaultButtons.mainListJobCloBtn({
+      hide: isShowMainButton(row, ['1', '2']),
+      hasPermi: 'wms:count-job-main:close'
+    }), // 关闭
     {
       label: '导出',
       name: 'exportCountJob',
-      hide: isShowMainButton(row,['1','2']),
+      hide: isShowMainButton(row, ['1', '2']),
       type: 'primary',
       color: '',
       link: true, //文本展现按钮
@@ -211,58 +229,64 @@ const butttondata = (row,$index) => {
     {
       label: '导入',
       name: 'importCountJob',
-      hide: isShowMainButton(row,['2']),
+      hide: isShowMainButton(row, ['2']),
       type: 'success',
       color: '',
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
     },
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
     {
       label: '完成',
       name: 'done',
-      hide: isShowMainButton(row,['2']),
+      hide: isShowMainButton(row, ['2']),
       type: 'success',
       color: '',
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
-    },
+    }
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'mainJobExe') { // 执行
+  if (val == 'mainJobExe') {
+    // 执行
     console.log('列表-操作按钮事件-执行')
-  } else if (val == 'mainJobAba') { // 放弃
+  } else if (val == 'mainJobAba') {
+    // 放弃
     console.log('列表-操作按钮事件-放弃')
     tableObject.loading = true
     try {
       await CountJobMainApi.abandonCountJobMain(row.id)
-      buttonBaseClick('refresh',null)
+      buttonBaseClick('refresh', null)
     } finally {
       tableObject.loading = false
     }
-  } else if (val == 'mainJobClo') { // 关闭
+  } else if (val == 'mainJobClo') {
+    // 关闭
     handleClose(row.id)
-  } else if (val == 'mainJobAcc') { // 承接
+  } else if (val == 'mainJobAcc') {
+    // 承接
     tableObject.loading = true
     try {
       await CountJobMainApi.acceptCountJobMain(row.id)
-      buttonBaseClick('refresh',null)
+      buttonBaseClick('refresh', null)
     } finally {
       tableObject.loading = false
     }
     console.log('列表-操作按钮事件-承接')
-  } else if (val == 'exportCountJob'){// 当前任务导出
-    handleExportCountJob(row.id,row.number)
-  } else if( val == 'importCountJob'){ // 导入
+  } else if (val == 'exportCountJob') {
+    // 当前任务导出
+    handleExportCountJob(row.id, row.number)
+  } else if (val == 'importCountJob') {
+    // 导入
     handleImport(row.id)
-  } else if( val == 'done'){ // 完成
+  } else if (val == 'done') {
+    // 完成
     handleDone(row.id)
   }
-
 }
 
 /** 关闭按钮操作 */
@@ -272,7 +296,7 @@ const handleClose = async (id: number) => {
     tableObject.loading = true
     await CountJobMainApi.closeCountJobMain(id)
     message.success(t('common.closeSuccess'))
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } finally {
     tableObject.loading = false
   }
@@ -283,21 +307,37 @@ const handleDone = async (id: number) => {
     await message.confirm('确认完成吗？')
     tableObject.loading = true
     await CountJobMainApi.doneCountJobMain(id)
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } finally {
     tableObject.loading = false
   }
 }
 
-
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
+const countJobDetailTableColumns = ref({})
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-  detailRef.value.openDetail(row, titleName, titleValue,"jobCountMain")
+  // 盲盘的时候不显示数量
+  countJobDetailTableColumns.value.tableColumns = []
+  if (!row.isShow) {
+    CountJobDetail.allSchemas.tableColumns.forEach((item) => {
+      if (item.field != 'qty') {
+        countJobDetailTableColumns.value.tableColumns.push(item)
+      }
+    })
+  } else {
+    countJobDetailTableColumns.value.tableColumns = JSON.parse(
+      JSON.stringify(CountJobDetail.allSchemas.tableColumns)
+    )
+  }
+
+  detailRef.value.openDetail(row, titleName, titleValue, 'jobCountMain')
 }
 
 /** 导出按钮操作 */
@@ -318,7 +358,7 @@ const handleExport = async () => {
 }
 
 /** 单条任务导出 */
-const handleExportCountJob = async (id: number,number: string) => {
+const handleExportCountJob = async (id: number, number: string) => {
   try {
     await message.exportConfirm()
     exportLoading.value = true
@@ -327,7 +367,7 @@ const handleExportCountJob = async (id: number,number: string) => {
     // download.excel(data, '盘点任务主'+number+'.xlsx')
     download.excel(data, `【${excelTitle.value}${number}】【${formatDate(new Date())}】.xlsx`)
   } catch {
-  }finally {
+  } finally {
     exportLoading.value = false
   }
 }
@@ -336,7 +376,7 @@ const handleExportCountJob = async (id: number,number: string) => {
 const importFormRef = ref()
 const rowMasterIdRef = ref('')
 const handleImport = (id: string) => {
-  rowMasterIdRef.value = id;
+  rowMasterIdRef.value = id
   importFormRef.value.open()
 }
 

From ab6e294d81f73d8e44a690a4588e44a6b3a898b1 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Fri, 16 Aug 2024 11:22:32 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5048?=
 =?UTF-8?q?=EF=BC=8CHL-5049=20=E4=BC=98=E5=8C=96=EF=BC=9A=E5=B0=86?=
 =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=E6=98=8E=E7=BB=86=E4=B8=AD?=
 =?UTF-8?q?mes=EF=BC=8Cbom=E5=8D=95=E7=8B=AC=E6=8F=90=E5=87=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E8=8F=9C=E5=8D=95=E5=B1=95=E7=A4=BA;=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=EF=BC=9A=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesRawMaterialConsumptionInfo.data.ts     | 17 ++++++
 .../rawMaterialConsumptionInfo.data.ts        | 56 +++++++++----------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
index 804384a66..527092ab8 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
@@ -170,4 +170,21 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
   },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
 ]))
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
index 3fdd7de9d..c4d9e18d3 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
@@ -164,34 +164,6 @@ export const RawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  {
-    label: '原料创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '原料创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '原料物料名称',
     field: 'itemName',
@@ -257,4 +229,32 @@ export const RawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '原料创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
 ]))
\ No newline at end of file

From 58d03b091851d3066df56b6b43b3d3c07d2f1c5e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 16 Aug 2024 11:39:39 +0800
Subject: [PATCH 08/11] =?UTF-8?q?HL-5374=E7=9B=98=E7=82=B9=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=20=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E6=97=B6=E5=8F=AA=E8=83=BD=E7=9B=B2=E7=9B=98?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=83=BD=E6=98=8E=E7=9B=98=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts | 44 ++++++-----
 .../countManage/count/countPlanMain/index.vue | 77 ++++++++++++-------
 2 files changed, 74 insertions(+), 47 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index a658c2a95..1ae19c31c 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -90,6 +90,25 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   }
   // },
+  {
+    label: '明盘',
+    field: 'isOpenCount',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '任务拆分方式',
     field: 'countSplitType',
@@ -102,7 +121,10 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:true,
     isForm: true,
     form: {
-      value: 'locationCode'
+      value: 'masterId',
+      componentProps: {
+        disabled:true
+      }
     }
 
   },
@@ -211,25 +233,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '明盘',
-    field: 'isOpenCount',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    form: {
-      component: 'Switch',
-      value: 'FALSE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '业务类型',
     field: 'businessType',
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index acc297ea5..cf020b296 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -307,7 +307,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('打开成功'))
         tableObject.loading = false
-        buttonBaseClick('refresh',null)
+        buttonBaseClick('refresh', null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -321,7 +321,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('关闭成功'))
         tableObject.loading = false
-        buttonBaseClick('refresh',null)
+        buttonBaseClick('refresh', null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -334,7 +334,7 @@ const buttonTableClick = async (val, row) => {
     await CountPlanMainApi.submit(row.id)
     message.success(t('提交审批成功'))
     tableObject.loading = false
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } else if (val == 'mainPlanTur') {
     // 驳回
     await message.confirm('确认要驳回吗？')
@@ -343,7 +343,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('驳回成功'))
         tableObject.loading = false
-        buttonBaseClick('refresh',null)
+        buttonBaseClick('refresh', null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -357,7 +357,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('审批已通过'))
         tableObject.loading = false
-        buttonBaseClick('refresh',null)
+        buttonBaseClick('refresh', null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -371,7 +371,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('发布成功'))
         tableObject.loading = false
-        buttonBaseClick('refresh',null)
+        buttonBaseClick('refresh', null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -385,7 +385,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('common.updateSuccess'))
         tableObject.loading = false
-        buttonBaseClick('refresh',null)
+        buttonBaseClick('refresh', null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -401,6 +401,22 @@ const buttonTableClick = async (val, row) => {
 }
 const onChange = (field, value) => {
   console.log(field, value)
+  if (field == 'isOpenCount') {
+    if (value == 'FALSE') {
+      CountPlanMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'countSplitType') {
+          item.componentProps.disabled = true
+        }
+      })
+      formRef.value.formRef.formModel.countSplitType = 'masterId'
+    } else {
+      CountPlanMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'countSplitType') {
+          item.componentProps.disabled = false
+        }
+      })
+    }
+  }
 }
 /** 添加/修改操作 */
 const formRef = ref()
@@ -419,22 +435,29 @@ const openForm = async (type: string, row?: any) => {
   //   }
   // })
   if (row.type == 'CYCLE') {
-      CountPlanMain.allSchemas.formSchema.forEach((item) => {
-        if (item.field == 'crontab') {
-          item.componentProps.disabled = false
-          item.label = '执行周期'
-        }
-      })
-      CountPlanMainRules.crontab[0].required = true
-    } else {
-      CountPlanMainRules.crontab[0].required = false
-      CountPlanMain.allSchemas.formSchema.forEach((item) => {
-        if (item.field == 'crontab') {
-          item.componentProps.disabled = true
-          item.label = ''
-        }
-      })
-    }
+    CountPlanMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'crontab') {
+        item.componentProps.disabled = false
+        item.label = '执行周期'
+      }
+    })
+    CountPlanMainRules.crontab[0].required = true
+  } else {
+    CountPlanMainRules.crontab[0].required = false
+    CountPlanMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'crontab') {
+        item.componentProps.disabled = true
+        item.label = ''
+      }
+    })
+  }
+  if (type == 'create') {
+    CountPlanMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'countSplitType') {
+        item.componentProps.disabled = true
+      }
+    })
+  }
   formRef.value.open(type, row)
 
   // Promise.all([getOwnerAllList(),
@@ -458,7 +481,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   // getAreaAllList()
   // getLocationgroupAllList()
   // getLocationAllList()
-  detailRef.value.openDetail(row, titleName, titleValue,"planCountMain")
+  detailRef.value.openDetail(row, titleName, titleValue, 'planCountMain')
 }
 // 详情打开的编辑的时候设置盘点范围值列表
 const detailOpenForm = (type, row) => {
@@ -607,7 +630,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } finally {
     tableObject.loading = false
   }
@@ -693,8 +716,8 @@ const submitForm = async (formType, data) => {
     // 刷新当前列表
     if (formType === 'create') {
       getList()
-    }else{
-      buttonBaseClick('refresh',null)
+    } else {
+      buttonBaseClick('refresh', null)
     }
   } finally {
     formRef.value.formLoading = false

From 55e8efb871bf43cc437d10e24d5fde9929351893 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 12:10:04 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E6=96=B0=E7=89=88=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/purchasereturnRequestDetail/index.ts  |   4 +
 src/components/BasicForm/src/BasicForm.vue    |   8 +-
 .../purchasereturnRequestMainNew/index.vue    | 287 +++++++++++++++---
 .../purchasereturnRequestMainNew.data.ts      |  60 +---
 4 files changed, 270 insertions(+), 89 deletions(-)

diff --git a/src/api/wms/purchasereturnRequestDetail/index.ts b/src/api/wms/purchasereturnRequestDetail/index.ts
index 921b1036f..6634cddde 100644
--- a/src/api/wms/purchasereturnRequestDetail/index.ts
+++ b/src/api/wms/purchasereturnRequestDetail/index.ts
@@ -45,6 +45,10 @@ export const getPurchasereturnSupplierByCode = async (params) => {
 export const getPurchasereturnPurchasereceiptRecordByItemCode = async (params) => {
     return await request.get({ url: `/wms/purchasereceipt-record-detail/queryPurchasereceiptRecordByItemCode`, params })
 }
+// 选完退货库位 渲染子列表数据
+export const getBalancePurchaseReceiptReturn = async (params) => {
+  return await request.get({ url: `/wms/balance/queryBalancePurchaseReceiptReturn`, params })
+}
 
 // 查询采购退货申请子列表
 export const getPurchasereturnRequestDetailPageSpare = async (params) => {
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index bd0156d2e..431b470fd 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -78,7 +78,7 @@
           <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail == 'InputString'" />
         </template>
       </Form>
-      <div class="table" v-if="isBusiness && formType == 'create' && fromeWhere != 'countPlan'">
+      <div class="table" v-if="(isBusiness && formType == 'create' && fromeWhere != 'countPlan')||(isBusiness && formType == 'update' && updateTypeEdiltSubList && fromeWhere != 'countPlan')">
         <TableForm
           ref="tableFormRef"
           class="w-[100%]"
@@ -261,6 +261,12 @@ const props = defineProps({
     required: false,
     default: ''
   },
+  //是否可以编辑子表
+  updateTypeEdiltSubList: {
+    type: String,
+    required: false,
+    default: false
+  },
   // 盘点范围类型
   countScopeType: {
     type: Array,
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 0b342081e..77d618ceb 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -62,10 +62,12 @@
     :apiUpdate="PurchasereturnRequestMainApi.updatePurchasereturnRequestMain"
     :apiCreate="PurchasereturnRequestMainApi.createPurchasereturnRequestMain"
     :isBusiness="true"
-    :isShowButton="isShowButton"
+    :isShowButton="false"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
-    :isShowReduceButtonSelection="true"
+    :isShowReduceButtonSelection="false"
+    :isShowReduceButton="false"
+    :updateTypeEdiltSubList="true"
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
@@ -73,7 +75,7 @@
     @onChange="onChangeForm"
   >
   <template #hahaha>
-      <el-button style="margin-left:90px;width:100%" type="primary" @click="chooseReceiptList">选择收货单明细</el-button>
+      <el-button style="width:100%" type="primary" @click="chooseReceiptList">选择收货单明细</el-button>
    
   </template>
   <template #hehehe>
@@ -124,7 +126,7 @@
     @searchTableSuccess="searchTableSuccessLabel"
   />
   <!-- 标签打印 -->
-  <SearchTable style="width: 905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess"/>
+  <SearchTable style="width: 905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" />
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
@@ -164,8 +166,6 @@ import * as BalanceApi from '@/api/wms/balance'
 import { async } from '@antv/x6/lib/registry/marker/async'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-import * as ItembasicApi from '@/api/wms/itembasic'
-import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestMainNew' })
 
@@ -186,36 +186,27 @@ const isShowButton = ref(true)
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-
-
-const onChangeForm = (field, cur, formRef)=>{
-  console.log('onChangeForm',field, cur, formRef)
-  if(field=='supplierCode'){
-    //供应商
-    PurchasereturnRequestMain.allSchemas.formSchema.forEach(item=>{
-      // 物料名称赋值
-      if(item.field=='supplierCode'){
-        let setV = {}
-        setV['supplierName'] =  item.componentProps.options?.find(el=>el.supplierCode==cur+'')['supplierName']
-        formRef.value.setValues(setV)
-      }
-    })
-  }else if(field == 'locationCode'){
-    // 退货库位 获取明细列表
-    tableData.value = [{
-      'batch':'20240908',
-      'status':'合格',
-      'inventoryBalance':300,
-      'qty':1,
-      'reason':'200',
-      'remark':'',
-    }]
-
-  }
-}
 const onEnter = async (field, value) => {
   console.log(field, value)
-  
+  if ('supplierCode' == field) {
+    //供应商代码
+    formRef.value.opensearchTable(
+      'purchaseReceiptRecordNumber',
+      'number',
+      '采购收货记录',
+      PurchasereceiptRecordMain1.allSchemas,
+      PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn,
+      [
+        {
+          key: 'supplierCode',
+          value: 'supplierCode',
+          isMainValue: true
+        }
+      ]
+    )
+  } else if ('purchaseReceiptRecordNumber' == field) {
+    //采购收货记录
+  }
 }
 
 // 生成标签
@@ -260,7 +251,6 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
     }
   })
 }
-
 // 查询页面返回
 const searchTableSuccess = async (formField, searchField, val, formRef, type, row) => {
   console.log('searchTableSuccess', formField, searchField, val, formRef, type, row)
@@ -281,6 +271,15 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
         if(res&&res.length>0){
           PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
             if(item.field == 'supplierCode'){
+              //重置
+              setV['supplierCode'] = ''
+              setV['supplierName'] = ''
+              setV['hahaha'] = ''
+              setV['poNumber'] = ''
+              setV['poLine'] = ''
+              setV['receiptNumber'] = ''
+              setV['asnNumber'] = ''
+              tableData.value = []
               item.componentProps.options = res
             }
           })
@@ -295,8 +294,63 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
 const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
-    setV[formField] = val[0][searchField]
+    if (formField == 'poLine' || formField == 'itemCode') {
+      console.log(val)
+      setV['poLine'] = val[0]['poLine']
+      setV['poNumber'] = val[0]['poNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['itemName'] = val[0]['itemName']
+      setV['itemDesc1'] = val[0]['itemDesc1']
+      setV['itemDesc2'] = val[0]['itemDesc2']
+      setV['batch'] = val[0]['toBatch']
+      setV['altBatch'] = val[0]['altBatch']
+      setV['containerNumber'] = val[0]['toContainerNumber']
+      setV['receiptQty'] = val[0]['qty']
+      setV['qty'] = val[0]['qty']
+      setV['uom'] = val[0]['uom']
+      setV['supplierQty'] = val[0]['supplierQty']
+      setV['supplierUom'] = val[0]['supplierUom']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      // setV['fromLocationCode'] = val[0]['toLocationCode']
+      // setV['toLocationCode'] = val[0]['toLocationCode']
+      setV['fromLocationGroupCode'] = val[0]['locationGroupCode']
+      setV['toLocationGroupCode'] = null
+      setV['toWarehouseCode'] = null
+      setV['toAreaTypes'] = null
+      setV['fromAreaCode'] = val[0]['areaCode']
+      setV['toAreaCode'] = val[0]['toAreaCode']
+      setV['fromQwnerCode'] = val[0]['fromQwnerCode']
+      setV['toOwnerCode'] = val[0]['toOwnerCode']
+      setV['arriveDate'] = val[0]['arriveDate']
+      setV['produceDate'] = val[0]['produceDate']
+      setV['expireDate'] = val[0]['expireDate']
+      setV['convertRate'] = val[0]['convertRate']
+      setV['visualInspectResult'] = val[0]['visualInspectResult']
+      setV['visualInspectPhotos'] = val[0]['visualInspectPhotos']
+      setV['failedReason'] = val[0]['failedReason']
+      setV['singlePrice'] = val[0]['singlePrice']
+      setV['amount'] = val[0]['amount']
+      setV['projectCode'] = val[0]['projectCode']
+      // setV['packingNumber'] = val[0]['packingNumber']
+      // setV['inventoryBalance'] = val[0]['qty']
 
+      if (formField == 'itemCode') {
+        setV['batch'] = val[0]['toBatch']
+        setV['containerNumber'] = val[0]['toContainerNumber']
+        setV['containerNumber'] = val[0]['containerNumber']
+        setV['containerNumber'] = val[0]['containerNumber']
+        // setV['fromLocationCode'] = val[0]['fromLocationCode']
+        // setV['toLocationCode'] = val[0]['toLocationCode']
+      }
+    } else if (formField == 'packingNumber'){
+      setV[formField] = val[0][searchField]
+      setV['inventoryBalance'] = val[0]['qty']
+      setV['batch'] = val[0]['batch']
+      setV['fromLocationCode'] = val[0]['locationCode']
+    }
+    else {
+      setV[formField] = val[0][searchField]
+    }
     formRef.setValues(setV)
   })
 }
@@ -453,10 +507,37 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {
-  originTableData.value = [] // 重置明细数据
-  tableData.value = [] // 重置明细数据
-  isShowButton.value = true
   
+  isShowButton.value = true
+  if (type == 'create') {
+    originTableData.value = [] // 重置明细数据
+    tableData.value = [] // 重置明细数据
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = true
+      }
+      if (item.field == 'asnNumber') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = true
+      }
+    })
+  }
+  if (type == 'update') {
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
+      }
+      if (item.field == 'asnNumber') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
+      }
+    })
+    tableData.value = [{
+
+    }]
+  }
   formRef.value.open(type, row)
 }
 
@@ -594,7 +675,132 @@ const originTableData = ref([])
 const searchTableRef = ref()
 // 添加明细
 const handleAddTable = () => {
-  
+  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 = PurchasereturnRequestDetail.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+
+  searchTableRef.value.openData('采购收货记录单号', tableObject, { tableColumns }, true)
+  // searchTableRef.value.open(
+  //   ('供应商信息',
+  //   // _searchTableAllSchemas,
+  //   // _searchTablePage, // 接口
+  //   // formField,
+  //   // searchField,
+  //   true,//是否多选
+  //   // type,
+  //   // row,
+  //   _searchCondition
+  //   )
+  // )
+
+  // console.log(subTableDFata)
+  // const {tableObject, tableMethods } = useTable({
+  //   getListApi: getPage.value // 分页接口
+  // })
+  // searchTableRef.value.open(
+  //   ('供应商信息',
+  //   // _searchTableAllSchemas,
+  //   // _searchTablePage, // 接口
+  //   // formField,
+  //   // searchField,
+  //   true,//是否多选
+  //   // type,
+  //   // row,
+  //   _searchCondition
+  //   )
+  // )
+  // tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  // let purchaseReceiptRecordNumber = formRef.value.formRef.formModel.purchaseReceiptRecordNumber
+  // PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => {
+  //   item.tableForm.disabled = true
+  //   if (item.field == 'remark') {
+  //     item.tableForm.disabled = false
+  //   }
+  //   if (item.field == 'reason') {
+  //     item.tableForm.disabled = false
+  //   }
+  //   if (item.field == 'qty') {
+  //     item.tableForm.disabled = false
+  //   }
+  //   if(purchaseReceiptRecordNumber == ''){
+  //     if (item.field == 'itemCode') {
+  //       item.tableForm.isInpuFocusShow = true
+  //     }
+  //     if(item.field == 'poLine'){
+  //       item.tableForm.isInpuFocusShow = false
+  //     }
+  //   }else{
+  //     if (item.field == 'itemCode') {
+  //       item.tableForm.isInpuFocusShow = false
+  //     }
+  //     if(item.field == 'poLine'){
+  //       item.tableForm.isInpuFocusShow = true
+  //     }
+  //   }
+  // })
+}
+const onChangeForm = async (field, cur, formRef)=>{
+  console.log('onChangeForm',field, cur, formRef)
+  if(field=='supplierCode'){
+    //供应商
+    PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
+      // 物料名称赋值
+      if(item.field=='supplierCode'){
+        let setV = {}
+        setV['supplierName'] =  item.componentProps.options?.find(el=>el.supplierCode==cur+'')['supplierName']
+        formRef.value.setValues(setV)
+      }
+    })
+  }else if(field == 'locationCode'){
+    // 退货库位 获取明细列表
+    let subList = await PurchasereturnRequestDetailApi.getBalancePurchaseReceiptReturn({
+      itemCode:formRef.value.formModel.itemCode,
+      fromLocationCode:formRef.value.formModel.locationCode
+    })
+
+    console.log('subList',subList)
+    if(subList&&subList.length>0){
+      tableData.value = subList.map(item=>({
+        'batch':item['batch'],
+        'status':item['inventoryStatus'],
+        'inventoryBalance':item['qty'],
+        'qty':1,
+        'reason_type':'',
+        'reason':''
+      }))
+    }
+  }
 }
 // 选择收货单明细
 const chooseReceiptList = ()=>{
@@ -632,6 +838,7 @@ const searchTableSuccess1 = (formField, searchField, val,  type, row) => {
   if(formField=='hahaha'){
     // 选择收货单明细
     const setV = {}
+    setV['hahaha'] = val[0]['asnNumber']
     setV['poNumber'] = val[0]['poNumber']
     setV['poLine'] = val[0]['poLine']
     setV['receiptNumber'] = val[0]['receiptNumber']
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
index 4814a83f2..3f0f6fda6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
@@ -134,7 +134,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
       }
     },
     {
-      label: '',
+      label: ' ',
       field: 'hahaha',
       table: {
         width: 180
@@ -228,7 +228,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
     {
       label: '状态',
       field: 'status',
-      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictType: DICT_TYPE.INVENTORY_STATUS,
       dictClass: 'string',
       isSearch: true,
       isTable: true,
@@ -323,48 +323,18 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
 )
 //表单校验
 export const PurchasereturnRequestMainRulesNew = reactive({
-  supplierCode: [
+  itemCode: [
     { required: true, message: '请输入供应商代码', trigger: 'blur' }
   ],
-  dueTime: [
-    { required: true, message: '请选择截止时间', trigger: 'blur' }
-  ],
-  // purchaseReceiptRecordNumber: [
-  //   { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
-  // ],
-  carrierCode: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-  ],
-  vehiclePlateNumber: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-  ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  fromWarehouseCode: [
-    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
-  ],
-  fromAreaTypes: [
-    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
-  ],
-  departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
-  ],
-  autoCommit: [
-    { required: true, message: '请选择是否自动提交', trigger: 'change' }
-  ],
-  autoAgree: [
-    { required: true, message: '请选择是否自动通过', trigger: 'change' }
-  ],
-  autoExecute: [
-    { required: true, message: '请选择是否自动执行', trigger: 'change' }
-  ],
-  directCreateRecord: [
-    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
   ],
-  businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  hahaha: [
+    required
   ],
+  locationCode: [
+    { required: true, message: '请选择收货单明细', trigger: 'blur' }
+  ]
 })
 
 export const PurchasereturnPurchasereceiptRecordNew = useCrudSchemas(
@@ -395,9 +365,6 @@ export const PurchasereturnPurchasereceiptRecordNew = useCrudSchemas(
       label: '收货单号',
       field: 'receiptNumber',
       sort: 'custom',
-      table: {
-        width: 150
-      },
       tableForm:{
         disabled:true
       },
@@ -411,9 +378,6 @@ export const PurchasereturnPurchasereceiptRecordNew = useCrudSchemas(
       label: '发货单号',
       field: 'asnNumber',
       sort: 'custom',
-      table: {
-        width: 150
-      },
       tableForm:{
         disabled:true
       },
@@ -579,7 +543,7 @@ export const PurchasereturnRequestDetailNew = useCrudSchemas(reactive<CrudSchema
   },
   {
     label: '退货原因',
-    field: 'reason',
+    field: 'reason_type',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     // isSearch: true,
@@ -599,7 +563,7 @@ export const PurchasereturnRequestDetailNew = useCrudSchemas(reactive<CrudSchema
   },
   {
     label: '退货原因描述',
-    field: 'remark',
+    field: 'reason',
     sort: 'custom',
     table: {
       width: 150

From 1b8cade9490e23d950299ebdb4cba5b03c9ba4f4 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 13:13:52 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E6=96=B0=E9=87=87=E8=B4=AD=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD-=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E8=BF=87=E6=BB=A4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMainNew/index.vue       | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 77d618ceb..da33ae7d3 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -890,26 +890,14 @@ const submitForm = async (formType, submitData) => {
   //   message.warning("退货数量不能大于收获数量")
   //   return;
   // }
-  if (tableData.value.find((item) => Number(item.qty) > Number(item.inventoryBalance))) {
+  if (tableData.value.find((item) => item['qty']> item['inventoryBalance'])) {
     message.warning('退货数量不能大于库存余额')
     return
   }
-  data.subList = tableData.value // 拼接子表数据参数
+  data.subList = tableData.value.filter(item=>item['qty']>0) // 拼接子表数据参数
   formRef.value.formLoading = true
   try {
     if (formType === 'create') {
-      let flag = false
-      data.subList.forEach((item) => {
-        if (item.qty == 0) {
-          message.warning('数量不能为0')
-          flag = true
-          return
-        }
-      })
-      if (flag) {
-        formRef.value.formLoading = false
-        return
-      }
       data.returnSourceType='1'
       await PurchasereturnRequestMainApi.createPurchasereturnRequestMain(data)
       message.success(t('common.createSuccess'))

From 699f4b1f3dc8dc122a69c3483eee6b05c56bde6d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 16 Aug 2024 13:33:59 +0800
Subject: [PATCH 11/11] =?UTF-8?q?Q3=E9=80=9A=E7=9F=A5=E5=8D=95=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E4=B8=8B=E6=96=B9=E6=90=9C=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionQ3/inspectionQ3.data.ts | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index 6492c298e..7eccd5dbe 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -288,18 +288,6 @@ export const InspectionQ3Detail = useCrudSchemas(
             isMainValue: false
           }
         ],
-        isShowTableFormSearch: true, //tableForm下方是否出现输入框
-        isRepeat: true, //tableForm下方输入框是否可以重复添加该条数据
-        verificationParams: [
-          {
-            key: 'code',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true
-          }
-        ] // 失去焦点校验参数
       },
       form: {
         // labelMessage: '信息提示说明！！！',