From a6e0d882806a7302f3e8565b093224c31382c019 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Mon, 7 Apr 2025 10:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/workOrderDetail.vue  |  4 +-
 src/views/goodsManagement/goodsList.vue   | 40 +++++++++--
 src/views/goodsManagement/myGoodsList.vue | 81 ++++++-----------------
 3 files changed, 56 insertions(+), 69 deletions(-)

diff --git a/src/views/components/workOrderDetail.vue b/src/views/components/workOrderDetail.vue
index e848d22..d8ae612 100644
--- a/src/views/components/workOrderDetail.vue
+++ b/src/views/components/workOrderDetail.vue
@@ -671,7 +671,7 @@ export default {
           if (res.data.data.status == 106) {
             data_.id = item.id
           }
-          if (res.data.data.status == 407||res.data.data.status == 302) {
+          if (res.data.data.status == 407||res.data.data.status == 302||res.data.data.status == 501||res.data.data.status == 104||res.data.data.status == 203||res.data.data.status == 204) {
             data_.useCount = item.useCount
           }
           this.tableData.push(data_)
@@ -721,7 +721,7 @@ export default {
           })
         }
 
-        console.log('approveRemark', this.evaluateForm)
+        console.log('approveRemark', this.repairForm)
       })
     },
     // 图片上传自定义校验
diff --git a/src/views/goodsManagement/goodsList.vue b/src/views/goodsManagement/goodsList.vue
index 8c7f227..fb9cbfa 100644
--- a/src/views/goodsManagement/goodsList.vue
+++ b/src/views/goodsManagement/goodsList.vue
@@ -250,7 +250,7 @@
       <el-dialog title="物资入库记录" :visible.sync="logVisible" :append-to-body="true" width="70%"
         :close-on-click-modal="false">
         <avue-crud :option="logoption" :table-loading="loading" :data="logData" :page.sync="logPage" ref="crud"
-          v-model="logForm">
+          v-model="logForm" @on-load="logOnLoad">
 
         </avue-crud>
       </el-dialog>
@@ -258,7 +258,7 @@
       <el-dialog title="物资申领记录" :visible.sync="applyVisible" :append-to-body="true" width="70%"
         :close-on-click-modal="false">
         <avue-crud :option="applyoption" :table-loading="loading" :data="applyData" :page.sync="applyPage" ref="crud"
-          v-model="applyForm">
+          v-model="applyForm"  @selection-change="applySelectionChange" @current-change="applyCurrentChange" @size-change="applySizeChange" @on-load="applyOnLoad">
           <template slot-scope="{ row }" slot="status">
             <el-tag
               :type="row.status == 0 ? '' : row.status == 1 ? 'success' : row.status == 2 ? 'info' : row.status == -1 ? 'danger' : 'warning'">
@@ -664,7 +664,9 @@ export default {
             slot: true
           },
         ]
