报废台账

src/api/repair/scrapLedgerReview.js

@@ -90,4 +90,13 @@ export function getScrapList(query) {
     method: 'get',
     params: query
   })
+}
+
+//报废台账详情列表
+export function getScrapDetailsList(query) {
+  return request({
+    url: '/material/scrap_apply_details/getScrapDetailsList',
+    method: 'get',
+    params: query
+  })
 }

src/views/material/repair/inventoryScrap/component/addToolsApply.vue

@@ -506,7 +506,7 @@ export default {
       // 这里假设 handleTypeChange 中有相关数据，你需要根据实际情况调整
       // 例如，假设 this.equipmentList 中有相关数据
       console.log('xxxxxxxxxxxxxxxxx')
-      return  getMachineListByCode({"typeId":row.typeId}).then((response) => {
+      return  getMachineListByCode({"typeId":row.typeId,"taskId":this.taskid}).then((response) => {
           console.log("response", response);
           const relatedData = response.data.map(item => ({ id: item.maId, code: item.maCode,typeId: item.typeId  }));
           console.log("relatedData", relatedData);

src/views/material/repair/scrapLedger/detail.vue

@@ -10,7 +10,7 @@
     >
       <el-form-item  prop="dateRange">
           <el-date-picker
-            v-model="queryParams.time"
+            v-model="queryParams.month"
             type="month"
             placeholder="请选择月份">
           </el-date-picker>
@@ -126,8 +126,8 @@ export default {
 
       // 查询参数
       queryParams: {
-        time:null,
-        keyWord,
+        month:null,
+        keyWord: null,
         pageNum: 1,
         pageSize: 10,
       },
@@ -158,15 +158,15 @@ export default {
       const params = {
           month: this.month,
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.time && this.queryParams.time[0],
-          endTime: this.queryParams.time && this.queryParams.time[1],
+          startTime: this.queryParams.month && this.queryParams.month[0],
+          endTime: this.queryParams.month && this.queryParams.month[1],
           pageSize: this.queryParams.pageSize,
           pageNum: this.queryParams.pageNum
       }
 
       getScrapDetailsList(params).then((response) => {
-        this.tableList = response.data;
-        this.total = response.total;
+        this.tableList = response.data.rows;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -174,7 +174,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.keyWord = null;
-      this.queryParams.time = null;
+      this.queryParams.month = null;
       this.handleQuery();
     },
     /** 搜索按钮操作 */
@@ -189,8 +189,8 @@ export default {
         const params = {
           month: this.month,
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.time && this.queryParams.time[0],
-          endTime: this.queryParams.time && this.queryParams.time[1],
+          startTime: this.queryParams.month && this.queryParams.month[0],
+          endTime: this.queryParams.month && this.queryParams.month[1],
       }
       this.download(
         "/material/scrap_apply_details/getScrapDetailsList",