BUG修改

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -5,28 +5,16 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="InspectRequestMain.allSchemas"
-    />
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="InspectRequestMain.allSchemas" />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
+    <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"
-    >
+      }" 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>
@@ -39,33 +27,18 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="formRef"
-    @success="getList"
-    :rules="InspectRequestMainRules"
-    :formAllSchemas="InspectRequestMain.allSchemas"
-    :tableAllSchemas="InspectRequestDetail.allSchemas"
-    :tableFormRules="InspectRequestDetailRules"
-    :tableData="tableData"
+  <BasicForm ref="formRef" @success="getList" :rules="InspectRequestMainRules"
+    :formAllSchemas="InspectRequestMain.allSchemas" :tableAllSchemas="InspectRequestDetail.allSchemas"
+    :tableFormRules="InspectRequestDetailRules" :tableData="tableData"
     :apiUpdate="InspectRequestMainApi.updateInspectRequestMain"
-    :apiCreate="InspectRequestMainApi.createInspectRequestMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
+    :apiCreate="InspectRequestMainApi.createInspectRequestMain" :isBusiness="true" @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
 
   <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="InspectRequestMain.allSchemas"
-    :detailAllSchemas="InspectRequestDetail.allSchemas"
-    :detailAllSchemasRules="InspectRequestDetailRules"
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectRequestMain.allSchemas"
+    :detailAllSchemas="InspectRequestDetail.allSchemas" :detailAllSchemasRules="InspectRequestDetailRules"
     :apiPage="InspectRequestDetailApi.getInspectRequestDetailPage"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-  />
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/inspect-request-main/import" :importTemplateData="importTemplateData"
@@ -73,32 +46,31 @@
 </template>
 
 <script setup lang="ts">
-import download from '@/utils/download'
-import { InspectRequestMain,InspectRequestMainRules,InspectRequestDetail,InspectRequestDetailRules } from './inspectRequestMain.data'
-import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
-import * as InspectRequestDetailApi from '@/api/wms/inspectRequestDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import download from '@/utils/download'
+  import { InspectRequestMain, InspectRequestMainRules, InspectRequestDetail, InspectRequestDetailRules } from './inspectRequestMain.data'
+  import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
+  import * as InspectRequestDetailApi from '@/api/wms/inspectRequestDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// 到货检验申请
-defineOptions({ name: 'InspectRequestMain' })
+  // 到货检验申请
+  defineOptions({ name: 'InspectRequestMain' })
 
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
 
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(InspectRequestMain.allSchemas.tableColumns)
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(InspectRequestMain.allSchemas.tableColumns)
 
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
     tableColumns.value = val
-}
+  }
 
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
     nextTick(() => {
-    console.log(val[0]['number'])
       if (type == 'tableForm') {
         // 明细查询页赋值
         row[formField] = val[0][searchField]
@@ -107,39 +79,37 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         const setV = {}
         setV[formField] = val[0][searchField]
         setV['purchaseReceiptRecordNumber'] = val[0]['number']
-      setV['supplierCode'] = val[0]['supplierCode']
-      // row['poNumber'] = val[0]['number']
-      // row['poLine'] = val[0]['lineNumber']
+        // setV['supplierCode'] = val[0]['supplierCode']
         formRef.setValues(setV)
       }
     })
-}
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
     nextTick(() => {
       const setV = {}
       setV[formField] = val[0][searchField]
       setV['itemCode'] = val[0]['code']
       formRef.setValues(setV)
     })
-}
+  }
 
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
+  // 子表新增的时候选择表格之后需要会显得字段
+  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+  const Echo = []
 
-const { tableObject, tableMethods } = useTable({
+  const { tableObject, tableMethods } = useTable({
     getListApi: InspectRequestMainApi.getInspectRequestMainPage // 分页接口
-})
+  })
 
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
 
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:inspect-request-main:create'}), // 新增——需要手动修改下权限
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn({ hasPermi: 'wms:inspect-request-main:create' }), // 新增——需要手动修改下权限
     // defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:inspect-request-main:export'}), // 导出
+    defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspect-request-main:export' }), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -151,10 +121,10 @@ const HeadButttondata = [
     //   icon: 'Select',
     //   color: ''
     // },
