修改商品选择和修改字段命名

src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue

@@ -172,12 +172,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog
-				ref="erpSpuSelectDialogRef"
-				v-model="state.erpSpuSelectDialogVisible"
-				:selectedSpuRows="state.editableTableData"
-				@getSelectedSpuRows="getSelectedSpuRows"
-			/>
+			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
 
 			<linkCodeDialog
 				ref="linkCgPlanDialogRef"
@@ -202,7 +197,7 @@ import { displayPrice } from "/@/utils/formatMoney"
 import { tablePrint } from "../../supermarketUtils"
 import { useSmProcessFormAction } from "/@/hooks/smProcessFormAction"
 
-const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/select-dialog.vue"))
 
 const props = withDefaults(
 	defineProps<{
@@ -244,7 +239,6 @@ const state = reactive<{
 	selectedRowsErpSpuIds: string[]
 	erpSpuSimpleAll: any
 	linkCodeVisible: boolean
-	erpSpuSelectDialogVisible: boolean
 	linkCgPlanDialogVisible: boolean
 }>({
 	editableTableData: [], // 可编辑表格数据
@@ -253,7 +247,6 @@ const state = reactive<{
 	erpSpuSimpleAll: [], // 简要商品列表
 
 	linkCodeVisible: false, // 关联采购申请单对话框开关
-	erpSpuSelectDialogVisible: false, // 商品选择对话框开关
 	linkCgPlanDialogVisible: false, // 关联采购申请单对话框开关
 })
 
@@ -343,7 +336,7 @@ const selectChangeEvent: VxeTableEvents.CheckboxChange<any> = ({ checked }) => {
 const handleClickSpuSelect = () => erpSpuSelectDialogRef.value.openDialog()
 
 // 获取被选择的商品行
-const getSelectedSpuRows = (selectionRows: any) => {
+const getSelectedRows = (selectionRows: any) => {
 	console.log("被选择的商品行", selectionRows)
 
 	// 筛选新勾选的项
@@ -372,7 +365,6 @@ const getSelectedSpuRows = (selectionRows: any) => {
 	// 		$table.setRow(item)
 	// 	}
 	// })
-	state.erpSpuSelectDialogVisible = false
 	console.log("state.editableTableData", state.editableTableData)
 }
 

src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue

@@ -177,12 +177,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog
-				ref="erpSpuSelectDialogRef"
-				v-model="state.erpSpuSelectDialogVisible"
-				:selectedSpuRows="state.editableTableData"
-				@getSelectedSpuRows="getSelectedSpuRows"
-			/>
+			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
 
 			<linkCodeDialog
 				ref="linkCgPlanDialogRef"
@@ -207,7 +202,7 @@ import { displayPrice } from "/@/utils/formatMoney"
 import { tablePrint } from "../../supermarketUtils"
 import { useSmProcessFormAction } from "/@/hooks/smProcessFormAction"
 
-const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/select-dialog.vue"))
 
 const props = withDefaults(
 	defineProps<{
@@ -250,7 +245,6 @@ const state = reactive<{
 	selectedRowsErpSpuIds: string[]
 	erpSpuSimpleAll: any
 	linkCodeVisible: boolean
-	erpSpuSelectDialogVisible: boolean
 	linkCgPlanDialogVisible: boolean
 }>({
 	editableTableData: [], // 可编辑表格数据
@@ -258,7 +252,6 @@ const state = reactive<{
 	selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId
 	erpSpuSimpleAll: [], // 简要商品列表
 	linkCodeVisible: false, // 关联采购申请单对话框开关
-	erpSpuSelectDialogVisible: false, // 商品选择对话框开关
 	linkCgPlanDialogVisible: false, // 关联采购申请单对话框开关
 })
 
@@ -348,7 +341,7 @@ const selectChangeEvent: VxeTableEvents.CheckboxChange<any> = ({ checked }) => {
 const handleClickSpuSelect = () => erpSpuSelectDialogRef.value.openDialog()
 
 // 获取被选择的商品行
-const getSelectedSpuRows = (selectionRows: any) => {
+const getSelectedRows = (selectionRows: any) => {
 	console.log("被选择的商品行", selectionRows)
 
 	// 筛选新勾选的项
@@ -377,7 +370,6 @@ const getSelectedSpuRows = (selectionRows: any) => {
 	// 		$table.setRow(item)
 	// 	}
 	// })
-	state.erpSpuSelectDialogVisible = false
 	console.log("state.editableTableData", state.editableTableData)
 }
 

src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue

@@ -178,12 +178,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog
-				ref="erpSpuSelectDialogRef"
-				v-model="state.erpSpuSelectDialogVisible"
-				:selectedSpuRows="state.editableTableData"
-				@getSelectedSpuRows="getSelectedSpuRows"
-			/>
+			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
 
 			<linkCodeDialog
 				ref="linkCgPlanDialogRef"
@@ -208,7 +203,7 @@ import { displayPrice, storePrice } from "/@/utils/formatMoney"
 import { tablePrint } from "../../supermarketUtils"
 import { useSmProcessFormAction } from "/@/hooks/smProcessFormAction"
 
-const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/select-dialog.vue"))
 
 const props = withDefaults(
 	defineProps<{
@@ -250,7 +245,6 @@ const state = reactive<{
 	selectedRowsErpSpuIds: string[]
 	erpSpuSimpleAll: any
 	linkCodeVisible: boolean
-	erpSpuSelectDialogVisible: boolean
 	linkCgPlanDialogVisible: boolean
 }>({
 	editableTableData: [], // 可编辑表格数据
@@ -259,7 +253,6 @@ const state = reactive<{
 	erpSpuSimpleAll: [], // 简要商品列表
 
 	linkCodeVisible: false, // 关联采购申请单对话框开关
-	erpSpuSelectDialogVisible: false, // 商品选择对话框开关
 	linkCgPlanDialogVisible: false, // 关联采购申请单对话框开关
 })
 
@@ -369,7 +362,7 @@ const selectChangeEvent: VxeTableEvents.CheckboxChange<any> = ({ checked }) => {
 const handleClickSpuSelect = () => erpSpuSelectDialogRef.value.openDialog()
 
 // 获取被选择的商品行
-const getSelectedSpuRows = (selectionRows: any) => {
+const getSelectedRows = (selectionRows: any) => {
 	console.log("被选择的商品行", selectionRows)
 
 	// 筛选新勾选的项
@@ -402,7 +395,6 @@ const getSelectedSpuRows = (selectionRows: any) => {
 	// 		$table.setRow(item)
 	// 	}
 	// })
-	state.erpSpuSelectDialogVisible = false
 	console.log("state.editableTableData", state.editableTableData)
 }
 

src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue

@@ -141,12 +141,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog
-				ref="erpSpuSelectDialogRef"
-				v-model="state.erpSpuSelectDialogVisible"
-				:selectedSpuRows="state.editableTableData"
-				@getSelectedSpuRows="getSelectedSpuRows"
-			/>
+			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
 		</div>
 	</div>
 </template>
@@ -160,7 +155,7 @@ import { formatDate } from "/@/utils/formatTime"
 import { tablePrint } from "../../supermarketUtils"
 import { useSmProcessFormAction } from "/@/hooks/smProcessFormAction"
 
-const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/select-dialog.vue"))
 
 const props = withDefaults(
 	defineProps<{
@@ -193,13 +188,11 @@ const state = reactive<{
 	erpSpuItemsMemo: any[]
 	selectedRowsErpSpuIds: string[]
 	erpSpuSimpleAll: any
-	erpSpuSelectDialogVisible: boolean
 }>({
 	editableTableData: [], // 可编辑表格数据
 	erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存
 	selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId
 	erpSpuSimpleAll: [], // 简要商品列表
-	erpSpuSelectDialogVisible: false, // 商品选择对话框开关
 })
 
 // 基本信息表单校验规则
@@ -269,7 +262,7 @@ const selectChangeEvent: VxeTableEvents.CheckboxChange<any> = ({ checked }) => {
 const handleClickSpuSelect = () => erpSpuSelectDialogRef.value.openDialog()
 
 // 获取被选择的商品行
-const getSelectedSpuRows = (selectionRows: any) => {
+const getSelectedRows = (selectionRows: any) => {
 	console.log("被选择的商品行", selectionRows)
 
 	// 筛选新勾选的项
@@ -298,7 +291,6 @@ const getSelectedSpuRows = (selectionRows: any) => {
 	// 		$table.setRow(item)
 	// 	}
 	// })
-	state.erpSpuSelectDialogVisible = false
 	console.log("state.editableTableData", state.editableTableData)
 }