Merge remote-tracking branch 'origin/master_hella' into master_hella

src/api/wms/purchasereceiptJobDetail/index.ts

@@ -55,6 +55,18 @@ export const getPurchasereceiptJobDetailPageSapre = async (params) => {
   }
 }
 
+// 查询采购收货任务子列表
+export const getPurchasereceiptJobDetailPageSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-detail/seniorSCP', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-job-detail/pageSCP`, params })
+  }
+}
+
+
 // 查询采购收货任务子详情
 export const getPurchasereceiptJobDetail = async (id: number) => {
   return await request.get({ url: `/wms/purchasereceipt-job-detail/get?id=` + id })

src/api/wms/relegateRequest/index.ts → src/api/wms/relegateRequestDetail/index.ts

@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 
-export interface RelegateRequestVO {
+export interface RelegateRequestDetailVO {
   id: number
   itemCode: string
   downItemCode: string
@@ -32,39 +32,39 @@ export interface RelegateRequestVO {
 }
 
 // 查询物料降级信息列表
-export const getRelegateRequestPage = async (params) => {
+export const getRelegateRequestDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/relegate-request/senior', data })
+    return await request.post({ url: '/wms/relegate-request-detail/senior', data })
   } else {
-    return await request.get({ url: `/wms/relegate-request/page`, params })
+    return await request.get({ url: `/wms/relegate-request-detail/page`, params })
   }
 }
 
 // 查询物料降级信息详情
-export const getRelegateRequest = async (id: number) => {
+export const getRelegateRequestDetail = async (id: number) => {
-  return await request.get({ url: `/wms/relegate-request/get?id=` + id })
+  return await request.get({ url: `/wms/relegate-request-detail/get?id=` + id })
 }
 
 // 新增物料降级信息
-export const createRelegateRequest = async (data: RelegateRequestVO) => {
+export const createRelegateRequestDetail = async (data: RelegateRequestDetailVO) => {
-  return await request.post({ url: `/wms/relegate-request/create`, data })
+  return await request.post({ url: `/wms/relegate-request-detail/create`, data })
 }
 
 // 修改物料降级信息
-export const updateRelegateRequest = async (data: RelegateRequestVO) => {
+export const updateRelegateRequestDetail = async (data: RelegateRequestDetailVO) => {
-  return await request.put({ url: `/wms/relegate-request/update`, data })
+  return await request.put({ url: `/wms/relegate-request-detail/update`, data })
 }
 
 // 删除物料降级信息
-export const deleteRelegateRequest = async (id: number) => {
+export const deleteRelegateRequestDetail = async (id: number) => {
-  return await request.delete({ url: `/wms/relegate-request/delete?id=` + id })
+  return await request.delete({ url: `/wms/relegate-request-detail/delete?id=` + id })
 }
 
 // 导出物料降级信息 Excel
-export const exportRelegateRequest = async (params) => {
+export const exportRelegateRequestDetail = async (params) => {
-  return await request.download({ url: `/wms/relegate-request/export-excel`, params })
+  return await request.download({ url: `/wms/relegate-request-detail/export-excel`, params })
 }
 
 // 下载用户导入模板

src/api/wms/relegateRequestMain/index.ts

@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface RelegateRequestMainVO {
+  id: number
+  fromWarehouseCode: string
+  number: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  concurrencyStamp: number
+  ruleUserId: number
+  fromAreaTypes: string
+  fromAreaCodes: string
+  serialNumber: string
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+  reason: string
+}
+
+// 查询物料降级申请主列表
+export const getRelegateRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/relegate-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/relegate-request-main/page`, params })
+  }
+}
+
+// 查询物料降级申请主详情
+export const getRelegateRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/relegate-request-main/get?id=` + id })
+}
+
+// 新增物料降级申请主
+export const createRelegateRequestMain = async (data: RelegateRequestMainVO) => {
+  return await request.post({ url: `/wms/relegate-request-main/create`, data })
+}
+
+// 修改物料降级申请主
+export const updateRelegateRequestMain = async (data: RelegateRequestMainVO) => {
+  return await request.put({ url: `/wms/relegate-request-main/update`, data })
+}
+
+// 删除物料降级申请主
+export const deleteRelegateRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/relegate-request-main/delete?id=` + id })
+}
+
+// 导出物料降级申请主 Excel
+export const exportRelegateRequestMain = async (params) => {
+  return await request.download({ url: `/wms/relegate-request-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/relegate-request-main/get-import-template' })
+}

src/views/mes/abilityInfo/index.vue

@@ -66,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '../components/Detail.vue'
+import {MesOrderMonthMain} from "@/views/mes/ordermonthplan/mesOrderMonthMain.data";
 
 defineOptions({ name: 'AbilityInfo' })
 
@@ -150,6 +151,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  AbilityInfo.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'ablityCode') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/opersteps/index.vue

@@ -159,7 +159,6 @@ const openForm = (type: string, row?: any) => {
       }
     })
   basicFormRef.value.open(type, row)
