diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index ec46cb9df..410cf97f0 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -89,7 +89,7 @@ @searchTableSuccess="searchTableSuccess" @submitForm="submitFormLabel" /> - + @@ -123,7 +123,7 @@ const tableColumns = ref([...ProductionreturnRequestMain.allSchemas.tableColumns const detailListTableColumns = ProductionreturnRequestDetailLabel.allSchemas const isCreateLabel = ref(false) const formLabelRef = ref() -const labelType = ref('') // 标签类别 采购还是制造等 +const labelType = ref('') // 标签类别 采购还是制造等 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ getListApi: ProductionreturnRequestDetailApi.getProductionreturnRequestDetailPage }) @@ -199,7 +199,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { row['batch'] = '000000' } - // 修改 tableform 属性 数量最大值设置为库存余额中数量 + // 修改 tableform 属性 数量最大值设置为库存余额中数量 // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如: 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制 ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => { if(item.field == 'qty' && val[0]['qty'] > 0) { @@ -278,7 +278,7 @@ const HeadButttondata = [ defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 - + ] // 头部按钮事件 @@ -492,7 +492,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = false console.log(err) }) - } else if (val == 'edit') { // 编辑 + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.masterId) @@ -750,10 +750,19 @@ const labelPrint = async (row) => { // 筛选提交 const searchFormClick = (searchData) => { - tableObject.params = { - isSearch: true, - filters: searchData.filters + tableObject.params.isSearch = true + if(!searchData.filters){//重置的时候应用 + searchData.filters = [] + } + let filters = [...searchData.filters] + if(!filters.find(item=>item.column=='business_type')) { + filters = [...filters,{ + action:'==', + column:'business_type', + value:'ReturnToStore', + }] } + tableObject.params.filters = filters getList() // 刷新当前列表 }