sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

BUG修改

intex_online20250327
叶佳兴 2 weeks ago
parent
d0d022ed5f
commit
f98e700b5b
6 changed files with 352 additions and 265 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts
  2. 1
      src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
  3. 272
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  4. 92
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
  5. 100
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
  6. 100
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts

2
src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts
View File

@ -19,7 +19,7 @@ export const DeliTimeWms = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '班次', label: '班次',
field: 'shift', field: 'shift',
dictType: DICT_TYPE.SHIFT, dictType: DICT_TYPE.DELISHIF,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: true,
isDetail: true, isDetail: true,

1
src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
View File

@ -256,6 +256,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '品番', label: '品番',
field: 'itemCode', field: 'itemCode',
sort: 'custom', sort: 'custom',
isSearch:true,
table: { table: {
width: 150 width: 150
}, },

272
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
View File

@ -1,7 +1,14 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="[...InventoryinitRequestMain.allSchemas.searchSchema,...InventoryinitRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" /> <Search
:schema="[
...InventoryinitRequestMain.allSchemas.searchSchema,
...InventoryinitRequestDetail.allSchemas.searchSchema
]"
@search="setSearchParams"
@reset="setSearchParams"
/>
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -17,7 +24,8 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table v-clientTable <Table
v-clientTable
:columns="tableColumns" :columns="tableColumns"
:data="tableObject.tableList" :data="tableObject.tableList"
:loading="tableObject.loading" :loading="tableObject.loading"
@ -28,13 +36,16 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" 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>
</el-button> </el-button>
</template> </template>
<template #action="{ row,$index }"> <template #action="{ row, $index }">
<ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBaseMore
:Butttondata="butttondata(row, $index)"
@button-base-click="buttonTableClick($event, row)"
/>
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -78,17 +89,36 @@
/> />
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/inventoryinit-request-main/import" :importTemplateData="importTemplateData" <ImportForm
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" /> ref="importFormRef"
url="/wms/inventoryinit-request-main/import"
:importTemplateData="importTemplateData"
@success="importSuccess"
:updateIsDisable="true"
:coverIsDisable="true"
:mode="2"
/>
<ImportForm ref="importFormRefLine" url="/wms/inventoryinit-request-main/importLine" :importTemplateData="importTemplateData" <ImportForm
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" /> ref="importFormRefLine"
url="/wms/inventoryinit-request-main/importLine"
:importTemplateData="importTemplateData"
@success="importSuccess"
:updateIsDisable="true"
:coverIsDisable="true"
:mode="2"
/>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { InventoryinitRequestMain,InventoryinitRequestMainRules,InventoryinitRequestDetail,InventoryinitRequestDetailRules } from './inventoryinitRequestMain.data' import {
InventoryinitRequestMain,
InventoryinitRequestMainRules,
InventoryinitRequestDetail,
InventoryinitRequestDetailRules
} from './inventoryinitRequestMain.data'
import * as InventoryinitRequestMainApi from '@/api/wms/inventoryinitRequestMain' import * as InventoryinitRequestMainApi from '@/api/wms/inventoryinitRequestMain'
import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDetail' import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
@ -105,7 +135,10 @@ 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([...InventoryinitRequestMain.allSchemas.tableColumns,...InventoryinitRequestDetail.allSchemas.tableMainColumns]) const tableColumns = ref([
...InventoryinitRequestMain.allSchemas.tableColumns,
...InventoryinitRequestDetail.allSchemas.tableMainColumns
])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -113,21 +146,25 @@ const updataTableColumns = (val) => {
} }
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
// 明细查询页赋值 // 明细查询页赋值
if(formField=='itemCode'){ if (formField == 'itemCode') {
//品番 //品番
let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['code'])) let itemCodes = val.filter((item) =>
if(itemCodes.length>0){ tableData.value.find((item1) => item1['itemCode'] == item['code'])
itemCodes = itemCodes.map(item=>(item['code'])) )
if (itemCodes.length > 0) {
itemCodes = itemCodes.map((item) => item['code'])
message.warning(`物料${itemCodes.join(',')}已经存在`) message.warning(`物料${itemCodes.join(',')}已经存在`)
} }
val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['code'])) val = val.filter(
if(val.length==0) return (item) => !tableData.value.find((item1) => item1['itemCode'] == item['code'])
val.forEach(item=>{ )
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) if (val.length == 0) return
val.forEach((item) => {
const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item }))
newRow[formField] = item[searchField] newRow[formField] = item[searchField]
newRow['packUnit'] = item['defaultPackUnit'] newRow['packUnit'] = item['defaultPackUnit']
newRow['packQty'] = item['defaultPackQty'] newRow['packQty'] = item['defaultPackQty']
@ -135,22 +172,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['batch'] = formatTime(new Date(), 'yyyyMMdd') newRow['batch'] = formatTime(new Date(), 'yyyyMMdd')
tableData.value.push(newRow) tableData.value.push(newRow)
}) })
} else if (formField == 'packUnit') {
}else if(formField=='packUnit'){
//包装规格1 //包装规格1
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
row['packUnit'] = val[0]['packUnit'] row['packUnit'] = val[0]['packUnit']
row['packQty'] = val[0]['packQty'] row['packQty'] = val[0]['packQty']
}else if(formField=='secondPackUnit'){ } else if (formField == 'secondPackUnit') {
//包装规格2 //包装规格2
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
row['secondPackUnit'] = val[0]['packUnit'] row['secondPackUnit'] = val[0]['packUnit']
row['secondPackQty'] = val[0]['packQty'] row['secondPackQty'] = val[0]['packQty']
}else if(formField == 'balancePackUnit'){ } else if (formField == 'balancePackUnit') {
// 入库存包装规格 // 入库存包装规格
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
row['balancePackUnit'] = val[0]['packUnit'] row['balancePackUnit'] = val[0]['packUnit']
}else{ } else {
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
} }
} else { } else {
@ -163,21 +199,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
}) })
} }
// 查询页面返回——详情 // 查询页面返回——详情
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
if(formField=='itemCode'){ if (formField == 'itemCode') {
//品番 //品番
setV['uom'] = val[0]['uom'] setV['uom'] = val[0]['uom']
}else if(formField=='packUnit'){ } else if (formField == 'packUnit') {
//包装规格1 //包装规格1
setV['packUnit'] = val[0]['packUnit'] setV['packUnit'] = val[0]['packUnit']
setV['packQty'] = val[0]['packQty'] setV['packQty'] = val[0]['packQty']
}else if(formField=='secondPackUnit'){ } else if (formField == 'secondPackUnit') {
//包装规格2 //包装规格2
setV['secondPackUnit'] = val[0]['packUnit'] setV['secondPackUnit'] = val[0]['packUnit']
setV['secondPackQty'] = val[0]['packQty'] setV['secondPackQty'] = val[0]['packQty']
}else if(formField == 'balancePackUnit'){ } else if (formField == 'balancePackUnit') {
// 入库存包装规格 // 入库存包装规格
setV['balancePackUnit'] = val[0]['packUnit'] setV['balancePackUnit'] = val[0]['packUnit']
} }
@ -199,8 +235,8 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:inventoryinit-request-main:create'}), // 新增 defaultButtons.defaultAddBtn({ hasPermi: 'wms:inventoryinit-request-main:create' }), // 新增
defaultButtons.defaultImportBtn({hasPermi:'wms:inventoryinit-request-main:import'}), // 导入 defaultButtons.defaultImportBtn({ hasPermi: 'wms:inventoryinit-request-main:import' }), // 导入
{ {
label: '线边导入', label: '线边导入',
name: 'importLine', name: 'importLine',
@ -210,10 +246,10 @@ const HeadButttondata = [
color: '', color: '',
hasPermi: '' hasPermi: ''
}, },
defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-request-main:export'}), // 导出 defaultButtons.defaultExportBtn({ hasPermi: 'wms:inventoryinit-request-main:export' }), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置 defaultButtons.defaultSetBtn(null) // 设置
// { // {
// label: '自定义扩展按钮', // label: '自定义扩展按钮',
// name: 'zdy', // name: 'zdy',
@ -226,30 +262,36 @@ const HeadButttondata = [
// 头部按钮事件 // 头部按钮事件
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') {
// 导入
handleImport() handleImport()
} else if(val == 'importLine'){ } else if (val == 'importLine') {
handleImportLine() handleImportLine()
}else if (val == 'export') { // 导出 } else if (val == 'export') {
// 导出
handleExport() handleExport()
} else if (val == 'refresh') { // 刷新 } else if (val == 'refresh') {
if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { // 刷新
if (tableObject.params.filters && tableObject.params.filters.length > 0) {
searchFormClick({ searchFormClick({
filters: tableObject.params.filters filters: tableObject.params.filters
}) })
} else { } else {
getList() getList()
} }
} else if (val == 'filtrate') { // 筛选 } else if (val == 'filtrate') {
} 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 {
@ -258,44 +300,71 @@ const isShowMainButton = (row,val) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row,$index) => { const butttondata = (row, $index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 const findIndex = row['masterId']
if(findIndex>-1&&findIndex<$index){ ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
: -1
if (findIndex > -1 && findIndex < $index) {
return [] return []
} }
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventoryinit-request-main:close'}), // 关闭 defaultButtons.mainListCloseBtn({
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:inventoryinit-request-main:reAdd'}), //重新添加 hide: isShowMainButton(row, ['1', '2', '3', '4']),
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventoryinit-request-main:submit'}), // 提交审批 hasPermi: 'wms:inventoryinit-request-main:close'
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventoryinit-request-main:refused'}), // 驳回 }), // 关闭
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventoryinit-request-main:agree'}), // 审批通过 defaultButtons.mainListReAddBtn({
defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventoryinit-request-main:handle'}), // 处理 hide: isShowMainButton(row, ['5']),
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventoryinit-request-main:update'}), // 编辑 hasPermi: 'wms:inventoryinit-request-main:reAdd'
}), //重新添加
defaultButtons.mainListSubmitBtn({
hide: isShowMainButton(row, ['1']),
hasPermi: 'wms:inventoryinit-request-main:submit'
}), // 提交审批
defaultButtons.mainListTurnDownBtn({
hide: isShowMainButton(row, ['2']),
hasPermi: 'wms:inventoryinit-request-main:refused'
}), // 驳回
defaultButtons.mainListApproveBtn({
hide: isShowMainButton(row, ['2']),
hasPermi: 'wms:inventoryinit-request-main:agree'
}), // 审批通过
defaultButtons.mainListHandleBtn({
hide: isShowMainButton(row, ['3']),
hasPermi: 'wms:inventoryinit-request-main:handle'
}), // 处理
defaultButtons.mainListEditBtn({
hide: isShowMainButton(row, ['1']),
hasPermi: 'wms:inventoryinit-request-main:update'
}) // 编辑
] ]
} }
// 列表-操作按钮事件 // 列表-操作按钮事件
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainClose') {
// 关闭
handleClose(row.masterId) handleClose(row.masterId)
} else if (val == 'mainReAdd') { // 重新添加 } else if (val == 'mainReAdd') {
// 重新添加
handleReAdd(row.masterId) handleReAdd(row.masterId)
} else if (val == 'mainSubmit') { // 提交审批 } else if (val == 'mainSubmit') {
// 提交审批
handleSubmit(row.masterId) handleSubmit(row.masterId)
} else if (val == 'mainTurnDown') { // 驳回 } else if (val == 'mainTurnDown') {
// 驳回
handleRefused(row.masterId) handleRefused(row.masterId)
} else if (val == 'mainApprove') { // 审批通过 } else if (val == 'mainApprove') {
// 审批通过
handleAgree(row.masterId) handleAgree(row.masterId)
} else if (val == 'mainHandle') { // 处理 } else if (val == 'mainHandle') {
// 处理
handleHandle(row.masterId) handleHandle(row.masterId)
} 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 {
@ -304,13 +373,13 @@ const handleClose = async (id: number) => {
await InventoryinitRequestMainApi.closeInventoryinitRequestMain(id) await InventoryinitRequestMainApi.closeInventoryinitRequestMain(id)
message.success(t('common.closeSuccess')) message.success(t('common.closeSuccess'))
tableObject.loading = false tableObject.loading = false
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} catch {}finally{ } catch {
} finally {
tableObject.loading = false tableObject.loading = false
} }
} }
/** 重新添加按钮操作 */ /** 重新添加按钮操作 */
const handleReAdd = async (id: number) => { const handleReAdd = async (id: number) => {
try { try {
@ -319,13 +388,13 @@ const handleReAdd = async (id: number) => {
await InventoryinitRequestMainApi.reAddInventoryinitRequestMain(id) await InventoryinitRequestMainApi.reAddInventoryinitRequestMain(id)
message.success(t('common.reAddSuccess')) message.success(t('common.reAddSuccess'))
tableObject.loading = false tableObject.loading = false
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} catch {}finally{ } catch {
} finally {
tableObject.loading = false tableObject.loading = false
} }
} }
/** 提交按钮操作 */ /** 提交按钮操作 */
const handleSubmit = async (id: number) => { const handleSubmit = async (id: number) => {
try { try {
@ -334,13 +403,13 @@ const handleSubmit = async (id: number) => {
await InventoryinitRequestMainApi.submitInventoryinitRequestMain(id) await InventoryinitRequestMainApi.submitInventoryinitRequestMain(id)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} catch {}finally{ } catch {
} finally {
tableObject.loading = false tableObject.loading = false
} }
} }
/** 审批通过按钮操作 */ /** 审批通过按钮操作 */
const handleAgree = async (id: number) => { const handleAgree = async (id: number) => {
try { try {
@ -349,13 +418,13 @@ const handleAgree = async (id: number) => {
await InventoryinitRequestMainApi.agreeInventoryinitRequestMain(id) await InventoryinitRequestMainApi.agreeInventoryinitRequestMain(id)
message.success(t('common.agreeSuccess')) message.success(t('common.agreeSuccess'))
tableObject.loading = false tableObject.loading = false
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} catch {}finally{ } catch {
} finally {
tableObject.loading = false tableObject.loading = false
} }
} }
/** 处理按钮操作 */ /** 处理按钮操作 */
const handleHandle = async (id: number) => { const handleHandle = async (id: number) => {
try { try {
@ -363,13 +432,13 @@ const handleHandle = async (id: number) => {
tableObject.loading = true tableObject.loading = true
await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id) await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id)
message.success(t('common.handleSuccess')) message.success(t('common.handleSuccess'))
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} catch {}finally{ } catch {
} finally {
tableObject.loading = false tableObject.loading = false
} }
} }
/** 审批驳回按钮操作 */ /** 审批驳回按钮操作 */
const handleRefused = async (id: number) => { const handleRefused = async (id: number) => {
try { try {
@ -378,19 +447,33 @@ const handleRefused = async (id: number) => {
await InventoryinitRequestMainApi.refusedInventoryinitRequestMain(id) await InventoryinitRequestMainApi.refusedInventoryinitRequestMain(id)
message.success(t('common.refusedSuccess')) message.success(t('common.refusedSuccess'))
tableObject.loading = false tableObject.loading = false
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} catch {}finally{ } catch {
} finally {
tableObject.loading = false tableObject.loading = false
} }
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm =async (type: string, row?: any) => { const openForm = async (type: string, row?: any) => {
tableData.value = [] // 重置明细数据 tableData.value = [] // 重置明细数据
const row1 = {...row} const row1 = { ...row }
if (type == 'update') { if (type == 'update') {
row1.remark = row.remark1 row1.remark = row.remark1
InventoryinitRequestMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'warehouseCode') {
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
})
} else {
InventoryinitRequestMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'warehouseCode') {
item.componentProps.isSearchList = true
item.componentProps.disabled = false
}
})
} }
formRef.value.open(type, row1) formRef.value.open(type, row1)
} }
@ -400,9 +483,11 @@ const { wsCache } = useCache()
/** 详情操作 */ /** 详情操作 */
const detailRef = ref() const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => { const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name const departmentCode = wsCache
.get(CACHE_KEY.DEPT)
.find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
detailRef.value.openDetail(row, titleName, titleValue,'requestInventoryinitMain') detailRef.value.openDetail(row, titleName, titleValue, 'requestInventoryinitMain')
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
@ -426,7 +511,9 @@ const handleExport = async () => {
// 发起导出 // 发起导出
loadStart() loadStart()
const excelTitle = ref(route.meta.title) const excelTitle = ref(route.meta.title)
const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(tableObject.params) const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(
tableObject.params
)
download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
@ -436,9 +523,9 @@ const handleExport = async () => {
/** /**
* tableForm方法 * tableForm方法
*/ */
const tableFormKeys = {} const tableFormKeys = {}
InventoryinitRequestDetail.allSchemas.tableFormColumns.forEach(item => { InventoryinitRequestDetail.allSchemas.tableFormColumns.forEach((item) => {
tableFormKeys[item.field] = item.default ? item.default : '' tableFormKeys[item.field] = item.default ? item.default : ''
}) })
const tableData = ref([]) const tableData = ref([])
@ -450,16 +537,16 @@ const handleAddTable = () => {
// 删除明细 // 删除明细
const handleDeleteTable = (item, index) => { const handleDeleteTable = (item, index) => {
let itemIndex = tableData.value.indexOf(item) let itemIndex = tableData.value.indexOf(item)
if(itemIndex>-1){ if (itemIndex > -1) {
tableData.value.splice(itemIndex, 1) tableData.value.splice(itemIndex, 1)
} }
} }
const tableSelectionDelete = (selection) => { const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item)) tableData.value = tableData.value.filter((item) => !selection.includes(item))
} }
// 主子数据 提交 // 主子数据 提交
const submitForm = async (formType, submitData) => { const submitForm = async (formType, submitData) => {
let data = {...submitData} let data = { ...submitData }
// if(data.masterId){ // if(data.masterId){
// data.id = data.masterId // data.id = data.masterId
// } // }
@ -477,8 +564,8 @@ const submitForm = async (formType, submitData) => {
// 刷新当前列表 // 刷新当前列表
if (formType === 'create') { if (formType === 'create') {
getList() getList()
}else{ } else {
buttonBaseClick('refresh',null) buttonBaseClick('refresh', null)
} }
} finally { } finally {
formRef.value.formLoading = false formRef.value.formLoading = false
@ -491,7 +578,6 @@ const handleImport = () => {
importFormRef.value.open() importFormRef.value.open()
} }
/** 线边导入 */ /** 线边导入 */
const importFormRefLine = ref() const importFormRefLine = ref()
const handleImportLine = () => { const handleImportLine = () => {

92
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
View File

@ -82,52 +82,52 @@ export const PurchasereturnRecordMain = useCrudSchemas(
}, },
isTable: false isTable: false
}, },
{ // {
label: 'Q2通知单号', // label: 'Q2通知单号',
field: 'q2Number', // field: 'q2Number',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
isDetail: true, // isDetail: true,
sortTableDefault: 4, // sortTableDefault: 4,
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
// labelMessage: '信息提示说明！！！', // // labelMessage: '信息提示说明！！！',
componentProps: { // componentProps: {
enterSearch: true, // enterSearch: true,
// multiple: true, // // multiple: true,
isSearchList: true, // 开启查询弹窗 // isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本 // searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 // searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q2通知单号', // 查询弹窗标题 // searchTitle: 'Q2通知单号', // 查询弹窗标题
searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类 // searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法 // searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
searchCondition: [ // searchCondition: [
{ // {
key: 'available', // key: 'available',
value: 'TRUE', // value: 'TRUE',
isMainValue: false // isMainValue: false
}, // },
{ // {
key: 'status', // key: 'status',
value: '0', // value: '0',
isMainValue: false // isMainValue: false
} // }
], // ],
verificationParams: [ // verificationParams: [
{ // {
key: 'number', // key: 'number',
action: '==', // action: '==',
value: '', // value: '',
isMainValue: false, // isMainValue: false,
isSearch: true, // isSearch: true,
isFormModel: true // isFormModel: true
} // }
] // 失去焦点校验参数 // ] // 失去焦点校验参数
} // }
} // }
}, // },
{ {
label: '供应商代码', label: '供应商代码',
field: 'supplierCode', field: 'supplierCode',

100
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
View File

@ -275,56 +275,56 @@ export const PurchasereturnRequestMain = useCrudSchemas(
isForm: false, isForm: false,
isTable: false isTable: false
}, },
{ // {
label: 'Q2通知单号', // label: 'Q2通知单号',
field: 'q2Number', // field: 'q2Number',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
isDetail: true, // isDetail: true,
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
// labelMessage: '信息提示说明！！！', // // labelMessage: '信息提示说明！！！',
componentProps: { // componentProps: {
enterSearch: true, // enterSearch: true,
// multiple: true, // // multiple: true,
isSearchList: true, // 开启查询弹窗 // isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本 // searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 // searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q2通知单号', // 查询弹窗标题 // searchTitle: 'Q2通知单号', // 查询弹窗标题
searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类 // searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法 // searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
searchCondition: [ // searchCondition: [
{ // {
key: 'available', // key: 'available',
value: 'TRUE', // value: 'TRUE',
isMainValue: false // isMainValue: false
}, // },
{ // {
key: 'status', // key: 'status',
value: '0', // value: '0',
isMainValue: false // isMainValue: false
}, // },
{ // {
key: 'supplierCode', // key: 'supplierCode',
value: 'supplierCode', // value: 'supplierCode',
isMainValue: true // isMainValue: true
} // }
], // ],
verificationParams: [ // verificationParams: [
{ // {
key: 'number', // key: 'number',
action: '==', // action: '==',
value: '', // value: '',
isMainValue: false, // isMainValue: false,
isSearch: true, // isSearch: true,
isFormModel: true // isFormModel: true
} // }
] // 失去焦点校验参数 // ] // 失去焦点校验参数
} // }
} // }
}, // },
{ {
label: '承运商', label: '承运商',
field: 'carrierCode', field: 'carrierCode',

100
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
View File

@ -275,56 +275,56 @@ export const PurchasereturnRequestMain = useCrudSchemas(
isForm: false, isForm: false,
isTable: false isTable: false
}, },
{ // {
label: 'Q2通知单号', // label: 'Q2通知单号',
field: 'q2Number', // field: 'q2Number',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
isDetail: true, // isDetail: true,
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
// labelMessage: '信息提示说明！！！', // // labelMessage: '信息提示说明！！！',
componentProps: { // componentProps: {
enterSearch: true, // enterSearch: true,
// multiple: true, // // multiple: true,
isSearchList: true, // 开启查询弹窗 // isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本 // searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 // searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q2通知单号', // 查询弹窗标题 // searchTitle: 'Q2通知单号', // 查询弹窗标题
searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类 // searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法 // searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
searchCondition: [ // searchCondition: [
{ // {
key: 'available', // key: 'available',
value: 'TRUE', // value: 'TRUE',
isMainValue: false // isMainValue: false
}, // },
{ // {
key: 'status', // key: 'status',
value: '0', // value: '0',
isMainValue: false // isMainValue: false
}, // },
{ // {
key: 'supplierCode', // key: 'supplierCode',
value: 'supplierCode', // value: 'supplierCode',
isMainValue: true // isMainValue: true
} // }
], // ],
verificationParams: [ // verificationParams: [
{ // {
key: 'number', // key: 'number',
action: '==', // action: '==',
value: '', // value: '',
isMainValue: false, // isMainValue: false,
isSearch: true, // isSearch: true,
isFormModel: true // isFormModel: true
} // }
] // 失去焦点校验参数 // ] // 失去焦点校验参数
} // }
} // }
}, // },
{ {
label: '承运商', label: '承运商',
field: 'carrierCode', field: 'carrierCode',

Write Preview
Loading…
Cancel
Save