-]
+  ]
 
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
+  // 头部按钮事件
+  const buttonBaseClick = (val, item) => {
     if (val == 'add') { // 新增
       openForm('create')
     } else if (val == 'import') { // 导入
@@ -167,34 +137,34 @@ const buttonBaseClick = (val, item) => {
     } else { // 其他按钮
       console.log('其他按钮', item)
     }
-}
+  }
 
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
     if (val.indexOf(row.status) > -1) {
       return false
     } else {
       return true
     }
-}
+  }
 
-// 列表-操作按钮
-const butttondata = (row) => {
+  // 列表-操作按钮
+  const butttondata = (row) => {
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
+      defaultButtons.mainListCloseBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4', '6']), hasPermi: 'wms:purchasereceipt-request-main:close' }), // 关闭
+      defaultButtons.mainListReAddBtn({ hide: isShowMainButton(row, ['5']), hasPermi: 'wms:purchasereceipt-request-main:reAdd' }), //重新添加
+      defaultButtons.mainListSubmitBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchasereceipt-request-main:submit' }), // 提交审批
+      defaultButtons.mainListTurnDownBtn({ hide: isShowMainButton(row, ['2']), hasPermi: 'wms:purchasereceipt-request-main:refused' }), // 驳回
+      defaultButtons.mainListApproveBtn({ hide: isShowMainButton(row, ['2']), hasPermi: 'wms:purchasereceipt-request-main:agree' }), // 审批通过
+      defaultButtons.mainListHandleBtn({ hide: isShowMainButton(row, ['3']), hasPermi: 'wms:purchasereceipt-request-main:handle' }), // 处理
       // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
     ]
-}
+  }
 
 
 
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
     if (val == 'mainClose') { // 关闭
       handleClose(row.id)
     } else if (val == 'mainReAdd') { // 重新添加
@@ -210,83 +180,83 @@ const buttonTableClick = async (val, row) => {
     } else if (val == 'edit') { // 编辑
       openForm('update', row)
     }
-}
+  }
 
-/** 关闭按钮操作 */
-const handleClose = async (id: number) => {
+  /** 关闭按钮操作 */
+  const handleClose = async (id : number) => {
     try {
       await message.confirm(t('common.confirmColse'))
       await InspectRequestMainApi.closeInspectRequestMain(id)
       message.success(t('common.closeSuccess'))
       await getList()
-  } catch {}
-}
+    } catch { }
+  }
 
-/** 重新添加按钮操作 */
-const handleReAdd = async (id: number) => {
+  /** 重新添加按钮操作 */
+  const handleReAdd = async (id : number) => {
     try {
       await message.confirm(t('common.confirmReAdd'))
       await InspectRequestMainApi.reAddInspectRequestMain(id)
       message.success(t('common.reAddSuccess'))
       await getList()
-  } catch {}
-}
+    } catch { }
+  }
 
-/** 审批通过按钮操作 */
-const handleAgree = async (id: number) => {
+  /** 审批通过按钮操作 */
+  const handleAgree = async (id : number) => {
     try {
       await message.confirm(t('common.confirmAgree'))
       await InspectRequestMainApi.agreeInspectRequestMain(id)
       message.success(t('common.agreeSuccess'))
       await getList()
-  } catch {}
-}
+    } catch { }
+  }
 
-/** 审批驳回按钮操作 */
-const handleRefused = async (id: number) => {
+  /** 审批驳回按钮操作 */
+  const handleRefused = async (id : number) => {
     try {
       await message.confirm(t('common.confirmRefused'))
       await InspectRequestMainApi.refusedInspectRequestMain(id)
       message.success(t('common.refusedSuccess'))
       await getList()
-  } catch {}
-}
+    } catch { }
+  }
 
-/** 处理按钮操作 */
-const handleHandle = async (id: number) => {
+  /** 处理按钮操作 */
+  const handleHandle = async (id : number) => {
     try {
       await message.confirm(t('common.confirmHandle'))
       await InspectRequestMainApi.handleInspectRequestMain(id)
       message.success(t('common.handleSuccess'))
       await getList()
-  } catch {}
-}
+    } catch { }
+  }
 
-/** 提交按钮操作 */
-const handleSubmit = async (id: number) => {
+  /** 提交按钮操作 */
+  const handleSubmit = async (id : number) => {
     try {
       await message.confirm(t('common.confirmSubmit'))
       await InspectRequestMainApi.submitInspectRequestMain(id)
       message.success(t('common.submitSuccess'))
       await getList()
-  } catch {}
-}
+    } catch { }
+  }
 
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm =async (type: string, row?: number) => {
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
     tableData.value = [] // 重置明细数据
     formRef.value.open(type, row)
-}
+  }
 
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
     detailRef.value.openDetail(row, titleName, titleValue)