-      }
+      },
+      productData:{},//存每一行的数据
+      logData:{},//
     }
   },
   computed: {
@@ -692,6 +694,7 @@ export default {
     // 查看日志列表
     handleLog(row) {
       this.logVisible = true
+      this.logData = row
       let query = {
         inventoryId: row.inventoryId,
         current: this.logPage.currentPage,
@@ -707,6 +710,7 @@ export default {
     // 查看物料的申领记录
     handleApplyLog(row) {
       this.applyVisible = true
+      this.productData = row
       let query = {
         productCode: row.inventoryId,
         current: this.applyPage.currentPage,
@@ -719,6 +723,7 @@ export default {
         }
       })
     },
+
     changeWare(val) {
       this.addForm.warehouseName = this.warehouseList.find(item => item.id == val).name
     },
@@ -809,8 +814,33 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.query);
     },
-    selectionChange(list) {
-      this.selectedList = list
+
+    applyOnLoad(page, params = {}){
+      console.log(9999999,page,params)
+      let query = {
+        productCode: this.productData.inventoryId,
+        current: page.currentPage,
+        size: page.pageSize,
+      }
+      getDetailApplyLog(query).then(res => {
+        if (res.data.code == 200) {
+          this.applyData = res.data.data.records
+          this.applyPage.total = res.data.data.total
+        }
+      })
+    },
+    logOnLoad(page, params = {}){
+      let query = {
+        productCode: this.logData.inventoryId,
+        current: page.currentPage,
+        size: page.pageSize,
+      }
+      getDetailLog(query).then(res => {
+        if (res.data.code == 200) {
+          this.logData = res.data.data.records
+          this.logPage.total = res.data.data.total
+        }
+      })
     },
     // 批量入库
     handleAdd() {
diff --git a/src/views/goodsManagement/myGoodsList.vue b/src/views/goodsManagement/myGoodsList.vue
index 1461e26..13f3292 100644
--- a/src/views/goodsManagement/myGoodsList.vue
+++ b/src/views/goodsManagement/myGoodsList.vue
@@ -31,7 +31,7 @@
 
       <!-- 物资申领记录列表 -->
       <el-dialog title="物资申领记录" :visible.sync="applyVisible" :append-to-body="true" width="70%"
-        :close-on-click-modal="false">
+        :close-on-click-modal="false" @on-load="applyOnLoad">
         <avue-crud :option="applyoption" :table-loading="loading" :data="applyData" :page.sync="applyPage" ref="crud"
           v-model="applyForm">
 
@@ -91,7 +91,7 @@
 <script>
 import SelectTree from '../../components/selectTree/tree.vue'
 import { mapGetters } from "vuex";
-import { getDetail, getMyList, getMyPersonDetail, getGoodsList } from '@/api/goodsManagement/goods'
+import { getDetail, getMyList, getMyPersonDetail, getGoodsList,getDetailApplyLog } from '@/api/goodsManagement/goods'
 import 'nprogress/nprogress.css';
 
 export default {
@@ -292,7 +292,8 @@ export default {
 
 
         ]
-      }
+      },
+      productData:{},//存每一行的数据
     }
   },
   computed: {
@@ -305,6 +306,7 @@ export default {
     // 查看物料的核销记录
     handleApplyLog(row) {
       this.applyVisible = true
+      this.productData = row
       let query = {
         productCode: row.productCode,
         current: this.applyPage.currentPage,
@@ -350,65 +352,20 @@ export default {
       this.selectedList = list
     },
 
-    // 归还
-    // loadmore() {
-    //   if (this.goodsCurrent * this.goodsSize >= this.goodsTotal) return
-    //   this.goodsCurrent++
-    //   this.getGoodsLists('more')
-    // },
-    // getGoodsLists() {
-    //   getGoodsList({ current: this.goodsCurrent, size: this.goodsSize }).then(res => {
-    //     if (this.goodsCurrent == 1) {
-    //       this.goodsList = res.data.data.records
-    //     } else {
-    //       this.goodsList = this.goodsList.concat(res.data.data.records)
-    //     }
-    //     this.goodsTotal = res.data.data.total
-    //   })
-    // },
-    // changeGood(val) {
-    //   let tmp = this.goodsList.find(item => item.id == val)
-    //   this.addForm = tmp
-    //   this.addForm.returnNum = 0
-
-    // },
-    // handleAddGoods() {
-    //   this.dialogAdd = true
-    //   this.dialogTitle = '物品归还'
-    //   this.viewType = 'returnGoods'
-    //   this.getGoodsLists()
-    // },
-    // // 点击取消按钮
-    // handleCancel() {
-    //   this.dialogVisible = false
-    //   this.addForm = {}
-    // },
-    // // 归还提交
-    // handleSave() {
-    //   if (this.addForm.returnNum == 0) {
-    //     this.$message.error('归还数量不可为0')
-    //   } else {
-    //     let data = []
-    //     data.push({
-    //       id: this.addForm.id,
-    //       returnNum: this.addForm.returnNum,
-    //       productId: this.addForm.productId,
-    //     })
-    //     let query = {
-    //       details: data,
-    //       id: this.receiveForm.id,
-    //       code: this.receiveForm.code
-    //     }
-    //     returnGoods(query).then(res => {
-    //       if (res.data.code == 200) {
-    //         this.$message.success('归还成功')
-    //         this.onLoad()
-    //         this.dialogReceive = false
-    //       }
-    //     })
-    //   }
-
-    // },
+    applyOnLoad(page, params = {}){
+      console.log(9999999,page,params)
+      let query = {
+        productCode: this.productData.inventoryId,
+        current: page.currentPage,
+        size: page.pageSize,
+      }
+      getDetailApplyLog(query).then(res => {
+        if (res.data.code == 200) {
+          this.applyData = res.data.data.records
+          this.applyPage.total = res.data.data.total
+        }
+      })
+    },
 
     onLoad(page, params = {}) {
       this.loading = true