-  basicFormRef.value.open(type, row)
 }
 
 // form表单提交

src/views/mes/ordermonthplan/index.vue

@@ -185,6 +185,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  MesOrderMonthMain.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'planMasterCode' || item.field == 'planSubCode') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/pattern/index.vue

@@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Pattern.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/patternType/index.vue

@@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  PatternType.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/qualityclass/index.vue

@@ -149,7 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
-  console.log(row)
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Qualityclass.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/qualitygroup/index.vue

@@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Qualitygroup.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/reworkBatch/index.vue

@@ -51,7 +51,7 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :allSchemas="ReworkBatch.allSchemas" :isBasic="false"  :isBasicMes="false"  :detailAllSchemas="ReworkBatch.allSchemas"
+  <Detail ref="detailRef" :allSchemas="ReworkBatch.allSchemas" :isBasic="false"  :isBasicMes="true"  :detailAllSchemas="ReworkBatch.allSchemas"
   :apiPage="ReworkBatchApi.getReworkBatchPage"/>
 
   <!-- 导入 -->

src/views/mes/reworkSingle/index.vue

@@ -51,7 +51,7 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :allSchemas="ReworkSingle.allSchemas" :isBasicMes="false"  :detailAllSchemas="ReworkSingle.allSchemas"
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="ReworkSingle.allSchemas" :isBasicMes="true"  :detailAllSchemas="ReworkSingle.allSchemas"
   :apiPage="ReworkSingleApi.getReworkSinglePage"/>
 
   <!-- 导入 -->

src/views/mes/workstation/index.vue

@@ -171,6 +171,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Workstation.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/system/user/UserForm.vue

@@ -7,6 +7,23 @@
       :rules="formRules"
       label-width="80px"
     >