-}
+  }
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
     try {
       // 删除的二次确认
       await message.delConfirm()
@@ -295,12 +265,12 @@ const handleDelete = async (id: number) => {
       message.success(t('common.delSuccess'))
       // 刷新列表
       await getList()
-  } catch {}
-}
+    } catch { }
+  }
 
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
@@ -312,28 +282,28 @@ const handleExport = async () => {
     } finally {
       exportLoading.value = false
     }
-}
+  }
 
-/**
+  /**
     * tableForm方法
-*/
-const tableFormKeys = {}
-InspectRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  */
+  const tableFormKeys = {}
+  InspectRequestDetail.allSchemas.tableFormColumns.forEach(item => {
     tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
+  })
+  const tableData = ref([])
 
-// 添加明细
-const handleAddTable = () => {
+  // 添加明细
+  const handleAddTable = () => {
     tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
-}
-// 删除明细
-const handleDeleteTable = (item, index) => {
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
     tableData.value.splice(index, 1)
-}
+  }
 
-// 主子数据 提交
-const submitForm = async (formType, data) => {
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
     data.subList = tableData.value // 拼接子表数据参数
     try {
       if (formType === 'create') {
@@ -349,37 +319,37 @@ const submitForm = async (formType, data) => {
     } finally {
       formRef.value.formLoading = false
     }
-}
+  }
 
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
     importFormRef.value.open()
-}
+  }
 
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
     templateUrl: '',
     templateTitle: '检验申请主导入模版.xlsx'
-})
+  })
 
-// 导入成功之后
-const importSuccess = () => {
+  // 导入成功之后
+  const importSuccess = () => {
     getList()
-}
+  }
 
-// 筛选提交
-const searchFormClick = (searchData) => {
+  // 筛选提交
+  const searchFormClick = (searchData) => {
     tableObject.params = {
       isSearch: true,
       filters: searchData.filters
     }
     getList() // 刷新当前列表
-}
+  }
 
-/** 初始化 **/
-onMounted(async () => {
+  /** 初始化 **/
+  onMounted(async () => {
     getList()
     importTemplateData.templateUrl = await InspectRequestMainApi.importTemplate()
-})
+  })
 </script>

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts

