diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index 30db7688f..2ef94ee4b 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -19,12 +19,6 @@ export const StockupMainJob = useCrudSchemas(reactive([ sort: 'custom', isForm: false, }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - isForm: false, - }, { label: '从仓库代码', field: 'fromWarehouseCode', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index feaa984b8..81b6e81b3 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -34,15 +34,6 @@ export const StockupMainRecord = useCrudSchemas(reactive([ width: 180 }, }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - isSearch: true, - table: { - width: 180 - }, - }, { label: '从仓库代码', field: 'fromWarehouseCode', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index 7a77e7e45..2947840a4 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -89,7 +89,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/src/Detail.vue' - +import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail' // 备货申请 defineOptions({ name: 'StockupMainRequest' }) @@ -124,9 +124,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['inventoryStatus'] = val[0]['inventoryStatus'] row['itemCode'] = val[0]['itemCode'] row['uom'] = val[0]['uom'] - } else if(formField == 'toLocationCode'){ - console.log(row,111); - + } + if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] }else{ row[formField] = val[0][searchField] diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index beb6c11e2..efa656f42 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -4,9 +4,6 @@ import { TableColumn } from '@/types/table' import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' -import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' -import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' - import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' @@ -51,35 +48,6 @@ export const StockupMainRequest = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - table: { - width: 140 - }, - 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',