Browse Source

BUG修改

master
yejiaxing 11 months ago
parent
commit
3eba837839
  1. 306
      src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
  2. 413
      src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
  3. 9
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
  4. 233
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

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

@ -5,28 +5,16 @@
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
<TableHead <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
:HeadButttondata="HeadButttondata" @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
@button-base-click="buttonBaseClick" :allSchemas="InspectRequestMain.allSchemas" />
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="InspectRequestMain.allSchemas"
/>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total total: tableObject.total
}" }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
v-model:pageSize="tableObject.pageSize" v-model:sort="tableObject.sort">
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #number="{row}"> <template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)"> <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
@ -39,33 +27,18 @@
</ContentWrap> </ContentWrap>
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm ref="formRef" @success="getList" :rules="InspectRequestMainRules"
ref="formRef" :formAllSchemas="InspectRequestMain.allSchemas" :tableAllSchemas="InspectRequestDetail.allSchemas"
@success="getList" :tableFormRules="InspectRequestDetailRules" :tableData="tableData"
:rules="InspectRequestMainRules"
:formAllSchemas="InspectRequestMain.allSchemas"
:tableAllSchemas="InspectRequestDetail.allSchemas"
:tableFormRules="InspectRequestDetailRules"
:tableData="tableData"
:apiUpdate="InspectRequestMainApi.updateInspectRequestMain" :apiUpdate="InspectRequestMainApi.updateInspectRequestMain"
:apiCreate="InspectRequestMainApi.createInspectRequestMain" :apiCreate="InspectRequestMainApi.createInspectRequestMain" :isBusiness="true" @handleAddTable="handleAddTable"
:isBusiness="true" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
@handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
/>
<!-- 详情 --> <!-- 详情 -->
<Detail <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectRequestMain.allSchemas"
ref="detailRef" :detailAllSchemas="InspectRequestDetail.allSchemas" :detailAllSchemasRules="InspectRequestDetailRules"
:isBasic="false"
:allSchemas="InspectRequestMain.allSchemas"
:detailAllSchemas="InspectRequestDetail.allSchemas"
:detailAllSchemasRules="InspectRequestDetailRules"
:apiPage="InspectRequestDetailApi.getInspectRequestDetailPage" :apiPage="InspectRequestDetailApi.getInspectRequestDetailPage"
@searchTableSuccessDetail="searchTableSuccessDetail" @searchTableSuccessDetail="searchTableSuccessDetail" />
/>
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/inspect-request-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/inspect-request-main/import" :importTemplateData="importTemplateData"
@ -73,32 +46,31 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { InspectRequestMain,InspectRequestMainRules,InspectRequestDetail,InspectRequestDetailRules } from './inspectRequestMain.data' import { InspectRequestMain, InspectRequestMainRules, InspectRequestDetail, InspectRequestDetailRules } from './inspectRequestMain.data'
import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain' import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
import * as InspectRequestDetailApi from '@/api/wms/inspectRequestDetail' import * as InspectRequestDetailApi from '@/api/wms/inspectRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
// //
defineOptions({ name: 'InspectRequestMain' }) defineOptions({ name: 'InspectRequestMain' })
const message = useMessage() // const message = useMessage() //
const { t } = useI18n() // const { t } = useI18n() //
const route = useRoute() // const route = useRoute() //
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(InspectRequestMain.allSchemas.tableColumns) const tableColumns = ref(InspectRequestMain.allSchemas.tableColumns)
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
tableColumns.value = val tableColumns.value = val
} }
// //
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => { nextTick(() => {
console.log(val[0]['number'])
if (type == 'tableForm') { if (type == 'tableForm') {
// //
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
@ -107,39 +79,37 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
setV['purchaseReceiptRecordNumber'] = val[0]['number'] setV['purchaseReceiptRecordNumber'] = val[0]['number']
setV['supplierCode'] = val[0]['supplierCode'] // setV['supplierCode'] = val[0]['supplierCode']
// row['poNumber'] = val[0]['number']
// row['poLine'] = val[0]['lineNumber']
formRef.setValues(setV) formRef.setValues(setV)
} }
}) })
} }
// //
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
setV['itemCode'] = val[0]['code'] setV['itemCode'] = val[0]['code']
formRef.setValues(setV) formRef.setValues(setV)
}) })
} }
// //
// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
const Echo = [] const Echo = []
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: InspectRequestMainApi.getInspectRequestMainPage // getListApi: InspectRequestMainApi.getInspectRequestMainPage //
}) })
// //
const { getList, setSearchParams } = tableMethods const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:inspect-request-main:create'}), // defaultButtons.defaultAddBtn({ hasPermi: 'wms:inspect-request-main:create' }), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // // 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.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -151,10 +121,10 @@ const HeadButttondata = [
// icon: 'Select', // icon: 'Select',
// color: '' // color: ''
// }, // },
] ]
// //
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
if (val == 'add') { // if (val == 'add') { //
openForm('create') openForm('create')
} else if (val == 'import') { // } else if (val == 'import') { //
@ -167,34 +137,34 @@ const buttonBaseClick = (val, item) => {
} else { // } else { //
console.log('其他按钮', item) console.log('其他按钮', item)
} }
} }
// //
const isShowMainButton = (row,val) => { const isShowMainButton = (row, val) => {
if (val.indexOf(row.status) > -1) { if (val.indexOf(row.status) > -1) {
return false return false
} else { } else {
return true return true
} }
} }
// - // -
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 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.mainListReAddBtn({ hide: isShowMainButton(row, ['5']), hasPermi: 'wms:purchasereceipt-request-main:reAdd' }), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 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.mainListTurnDownBtn({ hide: isShowMainButton(row, ['2']), hasPermi: 'wms:purchasereceipt-request-main:refused' }), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 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.mainListHandleBtn({ hide: isShowMainButton(row, ['3']), hasPermi: 'wms:purchasereceipt-request-main:handle' }), //
// defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // // 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') { // if (val == 'mainClose') { //
handleClose(row.id) handleClose(row.id)
} else if (val == 'mainReAdd') { // } else if (val == 'mainReAdd') { //
@ -210,83 +180,83 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // } else if (val == 'edit') { //
openForm('update', row) openForm('update', row)
} }
} }
/** 关闭按钮操作 */ /** 关闭按钮操作 */
const handleClose = async (id: number) => { const handleClose = async (id : number) => {
try { try {
await message.confirm(t('common.confirmColse')) await message.confirm(t('common.confirmColse'))
await InspectRequestMainApi.closeInspectRequestMain(id) await InspectRequestMainApi.closeInspectRequestMain(id)
message.success(t('common.closeSuccess')) message.success(t('common.closeSuccess'))
await getList() await getList()
} catch {} } catch { }
} }
/** 重新添加按钮操作 */ /** 重新添加按钮操作 */
const handleReAdd = async (id: number) => { const handleReAdd = async (id : number) => {
try { try {
await message.confirm(t('common.confirmReAdd')) await message.confirm(t('common.confirmReAdd'))
await InspectRequestMainApi.reAddInspectRequestMain(id) await InspectRequestMainApi.reAddInspectRequestMain(id)
message.success(t('common.reAddSuccess')) message.success(t('common.reAddSuccess'))
await getList() await getList()
} catch {} } catch { }
} }
/** 审批通过按钮操作 */ /** 审批通过按钮操作 */
const handleAgree = async (id: number) => { const handleAgree = async (id : number) => {
try { try {
await message.confirm(t('common.confirmAgree')) await message.confirm(t('common.confirmAgree'))
await InspectRequestMainApi.agreeInspectRequestMain(id) await InspectRequestMainApi.agreeInspectRequestMain(id)
message.success(t('common.agreeSuccess')) message.success(t('common.agreeSuccess'))
await getList() await getList()
} catch {} } catch { }
} }
/** 审批驳回按钮操作 */ /** 审批驳回按钮操作 */
const handleRefused = async (id: number) => { const handleRefused = async (id : number) => {
try { try {
await message.confirm(t('common.confirmRefused')) await message.confirm(t('common.confirmRefused'))
await InspectRequestMainApi.refusedInspectRequestMain(id) await InspectRequestMainApi.refusedInspectRequestMain(id)
message.success(t('common.refusedSuccess')) message.success(t('common.refusedSuccess'))
await getList() await getList()
} catch {} } catch { }
} }
/** 处理按钮操作 */ /** 处理按钮操作 */
const handleHandle = async (id: number) => { const handleHandle = async (id : number) => {
try { try {
await message.confirm(t('common.confirmHandle')) await message.confirm(t('common.confirmHandle'))
await InspectRequestMainApi.handleInspectRequestMain(id) await InspectRequestMainApi.handleInspectRequestMain(id)
message.success(t('common.handleSuccess')) message.success(t('common.handleSuccess'))
await getList() await getList()
} catch {} } catch { }
} }
/** 提交按钮操作 */ /** 提交按钮操作 */
const handleSubmit = async (id: number) => { const handleSubmit = async (id : number) => {
try { try {
await message.confirm(t('common.confirmSubmit')) await message.confirm(t('common.confirmSubmit'))
await InspectRequestMainApi.submitInspectRequestMain(id) await InspectRequestMainApi.submitInspectRequestMain(id)
message.success(t('common.submitSuccess')) message.success(t('common.submitSuccess'))
await getList() await getList()
} catch {} } catch { }
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm =async (type: string, row?: number) => { const openForm = async (type : string, row ?: number) => {
tableData.value = [] // tableData.value = [] //
formRef.value.open(type, row) formRef.value.open(type, row)
} }
/** 详情操作 */ /** 详情操作 */
const detailRef = ref() const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => { const openDetail = (row : any, titleName : any, titleValue : any) => {
detailRef.value.openDetail(row, titleName, titleValue) detailRef.value.openDetail(row, titleName, titleValue)
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (id : number) => {
try { try {
// //
await message.delConfirm() await message.delConfirm()
@ -295,12 +265,12 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
// //
await getList() await getList()
} catch {} } catch { }
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
const exportLoading = ref(false) // const exportLoading = ref(false) //
const handleExport = async () => { const handleExport = async () => {
try { try {
// //
await message.exportConfirm() await message.exportConfirm()
@ -312,28 +282,28 @@ const handleExport = async () => {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
} }
} }
/** /**
* tableForm方法 * tableForm方法
*/ */
const tableFormKeys = {} const tableFormKeys = {}
InspectRequestDetail.allSchemas.tableFormColumns.forEach(item => { InspectRequestDetail.allSchemas.tableFormColumns.forEach(item => {
tableFormKeys[item.field] = item.default ? item.default : '' 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))) tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
} }
// //
const handleDeleteTable = (item, index) => { const handleDeleteTable = (item, index) => {
tableData.value.splice(index, 1) tableData.value.splice(index, 1)
} }
// //
const submitForm = async (formType, data) => { const submitForm = async (formType, data) => {
data.subList = tableData.value // data.subList = tableData.value //
try { try {
if (formType === 'create') { if (formType === 'create') {
@ -349,37 +319,37 @@ const submitForm = async (formType, data) => {
} finally { } finally {
formRef.value.formLoading = false formRef.value.formLoading = false
} }
} }
/** 导入 */ /** 导入 */
const importFormRef = ref() const importFormRef = ref()
const handleImport = () => { const handleImport = () => {
importFormRef.value.open() importFormRef.value.open()
} }
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '检验申请主导入模版.xlsx' templateTitle: '检验申请主导入模版.xlsx'
}) })
// //
const importSuccess = () => { const importSuccess = () => {
getList() getList()
} }
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters
} }
getList() // getList() //
} }
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()
importTemplateData.templateUrl = await InspectRequestMainApi.importTemplate() importTemplateData.templateUrl = await InspectRequestMainApi.importTemplate()
}) })
</script> </script>

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

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

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

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

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

