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
05a44cbb99
commit
ee7b47aa96
4 changed files with 59 additions and 39 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. 21
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
  2. 17
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
  3. 29
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  4. 31
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

21
src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="DeliverJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...DeliverJobMain.allSchemas.searchSchema,...DeliverJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="DeliverJobMain.allSchemas" :allSchemas="DeliverJobMain.allSchemas"
:detailAllSchemas="DeliverJobDetail.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(DeliverJobMain.allSchemas.tableColumns) const tableColumns = ref([...DeliverJobMain.allSchemas.tableColumns,...DeliverJobDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -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'])}), // 关闭
@ -286,11 +291,11 @@ const buttonTableClick = async (val, row) => {
handleHandle(aaa) handleHandle(aaa)
console.log('列表-操作按钮事件-执行') console.log('列表-操作按钮事件-执行')
} else if (val == 'mainJobAba') { // 放弃 } else if (val == 'mainJobAba') { // 放弃
DeliverJobMainApi.abandonDeliverJobMain(row.id) DeliverJobMainApi.abandonDeliverJobMain(row.masterId)
} else if (val == 'mainJobClo') { // 关闭 } else if (val == 'mainJobClo') { // 关闭
DeliverJobMainApi.closeDeliverJobMain(row.id) DeliverJobMainApi.closeDeliverJobMain(row.masterId)
} else if (val == 'mainJobAcc') { // 承接 } else if (val == 'mainJobAcc') { // 承接
DeliverJobMainApi.acceptDeliverJobMain(row.id) DeliverJobMainApi.acceptDeliverJobMain(row.masterId)
} }
} }
// 获取部门 用于详情 部门回显 // 获取部门 用于详情 部门回显

17
src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="DeliverRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...DeliverRecordMain.allSchemas.searchSchema,...DeliverRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="DeliverRecordMain.allSchemas" :allSchemas="DeliverRecordMain.allSchemas"
:detailAllSchemas="DeliverRecordDetail.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>
@ -77,7 +78,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(DeliverRecordMain.allSchemas.tableColumns) const tableColumns = ref([...DeliverRecordMain.allSchemas.tableColumns,...DeliverRecordDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -126,7 +127,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 []
}
defaultButtons.mainListDocumentPrintBtn(null), // 标签打印 defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
] ]
@ -166,7 +171,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/929209659733770240?token=' + getAccessToken()) const src = ref(BASE_URL + '/jmreport/view/929209659733770240?token=' + getAccessToken())
// 标签打印 // 标签打印
const handlePoint = async (row) => { const handlePoint = async (row) => {
window.open(src.value+'&id='+row.id) window.open(src.value+'&id='+row.masterId)
} }
// 筛选提交 // 筛选提交

29
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="DeliverRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...DeliverRequestMain.allSchemas.searchSchema,...DeliverRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="DeliverRequestMain.allSchemas" :allSchemas="DeliverRequestMain.allSchemas"
:detailAllSchemas="DeliverRequestDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -33,8 +34,8 @@
</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>
@ -101,7 +102,7 @@ const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const customerCode = ref() const customerCode = ref()
const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns) const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns])
const isShowButton = ref(true) const isShowButton = ref(true)
@ -259,7 +260,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:deliver-request-main:close'}), // 关闭 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:deliver-request-main:close'}), // 关闭
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:deliver-request-main:reAdd'}), //重新添加 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:deliver-request-main:reAdd'}), //重新添加
@ -279,7 +284,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainClose') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
DeliverRequestMainApi.close(row.id).then(() => { DeliverRequestMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -290,7 +295,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
DeliverRequestMainApi.reAdd(row.id).then(() => { DeliverRequestMainApi.reAdd(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -301,7 +306,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
DeliverRequestMainApi.submit(row.id).then(() => { DeliverRequestMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -312,7 +317,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
DeliverRequestMainApi.refused(row.id).then(() => { DeliverRequestMainApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -323,7 +328,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
DeliverRequestMainApi.agree(row.id).then(() => { DeliverRequestMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -334,7 +339,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
DeliverRequestMainApi.handle(row.id).then(() => { DeliverRequestMainApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -345,7 +350,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)
} }
} }

31
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="DeliverPlanMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...DeliverPlanMain.allSchemas.searchSchema,...DeliverPlanDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="DeliverPlanMain.allSchemas" :allSchemas="DeliverPlanMain.allSchemas"
:detailAllSchemas="DeliverPlanDetail.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>
@ -92,7 +93,7 @@ const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const customerCode = ref() const customerCode = ref()
const tableColumns = ref(DeliverPlanMain.allSchemas.tableColumns) const tableColumns = ref([...DeliverPlanMain.allSchemas.tableColumns,...DeliverPlanDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -209,7 +210,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({hide:isShowMainButton(row,['5']),hasPermi:'wms:deliver-plan-main:open'}), // 打开 defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:deliver-plan-main:open'}), // 打开
defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:deliver-plan-main:close'}), // 关闭 defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:deliver-plan-main:close'}), // 关闭
@ -226,7 +231,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
DeliverPlanMainApi.open(row.id).then(() => { DeliverPlanMainApi.open(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -237,7 +242,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
DeliverPlanMainApi.close(row.id).then(() => { DeliverPlanMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -248,7 +253,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanSub') { // 提交审批 } else if (val == 'mainPlanSub') { // 提交审批
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
DeliverPlanMainApi.submit(row.id).then(() => { DeliverPlanMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -259,7 +264,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanTur') { // 驳回 } else if (val == 'mainPlanTur') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
DeliverPlanMainApi.reject(row.id).then(() => { DeliverPlanMainApi.reject(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -270,7 +275,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
DeliverPlanMainApi.agree(row.id).then(() => { DeliverPlanMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -281,7 +286,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
DeliverPlanMainApi.publish(row.id).then(() => { DeliverPlanMainApi.publish(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -292,7 +297,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
DeliverPlanMainApi.resetting(row.id).then(() => { DeliverPlanMainApi.resetting(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -303,7 +308,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