From 1eee4440565b60149e5d0f92ac1c9edda1ebdcd3 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 28 Dec 2023 15:31:59 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreceiptRequestMain/index.vue | 6 ++--- .../deliverRequestMain.data.ts | 24 +++++++------------ .../deliver/deliverRequestMain/index.vue | 3 --- .../deliverPlanMain/deliverPlanMain.data.ts | 2 +- .../deliverplan/deliverPlanMain/index.vue | 4 ++-- 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue index afde0dc20..b1d95d61b 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue @@ -214,7 +214,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainSubmit') { // 提交审批 - await message.confirm('确认要重新添加吗？') + await message.confirm('确认要提交审批吗？') CustomerreceiptRequestMainApi.submit(row.id).then(() => { message.success(t('common.updateSuccess')) getList() @@ -222,7 +222,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainTurnDown') { // 驳回 - await message.confirm('确认要重新添加吗？') + await message.confirm('确认要驳回吗？') CustomerreceiptRequestMainApi.refused(row.id).then(() => { message.success(t('common.updateSuccess')) getList() @@ -238,7 +238,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainHandle') { // 处理 - await message.confirm('确认要 处理吗？') + await message.confirm('确认要处理吗？') CustomerreceiptRequestMainApi.handle(row.id).then(() => { message.success(t('common.updateSuccess')) getList() diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index ac0dcc229..0d9896a2e 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -117,19 +117,8 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ }, isSearch: true, form: { - // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择客户代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '客户信息', // 查询弹窗标题 - searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类 - searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + disabled: true } } }, @@ -154,6 +143,11 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'customerCode', + value: 'customerCode', + isMainValue: true }] } } @@ -527,9 +521,9 @@ export const DeliverRequestMainRules = reactive({ // toLocationTypes: [ // { required: true, message: '请选择到库位类型范围', trigger: 'change' } // ], - deliverPlanNumber: [ - { required: true, message: '请选择发货计划单号', trigger: 'change' } - ], + // deliverPlanNumber: [ + // { required: true, message: '请选择发货计划单号', trigger: 'change' } + // ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 2a313ca18..7e7f59af8 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -130,9 +130,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => item.tableForm.isInpuFocusShow = false item.tableForm.disabled = true } - if(item.field == 'qty') { - item.tableForm.disabled = true - } if(item.field == 'uom') { item.tableForm.disabled = true } diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index e738f17ae..dccb4331d 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -369,7 +369,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ }, form: { componentProps: { - isInpuFocusShow: true, + isSearchList: true, searchListPlaceholder: '请选择物品代码', searchField: 'code', searchTitle: '物品基础信息', diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 09ac14d55..3b0e17709 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -122,8 +122,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { // setV['soLine'] = val[0]['lineNumber'] // setV['lineNumber'] = val[0]['lineNumber'] // setV['itemCode'] = val[0]['itemCode'] - // setV['remark'] = val[0]['remark'] - // setV['uom'] = val[0]['uom'] + setV['remark'] = val[0]['remark'] + setV['uom'] = val[0]['uom'] formRef.setValues(setV) }) }