diff --git a/src/views/supermarketerp/smErpCgBack/index.vue b/src/views/supermarketerp/smErpCgBack/index.vue index 544ddb0..cc24a7f 100644 --- a/src/views/supermarketerp/smErpCgBack/index.vue +++ b/src/views/supermarketerp/smErpCgBack/index.vue @@ -11,8 +11,8 @@ type="date" placeholder="请输入单据日期" v-model="state.queryForm.inventoryDate" - fomat="yyyy-MM-dd" - value-format="yyyy-MM-dd" + fomat="YYYY-MM-DD" + value-format="YYYY-MM-DD" /> @@ -129,7 +129,9 @@ const selectObjs = ref([]) as any const multiple = ref(true) const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + inventoryType: "4", + }, pageList: fetchList, }) diff --git a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue index 982cc17..7e1547f 100644 --- a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue +++ b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue @@ -212,7 +212,7 @@ const baseDataForm = reactive({ remark: "", orderType: "2", totalAmount: "", - inventoryType: "4", + inventoryType: "4", }) const state = reactive<{ editableTableData: any[] diff --git a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue index 0644326..3c3bd5a 100644 --- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue +++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue @@ -26,7 +26,9 @@ - + + + @@ -193,6 +195,7 @@ import { Search } from "@element-plus/icons-vue" import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue" import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue" import { displayPrice } from "/@/utils/formatMoney" +import { useDict } from "/@/hooks/dict" const router = useRouter() const route = useRoute() @@ -202,6 +205,7 @@ const linkCgCodeDialogRef = ref() // 关联采购申请单对话框ref const baseDataFormRef = ref() // 基本数据表单ref const editableTableRef = ref>() // 可编辑表格ref const supplierTypeDict = ref([]) // 货商下拉选项 +const { check_status } = useDict("check_status") // 基本信息表单数据 const baseDataForm = reactive({ id: "", diff --git a/src/views/supermarketerp/smErpInventoryRecords/index.vue b/src/views/supermarketerp/smErpInventoryRecords/index.vue index 72a8161..87fb1c8 100644 --- a/src/views/supermarketerp/smErpInventoryRecords/index.vue +++ b/src/views/supermarketerp/smErpInventoryRecords/index.vue @@ -11,8 +11,8 @@ type="date" placeholder="请输入单据日期" v-model="state.queryForm.inventoryDate" - fomat="yyyy-MM-dd" - value-format="yyyy-MM-dd" + fomat="YYYY-MM-DD" + value-format="YYYY-MM-DD" /> @@ -76,11 +76,11 @@ - - - - - + + + + + @@ -129,7 +129,9 @@ const selectObjs = ref([]) as any const multiple = ref(true) const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + inventoryType: "3", + }, pageList: fetchList, }) diff --git a/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue b/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue index cb4ece9..a415218 100644 --- a/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue +++ b/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue @@ -27,7 +27,9 @@ - + + + @@ -194,6 +196,7 @@ import { Search } from "@element-plus/icons-vue" import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue" import linkCgCodeDialog from "/@/views/supermarketerp/smErpInventoryRecords/components/linkCgCodeDialog.vue" import { displayPrice } from "/@/utils/formatMoney" +import { useDict } from "/@/hooks/dict" const router = useRouter() const route = useRoute() @@ -203,6 +206,7 @@ const linkCgCodeDialogRef = ref() // 关联采购申请单对话框ref const baseDataFormRef = ref() // 基本数据表单ref const editableTableRef = ref>() // 可编辑表格ref const supplierTypeDict = ref([]) // 货商下拉选项 +const { check_status } = useDict("check_status") // 基本信息表单数据 const baseDataForm = reactive({ id: "", @@ -214,7 +218,7 @@ const baseDataForm = reactive({ checkTime: "", supplierId: "", remark: "", - inventoryType: "3", + inventoryType: "3", orderType: "1", totalAmount: "", }) @@ -289,7 +293,7 @@ const handleClickLinkCode = () => linkCgCodeDialogRef.value.openLinkCodeDialog() const getSelectedCgPlan = (selectionRows: any) => { console.log("被选择的关联数据", selectionRows) - baseDataForm.linkCode = selectionRows.planCode + baseDataForm.linkCode = selectionRows.code state.editableTableData = selectionRows.items state.erpSpuItemsMemo = selectionRows.items state.linkCgCodeDialogVisible = false diff --git a/src/views/supermarketerp/smErpRetailBack/index.vue b/src/views/supermarketerp/smErpRetailBack/index.vue index 316789b..b7fc6b2 100644 --- a/src/views/supermarketerp/smErpRetailBack/index.vue +++ b/src/views/supermarketerp/smErpRetailBack/index.vue @@ -11,8 +11,8 @@ type="date" placeholder="请输入单据日期" v-model="state.queryForm.inventoryDate" - fomat="yyyy-MM-dd" - value-format="yyyy-MM-dd" + fomat="YYYY-MM-DD" + value-format="YYYY-MM-DD" /> @@ -129,7 +129,9 @@ const selectObjs = ref([]) as any const multiple = ref(true) const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + inventoryType: "6", + }, pageList: fetchList, }) diff --git a/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue b/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue index 11b23e4..829e1a4 100644 --- a/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue +++ b/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue @@ -27,7 +27,9 @@ - + + + @@ -219,6 +221,7 @@ import { Search } from "@element-plus/icons-vue" import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue" import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue" import { displayPrice, storePrice } from "/@/utils/formatMoney" +import { useDict } from "/@/hooks/dict" const router = useRouter() const route = useRoute() @@ -228,6 +231,7 @@ const linkCgCodeDialogRef = ref() // 关联采购申请单对话框ref const baseDataFormRef = ref() // 基本数据表单ref const editableTableRef = ref>() // 可编辑表格ref const supplierTypeDict = ref([]) // 货商下拉选项 +const { check_status } = useDict("check_status") // 基本信息表单数据 const baseDataForm = reactive({ id: "", @@ -242,7 +246,7 @@ const baseDataForm = reactive({ orderType: "1", totalAmount: "", memberNumber: "", - inventoryType: "6", + inventoryType: "6", }) const state = reactive<{ editableTableData: any[] diff --git a/src/views/supermarketerp/smErpRetailDelivery/index.vue b/src/views/supermarketerp/smErpRetailDelivery/index.vue index d1e18ea..238d269 100644 --- a/src/views/supermarketerp/smErpRetailDelivery/index.vue +++ b/src/views/supermarketerp/smErpRetailDelivery/index.vue @@ -11,8 +11,8 @@ type="date" placeholder="请输入单据日期" v-model="state.queryForm.inventoryDate" - fomat="yyyy-MM-dd" - value-format="yyyy-MM-dd" + fomat="YYYY-MM-DD" + value-format="YYYY-MM-DD" /> @@ -129,7 +129,9 @@ const selectObjs = ref([]) as any const multiple = ref(true) const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + inventoryType: "5", + }, pageList: fetchList, }) diff --git a/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue b/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue index 7c251ae..dfeccf4 100644 --- a/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue +++ b/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue @@ -27,7 +27,9 @@ - + + + @@ -219,6 +221,7 @@ import { Search } from "@element-plus/icons-vue" import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue" import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue" import { displayPrice, storePrice } from "/@/utils/formatMoney" +import { useDict } from "/@/hooks/dict" const router = useRouter() const route = useRoute() @@ -228,6 +231,7 @@ const linkCgCodeDialogRef = ref() // 关联采购申请单对话框ref const baseDataFormRef = ref() // 基本数据表单ref const editableTableRef = ref>() // 可编辑表格ref const supplierTypeDict = ref([]) // 货商下拉选项 +const { check_status } = useDict("check_status") // 基本信息表单数据 const baseDataForm = reactive({ id: "", @@ -242,7 +246,7 @@ const baseDataForm = reactive({ orderType: "2", totalAmount: "", memberNumber: "", - inventoryType: "5", + inventoryType: "5", }) const state = reactive<{ editableTableData: any[]