diff --git a/src/api/admin/user.ts b/src/api/admin/user.ts index ba11da8..2ced6cf 100644 --- a/src/api/admin/user.ts +++ b/src/api/admin/user.ts @@ -144,7 +144,7 @@ export function validatePhone(rule: any, value: any, callback: any, isEdit: bool } // 获取简要用户信息 -export function getSimpleUserAll(params?: { name?: string; mobile?: string }) { +export function getSimpleUserAll(params?: { name?: string; mobile?: string; userId?: string }) { return request({ url: "/admin/user/getSimpleUserAll", method: "get", diff --git a/src/components/Select/SelectHandlerUser.vue b/src/components/Select/SelectHandlerUser.vue index 4b01739..710e85b 100644 --- a/src/components/Select/SelectHandlerUser.vue +++ b/src/components/Select/SelectHandlerUser.vue @@ -41,10 +41,7 @@ const props = withDefaults(defineProps(), { isDisplayName: false, }) -const queryForm = reactive({ - current: 1, - size: 10, -}) +const queryForm = reactive({}) const state = reactive({ loading: true, @@ -57,6 +54,7 @@ watch( (newVal, oldValue) => { if (newVal == oldValue) return state.selectId = newVal + queryForm.userId = newVal getOptions() }, { immediate: true }, @@ -65,10 +63,7 @@ watch( async function getOptions() { try { state.loading = true - const _pa = { - ...queryForm, - } - const { data } = await getSimpleUserAll(_pa) + const { data } = await getSimpleUserAll(queryForm) state.options = data ?? [] } finally { setTimeout(() => (state.loading = false), 500) @@ -81,9 +76,4 @@ function remoteSearch(params: string) { getOptions() } } - -function clear() { - state.selectId = null - getOptions() -} diff --git a/src/components/Select/SelectSupplier.vue b/src/components/Select/SelectSupplier.vue index 7327c5b..38b483b 100644 --- a/src/components/Select/SelectSupplier.vue +++ b/src/components/Select/SelectSupplier.vue @@ -54,6 +54,7 @@ watch( (newVal, oldValue) => { if (newVal == oldValue) return state.selectId = newVal + queryForm.supplierId = newVal getOptions() }, { immediate: true }, @@ -62,10 +63,7 @@ watch( async function getOptions() { try { state.loading = true - const _pa = { - ...queryForm, - } - const { data } = await getSupplierSimpleAll(_pa) + const { data } = await getSupplierSimpleAll(queryForm) state.options = data ? data.filter((item: any) => item.supplierId) : [] } finally { setTimeout(() => (state.loading = false), 500) @@ -78,9 +76,4 @@ function remoteSearch(params: string) { getOptions() } } - -function clear() { - state.selectId = null - getOptions() -} diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue index 1c0a007..4b1e110 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue @@ -13,7 +13,12 @@
经办人: - {{ baseDataForm.handlerUserId }} +
关联补货申请: @@ -21,7 +26,7 @@
货商: - {{ baseDataForm.supplierId }} +
备注: @@ -290,14 +295,14 @@ const getInitData = async () => { const unitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId) return { ...item, - unitObj: { ...unitObj, realPrice: item?.realPrice || 0 }, + unitObj: { ...unitObj, realPrice: displayPrice(item?.realPrice, "") || 0 }, } }) state.erpSpuItemsMemo = cgPlanData.data.items.map((item: any) => { const unitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId) return { ...item, - unitObj: { ...unitObj, realPrice: item?.realPrice || 0 }, + unitObj: { ...unitObj, realPrice: displayPrice(item?.realPrice, "") || 0 }, } }) } diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue index 97afbc0..49b9665 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue @@ -18,11 +18,11 @@ - + 查询 重置 @@ -70,11 +70,11 @@ - + @@ -84,21 +84,13 @@ @@ -130,7 +122,7 @@ - +
diff --git a/src/views/thirdparty/third-pay-log/index.vue b/src/views/thirdparty/third-pay-log/index.vue index d76a0b7..44100a6 100644 --- a/src/views/thirdparty/third-pay-log/index.vue +++ b/src/views/thirdparty/third-pay-log/index.vue @@ -1,6 +1,23 @@