diff --git a/src/views/firstOrder/components/batchSelectionDialog.vue b/src/views/firstOrder/components/batchSelectionDialog.vue
index fb013e1..0e507f9 100644
--- a/src/views/firstOrder/components/batchSelectionDialog.vue
+++ b/src/views/firstOrder/components/batchSelectionDialog.vue
@@ -93,31 +93,31 @@ export default {
handleSelectionChange(selection, parentRow) {
console.log('666666', selection, parentRow)
const maxAllowed = parentRow.applicationQuantity - parentRow.outboundQuantity;
- if(selection.length>(parentRow.applicationQuantity-parentRow.outboundQuantity)){
- const validSelection = selection.slice(0, maxAllowed);
- const removedItems = selection.slice(maxAllowed);
- const selectionWithParent = validSelection.map(item => ({
- ...item,
- parentMaterialId: parentRow.materialId,
- parentDepartmentName: parentRow.departmentName,
- applicationQuantity: parentRow.applicationQuantity,
- department:parentRow.department,
- departmentName:parentRow.departmentName,
- ldDemandEndId: parentRow.ldDemandEndId,
- outboundQuantity: parentRow.outboundQuantity,
- }));
- this.selectedRows = this.selectedRows.filter(
- item => item.parentMaterialId !== parentRow.materialId
- );
- this.selectedRows.push(...selectionWithParent);
- // 获取最后一个被选中的行(通常是 selection 数组的最后一项)
- const lastSelected = selection[selection.length - 1];
+ // if(selection.length>(parentRow.applicationQuantity-parentRow.outboundQuantity)){
+ // const validSelection = selection.slice(0, maxAllowed);
+ // const removedItems = selection.slice(maxAllowed);
+ // const selectionWithParent = validSelection.map(item => ({
+ // ...item,
+ // parentMaterialId: parentRow.materialId,
+ // parentDepartmentName: parentRow.departmentName,
+ // applicationQuantity: parentRow.applicationQuantity,
+ // department:parentRow.department,
+ // departmentName:parentRow.departmentName,
+ // ldDemandEndId: parentRow.ldDemandEndId,
+ // outboundQuantity: parentRow.outboundQuantity,
+ // }));
+ // this.selectedRows = this.selectedRows.filter(
+ // item => item.parentMaterialId !== parentRow.materialId
+ // );
+ // this.selectedRows.push(...selectionWithParent);
+ // // 获取最后一个被选中的行(通常是 selection 数组的最后一项)
+ // const lastSelected = selection[selection.length - 1];
- // 手动取消该行在 UI 上的勾选
- this.$refs.innerTable.toggleRowSelection(lastSelected, false);
- return
+ // // 手动取消该行在 UI 上的勾选
+ // this.$refs.innerTable.toggleRowSelection(lastSelected, false);
+ // return
- }
+ // }
// 为勾选的数据补充父行关联信息
const selectionWithParent = selection.map(item => ({
...item,
diff --git a/src/views/materials/expend.vue b/src/views/materials/expend.vue
index 09e1894..7a44ca5 100644
--- a/src/views/materials/expend.vue
+++ b/src/views/materials/expend.vue
@@ -25,6 +25,12 @@
待借出
+ 记录
+
+
+
+
@@ -70,13 +85,16 @@ import { getList } from "@/api/materials/expend";
import returnDialog from "./components/returnDialog.vue";
import scrapDialog from "./components/scrapDialog.vue";
+import recordDialog from "../secondOrder/components/recordDialog.vue";
export default {
components: {
returnDialog,
scrapDialog,
+ recordDialog
},
data() {
return {
+ recordShow:false,
returnShow: false, //归还
scrapShow: false, //报废
@@ -232,10 +250,16 @@ export default {
this.tableData = this.ckTable;
},
methods: {
+ handleLog(row) {
+ this.recordShow = true;
+ this.rowData = row;
+ },
// 关闭弹窗
closeDialog() {
this.returnShow = false;
this.scrapShow = false;
+ this.recordShow = false;
+ this.onLoad(this.page)
},
searchReset() {
this.query = {};
diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue
index 4cbf3e8..1c0a4cd 100644
--- a/src/views/secondOrder/components/outDialog.vue
+++ b/src/views/secondOrder/components/outDialog.vue
@@ -829,6 +829,9 @@ export default {
if (this.sizeForm.groupName != "自由出库") {
this.groupTableData = res.data.result.ldTwoOutStorageDetailList;
+ this.groupTableData.forEach(item=>{
+ item.applyNum=item.num
+ })
}
// this.sizeForm.ldTwoOutStorage.proposerInfo={}
});
diff --git a/src/views/secondOrder/components/recordDialog.vue b/src/views/secondOrder/components/recordDialog.vue
index 68b628b..93138cb 100644
--- a/src/views/secondOrder/components/recordDialog.vue
+++ b/src/views/secondOrder/components/recordDialog.vue
@@ -42,6 +42,10 @@ export default {
type: Object,
default: () => ({}),
},
+ type: {
+ type: String,
+ default: "",
+ },
},
data() {
return {
@@ -147,6 +151,7 @@ export default {
transactionType: this.transactionType,
currentPage: page.currentPage,
pageSize: page.pageSize,
+ type:this.type
};
recordList(query_).then((res) => {
this.data = res.data.result.list;
diff --git a/src/views/secondOrder/list.vue b/src/views/secondOrder/list.vue
index a41f63d..b6744be 100644
--- a/src/views/secondOrder/list.vue
+++ b/src/views/secondOrder/list.vue
@@ -28,6 +28,7 @@
:showDialog="recordShow"
@closeDialog="closeDialog"
:rowData="rowData"
+ :type="'YH'"
>