+    <el-row>
+        <el-col :span="12">
+          <el-form-item v-if="formData.id === undefined" label="用户账号" prop="username">
+            <el-input v-model="formData.username" placeholder="请输入用户账号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
+            <el-input
+              v-model="formData.password"
+              placeholder="请输入用户密码"
+              show-password
+              type="password"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="用户昵称" prop="nickname">
@@ -38,23 +55,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
-            <el-input v-model="formData.username" placeholder="请输入用户名称" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
-            <el-input
-              v-model="formData.password"
-              placeholder="请输入用户密码"
-              show-password
-              type="password"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="用户性别">

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@@ -0,0 +1,340 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...RelegateRequestMain.allSchemas.searchSchema,...RelegateRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RelegateRequestMain.allSchemas"
+      :detailAllSchemas="RelegateRequestDetail.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #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>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
+    @success="getList"
+    :rules="RelegateRequestMainRules"
+    :formAllSchemas="RelegateRequestMain.allSchemas"
+    :tableAllSchemas="RelegateRequestDetail.allSchemas"
+    :tableFormRules="RelegateRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="RelegateRequestMainApi.updateRelegateRequestMain"
+    :apiCreate="RelegateRequestMainApi.createRelegateRequestMain"
+    :isBusiness="true"
+    fromeWhere="RelegateRequestMain"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    :isShowButton = isShowButton
+  />
+
+  <!-- 详情 -->
+  <Detail 
+    ref="detailRef" 
+    :isBasic="true" 
+    :allSchemas="RelegateRequestMain.allSchemas" 
+    :detailAllSchemas="RelegateRequestDetail.allSchemas"
+    :detailAllSchemasRules="RelegateRequestDetailRules"
+    :apiCreate="RelegateRequestDetailApi.createRelegateRequestDetail"
+    :apiUpdate="RelegateRequestDetailApi.updateRelegateRequestDetail"
+    :apiPage="RelegateRequestDetailApi.getRelegateRequestDetailPage"
+    :apiDelete="RelegateRequestDetailApi.deleteRelegateRequestDetail"
+    fromeWhere="RelegateRequestMain"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="trueFalse"
+    :detailButtonIsShowDelete="trueFalse"
+/>
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/relegate-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { RelegateRequestMain,RelegateRequestMainRules,RelegateRequestDetail,RelegateRequestDetailRules } from './relegateRequestMain.data'
+import * as RelegateRequestMainApi from '@/api/wms/relegateRequestMain'
+import * as RelegateRequestDetailApi from '@/api/wms/relegateRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'RelegateRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...RelegateRequestMain.allSchemas.tableColumns,...RelegateRequestDetail.allSchemas.tableMainColumns])
+const isShowButton = ref(true)
+//定义  展示子表数据时是否显示新增/修改/删除按钮
+const trueFalse = ref(false)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['itemCode']
+      setV['uom'] = val[0]['customerUom']    
+    }else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: RelegateRequestDetailApi.getRelegateRequestDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:relegate-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:relegate-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:relegate-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
+    return [
+  defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-request-main:delete'}), // 删除
+]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+//为true表示子表数据中存在数量为0的数据
+const flag = ref(false)
+// form表单提交
+const submitForm = async (formType,data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  let isExist = false
+  tableData.value.forEach(item => {
+   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
+   if(rs.length > 1) isExist = true
+  })
+  if (isExist) {
+    basicFormRef.value.formLoading = false
+    return message.warning('物料代码重复')
+  }
+  data.subList.forEach(obj => {
+    if(obj.qty == 0){
+      message.warning(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag.value){
+    basicFormRef.value.formLoading = false
+    return
+  }
+  try {
+    if (formType === 'create') {
+      if(tableData.value.length <= 0){
+      message.warning(`子表明细不能为空!`)
+      flag.value = true
+      basicFormRef.value.formLoading = false
+      return;
+  }
+    await RelegateRequestMainApi.createRelegateRequestMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await RelegateRequestMainApi.updateRelegateRequestMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+} finally {
+  basicFormRef.value.formLoading = false
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicRelegateRequestMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RelegateRequestMainApi.deleteRelegateRequestMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+RelegateRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RelegateRequestMainApi.exportRelegateRequestMain(tableObject.params)
+    download.excel(data, '物料降级申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '物料降级申请主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await RelegateRequestMainApi.importTemplate()
+})
+
+</script>

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@@ -0,0 +1,539 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'RelegateRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+// 表单校验
+export const RelegateRequestMainRules = reactive({
+  fromWarehouseCode: [required],
+  number: [required],
+  businessType: [required],
+  autoCommit: [required],
+  autoAgree: [required],
+  autoExecute: [required],
+  directCreateRecord: [required],
+  concurrencyStamp: [required],
+  fromAreaTypes: [required],
+  fromAreaCodes: [required],
+})
+
+export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '权限所属人员id',
+    field: 'ruleUserId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const RelegateRequestDetailRules = reactive({
+  itemCode: [required],
+  downItemCode: [required],
+  businessType: [required],
+  available: [required],
+  departmentCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '降级物料代码',
+    field: 'downItemCode',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择降级物料代码',
+        searchField: 'itemCode',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    isSearch: true
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从库区类型',
+    field: 'fromAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区类型',
+    field: 'toAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm:false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    isForm:false,
+    sort: 'custom',
+  },
+  {
+    label: '权限所属人员id',
+    field: 'ruleUserId',
+    sort: 'custom',
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequestMain.data.ts

@@ -0,0 +1,553 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as ItembasicApi from "@/api/wms/itembasic";
+
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'RelegateRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+// 表单校验
+export const RelegateRequestMainRules = reactive({
+  fromWarehouseCode: [required],
+  number: [required],
+  businessType: [required],
+  autoCommit: [required],
+  autoAgree: [required],
+  autoExecute: [required],
+  directCreateRecord: [required],
+  concurrencyStamp: [required],
+  fromAreaTypes: [required],
+  fromAreaCodes: [required],
+})
+
+export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '权限所属人员id',
+    field: 'ruleUserId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const RelegateRequestDetailRules = reactive({
+  itemCode: [required],
+  downItemCode: [required],
+  businessType: [required],
+  available: [required],
+  departmentCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    tableForm:{
+      isInpuFocusShow: false, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'code',
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItembasicApi.getItembasicPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '降级物料代码',
+    field: 'downItemCode',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择降级物料代码',
+        searchField: 'itemCode',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    isSearch: true
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '从库区类型',
+    field: 'fromAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区类型',
+    field: 'toAreaTypes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm:false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm:false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    isForm:false,
+    sort: 'custom',
+  },
+  {
+    label: '权限所属人员id',
+    field: 'ruleUserId',
+    sort: 'custom',
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue → src/views/wms/basicDataManage/itemManage/relegateRequestDetail/index.vue

@@ -60,7 +60,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { RelegateRequest,RelegateRequestRules } from './relegateRequest.data'
-import * as RelegateRequestApi from '@/api/wms/relegateRequest'
+import * as RelegateRequestApi from '@/api/wms/relegateRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'

src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts → src/views/wms/basicDataManage/itemManage/relegateRequestDetail/relegateRequest.data.ts

@@ -32,7 +32,7 @@ export const RelegateRequest = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true,
         searchListPlaceholder: '请选择物料代码',
         searchField: 'itemCode',
-        searchTitle: '客户物料基础信息',
+        searchTitle: '物料基础信息',
         searchAllSchemas: Itembasic.allSchemas,
         searchPage: ItembasicApi.getItembasicPage,
         searchCondition: [{

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -3,6 +3,8 @@ import { dateFormatter } from '@/utils/formatTime'
 
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import * as PackageunitApi from '@/api/wms/packageunit'
@@ -68,12 +70,23 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        isSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
+        searchField: 'itemCode', // 查询弹窗赋值字段
-        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchTitle: '物料包装信息', // 查询弹窗标题
-        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        }]
       }
     }
   },

src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@@ -87,8 +87,8 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     if (formField == 'itemCode') {
       setV['itemCode'] = val[0]['code']
     } else  if (formField == 'packUnit') {
-      setV['uom'] = val[0]['unit']
+      setV['uom'] = val[0]['uom']
-      setV['packUnit'] = val[0]['code']
+      setV['packUnit'] = val[0]['packUnit']
     }else {
       setV[formField] = val[0][searchField]
     }

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue

@@ -107,9 +107,14 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...PurchasereceiptJobMain.allSchemas.tableColumns,...PurchasereceiptJobDetail.allSchemas.tableMainColumns])
-
+if(routeName.value.includes('SCP')){
+  tableColumns.value = tableColumns.value.filter(item=>item.label!='操作')
+}
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
+  if(routeName.value.includes('SCP')){
+    val = val.filter(item=>item.label!='操作')
+  }
   tableColumns.value = val
 }
 
@@ -153,7 +158,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage // 分页接口
+  getListApi: routeName.value.includes('SCP')?PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPageSCP:PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@@ -41,6 +41,16 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '采购收货记录单号',
+    field: 'number',
+    fixed: 'left',
+    sort: 'custom',
+    table: {
+      width: 200
+    },
+    isSearch: true
+  },
   {
     label: '发货单号',
     field: 'asnNumber',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -3,8 +3,6 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
-// import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
-import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
 import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
 import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
 import { validateHanset, validateEmail } from '@/utils/validator'
@@ -23,8 +21,8 @@ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
 const requestsettingData = data?.list[0] || {}
 
  // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
+import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
+import { TableColumn } from '@/types/table'
 import { tr } from 'element-plus/es/locale'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
@@ -64,7 +62,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
         searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+        searchPage: SupplierApi.getSupplierPageSCP // 查询弹窗所需分页方法
       }
     }
   },
@@ -94,8 +92,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '要货计划信息', // 查询弹窗标题
-        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: PurchasePlanDetail.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage, // 查询弹窗所需分页方法
         searchCondition: [
           {
             key: 'supplierCode',
@@ -1692,4 +1690,4 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     },
   },
 
-]))
+]))