diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 1287cdda0..361e1d426 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -59,7 +59,7 @@ :formAllSchemas="PurchasePlanMain.allSchemas" :tableAllSchemas="PurchasePlanDetail.allSchemas" :tableFormRules="PurchasePlanDetailRules" - :tableData="tableData" + :tableData="showTableData" :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain" :apiCreate="PurchasePlanMainApi.createPurchasePlanMain" :isBusiness="true" @@ -70,10 +70,24 @@ @clearSearchInput="clearSearchInput" @handleDeleteTable="handleDeleteTable" @tableSelectionDelete="tableSelectionDelete" - @searchTableSuccess="searchTableSuccess" + @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @onEnter="onEnter" - @onBlur="onEnter"/> + @onBlur="onEnter"> + + + @@ -261,7 +275,7 @@ const { loadStart, loadDone } = usePageLoading() // setV['contacts'] = res.contacts // setV['phone'] = res.phone // }) - tableData.value = [] + clearTableDataSearch() } if (formField == 'poLine') { setV['itemCode'] = val[0]['itemCode'] @@ -332,6 +346,9 @@ const getSearchTableData = async (number,formField,searchField)=>{ } tableData.value.push(newRow) }) + // 清空筛选条件 + initTableDataSearch() + } // 查询页面返回——详情 const searchTableSuccessDetail = (formField, searchField, val, formRef,formModel) => { @@ -529,7 +546,7 @@ const isShowMainButton1 = (row, val) => { /** 添加/修改操作 */ const formRef = ref() const openForm = async (type : string, row ?: number) => { - tableData.value = [] // 重置明细数据 + clearTableDataSearch() formRef.value.open(type, row) if('create'==type){ nextTick(async () => { @@ -845,6 +862,42 @@ const handleSelectionPublish = async ()=>{ tableFormKeys[item.field] = item.default ? item.default : '' }) const tableData = ref([]) + const showTableData = ref([]) + const tableDataSearch = ref({ + itemCode:'', + backNumber:'' + }) + const clearTableDataSearch = ()=>{ + tableDataSearch.value = { + itemCode:'', + backNumber:'' + } + showTableData.value = [] + tableData.value = [] + } + + const initTableDataSearch = ()=>{ + tableDataSearch.value = { + itemCode:'', + backNumber:'' + } + showTableData.value = tableData.value + } + + const changeTableDataSearch = ()=>{ + let filterList = tableData.value + if(tableDataSearch.value['itemCode']){ + filterList = tableData.value.filter(item => { + return item['itemCode'].includes(tableDataSearch.value['itemCode']) + }) + } + if(tableDataSearch.value['backNumber']){ + filterList = filterList.filter(item => { + return item['backNumber'].includes(tableDataSearch.value['backNumber']) + }) + } + showTableData.value = filterList + } // 添加明细 const handleAddTable = () => { @@ -998,8 +1051,14 @@ const handleSelectionPublish = async ()=>{ getList() // 刷新当前列表 } const clearSearchInput = (field) => { + if (field == 'supplierCode') { + formRef.value.formRef.setValues({ + poNumber: '' + }) + clearTableDataSearch() + } if (field == 'poNumber') { - tableData.value = [] + clearTableDataSearch() } } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index a70f2a599..a0dfecbb4 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -917,25 +917,7 @@ export const PurchasePlanDetail = useCrudSchemas( } }, { - label: '订单数量', - field: 'orderQty', - sort: 'custom', - sortSearchDefault: 8, - sortTableDefault:23, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - }, - tableForm: { - disabled: true - } - }, - { - label: '计划采购数量', + label: '箱数', field: 'planQty', sort: 'custom', sortSearchDefault: 9, @@ -955,6 +937,24 @@ export const PurchasePlanDetail = useCrudSchemas( } } }, + { + label: '订单数量', + field: 'orderQty', + sort: 'custom', + sortSearchDefault: 8, + sortTableDefault:23, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } + }, { label: '采购标包数量', field: 'purchaseStdQty',