From d1ef7259d0d6d94cbfc51c3370cd4c13beeceaed Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 7 Dec 2023 19:23:19 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/unplannedissueRequestMain/index.ts | 32 ++++++- .../unplannedissueJobMain/index.vue | 6 +- .../unplannedissueRequestMain/index.vue | 84 +++++++++++++++++-- 3 files changed, 111 insertions(+), 11 deletions(-) diff --git a/src/api/wms/unplannedissueRequestMain/index.ts b/src/api/wms/unplannedissueRequestMain/index.ts index d5bc786fa..b0a4f096e 100644 --- a/src/api/wms/unplannedissueRequestMain/index.ts +++ b/src/api/wms/unplannedissueRequestMain/index.ts @@ -66,4 +66,34 @@ export const exportUnplannedissueRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/unplannedissue-request-main/get-import-template' }) -} \ No newline at end of file +} + +// 关闭-计划外出库申请 +export const closeUnplannedissueRequestMain = async (id) => { + return await request.put({ url: `/wms/unplannedissue-request-main/close?id=` + id }) +} + +// 重新添加-计划外出库申请 +export const reAddUnplannedissueRequestMain = async (id) => { + return await request.put({ url: `/wms/unplannedissue-request-main/reAdd?id=` + id }) +} + +// 提交审批-计划外出库申请 +export const submitUnplannedissueRequestMain = async (id) => { + return await request.put({ url: `/wms/unplannedissue-request-main/submit?id=` + id }) +} + +// 审批驳回-计划外出库申请 +export const refusedUnplannedissueRequestMain = async (id) => { + return await request.put({ url: `/wms/unplannedissue-request-main/refused?id=` + id }) +} + +// 审批通过-计划外出库申请 +export const agreeUnplannedissueRequestMain = async (id) => { + return await request.put({ url: `/wms/unplannedissue-request-main/agree?id=` + id }) +} + +// 处理-计划外出库申请 +export const handleUnplannedissueRequestMain = async (id) => { + return await request.put({ url: `/wms/unplannedissue-request-main/handle?id=` + id }) +} diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue index 2b0f76ab2..ba92eead2 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue @@ -174,9 +174,9 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 - defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 - defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 + // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 + // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 + // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index eb7f7836f..dbf1a7f22 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -82,6 +82,7 @@ import { UnplannedissueRequestMain,UnplannedissueRequestMainRules,Unplannedissue import * as UnplannedissueRequestMainApi from '@/api/wms/unplannedissueRequestMain' import * as UnplannedissueRequestDetailApi from '@/api/wms/unplannedissueRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import * as TransferissueRequestMainApi from "@/api/wms/transferissueRequestMain"; // 计划外出库申请 defineOptions({ name: 'UnplannedissueRequestMain' }) @@ -190,13 +191,14 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:unplannedissue-request-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedissue-request-main:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedissue-request-main:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedissue-request-main:reAdd'}), // 重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedissue-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedissue-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedissue-request-main:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:unplannedissue-request-main:handle'}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedissue-request-main:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedissue-request-main:delete'}), // 删除 ] } @@ -206,14 +208,21 @@ const butttondata = (row) => { const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 console.log('列表-操作按钮事件-关闭') + handleClose(row.id) } else if (val == 'mainReAdd') { // 重新添加 console.log('列表-操作按钮事件-重新添加') + handleReAdd(row.id) } else if (val == 'mainSubmit') { // 提交审批 console.log('列表-操作按钮事件-提交审批') + handleSubmit(row.id) } else if (val == 'mainTurnDown') { // 驳回 console.log('列表-操作按钮事件-驳回') + handleRefused(row.id) } else if (val == 'mainApprove') { // 审批通过 console.log('列表-操作按钮事件-审批通过') + handleAgree(row.id) + } else if (val == 'mainHandle') { // 处理 + handleHandle(row.id) } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 @@ -221,6 +230,67 @@ const buttonTableClick = async (val, row) => { } } +/** 处理按钮操作 */ +const handleHandle = async (id: number) => { + try { + await message.confirm(t('common.confirmHandle')) + await UnplannedissueRequestMainApi.handleUnplannedissueRequestMain(id) + message.success(t('common.handleSuccess')) + await getList() + } catch {} +} + +/** 审批通过按钮操作 */ +const handleAgree = async (id: number) => { + try { + await message.confirm(t('common.confirmAgree')) + await UnplannedissueRequestMainApi.agreeUnplannedissueRequestMain(id) + message.success(t('common.agreeSuccess')) + await getList() + } catch {} +} + +/** 审批驳回按钮操作 */ +const handleRefused = async (id: number) => { + try { + await message.confirm(t('common.confirmRefused')) + await UnplannedissueRequestMainApi.refusedUnplannedissueRequestMain(id) + message.success(t('common.refusedSuccess')) + await getList() + } catch {} +} + +/** 提交按钮操作 */ +const handleSubmit = async (id: number) => { + try { + await message.confirm(t('common.confirmSubmit')) + await UnplannedissueRequestMainApi.submitUnplannedissueRequestMain(id) + message.success(t('common.submitSuccess')) + await getList() + } catch {} +} + + +/** 关闭按钮操作 */ +const handleClose = async (id: number) => { + try { + await message.confirm(t('common.confirmColse')) + await UnplannedissueRequestMainApi.closeUnplannedissueRequestMain(id) + message.success(t('common.closeSuccess')) + await getList() + } catch {} +} + +/** 重新添加按钮操作 */ +const handleReAdd = async (id: number) => { + try { + await message.confirm(t('common.confirmReAdd')) + await UnplannedissueRequestMainApi.reAddUnplannedissueRequestMain(id) + message.success(t('common.reAddSuccess')) + await getList() + } catch {} +} + /** 添加/修改操作 */ const formRef = ref() const openForm =async (type: string, row?: number) => { From 45a4d41f254e220d34836944a156e27c6e7ba4c6 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 7 Dec 2023 19:31:01 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 59 ++++++++++++++++- src/components/Detail/src/Detail.vue | 27 +++++++- .../DetailTable/src/DetailTable.vue | 14 +++- .../countManage/count/countPlanMain/index.vue | 64 +++++++++++++++++++ 4 files changed, 156 insertions(+), 8 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 4d039ba7b..ba04ec367 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -21,6 +21,7 @@ v-model="formSchema.type" placeholder="选择盘点类型" @change="selectChange('type', $event)" + v-if="!isDetail" > + + + + +
@@ -165,11 +194,30 @@ const props = defineProps({ required: false, default: '' }, + // 盘点范围类型 countScopeType: { type: Array, required: false, default: null - } + }, + // 是否从详情进入 + isDetail: { + type: Boolean, + required: false, + default: false + }, + //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框 + formTypeDetail: { + type: String, + required: false, + default: 'InputString' + }, + //盘点详情子表新增的时候判断盘点范围值的下拉列表 + countPlanAllList: { + type: Array, + required: false, + default: null + }, }) const { t } = useI18n() // 国际化 @@ -184,7 +232,7 @@ const formRef = ref() // 表单 Ref const formSchema = ref(props.formAllSchemas?.formSchema) const tableAllSchemas = ref(props.tableAllSchemas) const tableFormRules = ref(props.tableFormRules) -console.log('tableAllSchemas', tableAllSchemas.value) +console.log('fromeWhere', props.fromeWhere) /** 弹层操作 */ // formField form表单中的字段 @@ -377,6 +425,7 @@ const emit = defineEmits([ 'opensearchTable', 'submitForm', 'selectChange', + 'selectChangeDetail', 'tableFormChange' ]) //普通下拉改变事件 @@ -431,6 +480,12 @@ const inpuFocus = (headerItem, row, index) => { const selectChange = (field, val) => { emit('selectChange', field, val) } +// 修改盘点范围类型 +const selectChangeDetail = (field, val,formSchema) => { + formSchema.value = '' + emit('selectChangeDetail', field, val) +} + const tableFormChange = (field, val, row) => { emit('tableFormChange', field, val, row) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 0b90a363d..d39b6d795 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -104,9 +104,14 @@ :isBusiness="false" :apiUpdate="apiUpdate" :apiCreate="apiCreate" + :fromeWhere="fromeWhere" + :isDetail="true" @searchTableSuccess="searchTableSuccess" :detailData="detailData" @submitForm="submitForm" + @selectChangeDetail="selectChangeDetail" + :formTypeDetail="formTypeDetail" + :countPlanAllList="countPlanAllList" />
@@ -208,11 +213,24 @@ const props = defineProps({ required: true, default: null }, + // 盘点范围类型 countScopeType: { type: Array, required: false, default: null - } + }, + //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框 + formTypeDetail: { + type: String, + required: false, + default: 'InputString' + }, + //盘点详情子表新增的时候判断盘点范围值的下拉列表 + countPlanAllList: { + type: Array, + required: false, + default: null + }, }) const isShowDrawer = ref(false) const detailLoading = ref(false) @@ -465,7 +483,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { emit('searchTableSuccessDetail', formField, searchField, val, formRef) } // 传递给父类 -const emit = defineEmits(['searchTableSuccessDetail', 'changeTabs']) +const emit = defineEmits(['searchTableSuccessDetail', 'changeTabs','selectChangeDetail']) /** 删除按钮操作 */ const handleDelete = async (id: number) => { try { @@ -503,7 +521,10 @@ const searchFormClick = (searchData) => { // } // getList() // 刷新当前列表 } - +// 选择盘点类型的时候针对限值的操作 +const selectChangeDetail = (field, val) => { + emit('selectChangeDetail', field, val) +} //监视属性 watch( () =>props.apiPage, diff --git a/src/components/DetailTable/src/DetailTable.vue b/src/components/DetailTable/src/DetailTable.vue index 58f5ba226..2b1216e75 100644 --- a/src/components/DetailTable/src/DetailTable.vue +++ b/src/components/DetailTable/src/DetailTable.vue @@ -13,6 +13,9 @@
{{ forrmatter1(scope.row) }}
+ + + @@ -80,9 +83,14 @@ const forrmatter1 = (item) => { return '' } } -onMounted(async () => { - console.log('props.data',props.data) -}) +const isShowMainButton = (row, val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} + diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index 47b5f6f05..927714111 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -83,7 +83,10 @@ :allList="allList" :countScopeType="getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)" :Echo="Echo" + @selectChangeDetail="selectChangeDetail" fromeWhere="countPlan" + :formTypeDetail="formTypeDetail" + :countPlanAllList="countPlanAllList" /> @@ -451,6 +454,67 @@ const selectChange = (field, val) => { } } } +const formTypeDetail = ref('InputString')//盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框 +const countPlanAllList = ref([])//盘点详情子表新增的时候判断盘点范围值的下拉列表 +// 详情新增的时候选择盘点范围类型的时候针对限值的操作 +const selectChangeDetail= (field, val) => { + console.log('888',CountPlanDetail.allSchemas.formSchema) + if (field == 'type') { + // CountPlanDetail.allSchemas.formSchema[1].value = '' + if ( + val == 'OWNER' || + val == 'SUPPLIER' || + val == 'CUSTOMER' || + val == 'ABC' || + val == 'ITEMS_TYPE' || + val == 'ITEMS_GROUP' || + val == 'ITEMS_CODE' || + val == 'WAREHOUSE_CODE' || + val == 'AREABASIC_CODE' || + val == 'LOCATIONGROUP_CODE' || + val== 'LOCATION_CODE' + ) { + formTypeDetail.value = 'Select' + switch (val) { + case 'OWNER': + countPlanAllList.value = allList.value.ownerAllList + break + case 'SUPPLIER': + countPlanAllList.value= allList.value.supplierAllList + break + case 'CUSTOMER': + countPlanAllList.value = allList.value.customerAllList + break + case 'ABC': + countPlanAllList.value = getStrDictOptions(DICT_TYPE.ABC_CLASS) + break + case 'ITEMS_TYPE': + countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_TYPE) + break + case 'ITEMS_GROUP': + countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_GROUP) + break + case 'ITEMS_CODE': + countPlanAllList.value = allList.value.itembasicAllList + break + case 'WAREHOUSE_CODE': + countPlanAllList.value = allList.value.warehouseAllList + break + case 'AREABASIC_CODE': + countPlanAllList.value = allList.value.areaAllList + break + case 'LOCATIONGROUP_CODE': + countPlanAllList.value = allList.value.locationgroupAllList + break + case 'LOCATION_CODE': + countPlanAllList.value= allList.value.locationAllList + break + } + } else if (val == 'PROJECT') { + formTypeDetail.value = 'InputString' + } + } +} // 选择盘点范围类型 const tableFormChange = async (field, val, row) => { if (field == 'type') { From a2b1075ed23407d51931aa02a2f1b765a72860c0 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 7 Dec 2023 19:49:37 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/inspectJobMain/index.ts | 2 +- src/api/wms/purchasereceiptJobMain/index.ts | 2 +- src/api/wms/putawayJobMain/index.ts | 2 +- .../inspect/inspectRequestMain/index.vue | 6 +----- .../inspectRequestMain.data.ts | 19 ++++--------------- .../purchasereceiptRequestMain/index.vue | 1 - 6 files changed, 8 insertions(+), 24 deletions(-) diff --git a/src/api/wms/inspectJobMain/index.ts b/src/api/wms/inspectJobMain/index.ts index bfd3d2db3..03bf0b791 100644 --- a/src/api/wms/inspectJobMain/index.ts +++ b/src/api/wms/inspectJobMain/index.ts @@ -92,5 +92,5 @@ export const importTemplate = () => { // 关闭检验任务主 export const closeInspectJobMain = (id: number) => { - return request.download({ url: '/wms/inspect-job-main/close?id=' + id }) + return request.put({ url: '/wms/inspect-job-main/close?id=' + id }) } diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index 44601138e..3e2f9a27d 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -95,5 +95,5 @@ export const importTemplate = () => { // 关闭采购收货任务主 export const closePurchasereceiptJobMain = (id: number) => { - return request.download({ url: '/wms/purchasereceipt-job-main/close?id=' + id }) + return request.put({ url: '/wms/purchasereceipt-job-main/close?id=' + id }) } diff --git a/src/api/wms/putawayJobMain/index.ts b/src/api/wms/putawayJobMain/index.ts index f072d9287..6437b8608 100644 --- a/src/api/wms/putawayJobMain/index.ts +++ b/src/api/wms/putawayJobMain/index.ts @@ -84,5 +84,5 @@ export const importTemplate = () => { // 关闭上架任务主 export const closePutawayJobMain = (id: number) => { - return request.download({ url: '/wms/putaway-job-main/close?id=' + id }) + return request.put({ url: '/wms/putaway-job-main/close?id=' + id }) } diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index 986cdf661..3d81e720b 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -63,11 +63,7 @@ :allSchemas="InspectRequestMain.allSchemas" :detailAllSchemas="InspectRequestDetail.allSchemas" :detailAllSchemasRules="InspectRequestDetailRules" - :apiCreate="InspectRequestDetailApi.createInspectRequestDetail" - :apiUpdate="InspectRequestDetailApi.updateInspectRequestDetail" :apiPage="InspectRequestDetailApi.getInspectRequestDetailPage" - :apiDelete="InspectRequestDetailApi.deleteInspectRequestDetail" - :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -271,7 +267,7 @@ const handleSubmit = async (id: number) => { try { await message.confirm(t('common.confirmSubmit')) await InspectRequestMainApi.submitInspectRequestMain(id) - message.success(t('common.closeSuccess')) + message.success(t('common.submitSuccess')) await getList() } catch {} } diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts index cf0529ca6..c9fa4cc01 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts @@ -106,8 +106,8 @@ export const InspectRequestMain = useCrudSchemas(reactive([ { label: '从库位类型范围', field: 'fromLocationTypes', - // dictType: DICT_TYPE.LOCATION_TYPE, - // dictClass: 'string', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', isTable: true, sort: 'custom', table: { @@ -325,7 +325,7 @@ export const InspectRequestMain = useCrudSchemas(reactive([ }, { label: '物品代码', - field: 'itemcode', + field: 'itemCode', sort: 'custom', table: { width: 150 @@ -776,17 +776,6 @@ export const InspectRequestDetail = useCrudSchemas(reactive([ tableForm: { type: 'Select' } - }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:false, } ])) @@ -804,4 +793,4 @@ export const InspectRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请输入物品代码', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 9b9ce77ec..a187bd907 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -84,7 +84,6 @@ import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequest import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' -import { SupplierdeliverRecordMain, SupplierdeliverRecordDetail} from './../../supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data' // 采购收货申请 defineOptions({ name: 'PurchasereceiptRequestMain' }) From b8924119c59a1c7c61893d840aedde109af4b03a Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Fri, 8 Dec 2023 09:30:01 +0800 Subject: [PATCH 4/8] =?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 --- .../wms/supplierdeliverRequestMain/index.ts | 4 + .../supplierdeliverRequestMain/index.vue | 892 +++++++++--------- .../supplierdeliverRequestMain/point.vue | 98 ++ 3 files changed, 559 insertions(+), 435 deletions(-) create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index d60e9ddda..7b29c5f5d 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -87,6 +87,10 @@ export const rejSupplierdeliverRequestMain = async (id: number) => { export const genLabel = async (id) => { return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel?id=` + id }) } +// 生成记录 +export const genRecordsSupplierdeliverRequestMain = async (id) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id }) +} // 导出供应商发货申请主 Excel export const exportSupplierdeliverRequestMain = async (params) => { return await request.download({ url: `/wms/supplierdeliver-request-main/export-excel`, params }) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 41d0eed8a..0f4e0c040 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -38,7 +38,8 @@ - + - + + diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue new file mode 100644 index 000000000..4ac3eee67 --- /dev/null +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue @@ -0,0 +1,98 @@ + + + From 905dc07073a1a36a7243942dd72fb2a14185b5c4 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 8 Dec 2023 09:39:30 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 19 +++- .../DetailTable/src/DetailTable.vue | 12 ++- .../countManage/count/countPlanMain/index.vue | 91 +++++++++++++++---- 3 files changed, 98 insertions(+), 24 deletions(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index d39b6d795..dea1e0a86 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -67,6 +67,7 @@ :data="tableObjectRef.tableList" :allList="allList" :countScopeType="countScopeType" + :key="updateKey" > - + @@ -23,6 +26,11 @@