Browse Source

优化

master_hella_20240701
yufei0306 7 months ago
parent
commit
047a881a0f
  1. 15
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
  2. 15
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
  3. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
  4. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
  5. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
  6. 2
      src/views/wms/productionManage/productredress/productredressJobMain/index.vue
  7. 2
      src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
  8. 2
      src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

15
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ProductreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...ProductreceiptJobMain.allSchemas.searchSchema,...ProductreceiptJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductreceiptJobMain.allSchemas"
:detailAllSchemas="ProductreceiptJobDetail.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>
@ -82,7 +83,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(ProductreceiptJobMain.allSchemas.tableColumns)
const tableColumns = ref([...ProductreceiptJobMain.allSchemas.tableColumns,...ProductreceiptJobDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -158,7 +159,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'])}), //

15
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ProductreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...ProductreceiptRecordMain.allSchemas.searchSchema,...ProductreceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductreceiptRecordMain.allSchemas"
:detailAllSchemas="ProductreceiptRecordDetail.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>
@ -101,7 +102,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(ProductreceiptRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...ProductreceiptRecordMain.allSchemas.tableColumns,...ProductreceiptRecordDetail.allSchemas.tableMainColumns])
// table
const buttondataTable = ref([{
label: 'Bom',
@ -169,7 +170,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 []
}

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductreceiptJobMain.allSchemas"
:detailAllSchemas=ProductreceiptJobDetail.allSchemas"
:detailAllSchemas="ProductreceiptJobDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductreceiptRecordMain.allSchemas"
:detailAllSchemas=ProductreceiptRecordDetail.allSchemas"
:detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductreceiptRequestMain.allSchemas"
:detailAllSchemas=ProductreceiptRequestDetail.allSchemas"
:detailAllSchemas="ProductreceiptRequestDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productredress/productredressJobMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductredressJobMain.allSchemas"
:detailAllSchemas=ProductredressJobDetail.allSchemas"
:detailAllSchemas="ProductredressJobDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productredress/productredressRecordMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductredressRecordMain.allSchemas"
:detailAllSchemas=ProductredressRecordDetail.allSchemas"
:detailAllSchemas="ProductredressRecordDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductredressRequestMain.allSchemas"
:detailAllSchemas=ProductredressRequestDetail.allSchemas"
:detailAllSchemas="ProductredressRequestDetail.allSchemas"
/>
<!-- 列表 -->

Loading…
Cancel
Save