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

制品报废--主子表合并

master_hella_20240701
yufei0306 5 months ago
parent
16d7c745e6
commit
d235352254
3 changed files with 40 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
  2. 17
      src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
  3. 33
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

15
src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
View File

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ProductscrapJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...ProductscrapJobMain.allSchemas.searchSchema,...ProductscrapJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductscrapJobMain.allSchemas"
:detailAllSchemas="ProductscrapJobDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(ProductscrapJobMain.allSchemas.tableColumns)
const tableColumns = ref([...ProductscrapJobMain.allSchemas.tableColumns,...ProductscrapJobDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段
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 [
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭

17
src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
View File

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ProductscrapRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...ProductscrapRecordMain.allSchemas.searchSchema,...ProductscrapRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductscrapRecordMain.allSchemas"
:detailAllSchemas="ProductscrapRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -103,7 +104,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(ProductscrapRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...ProductscrapRecordMain.allSchemas.tableColumns,...ProductscrapRecordDetail.allSchemas.tableMainColumns])
// 详情 table 操作扩展 按钮
const buttondataTable = ref([{
@ -180,7 +181,7 @@ const tableFormButton = async (val , row) => {
bomModelVisible.value = true
DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
detatableDataBom.params = {
masterId: row.id
masterId: row.masterId
}
await getDetailListBom()
}
@ -233,7 +234,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 []
}

33
src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
View File

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ProductscrapRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...ProductscrapRequestMain.allSchemas.searchSchema,...ProductscrapRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductscrapRequestMain.allSchemas"
:detailAllSchemas="ProductscrapRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -123,7 +124,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(ProductscrapRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...ProductscrapRequestMain.allSchemas.tableColumns,...ProductscrapRequestDetail.allSchemas.tableMainColumns])
// 详情 table 操作扩展 按钮
const buttondataTable = ref([{
@ -274,9 +275,9 @@ const tableFormButton = async (val , row) => {
detatableDataBom.params = {
itemCode: row.itemCode,
bomVersion: row.bomVersion,
masterId: row.id
masterId: row.masterId
}
rowId.value = row.id
rowId.value = row.masterId
detailQty.value = row.qty
await getDetailListBom()
detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
@ -411,7 +412,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 [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:productscrap-request-main:close'}), // 关闭
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:productscrap-request-main:reAdd'}), // 重新添加
@ -428,26 +433,26 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭
console.log('列表-操作按钮事件-关闭')
handleClose(row.id)
handleClose(row.masterId)
} else if (val == 'mainReAdd') { // 重新添加
console.log('列表-操作按钮事件-重新添加')
handleReAdd(row.id)
handleReAdd(row.masterId)
} else if (val == 'mainSubmit') { // 提交审批
console.log('列表-操作按钮事件-提交审批')
handleSubmit(row.id)
handleSubmit(row.masterId)
} else if (val == 'mainTurnDown') { // 驳回
console.log('列表-操作按钮事件-驳回')
handleRefused(row.id)
handleRefused(row.masterId)
} else if (val == 'mainApprove') { // 审批通过
console.log('列表-操作按钮事件-审批通过')
handleAgree(row.id)
handleAgree(row.masterId)
} else if (val == 'mainHandle') { // 处理
console.log('列表-操作按钮事件-处理')
handleHandle(row.id)
handleHandle(row.masterId)
} else if (val == 'edit') { // 编辑
openForm('update', row)
} else if (val == 'delete') { // 删除
handleDelete(row.id)
handleDelete(row.masterId)
}
}

Write Preview
Loading…
Cancel
Save