From d8b612f21bd04f6b0f0fbd4365e58017cb4b7f47 Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 20 Mar 2024 13:59:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=B7=BB=E5=8A=A0=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E6=90=9C=E7=B4=A2=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockup/stockupMainRequest/index.vue | 2 + .../stockupMainRequest.data.ts | 244 ++++++++++-------- 2 files changed, 140 insertions(+), 106 deletions(-) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index df54d6c80..a0d1bca2c 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -90,6 +90,8 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail' +import {DeliverRequestDetail} from '../../deliver/deliverRequestMain/deliverRequestMain.data' + // 备货申请 defineOptions({ name: 'StockupMainRequest' }) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index 156c1f1df..d0241eb88 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -7,6 +7,9 @@ import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' +import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' +import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' + import * as locationApi from '@/api/wms/location' import { Location } from '../../../basicDataManage/factoryModeling/location/location.data' @@ -48,6 +51,35 @@ export const StockupMainRequest = useCrudSchemas(reactive([ }, isForm: false, }, + { + label: '发货计划单号', + field: 'deliverPlanNumber', + sort: 'custom', + table: { + width: 180 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: '发货计划信息', // 查询弹窗标题 + searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类 + searchPage: DeliverPlanMainApi.getDeliverPlanMainPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'status', + value: '6', + isMainValue: false + }] + } + } + }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -318,26 +350,26 @@ export const StockupMainRequest = useCrudSchemas(reactive([ } } }, - { - label: '直接生成记录', - field: 'directCreateRecord', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: requestsettingData.directCreateRecord, - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE', - disabled: true - } - } - }, + // { + // label: '直接生成记录', + // field: 'directCreateRecord', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: requestsettingData.directCreateRecord, + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE', + // disabled: true + // } + // } + // }, { label: '到库区类型范围', @@ -443,92 +475,92 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ width: 100 }, }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.getBalanceItemPage, - searchCondition: [ - // { - // key:'customerCode', // 查询列表中字段 - // value:'customerCode', // 指主表某字段 - // message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 - // isMainValue: true // 表示查询条件是主表的字段的值 - // } - ] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.getBalanceItemPage, - searchCondition: [ - // { - // key:'customerCode', // 查询列表中字段 - // value:'customerCode', // 指主表某字段 - // message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 - // isMainValue: true // 表示查询条件是主表的字段的值 - // } - ] - } - } - }, - { - label: '器具号', - field: 'containerNumber', - sort: 'custom', - table: { - width: 100 - }, - isSearch: true, - }, - { - label: '批次', - field: 'batch', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 120 - }, - tableForm: { - disabled: true, - type: 'Select' - }, - form: { - componentProps: { - disabled: true - } - } - }, + // { + // label: '包装号', + // field: 'packingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择包装号', + // searchField: 'packingNumber', + // searchTitle: '库存余额信息', + // searchAllSchemas: Balance.allSchemas, + // searchPage: BalanceApi.getBalanceItemPage, + // searchCondition: [ + // // { + // // key:'customerCode', // 查询列表中字段 + // // value:'customerCode', // 指主表某字段 + // // message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 + // // isMainValue: true // 表示查询条件是主表的字段的值 + // // } + // ] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择包装号', + // searchField: 'packingNumber', + // searchTitle: '库存余额信息', + // searchAllSchemas: Balance.allSchemas, + // searchPage: BalanceApi.getBalanceItemPage, + // searchCondition: [ + // // { + // // key:'customerCode', // 查询列表中字段 + // // value:'customerCode', // 指主表某字段 + // // message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 + // // isMainValue: true // 表示查询条件是主表的字段的值 + // // } + // ] + // } + // } + // }, + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 100 + // }, + // isSearch: true, + // }, + // { + // label: '批次', + // field: 'batch', + // sort: 'custom', + // isSearch: true, + // tableForm: { + // disabled: true, + // }, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, + // { + // label: '库存状态', + // field: 'inventoryStatus', + // dictType: DICT_TYPE.INVENTORY_STATUS, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 120 + // }, + // tableForm: { + // disabled: true, + // type: 'Select' + // }, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, { label: '物品代码', field: 'itemCode',