diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index b2b627a..54920d5 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -111,6 +111,12 @@
{{ getTypeName(scope.row.type) }}/{{ scope.row.cateName }}
+
+
+ 售卖中
+ 已停售
+
+
{{ scope.row.inventoryWholeNumber }}{{ scope.row.packagingUnit }}
@@ -266,7 +272,7 @@ const searchGoods = () => {
maxInterestRate: parseFloat(searchModel.value.maxInterestRate) || null, // 转换为数字并处理空值
interestRateIntervalList: [] as { min: number; max: number }[], // 显式声明类型
inventoryNumber: inventoryNumber.value ? 0 : '',
- status: status.value ? true : '',
+ saleStatus: status.value ? status.value: null,
}
searchModel.value.curProfitCate.forEach((item) => {
for (const cate of profitCategory) {
diff --git a/src/views/inventory/supplier.vue b/src/views/inventory/supplier.vue
index 97f2986..388a949 100644
--- a/src/views/inventory/supplier.vue
+++ b/src/views/inventory/supplier.vue
@@ -5,10 +5,14 @@
-
+
+
+
+
@@ -31,7 +35,7 @@
-
+
启用中
已禁用
@@ -69,6 +73,7 @@ const getSupplier = () => {
const query = {
page: page.value,
pageSize: 20,
+ ...searchModel.value,
}
post("inventory/supplier/list", {query: query}, null).then(
(res: any) => {
@@ -101,24 +106,15 @@ let changePage = (value: number) => {
getSupplier()
}
const searchModel = ref({
- code: null,
- name: null,
+ keyword: null,
turn: null,
- licenseCode: null,
- contactName: null,
- contactTel: null,
- reamark: null,
})
const resetSearch = () => {
searchModel.value = {
- code: null,
- name: null,
+ keyword: null,
turn: null,
- licenseCode: null,
- contactName: null,
- contactTel: null,
- reamark: null,
}
+ getSupplier()
}