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

主子表合并

master_hella_20240701
yufei0306 7 months ago
parent
ebfe3fcddc
commit
67326cb645
14 changed files with 198 additions and 133 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. 19
      src/views/wms/countManage/count/countJobMain/index.vue
  2. 34
      src/views/wms/countManage/count/countPlanMain/index.vue
  3. 17
      src/views/wms/countManage/count/countRecordMain/index.vue
  4. 39
      src/views/wms/countManage/count/countRequestMain/index.vue
  5. 17
      src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
  6. 31
      src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
  7. 13
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
  8. 17
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
  9. 31
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
  10. 17
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
  11. 17
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
  12. 31
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
  13. 17
      src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
  14. 31
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

19
src/views/wms/countManage/count/countJobMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="CountJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...CountJobMain.allSchemas.searchSchema,...CountJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="CountJobMain.allSchemas" :allSchemas="CountJobMain.allSchemas"
:detailAllSchemas="CountJobDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -81,7 +82,7 @@ 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(CountJobMain.allSchemas.tableColumns) const tableColumns = ref([...CountJobMain.allSchemas.tableColumns,...CountJobDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -128,7 +129,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const Echo = [] const Echo = []
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: CountJobMainApi.getCountJobMainPage // 分页接口 getListApi: CountJobDetailApi.getCountJobDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -178,7 +179,11 @@ const isShowMainButton = (row,val) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:count-job-main:close'}), // 关闭 defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:count-job-main:close'}), // 关闭
@ -194,7 +199,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainJobAba') { // 放弃 } else if (val == 'mainJobAba') { // 放弃
console.log('列表-操作按钮事件-放弃') console.log('列表-操作按钮事件-放弃')
} else if (val == 'mainJobClo') { // 关闭 } else if (val == 'mainJobClo') { // 关闭
handleClose(row.id) handleClose(row.masterId)
} else if (val == 'mainJobAcc') { // 承接 } else if (val == 'mainJobAcc') { // 承接
console.log('列表-操作按钮事件-承接') console.log('列表-操作按钮事件-承接')
} }

34
src/views/wms/countManage/count/countPlanMain/index.vue
View File

