diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
index 5ae19ffb2..4c4d90738 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
@@ -1,7 +1,11 @@
-
+
@@ -12,7 +16,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ContainerRecordMain.allSchemas"
- :detailAllSchemas="ContainerRecordDetailAllSchemas"
+ :detailAllSchemas="ContainerRecordDetail.allSchemas"
/>
@@ -33,23 +37,8 @@
{{ row.number }}
-
-
-
-
-
-
-
item.field != "fromLocationCode")
-// ContainerRecordDetailAllSchemas.value.tableMainColumns = array
-// tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
-// }
-// else {
-// ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
-// tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
-// }
-
+tableObject.params = {
+ type:'INITIAL'
+}
+importFileName.value = '器具初始化记录'
// 字段设置 更新主列表字段
@@ -167,26 +101,11 @@ const HeadButttondata = [
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置
- // {
- // label: '自定义扩展按钮',
- // name: 'zdy',
- // hide: false,
- // type: 'primary',
- // icon: 'Select',
- // color: ''
- // },
]
-const searchList = (model)=>{
- model.type = searchType.value
- setSearchParams(model)
-}
-
// 头部按钮事件
const buttonBaseClick = (val, item) => {
- if (val == 'add') { // 新增
- openForm('create')
- } else if (val == 'export') { // 导出
+ if (val == 'export') { // 导出
handleExport()
} else if (val == 'refresh') { // 刷新
if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -201,28 +120,6 @@ const buttonBaseClick = (val, item) => {
console.log('其他按钮', item)
}
}
-
-// 列表-操作按钮
-const butttondata = (row,$index) => {
-const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
- if(findIndex>-1&&findIndex<$index){
- return []
- }
- return [
- // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
- // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
- ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
- if (val == 'edit') { // 编辑
- openForm('update', row)
- } else if (val == 'delete') { // 删除
- handleDelete(row.id)
- }
-}
-
// 获取部门 用于详情 部门回显
const { wsCache } = useCache()
/** 详情操作 */
@@ -233,24 +130,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
}
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
- basicFormRef.value.open(type, row)
-}
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
- try {
- // 删除的二次确认
- await message.delConfirm()
- // 发起删除
- await ContainerRecordMainApi.deleteContainerRecordMain(id)
- message.success(t('common.delSuccess'))
- // 刷新列表
- buttonBaseClick('refresh',null)
- } catch {}
-}
+
/** 导出按钮操作 */
const handleExport = async () => {
@@ -260,13 +141,8 @@ const handleExport = async () => {
// 发起导出
loadStart()
const excelTitle = ref(route.meta.title)
- if(businessType.value = 'InitialContainerManage'){
- const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+ const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
- }else {
- const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
- download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
- }
} catch {
} finally {
loadDone()
@@ -278,7 +154,7 @@ const searchFormClick = (searchData) => {
const cmd = {
'column':'type',
'action':'==',
- 'value':searchType.value
+ 'value':'INITIAL'
}
if (!Array.isArray(searchData.filters)) {
searchData.filters = [];
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
index 8b65a711b..3cdb48b7e 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
@@ -39,7 +39,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([
sort: 'custom',
dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
dictClass: 'string',
- isSearch: true,
+ isSearch: false,
isTable: true,
table: {
width: 120
@@ -180,15 +180,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive([
table: {
width: 150
}
- },
- {
- label: '操作',
- field: 'action',
- isForm: false,
- table: {
- width: 150,
- fixed: 'right'
- }
}
]))