@@ -1,18 +1,26 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
+import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'InspectRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'InspectRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
- // 获取当前操作人的部门
+// 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
@@ -31,64 +39,121 @@ import * as LocationApi from '@/api/wms/location'
  * @returns {Array} 检验申请主表
  */
 export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+
   {
-    label: '采购收货记录单号',
-    field: 'purchaseReceiptRecordNumber',
+    label: '发货单号',
+    field: 'asnNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isForm: false,
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
     form: {
-      // labelMessage: '信息提示说明！！！',
+      labelMessage: '影响明细中物品代码，需在供应商物品中维护',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '采购收货记录', // 查询弹窗标题
-        searchAllSchemas: PurchasereceiptRecordMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPage // 查询弹窗所需分页方法
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },
+  
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '收货数量',
+    field: 'receiveQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: true,
+    isForm: true,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isSearch: true,
-    form:{
-      componentProps:{
-        disabled:true
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '运输方式',
+    field: 'transferMode',
     sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    dictClass: 'string',
     table: {
-      width: 150,
-      fixed: 'left'
+      width: 150
     },
-    isForm: false,
-    isSearch: true,
   },
   {
-    label: '业务类型',
-    field: 'businessType',
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      value: 'Inspect',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
     label: '从仓库代码',
@@ -100,19 +165,20 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTableForm: false,
     isForm: false,
   },
   {
     label: '从库位类型范围',
     field: 'fromLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.LOCATION_TYPE,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
@@ -121,17 +187,21 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '到库位类型范围',
+    field: 'toLocationTypes',
+    // dictType: DICT_TYPE.LOCATION_TYPE,
+    // dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable: false,
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
     sort: 'custom',
     table: {
       width: 150
@@ -139,23 +209,46 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
     },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
     },
     form: {
-      component: 'DatePicker',
+      value: 'PurchaseReturn',
       componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        disabled: true
       }
     },
     isForm: false,
@@ -174,7 +267,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -196,7 +289,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -236,181 +329,44 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '订单号',
-    field: 'poNumber',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单号',
-      searchField: 'number',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseMain.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单号',
-        searchField: 'number',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseMain.allSchemas,
-        searchPage: PurchaseMainApi.getPurchaseMainPage
-      }
-    }
+    isTable: false,
   },
   {
-    label: '订单行',
-    field: 'poLine',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单行',
-      searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPage
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单行',
-        searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage
-      }
-    }
+    isForm: false,
   },
   {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-  {
-    label: '物品代码',
-    field: 'itemCode',
     sort: 'custom',
     table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物品代码',
-      searchField: 'code',
-      searchTitle: '物品基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
+      width: 180
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
+      component: 'DatePicker',
       componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择物品代码',
-        searchField: 'code',
-        searchTitle: '物品基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
-      }
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
-  {
-    label: '检验类型',
-    field: 'inspectType',
-    dictType: DICT_TYPE.INSPECT_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '下一步检验动作',
-    field: 'nextAction',
-    dictType: DICT_TYPE.NEXT_ACTION,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '抽检方式',
-    field: 'sampleMethod',
-    dictType: DICT_TYPE.SAMPLE_METHOD,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '收货数量',
-    field: 'receiveQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      },
-    },
-    isForm: false
-  },
-  {
-    label: '样品数量',
-    field: 'sampleQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      },
-    },
-    isForm: false
-  },
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
+    isForm: false,
   },
   {
     label: '自动提交',
@@ -604,7 +560,7 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择从库位代码',
       searchField: 'code',
@@ -631,25 +587,24 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
+      disabled: true,
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物品代码',
-      searchField: 'code',
-      searchTitle: '物品基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
+      earchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePagePutaway,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }, {
+        key: 'workshopCode',
+        value: 'workshopCode',
+        isMainValue: true
+      }]
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择物品代码',
-        searchField: 'code',
-        searchTitle: '物品基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
-      }
-    }
   },
   {
     label: '物品名称',

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -106,9 +106,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
-      row['itemCode'] = val[0]['code']
-      row['poNumber'] = val[0]['number']
-      row['poLine'] = val[0]['lineNumber']
+      if (formField == 'itemCode') {
+       row['poNumber'] = val[0]['poNumber']
+       row['poLine'] = val[0]['poLine']
+       row['itemCode'] = val[0]['itemCode']
+       row['uom'] = val[0]['uom']
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

@@ -3,8 +3,8 @@ import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
-// import * as SupplierApi from '@/api/wms/supplier'
-// import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
 import { InspectRequestMain } from '@/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data'
 
@@ -17,17 +17,23 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 
+import * as BalanceApi from '@/api/wms/balance'
+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";
+
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'MaterialPutawayRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'MaterialPutawayRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
- // 获取当前操作人的部门
+// 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
 const userStore = useUserStore()
@@ -37,15 +43,15 @@ const userDept = userStore.userSelfInfo.dept
  * @returns {Array} 上架申请主表
  */
 export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
+  // {
+  //   label: '从仓库代码',
+  //   field: 'fromWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  // },
   {
     label: '从库位类型范围',
     field: 'fromLocationTypes',
@@ -72,26 +78,108 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
     isSearch: true,
   },
   {
-    label: '业务类型',
-    field: 'businessType',
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
     form: {
-      value: 'PurchasePutaway',
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },
+
   {
     label: '备注',
     field: 'remark',
@@ -115,7 +203,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -146,7 +234,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -169,7 +257,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -410,6 +498,46 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      earchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePagePutaway,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }, {
+        key: 'workshopCode',
+        value: 'workshopCode',
+        isMainValue: true
+      }]
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
   {
     label: '订单号',
     field: 'poNumber',
@@ -471,7 +599,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择从库位代码',
       searchField: 'code',
@@ -500,38 +628,12 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     form: {
-      componentProps:{
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物品代码',
-      searchField: 'code',
-      searchTitle: '物品基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择物品代码',
-        searchField: 'code',
-        searchTitle: '物品基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
+        disabled: true
       }
     }
   },
+
   {
     label: '备注',
     field: 'remark',
@@ -554,7 +656,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -633,20 +735,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select'
-    }
-  },
+
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -671,13 +760,13 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isDetail: false,
-    isForm: false ,
-    isTable: false ,
+    isForm: false,
+    isTable: false,
     table: {
       width: 150,
       fixed: 'right'
     },
-    isTableForm:false,
+    isTableForm: false,
   }
 ]))