货物页面 分页修复

server/dao/godown/manifest.go

@@ -41,7 +41,7 @@ func QueryManifestList(limit, offset int, genre, title string) (manifests []Mani
 	if err != nil {
 		return
 	}
-	err = db.Order("id desc").Limit(limit).Offset(offset).Preload("Cargos").Preload("Cargos.Commodity").Preload("Cargos.Warehouse").Find(&manifests).Error
+	err = db.Order("id desc").Limit(limit).Offset(offset).Preload("Cargos").Preload("Cargos.Goods").Find(&manifests).Error
 	return manifests, total, err
 }
 
@@ -76,7 +76,7 @@ func CreateInboundManifest(manifestGenre, title, custodian string, cargos []Carg
 		for _, cargo := range manifest.Cargos {
 			// 检查是否已存在相同商品、仓库、库区、库位的记录
 			var goods Goods
-			err := tx.Where("good_id = ?",
+			err := tx.Where("id = ?",
 				cargo.GoodsId).
 				First(&goods).Error
 
@@ -104,7 +104,7 @@ func CreateOutboundManifest(manifestGenre, title, custodian string, cargos []Car
 		// 1. 检查库存是否充足（预扣减检查）
 		for _, cargo := range cargos {
 			var goods Goods
-			if err := tx.Where("good_id = ?",
+			if err := tx.Where("id = ?",
 				cargo.GoodsId).
 				First(&goods).Error; err != nil {
 				return fmt.Errorf("库存记录不存在: %v", err)
@@ -129,7 +129,7 @@ func CreateOutboundManifest(manifestGenre, title, custodian string, cargos []Car
 		// 3. 扣减库存
 		for _, cargo := range manifest.Cargos {
 			if err := tx.Model(&Goods{}).
-				Where("goods_id = ?",
+				Where("id = ?",
 					cargo.GoodsId).
 				Update("number", gorm.Expr("number - ?", cargo.Number)).
 				Error; err != nil {

web/src/view/storehouse/commodity/commodity.vue

@@ -817,18 +817,18 @@ const changeQueryGoodsType = (val) => {
 
 // 分页
 const handleSizeChange = (val) => {
-  queryGoodsData.pageSize = val
+  queryGoodsData.pageInfo.pageSize = val
   getData()
 }
 
 const handleCurrentChange = (val) => {
-  queryGoodsData.page = val
+  queryGoodsData.pageInfo.page = val
   getData()
 }
 
 const searchData = async () => {
-  queryGoodsData.page = 1
-  queryGoodsData.pageSize = 10
+  queryGoodsData.pageInfo.page = 1
+  queryGoodsData.pageInfo.pageSize = 10
   await queryGoodsList(queryGoodsData).then(res => {
     if (res.code === 0) {
       goodsListData.length = 0
@@ -849,6 +849,7 @@ const getData = async() => {
     if (res.code === 0) {
       goodsListData.length = 0
       goodsListData.push(...res.data.list)
+      total.value = res.data.total
     }
   })
 }