@ -3,8 +3,8 @@ import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
// import * as SupplierApi from '@/api/wms/supplier' import * as SupplierApi from '@/api/wms/supplier'
// import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain' import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
import { InspectRequestMain } from '@/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data' 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 PurchaseMainApi from '@/api/wms/purchaseMain'
import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' 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 = { const queryParams = {
pageSize:10, pageSize: 10,
pageNo:1, pageNo: 1,
code:'MaterialPutawayRequest' code: 'MaterialPutawayRequest'
} }
const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
const requestsettingData =data?.list[0]||{} const requestsettingData = data?.list[0] || {}
// 获取当前操作人的部门 // 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data' import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
const userStore = useUserStore() const userStore = useUserStore()
@ -37,15 +43,15 @@ const userDept = userStore.userSelfInfo.dept
* @returns {Array} * @returns {Array}
*/ */
export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
{ // {
label: '从仓库代码', // label: '从仓库代码',
field: 'fromWarehouseCode', // field: 'fromWarehouseCode',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
isForm: false, // isForm: false,
}, // },
{ {
label: '从库位类型范围', label: '从库位类型范围',
field: 'fromLocationTypes', field: 'fromLocationTypes',
@ -72,26 +78,108 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'number', field: 'number',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 180,
fixed: 'left' fixed: 'left'
}, },
isForm: false, isForm: false,
isSearch: true, isSearch: true,
}, },
{ {
label: '业务类型', label: '供应商代码',
field: 'businessType', field: 'supplierCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isSearch: true,
form: { form: {
value: 'PurchasePutaway', // labelMessage: '信息提示说明!!!',
componentProps: { 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: '备注', label: '备注',
field: 'remark', field: 'remark',
@ -115,7 +203,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
@ -146,7 +234,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
@ -169,7 +257,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
@ -410,6 +498,46 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
type: 'Select' 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: '订单号', label: '订单号',
field: 'poNumber', field: 'poNumber',
@ -471,7 +599,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
tableForm:{ tableForm: {
isInpuFocusShow: true, isInpuFocusShow: true,
searchListPlaceholder: '请选择从库位代码', searchListPlaceholder: '请选择从库位代码',
searchField: 'code', searchField: 'code',
@ -500,38 +628,12 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTableForm: false, isTableForm: false,
form: { 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: { componentProps: {
isSearchList: true, disabled: true
searchListPlaceholder: '请选择物品代码',
searchField: 'code',
searchTitle: '物品基础信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage
} }
} }
}, },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
@ -554,7 +656,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
@ -633,20 +735,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
precision: 6 precision: 6
} }
}, },
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
type: 'Select'
}
},
{ {
label: '从货主代码', label: '从货主代码',
field: 'fromOwnerCode', field: 'fromOwnerCode',
@ -671,13 +760,13 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '操作', label: '操作',
field: 'action', field: 'action',
isDetail: false, isDetail: false,
isForm: false , isForm: false,
isTable: false , isTable: false,
table: { table: {
width: 150, width: 150,
fixed: 'right' fixed: 'right'
}, },
isTableForm:false, isTableForm: false,
} }
])) ]))

Loading…
Cancel
Save