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

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
zhang_li 7 months ago
parent
8cc3c8aeb3 f38122f8f5
commit
a9a17cdf6d
2 changed files with 21 additions and 11 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. 15
      src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
  2. 17
      src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue

15
src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="OfflinesettlementRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...OfflinesettlementRecordMain.allSchemas.searchSchema,...OfflinesettlementRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="OfflinesettlementRecordMain.allSchemas" :allSchemas="OfflinesettlementRecordMain.allSchemas"
:detailAllSchemas="OfflinesettlementRecordDetail.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(OfflinesettlementRecordMain.allSchemas.tableColumns) const tableColumns = ref([...OfflinesettlementRecordMain.allSchemas.tableColumns,...OfflinesettlementRecordDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -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 []
} }

17
src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="OfflinesettlementRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...OfflinesettlementRequestMain.allSchemas.searchSchema,...OfflinesettlementRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="OfflinesettlementRequestMain.allSchemas" :allSchemas="OfflinesettlementRequestMain.allSchemas"
:detailAllSchemas="OfflinesettlementRequestDetail.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(OfflinesettlementRequestMain.allSchemas.tableColumns) const tableColumns = ref([...OfflinesettlementRequestMain.allSchemas.tableColumns,...OfflinesettlementRequestDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -197,7 +198,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'])}), // 关闭 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
@ -226,7 +231,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