diff --git a/src/api/warehouse_product.ts b/src/api/warehouse_product.ts
index 302a90e8..64ca85ea 100644
--- a/src/api/warehouse_product.ts
+++ b/src/api/warehouse_product.ts
@@ -28,3 +28,7 @@ export function apiWarehouseProductDetail(params: any) {
export function apiWarehouseProductEnter(params: any) {
return request.post({ url: '/warehouse_product/warehouseproduct/enter', params })
}
+//商品结算
+export function apiWarehouseProductSettlement(params: any) {
+ return request.post({ url: '/warehouse_product/warehouseproduct/settlement', params })
+}
diff --git a/src/views/statistics/stock/index.vue b/src/views/statistics/stock/index.vue
index 51c318ae..e5df07d4 100644
--- a/src/views/statistics/stock/index.vue
+++ b/src/views/statistics/stock/index.vue
@@ -172,12 +172,19 @@
+
+
- {{ row.vip_price }}
-
+ -->
-
+
+
+
-
-
-
- {{ item.name }}
-
-
-
diff --git a/src/views/supplier/index.vue b/src/views/supplier/index.vue
index 3c1e19f5..52fca1bf 100644
--- a/src/views/supplier/index.vue
+++ b/src/views/supplier/index.vue
@@ -48,6 +48,36 @@
+
+
+ {{ row.total_completed_amount || 0 }}
+
+
+
+
+ {{ row.total_outstanding_amount || 0 }}
+
+
+
@@ -91,6 +122,10 @@ import { apiSupplierLists, apiSupplierDelete } from '@/api/supplier'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
+import warehouseProduct from './warehouseProduct.vue'
+
+const showWarehouseProduct = ref(false)
+const warehouseProductRef = ref(null)
const editRef = shallowRef>()
// 是否显示编辑框
@@ -109,6 +144,13 @@ const selectData = ref([])
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
+// 商品出入库详情
+const handleWarehouseProduct = async (data: any, type = 1) => {
+ showWarehouseProduct.value = true
+ await nextTick()
+ warehouseProductRef.value?.open()
+ warehouseProductRef.value?.getDetail(data, type)
+}
// 获取字典数据
const { dictData } = useDictData('show_status')
diff --git a/src/views/supplier/warehouseProduct.vue b/src/views/supplier/warehouseProduct.vue
new file mode 100644
index 00000000..8c352a1f
--- /dev/null
+++ b/src/views/supplier/warehouseProduct.vue
@@ -0,0 +1,92 @@
+
+
+
+
+