From d55502f6da655ca5a9e9c5bb0acc14a7212eb72d Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 30 May 2025 19:28:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...inkCodeDialog.vue => link-code-dialog.vue} | 0 .../purchaseManagement/smErpCgBack/form.vue | 11 +---- .../purchaseManagement/smErpCgDd/form.vue | 10 +---- .../smErpCgInventory/form.vue | 11 +---- .../retailManagement/smErpRetailBack/form.vue | 11 +---- .../smErpRetailDelivery/form.vue | 11 +---- .../stockTaking/barCodeEnter.vue | 45 +++++++++---------- src/views/supermarketerp/stockTaking/form.vue | 5 --- 8 files changed, 32 insertions(+), 72 deletions(-) rename src/views/supermarketerp/components/{linkCodeDialog.vue => link-code-dialog.vue} (100%) diff --git a/src/views/supermarketerp/components/linkCodeDialog.vue b/src/views/supermarketerp/components/link-code-dialog.vue similarity index 100% rename from src/views/supermarketerp/components/linkCodeDialog.vue rename to src/views/supermarketerp/components/link-code-dialog.vue diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue index d9df6c5..3e6b37c 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue @@ -174,9 +174,8 @@ - ({ editableTableData: [], // 可编辑表格数据 erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存 selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId erpSpuSimpleAll: [], // 简要商品列表 - - linkCodeVisible: false, // 关联采购申请单对话框开关 - linkCgPlanDialogVisible: false, // 关联采购申请单对话框开关 }) // 基本信息表单校验规则 @@ -308,7 +302,6 @@ const getSelectedLinkCode = (selectionRows: any) => { baseDataForm.linkCode = selectionRows.inventoryCode state.editableTableData = selectionRows.items state.erpSpuItemsMemo = selectionRows.items - state.linkCgPlanDialogVisible = false } // 删除选中的行 diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue index b26fc2b..87343c6 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue @@ -179,9 +179,8 @@ - ({ editableTableData: [], // 可编辑表格数据 erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存 selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId erpSpuSimpleAll: [], // 简要商品列表 - linkCodeVisible: false, // 关联采购申请单对话框开关 - linkCgPlanDialogVisible: false, // 关联采购申请单对话框开关 }) // 基本信息表单校验规则 @@ -313,7 +308,6 @@ const getSelectedLinkCode = (selectionRows: any) => { baseDataForm.linkCode = selectionRows.planCode state.editableTableData = selectionRows.items state.erpSpuItemsMemo = selectionRows.items - state.linkCgPlanDialogVisible = false } // 删除选中的行 diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue index 04bffaa..4ff2fc4 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue @@ -180,9 +180,8 @@ - ({ editableTableData: [], // 可编辑表格数据 erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存 selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId erpSpuSimpleAll: [], // 简要商品列表 - - linkCodeVisible: false, // 关联采购申请单对话框开关 - linkCgPlanDialogVisible: false, // 关联采购申请单对话框开关 }) // 基本信息表单校验规则 @@ -334,7 +328,6 @@ const getSelectedLinkCode = (selectionRows: any) => { unitObj: {}, realPrice: displayPrice(item.purchasePrice, ""), })) - state.linkCgPlanDialogVisible = false } // 删除选中的行 diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue index 33bbb90..8b7234c 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue @@ -206,9 +206,8 @@ - ({ editableTableData: [], // 可编辑表格数据 erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存 selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId erpSpuSimpleAll: [], // 简要商品列表 - - linkCodeVisible: false, // 关联采购申请单对话框开关 - linkCgPlanDialogVisible: false, // 关联采购申请单对话框开关 }) // 合计金额表单数据 @@ -354,7 +348,6 @@ const getSelectedLinkCode = (selectionRows: any) => { baseDataForm.linkCode = selectionRows.inventoryCode state.editableTableData = selectionRows.items state.erpSpuItemsMemo = selectionRows.items - state.linkCgPlanDialogVisible = false } // 删除选中的行 diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue index fe1e86a..542aa6d 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue @@ -198,9 +198,8 @@ - ({ editableTableData: [], // 可编辑表格数据 erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存 selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId erpSpuSimpleAll: [], // 简要商品列表 - - linkCodeVisible: false, // 关联采购申请单对话框开关 - linkCgPlanDialogVisible: false, // 关联采购申请单对话框开关 }) // 合计金额表单数据 @@ -346,7 +340,6 @@ const getSelectedLinkCode = (selectionRows: any) => { baseDataForm.linkCode = selectionRows.code state.editableTableData = selectionRows.items state.erpSpuItemsMemo = selectionRows.items - state.linkCgPlanDialogVisible = false } // 删除选中的行 diff --git a/src/views/supermarketerp/stockTaking/barCodeEnter.vue b/src/views/supermarketerp/stockTaking/barCodeEnter.vue index bf00215..8c2fc6e 100644 --- a/src/views/supermarketerp/stockTaking/barCodeEnter.vue +++ b/src/views/supermarketerp/stockTaking/barCodeEnter.vue @@ -51,10 +51,8 @@ @@ -85,10 +83,11 @@ const form = reactive({ salesCount: "", erpSpuName: "", }) +const dialogVisible = ref(false) // 定义校验规则 const dataRules = ref({ - // sliderPicUrls: [{ required: true, message: "请上传轮播图", trigger: "blur" }], + sliderPicUrls: [{ required: true, message: "请上传轮播图", trigger: "blur" }], }) // 打开弹窗 @@ -143,29 +142,29 @@ const state: BasicTableProps = reactive({ const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) -// const resetQuery = () => { -// getDataList() -// } +const resetQuery = () => { + getDataList() +} // 点击选择库存商品 -// const handleClickSelectSpu = () => { -// loading.value = true -// resetQuery() -// spuSelectDialogVisible.value = true -// try { -// getDataList() -// } catch (error) { -// state.dataList = [] -// loading.value = false -// } -// loading.value = false -// } +const handleClickSelectSpu = () => { + loading.value = true + resetQuery() + dialogVisible.value = true + try { + getDataList() + } catch (error) { + state.dataList = [] + loading.value = false + } + loading.value = false +} // 线上商品列表表格行点击 const handleRowClick = (row: any) => { - // spuSelectDialogVisible.value = false - // form.erpSpuId = row.id - // form.erpSpuName = row.productName + dialogVisible.value = false + form.erpSpuId = row.id + form.erpSpuName = row.productName } // 暴露变量 diff --git a/src/views/supermarketerp/stockTaking/form.vue b/src/views/supermarketerp/stockTaking/form.vue index 166f83e..b06b1ee 100644 --- a/src/views/supermarketerp/stockTaking/form.vue +++ b/src/views/supermarketerp/stockTaking/form.vue @@ -243,16 +243,11 @@ const state = reactive<{ erpSpuItemsMemo: any[] selectedRowsErpSpuIds: string[] erpSpuSimpleAll: any - linkCodeVisible: boolean - linkCgPlanDialogVisible: boolean }>({ editableTableData: [], // 可编辑表格数据 erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存 selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId erpSpuSimpleAll: [], // 简要商品列表 - - linkCodeVisible: false, // 关联采购申请单对话框开关 - linkCgPlanDialogVisible: false, // 关联采购申请单对话框开关 }) // 基本信息表单校验规则 From a6c8b58801ae04192019d8c040dbc7b58172145a Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 30 May 2025 19:31:23 +0800 Subject: [PATCH 2/2] 1 --- .../supermarketerp/purchaseManagement/smErpCgBack/form.vue | 6 +++--- .../supermarketerp/purchaseManagement/smErpCgDd/form.vue | 6 +++--- .../purchaseManagement/smErpCgInventory/form.vue | 6 +++--- .../retailManagement/smErpRetailBack/form.vue | 6 +++--- .../retailManagement/smErpRetailDelivery/form.vue | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue index 3e6b37c..baddbff 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue @@ -175,7 +175,7 @@ >() // 可编辑表格ref const baseDataInfoRef = ref() // 基本信息ref @@ -293,7 +293,7 @@ const getInitData = async () => { } // 点击关联采购申请编号 -const handleClickLinkCode = () => linkCgPlanDialogRef.value.openLinkCodeDialog(3) +const handleClickLinkCode = () => linkCodeDialogRef.value.openLinkCodeDialog(3) // 获取选择的采购申请 const getSelectedLinkCode = (selectionRows: any) => { diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue index 87343c6..04bbd7c 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue @@ -180,7 +180,7 @@ >() // 可编辑表格ref const baseDataInfoRef = ref() // 基本信息ref @@ -299,7 +299,7 @@ const getInitData = async () => { } // 点击关联采购申请编号 -const handleClickLinkCode = () => linkCgPlanDialogRef.value.openLinkCodeDialog(1) +const handleClickLinkCode = () => linkCodeDialogRef.value.openLinkCodeDialog(1) // 获取选择的采购申请 const getSelectedLinkCode = (selectionRows: any) => { diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue index 4ff2fc4..fb751c1 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue @@ -181,7 +181,7 @@ >() // 可编辑表格ref const baseDataInfoRef = ref() // 基本信息ref @@ -311,7 +311,7 @@ const getInitData = async () => { } // 点击关联采购申请编号 -const handleClickLinkCode = () => linkCgPlanDialogRef.value.openLinkCodeDialog(2) +const handleClickLinkCode = () => linkCodeDialogRef.value.openLinkCodeDialog(2) // 获取选择的采购申请 const getSelectedLinkCode = (selectionRows: any) => { diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue index 8b7234c..d20bc18 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue @@ -207,7 +207,7 @@ >() // 可编辑表格ref const baseDataInfoRef = ref() // 基本信息ref @@ -339,7 +339,7 @@ const getInitData = async () => { } // 点击关联采购申请编号 -const handleClickLinkCode = () => linkCgPlanDialogRef.value.openLinkCodeDialog(3) +const handleClickLinkCode = () => linkCodeDialogRef.value.openLinkCodeDialog(3) // 获取选择的采购申请 const getSelectedLinkCode = (selectionRows: any) => { diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue index 542aa6d..e41f801 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue @@ -199,7 +199,7 @@ >() // 可编辑表格ref const baseDataInfoRef = ref() // 基本信息ref @@ -331,7 +331,7 @@ const getInitData = async () => { } // 点击关联采购申请编号 -const handleClickLinkCode = () => linkCgPlanDialogRef.value.openLinkCodeDialog(2) +const handleClickLinkCode = () => linkCodeDialogRef.value.openLinkCodeDialog(2) // 获取选择的采购申请 const getSelectedLinkCode = (selectionRows: any) => {