From 4a5371bcad2ba23f2c9609f4b9f94860c3ca3219 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Thu, 30 Nov 2023 16:32:55 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/index.vue | 19 +++--- .../purchasePlanMain/purchasePlanMain.data.ts | 60 ++++++++++--------- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index ed8847a16..8a0895e54 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -204,12 +204,10 @@ const butttondata = (row) => { defaultButtons.mainListPurchasePlanCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 defaultButtons.mainListPurchasePlanOpeBtn({hide:isShowMainButton(row,['2'])}), // 打开 defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除 + // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除 ] } - - // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainPurPlanOpe') { // 打开 @@ -299,13 +297,14 @@ const submitForm = async (formType, data) => { for(let item of tableData.value) { await PurchaseDetailApi.getPurchaseDetailPage({ number: item.poNumber, - lineNumber: item.poLine + lineNumber: item.poLine, }).then(res => { - if(item.planQty > res.list[0].orderQty-res.list[0].plannedQty){ - message.error('要货计划数量不得大于订单数量-已计划数量') - } else { - data.subList.push(item) // 拼接子表数据参数 - } + data.subList.push(item) // 拼接子表数据参数 + // if(item.planQty > res.list[0].orderQty-res.list[0].plannedQty){ + // message.error('要货计划数量不得大于订单数量-已计划数量') + // } else { + // data.subList.push(item) // 拼接子表数据参数 + // } }) } if(data.subList.length == tableData.value.length){ @@ -375,4 +374,4 @@ onMounted(async () => { getList() importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index e4036623a..418dc8d84 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -15,7 +15,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ label: '单据号', field: 'number', sort: 'custom', - isForm: false , + isForm: false, table: { width: 150, fixed: 'left' @@ -122,7 +122,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -145,7 +145,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -166,7 +166,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ label: '创建时间', field: 'createTime', isTable: true, - isForm: false , + isForm: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -178,7 +178,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -189,7 +189,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ label: '创建者', field: 'creator', sort: 'custom', - isForm: false , + isForm: false, table: { width: 150 }, @@ -198,7 +198,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ label: '最后更新时间', field: 'updateTime', isTable: true, - isForm: false , + isForm: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -210,7 +210,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -221,7 +221,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ label: '最后更新者', field: 'updater', sort: 'custom', - isForm: false , + isForm: false, table: { width: 150 }, @@ -250,7 +250,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ label: '操作', field: 'action', isDetail: false, - isForm: false , + isForm: false, table: { width: 200, fixed: 'right' @@ -285,7 +285,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm:{ + tableForm: { isInpuFocusShow: true, searchListPlaceholder: '请选择订单号', searchField: 'number', @@ -322,7 +322,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm:{ + tableForm: { isInpuFocusShow: true, searchListPlaceholder: '请选择订单行', searchField: 'lineNumber', @@ -330,10 +330,11 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ searchAllSchemas: PurchaseDetail.allSchemas, searchPage: PurchaseDetailApi.getPurchaseDetailPage, searchCondition: [{ - key:'number', - value:'poNumber', + key: 'number', + value: 'poNumber', isMainValue: true - },{ + }, + { key: 'available', value: 'TRUE', isMainValue: false @@ -349,10 +350,11 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ searchAllSchemas: PurchaseDetail.allSchemas, searchPage: PurchaseDetailApi.getPurchaseDetailPage, searchCondition: [{ - key:'number', - value:'poNumber', + key: 'number', + value: 'number', isMainValue: true - },{ + }, + { key: 'available', value: 'TRUE', isMainValue: false @@ -364,7 +366,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ label: '单据号', field: 'number', sort: 'custom', - isTableForm:false, + isTableForm: false, table: { width: 150 }, @@ -398,7 +400,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', - isTableForm:false, + isTableForm: false, table: { width: 180 }, @@ -406,7 +408,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -417,7 +419,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ label: '创建者', field: 'creator', sort: 'custom', - isTableForm:false, + isTableForm: false, table: { width: 150 }, @@ -472,7 +474,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ label: '最后更新者', field: 'updater', sort: 'custom', - isTableForm:false, + isTableForm: false, table: { width: 150 }, @@ -482,7 +484,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ label: '最后更新时间', field: 'updateTime', sort: 'custom', - isTableForm:false, + isTableForm: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -494,7 +496,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -520,8 +522,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm:{ - type:'Select', + tableForm: { + type: 'Select', default: 'TRUE', inactiveValue: 'FALSE', activeValue: 'TRUE' @@ -539,12 +541,12 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ label: '操作', field: 'action', isDetail: false, - isForm: false , + isForm: false, table: { width: 150, fixed: 'right' }, - isTableForm:false, + isTableForm: false, } ]))