@ -2,7 +2,7 @@
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search <Search
:schema="CountPlanMain.allSchemas.searchSchema" :schema="[...CountPlanMain.allSchemas.searchSchema,...CountPlanDetail.allSchemas.searchSchema]"
@search="setSearchParams" @search="setSearchParams"
@reset="setSearchParams" @reset="setSearchParams"
/> />
@ -16,6 +16,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="CountPlanMain.allSchemas" :allSchemas="CountPlanMain.allSchemas"
:detailAllSchemas="CountPlanDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -36,10 +37,9 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase <ButtonBase
:Butttondata="butttondata(row)" :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event, row)"
@button-base-click="buttonTableClick($event, row)"
/> />
</template> </template>
</Table> </Table>
@ -132,7 +132,7 @@ 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(CountPlanMain.allSchemas.tableColumns) const tableColumns = ref([...CountPlanMain.allSchemas.tableColumns,...CountPlanDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -178,7 +178,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
const Echo = [] const Echo = []
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: CountPlanMainApi.getCountPlanMainPage // 分页接口 getListApi: CountPlanDetailApi.getCountPlanDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -240,7 +240,11 @@ const isShowMainButton = (row, val) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
defaultButtons.mainListPlanOpeBtn({ defaultButtons.mainListPlanOpeBtn({
hide: isShowMainButton(row, ['5']), hide: isShowMainButton(row, ['5']),
@ -281,7 +285,7 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainPlanOpe') { // 打开 if (val == 'mainPlanOpe') { // 打开
tableObject.loading = true tableObject.loading = true
CountPlanMainApi.open(row.id).then(() => { CountPlanMainApi.open(row.masterId).then(() => {
message.success(t('打开成功')) message.success(t('打开成功'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -292,7 +296,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanClo') { // 关闭 } else if (val == 'mainPlanClo') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
CountPlanMainApi.close(row.id).then(() => { CountPlanMainApi.close(row.masterId).then(() => {
message.success(t('关闭成功')) message.success(t('关闭成功'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -303,14 +307,14 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanSub') { // 提交审批 } else if (val == 'mainPlanSub') { // 提交审批
await message.confirm(t('common.confirmSubmit')) await message.confirm(t('common.confirmSubmit'))
tableObject.loading = true tableObject.loading = true
await CountPlanMainApi.submit(row.id) await CountPlanMainApi.submit(row.masterId)
message.success(t('提交审批成功')) message.success(t('提交审批成功'))
tableObject.loading = false tableObject.loading = false
await getList() await getList()
} else if (val == 'mainPlanTur') { // 驳回 } else if (val == 'mainPlanTur') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
CountPlanMainApi.reject(row.id).then(() => { CountPlanMainApi.reject(row.masterId).then(() => {
message.success(t('驳回成功')) message.success(t('驳回成功'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -321,7 +325,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanApp') { // 审批通过 } else if (val == 'mainPlanApp') { // 审批通过
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
CountPlanMainApi.agree(row.id).then(() => { CountPlanMainApi.agree(row.masterId).then(() => {
message.success(t('审批已通过')) message.success(t('审批已通过'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -332,7 +336,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanPub') { // 发布 } else if (val == 'mainPlanPub') { // 发布
await message.confirm('确认要发布吗？') await message.confirm('确认要发布吗？')
tableObject.loading = true tableObject.loading = true
CountPlanMainApi.publish(row.id).then(() => { CountPlanMainApi.publish(row.masterId).then(() => {
message.success(t('发布成功')) message.success(t('发布成功'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -343,7 +347,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanRes') { // 重置 } else if (val == 'mainPlanRes') { // 重置
await message.confirm('确认要重置吗？') await message.confirm('确认要重置吗？')
tableObject.loading = true tableObject.loading = true
CountPlanMainApi.resetting(row.id).then(() => { CountPlanMainApi.resetting(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -354,7 +358,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }
/** 添加/修改操作 */ /** 添加/修改操作 */

17
src/views/wms/countManage/count/countRecordMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="CountRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...CountRecordMain.allSchemas.searchSchema,...CountRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="CountRecordMain.allSchemas" :allSchemas="CountRecordMain.allSchemas"
:detailAllSchemas="CountRecordDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -76,7 +77,7 @@ 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(CountRecordMain.allSchemas.tableColumns) const tableColumns = ref([...CountRecordMain.allSchemas.tableColumns,...CountRecordDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -84,7 +85,7 @@ const updataTableColumns = (val) => {
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: CountRecordMainApi.getCountRecordMainPage // 分页接口 getListApi: CountRecordDetailApi.getCountRecordDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -125,7 +126,11 @@ const buttonBaseClick = (val, item) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
defaultButtons.mainCountAdjustRequesttBtn({ defaultButtons.mainCountAdjustRequesttBtn({
hasPermi: 'wms:count-record-main:generate' hasPermi: 'wms:count-record-main:generate'

39
src/views/wms/countManage/count/countRequestMain/index.vue
View File

@ -2,7 +2,7 @@
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search <Search
:schema="CountRequestMain.allSchemas.searchSchema" :schema="[...CountRequestMain.allSchemas.searchSchema,...CountRequestDetail.allSchemas.searchSchema]"
@search="setSearchParams" @search="setSearchParams"
@reset="setSearchParams" @reset="setSearchParams"
/> />
@ -16,6 +16,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="CountRequestMain.allSchemas" :allSchemas="CountRequestMain.allSchemas"
:detailAllSchemas="CountRequestDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -36,9 +37,9 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase <ButtonBase
:Butttondata="butttondata(row)" :Butttondata="butttondata(row,$index)"
@button-base-click="buttonTableClick($event, row)" @button-base-click="buttonTableClick($event, row)"
/> />
</template> </template>
@ -122,7 +123,7 @@ 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(CountRequestMain.allSchemas.tableColumns) const tableColumns = ref([...CountRequestMain.allSchemas.tableColumns,...CountRequestDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -197,7 +198,7 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) =>
const Echo = [] const Echo = []
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: CountRequestMainApi.getCountRequestMainPage // 分页接口 getListApi: CountRequestDetailApi.getCountRequestDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -281,7 +282,11 @@ const isShowGenerateMainButton = (row, val) => {
const searchTableRef = ref() const searchTableRef = ref()
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
defaultButtons.mainListCloseBtn({hide: isShowMainButton(row, ['1', '2', '3', '4', '6']),hasPermi: 'wms:count-request-main:close'}), // 关闭 defaultButtons.mainListCloseBtn({hide: isShowMainButton(row, ['1', '2', '3', '4', '6']),hasPermi: 'wms:count-request-main:close'}), // 关闭
defaultButtons.mainListReAddBtn({hide: isShowMainButton(row, ['5']),hasPermi: 'wms:count-request-main:reAdd'}), //重新添加 defaultButtons.mainListReAddBtn({hide: isShowMainButton(row, ['5']),hasPermi: 'wms:count-request-main:reAdd'}), //重新添加
@ -304,7 +309,7 @@ const buttonTableClick = async (val, row) => {
// 关闭 // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
CountRequestMainApi.close(row.id) CountRequestMainApi.close(row.masterId)
.then(() => { .then(() => {
message.success(t('关闭成功')) message.success(t('关闭成功'))
tableObject.loading = false tableObject.loading = false
@ -318,7 +323,7 @@ const buttonTableClick = async (val, row) => {
// 重新添加 // 重新添加
await message.confirm('确认要重新添加吗？') await message.confirm('确认要重新添加吗？')
tableObject.loading = true tableObject.loading = true
CountRequestMainApi.reAdd(row.id) CountRequestMainApi.reAdd(row.masterId)
.then(() => { .then(() => {
message.success(t('添加成功')) message.success(t('添加成功'))
tableObject.loading = false tableObject.loading = false
@ -332,7 +337,7 @@ const buttonTableClick = async (val, row) => {
// 提交审批 // 提交审批
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
CountRequestMainApi.submit(row.id) CountRequestMainApi.submit(row.masterId)
.then(() => { .then(() => {
message.success(t('提交审批成功')) message.success(t('提交审批成功'))
tableObject.loading = false tableObject.loading = false
@ -346,7 +351,7 @@ const buttonTableClick = async (val, row) => {
// 驳回 // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
CountRequestMainApi.refused(row.id) CountRequestMainApi.refused(row.masterId)
.then(() => { .then(() => {
message.success(t('驳回成功')) message.success(t('驳回成功'))
tableObject.loading = false tableObject.loading = false
@ -360,7 +365,7 @@ const buttonTableClick = async (val, row) => {
// 审批通过 // 审批通过
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
CountRequestMainApi.agree(row.id) CountRequestMainApi.agree(row.masterId)
.then(() => { .then(() => {
message.success(t('审批已通过')) message.success(t('审批已通过'))
tableObject.loading = false tableObject.loading = false
@ -374,7 +379,7 @@ const buttonTableClick = async (val, row) => {
// 处理 // 处理
await message.confirm('确认要处理吗？') await message.confirm('确认要处理吗？')
tableObject.loading = true tableObject.loading = true
CountRequestMainApi.handle(row.id) CountRequestMainApi.handle(row.masterId)
.then(() => { .then(() => {
message.success(t('处理成功')) message.success(t('处理成功'))
tableObject.loading = false tableObject.loading = false
@ -396,7 +401,7 @@ const buttonTableClick = async (val, row) => {
label:3, label:3,
title:'选择' title:'选择'
}]) }])
searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'reCount','',true,'',row,{masterId:row.id},'',radioList.value) searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'reCount','',true,'',row,{masterId:row.masterId},'',radioList.value)
} else if (val == 'mainSuperviseCount') { } else if (val == 'mainSuperviseCount') {
// 监盘 // 监盘
const radioList = ref([{ const radioList = ref([{
@ -406,11 +411,11 @@ const buttonTableClick = async (val, row) => {
label:2, label:2,
title:'选择' title:'选择'
}]) }])
searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'superviseCount','',true,'',row,{masterId:row.id},'',radioList.value) searchTableRef.value.open('盘点申请明细',CountRequestDetail.allSchemas,CountRequestDetailApi.getCountRequestDetailPage,'superviseCount','',true,'',row,{masterId:row.masterId},'',radioList.value)
} else if (val == 'countAdjustRequest') { } else if (val == 'countAdjustRequest') {
// 生成盘点调整申请 // 生成盘点调整申请
await message.confirm('确认要生成盘点调整申请吗？') await message.confirm('确认要生成盘点调整申请吗？')
CountRequestMainApi.generateCountadjustRequest(row.id) CountRequestMainApi.generateCountadjustRequest(row.masterId)
.then(() => { .then(() => {
message.success(t('已生成盘点调整申请')) message.success(t('已生成盘点调整申请'))
getList() getList()
@ -422,7 +427,7 @@ const buttonTableClick = async (val, row) => {
// 解冻 // 解冻
await message.confirm('确认要解冻吗？') await message.confirm('确认要解冻吗？')
tableObject.loading = true tableObject.loading = true
CountRequestMainApi.thaw(row.id) CountRequestMainApi.thaw(row.masterId)
.then(() => { .then(() => {
message.success(t('解冻成功')) message.success(t('解冻成功'))
tableObject.loading = false tableObject.loading = false
@ -437,7 +442,7 @@ const buttonTableClick = async (val, row) => {
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { } else if (val == 'delete') {
// 删除 // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

17
src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="CountadjustRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...CountadjustRecordMain.allSchemas.searchSchema,...CountadjustRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="CountadjustRecordMain.allSchemas" :allSchemas="CountadjustRecordMain.allSchemas"
:detailAllSchemas="CountadjustRecordDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -76,7 +77,7 @@ 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(CountadjustRecordMain.allSchemas.tableColumns) const tableColumns = ref([...CountadjustRecordMain.allSchemas.tableColumns,...CountadjustRecordDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -84,7 +85,7 @@ const updataTableColumns = (val) => {
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: CountadjustRecordMainApi.getCountadjustRecordMainPage // 分页接口 getListApi: CountadjustRecordDetailApi.getCountadjustRecordDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -125,7 +126,11 @@ const buttonBaseClick = (val, item) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [] return []
} }

31
src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="CountadjustRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...CountadjustRequestMain.allSchemas.searchSchema,...CountadjustRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="CountadjustRequestMain.allSchemas" :allSchemas="CountadjustRequestMain.allSchemas"
:detailAllSchemas="CountadjustRequestDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -94,7 +95,7 @@ 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(CountadjustRequestMain.allSchemas.tableColumns) const tableColumns = ref([...CountadjustRequestMain.allSchemas.tableColumns,...CountadjustRequestDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -128,7 +129,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
const Echo = [] const Echo = []
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: CountadjustRequestMainApi.getCountadjustRequestMainPage // 分页接口 getListApi: CountadjustRequestDetailApi.getCountadjustRequestDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -184,7 +185,11 @@ const isShowMainButton = (row,val) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:countadjust-request-main:close'}), // 关闭 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:countadjust-request-main:close'}), // 关闭
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加
@ -199,7 +204,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainClose') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
CountadjustRequestMainApi.close(row.id).then(() => { CountadjustRequestMainApi.close(row.masterId).then(() => {
message.success(t('关闭成功')) message.success(t('关闭成功'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -210,7 +215,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainReAdd') { // 重新添加 } else if (val == 'mainReAdd') { // 重新添加
await message.confirm('确认要重新添加吗？') await message.confirm('确认要重新添加吗？')
tableObject.loading = true tableObject.loading = true
CountadjustRequestMainApi.reAdd(row.id).then(() => { CountadjustRequestMainApi.reAdd(row.masterId).then(() => {
message.success(t('添加成功')) message.success(t('添加成功'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -221,7 +226,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { // 提交审批 } else if (val == 'mainSubmit') { // 提交审批
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
CountadjustRequestMainApi.submit(row.id).then(() => { CountadjustRequestMainApi.submit(row.masterId).then(() => {
message.success(t('提交审批成功')) message.success(t('提交审批成功'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -232,7 +237,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { // 驳回 } else if (val == 'mainTurnDown') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
CountadjustRequestMainApi.refused(row.id).then(() => { CountadjustRequestMainApi.refused(row.masterId).then(() => {
message.success(t('驳回成功')) message.success(t('驳回成功'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -243,7 +248,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { // 审批通过 } else if (val == 'mainApprove') { // 审批通过
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
CountadjustRequestMainApi.agree(row.id).then(() => { CountadjustRequestMainApi.agree(row.masterId).then(() => {
message.success(t('审批已通过')) message.success(t('审批已通过'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -254,7 +259,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainHandle') { // 处理 } else if (val == 'mainHandle') { // 处理
await message.confirm('确认要处理吗？') await message.confirm('确认要处理吗？')
tableObject.loading = true tableObject.loading = true
CountadjustRequestMainApi.handle(row.id).then(() => { CountadjustRequestMainApi.handle(row.masterId).then(() => {
message.success(t('处理成功')) message.success(t('处理成功'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -265,7 +270,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

13
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="PackageoverJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...PackageoverJobMain.allSchemas.searchSchema,...PackageoverJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="PackageoverJobMain.allSchemas" :allSchemas="PackageoverJobMain.allSchemas"
:detailAllSchemas="PackageoverJobDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<!-- <template #action="{ row }"> <!-- <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> --> </template> -->
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -81,7 +82,7 @@ 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(PackageoverJobMain.allSchemas.tableColumns) const tableColumns = ref([...PackageoverJobMain.allSchemas.tableColumns,...PackageoverJobDetail.allSchemas.tableMainColumns])
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccess = (formField, searchField, val, formRef) => {
@ -98,7 +99,7 @@ const updataTableColumns = (val) => {
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: PackageoverJobMainApi.getPackageoverJobMainPage // 分页接口 getListApi: PackageoverJobDetailApi.getPackageoverJobDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -149,7 +150,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'edit') { // 编辑 if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

17
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="PackageoverMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...PackageoverMain.allSchemas.searchSchema,...PackageoverDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="PackageoverMain.allSchemas" :allSchemas="PackageoverMain.allSchemas"
:detailAllSchemas="PackageoverDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -78,7 +79,7 @@ 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(PackageoverMain.allSchemas.tableColumns) const tableColumns = ref([...PackageoverMain.allSchemas.tableColumns,...PackageoverDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -86,7 +87,7 @@ const updataTableColumns = (val) => {
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: PackageoverRecordMainApi.getPackageoverMainPage // 分页接口 getListApi: PackageoverRecordDetailApi.getPackageoverDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -119,7 +120,11 @@ const buttonBaseClick = (val, item) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [defaultButtons.mainListPointBtn(null)] // 标签打印 return [defaultButtons.mainListPointBtn(null)] // 标签打印
} }

31
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="PackageoverRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...PackageoverRequestMain.allSchemas.searchSchema,...PackageoverRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="PackageoverRequestMain.allSchemas" :allSchemas="PackageoverRequestMain.allSchemas"
:detailAllSchemas="PackageoverRequestDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -91,7 +92,7 @@ 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(PackageoverRequestMain.allSchemas.tableColumns) const tableColumns = ref([...PackageoverRequestMain.allSchemas.tableColumns,...PackageoverRequestDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -163,7 +164,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: PackageoverRequestMainApi.getPackageoverRequestMainPage // 分页接口 getListApi: PackageoverRequestDetailApi.getPackageoverRequestDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -219,7 +220,11 @@ const isShowMainButton = (row,val) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:packageover-request-main:close'}), // 关闭 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:packageover-request-main:close'}), // 关闭
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:packageover-request-main:reAdd'}), // 重新添加 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:packageover-request-main:reAdd'}), // 重新添加
@ -239,7 +244,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainClose') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
PackageoverRequestMainApi.close(row.id).then(() => { PackageoverRequestMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -250,7 +255,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainReAdd') { // 重新添加 } else if (val == 'mainReAdd') { // 重新添加
await message.confirm('确认要重新添加吗？') await message.confirm('确认要重新添加吗？')
tableObject.loading = true tableObject.loading = true
PackageoverRequestMainApi.reAdd(row.id).then(() => { PackageoverRequestMainApi.reAdd(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -261,7 +266,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { // 提交审批 } else if (val == 'mainSubmit') { // 提交审批
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
PackageoverRequestMainApi.submit(row.id).then(() => { PackageoverRequestMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -272,7 +277,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { // 驳回 } else if (val == 'mainTurnDown') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
PackageoverRequestMainApi.refused(row.id).then(() => { PackageoverRequestMainApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -283,7 +288,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { // 审批通过 } else if (val == 'mainApprove') { // 审批通过
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
PackageoverRequestMainApi.agree(row.id).then(() => { PackageoverRequestMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -294,7 +299,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainHandle') { // 处理 } else if (val == 'mainHandle') { // 处理
await message.confirm('确认要处理吗？') await message.confirm('确认要处理吗？')
tableObject.loading = true tableObject.loading = true
PackageoverRequestMainApi.handle(row.id).then(() => { PackageoverRequestMainApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -305,7 +310,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

17
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="UnplannedissueJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...UnplannedissueJobMain.allSchemas.searchSchema,...UnplannedissueJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="UnplannedissueJobMain.allSchemas" :allSchemas="UnplannedissueJobMain.allSchemas"
:detailAllSchemas="UnplannedissueJobDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -81,7 +82,7 @@ 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(UnplannedissueJobMain.allSchemas.tableColumns) const tableColumns = ref([...UnplannedissueJobMain.allSchemas.tableColumns,...UnplannedissueJobDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -128,7 +129,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const Echo = [] const Echo = []
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: UnplannedissueJobMainApi.getUnplannedissueJobMainPage // 分页接口 getListApi: UnplannedissueJobDetailApi.getUnplannedissueJobDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -178,7 +179,11 @@ const isShowMainButton = (row,val) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
// defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭

17
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="UnplannedissueRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...UnplannedissueRecordMain.allSchemas.searchSchema,...UnplannedissueRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="UnplannedissueRecordMain.allSchemas" :allSchemas="UnplannedissueRecordMain.allSchemas"
:detailAllSchemas="UnplannedissueRecordDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -76,7 +77,7 @@ 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(UnplannedissueRecordMain.allSchemas.tableColumns) const tableColumns = ref([...UnplannedissueRecordMain.allSchemas.tableColumns,...UnplannedissueRecordDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -84,7 +85,7 @@ const updataTableColumns = (val) => {
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: UnplannedissueRecordMainApi.getUnplannedissueRecordMainPageSpare // 备件领用分页接口 getListApi: UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPage // 备件领用分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -125,7 +126,11 @@ const buttonBaseClick = (val, item) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [] return []
} }

31
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="UnplannedissueRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...UnplannedissueRequestMain.allSchemas.searchSchema,...UnplannedissueRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="UnplannedissueRequestMain.allSchemas" :allSchemas="UnplannedissueRequestMain.allSchemas"
:detailAllSchemas="UnplannedissueRequestDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -96,7 +97,7 @@ 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(UnplannedissueRequestMain.allSchemas.tableColumns) const tableColumns = ref([...UnplannedissueRequestMain.allSchemas.tableColumns,...UnplannedissueRequestDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -142,7 +143,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
const Echo = [] const Echo = []
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: UnplannedissueRequestMainApi.getUnplannedissueRequestMainPageSpare // 分页接口 getListApi: UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -198,7 +199,11 @@ const isShowMainButton = (row,val) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedissue-request-main:close'}), // 关闭 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedissue-request-main:close'}), // 关闭
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedissue-request-main:reAdd'}), // 重新添加 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedissue-request-main:reAdd'}), // 重新添加
@ -217,25 +222,25 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainClose') { // 关闭
console.log('列表-操作按钮事件-关闭') console.log('列表-操作按钮事件-关闭')
handleClose(row.id) handleClose(row.masterId)
} else if (val == 'mainReAdd') { // 重新添加 } else if (val == 'mainReAdd') { // 重新添加
console.log('列表-操作按钮事件-重新添加') console.log('列表-操作按钮事件-重新添加')
handleReAdd(row.id) handleReAdd(row.masterId)
} else if (val == 'mainSubmit') { // 提交审批 } else if (val == 'mainSubmit') { // 提交审批
console.log('列表-操作按钮事件-提交审批') console.log('列表-操作按钮事件-提交审批')
handleSubmit(row.id) handleSubmit(row.masterId)
} else if (val == 'mainTurnDown') { // 驳回 } else if (val == 'mainTurnDown') { // 驳回
console.log('列表-操作按钮事件-驳回') console.log('列表-操作按钮事件-驳回')
handleRefused(row.id) handleRefused(row.masterId)
} else if (val == 'mainApprove') { // 审批通过 } else if (val == 'mainApprove') { // 审批通过
console.log('列表-操作按钮事件-审批通过') console.log('列表-操作按钮事件-审批通过')
handleAgree(row.id) handleAgree(row.masterId)
} else if (val == 'mainHandle') { // 处理 } else if (val == 'mainHandle') { // 处理
handleHandle(row.id) handleHandle(row.masterId)
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

17
src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="InventorychangeRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...InventorychangeRecordMain.allSchemas.searchSchema,...InventorychangeRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="InventorychangeRecordMain.allSchemas" :allSchemas="InventorychangeRecordMain.allSchemas"
:detailAllSchemas="InventorychangeRecordDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -76,7 +77,7 @@ 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(InventorychangeRecordMain.allSchemas.tableColumns) const tableColumns = ref([...InventorychangeRecordMain.allSchemas.tableColumns,...InventorychangeRecordDetail.allSchemas.tableMainColumns])
console.log(99 , routeName.value) console.log(99 , routeName.value)
const fromInventoryStatus = ref() const fromInventoryStatus = ref()
@ -88,7 +89,7 @@ const updataTableColumns = (val) => {
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: InventorychangeRecordMainApi.getInventorychangeRecordMainPage // 分页接口 getListApi: InventorychangeRecordDetailApi.getInventorychangeRecordDetailPage // 分页接口
}) })
@ -171,7 +172,11 @@ const buttonBaseClick = (val, item) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [] return []
} }

31
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="InventorychangeRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...InventorychangeRequestMain.allSchemas.searchSchema,...InventorychangeRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="InventorychangeRequestMain.allSchemas" :allSchemas="InventorychangeRequestMain.allSchemas"
:detailAllSchemas="InventorychangeRequestDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -90,10 +91,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(InventorychangeRequestMain.allSchemas.tableColumns) const tableColumns = ref([...InventorychangeRequestMain.allSchemas.tableColumns,...InventorychangeRequestDetail.allSchemas.tableMainColumns])
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: InventorychangeRequestMainApi.getInventorychangeRequestMainPage // 分页接口 getListApi: InventorychangeRequestDetailApi.getInventorychangeRequestDetailPage // 分页接口
}) })
@ -235,7 +236,11 @@ const isShowMainButton = (row,val) => {
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorychange-request-main:reAdd'}), //重新添加 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorychange-request-main:reAdd'}), //重新添加
@ -255,7 +260,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainClose') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
InventorychangeRequestMainApi.close(row.id).then(() => { InventorychangeRequestMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -266,7 +271,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainReAdd') { // 重新添加 } else if (val == 'mainReAdd') { // 重新添加
await message.confirm('确认要重新添加吗？') await message.confirm('确认要重新添加吗？')
tableObject.loading = true tableObject.loading = true
InventorychangeRequestMainApi.reAdd(row.id).then(() => { InventorychangeRequestMainApi.reAdd(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -277,7 +282,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { // 提交审批 } else if (val == 'mainSubmit') { // 提交审批
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
InventorychangeRequestMainApi.submit(row.id).then(() => { InventorychangeRequestMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -288,7 +293,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { // 驳回 } else if (val == 'mainTurnDown') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
InventorychangeRequestMainApi.refused(row.id).then(() => { InventorychangeRequestMainApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -299,7 +304,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { // 审批通过 } else if (val == 'mainApprove') { // 审批通过
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
InventorychangeRequestMainApi.agree(row.id).then(() => { InventorychangeRequestMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -310,7 +315,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainHandle') { // 处理 } else if (val == 'mainHandle') { // 处理
await message.confirm('确认要处理吗？') await message.confirm('确认要处理吗？')
tableObject.loading = true tableObject.loading = true
InventorychangeRequestMainApi.handle(row.id).then(() => { InventorychangeRequestMainApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -321,7 +326,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

Write Preview
Loading…
Cancel
Save