# Conflicts: # src/views/secondOrder/components/categoryDialog.vue # src/views/secondOrder/components/outDialog.vuemaster
taozi
4 months ago
commit
7a03181d04
5 changed files with 569 additions and 407 deletions
@ -1,305 +1,362 @@ |
|||||||
<template> |
<template> |
||||||
<el-dialog :close-on-click-modal="false" :title="categoryDialogTitle" :visible.sync="categoryVisible" |
<el-dialog |
||||||
:append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen> |
:close-on-click-modal="false" |
||||||
<el-tabs v-model="transactionType" @tab-click="handleTabClick"> |
:title="categoryDialogTitle" |
||||||
<el-tab-pane label="易耗品" name="YH"></el-tab-pane> |
:visible.sync="categoryVisible" |
||||||
<el-tab-pane label="耐用品" name="NY"></el-tab-pane> |
:append-to-body="true" |
||||||
</el-tabs> |
width="70%" |
||||||
<avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page" |
@close="handleCancel" |
||||||
:permission="permissionList" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" |
fullscreen |
||||||
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" |
> |
||||||
@refresh-change="refreshChange" @on-load="onLoad" @row-change="handleRowChange"> |
<el-tabs v-model="transactionType" @tab-click="handleTabClick"> |
||||||
</avue-crud> |
<el-tab-pane label="易耗品" name="YH"></el-tab-pane> |
||||||
<div slot="footer" class="dialog-footer"> |
<el-tab-pane label="耐用品" name="NY"></el-tab-pane> |
||||||
<el-button @click="handleCloseDetail">取消</el-button> |
</el-tabs> |
||||||
<el-button type="primary" @click="handleConfirm">确定</el-button> |
<avue-crud |
||||||
</div> |
:option="option" |
||||||
</el-dialog> |
:table-loading="loading" |
||||||
|
:data="data" |
||||||
|
ref="crud" |
||||||
|
v-model="form" |
||||||
|
:page.sync="page" |
||||||
|
:permission="permissionList" |
||||||
|
@row-del="rowDel" |
||||||
|
@search-change="searchChange" |
||||||
|
@search-reset="searchReset" |
||||||
|
@select="selectionChange" |
||||||
|
@current-change="currentChange" |
||||||
|
@size-change="sizeChange" |
||||||
|
@refresh-change="refreshChange" |
||||||
|
@on-load="onLoad" |
||||||
|
@row-change="handleRowChange" |
||||||
|
row-key="id" |
||||||
|
> |
||||||
|
</avue-crud> |
||||||
|
<div slot="footer" class="dialog-footer"> |
||||||
|
<el-button @click="handleCancel">取消</el-button> |
||||||
|
<el-button type="primary" @click="handleConfirm">确定</el-button> |
||||||
|
</div> |
||||||
|
</el-dialog> |
||||||
</template> |
</template> |
||||||
<script> |
<script> |
||||||
import { getList } from "@/api/secondOrder/list.js"; |
import { getList } from "@/api/secondOrder/list.js"; |
||||||
import { getList as fetchDurableApi } from "@/api/materials/expend"; |
import { getList as fetchDurableApi } from "@/api/materials/expend"; |
||||||
|
|
||||||
export default { |
export default { |
||||||
props: { |
props: { |
||||||
categoryVisible: { |
categoryVisible: { |
||||||
type: Boolean, |
type: Boolean, |
||||||
default: false |
default: false, |
||||||
}, |
|
||||||
categoryDialogTitle: { |
|
||||||
type: String, |
|
||||||
default: '' |
|
||||||
}, |
|
||||||
departmentId: { |
|
||||||
type: String, |
|
||||||
default: '' |
|
||||||
}, |
|
||||||
selectionData: { |
|
||||||
type: Array, |
|
||||||
default: () => [] |
|
||||||
} |
|
||||||
}, |
}, |
||||||
data() { |
categoryDialogTitle: { |
||||||
return { |
type: String, |
||||||
form: {}, |
default: "", |
||||||
selectionList: [], |
}, |
||||||
newselection: [], |
departmentId: { |
||||||
query: {}, |
type: [String, Number], |
||||||
loading: true, |
default: "", |
||||||
page: { |
}, |
||||||
pageSize: 10, |
selectionData: { |
||||||
currentPage: 1, |
type: Array, |
||||||
total: 0, |
default: () => [], |
||||||
}, |
}, |
||||||
option: { |
}, |
||||||
reserveSelection: true, |
data() { |
||||||
calcHeight: 30, |
return { |
||||||
tip: false, |
form: {}, |
||||||
searchShow: true, |
selectionList: [], |
||||||
searchMenuSpan: 18, |
newselection: [], |
||||||
border: true, |
query: {}, |
||||||
index: true, |
loading: true, |
||||||
selection: true, |
page: { |
||||||
viewBtn: true, |
pageSize: 10, |
||||||
dialogClickModal: false, |
currentPage: 1, |
||||||
menu: false, |
total: 0, |
||||||
addBtn: false, |
}, |
||||||
printBtn: false, |
option: { |
||||||
refreshBtn: false, |
reserveSelection: true, |
||||||
gridBtn: false, |
calcHeight: 30, |
||||||
gridBackgroundImage: false, |
tip: false, |
||||||
gridSpan: false, |
searchShow: true, |
||||||
filterBtn: false, |
searchMenuSpan: 18, |
||||||
columnBtn: false, |
border: true, |
||||||
menuAlign: "left", |
index: true, |
||||||
searchMenuPosition: "right", |
selection: true, |
||||||
menuWidth: 80, |
viewBtn: true, |
||||||
selectable: (row, index) => row.num !== 0, |
dialogClickModal: false, |
||||||
column: [ |
menu: false, |
||||||
{ |
addBtn: false, |
||||||
label: "存货编号", |
printBtn: false, |
||||||
prop: "materialCode", |
refreshBtn: false, |
||||||
headerAlign: "center", |
gridBtn: false, |
||||||
align: "center", |
gridBackgroundImage: false, |
||||||
}, |
gridSpan: false, |
||||||
{ |
filterBtn: false, |
||||||
label: "存货名称", |
columnBtn: false, |
||||||
prop: "materialName", |
menuAlign: "left", |
||||||
search: true, |
searchMenuPosition: "right", |
||||||
headerAlign: "center", |
menuWidth: 80, |
||||||
align: "left", |
selectable: (row, index) => row.num !== 0, |
||||||
}, |
column: [ |
||||||
{ |
{ |
||||||
label: "规格型号", |
label: "存货编号", |
||||||
prop: "model", |
prop: "materialCode", |
||||||
headerAlign: "center", |
headerAlign: "center", |
||||||
align: "left", |
align: "center", |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
label: "类别", |
label: "存货名称", |
||||||
prop: "type", |
prop: "materialName", |
||||||
search: false, |
search: true, |
||||||
type: "select", |
headerAlign: "center", |
||||||
headerAlign: "center", |
align: "left", |
||||||
align: "center", |
}, |
||||||
value: "NY", |
{ |
||||||
disabled: true, |
label: "规格型号", |
||||||
dicData: [ |
prop: "model", |
||||||
{ |
headerAlign: "center", |
||||||
label: "易耗品", |
align: "left", |
||||||
value: "YH", |
}, |
||||||
}, |
{ |
||||||
{ |
label: "类别", |
||||||
label: "耐用品", |
prop: "type", |
||||||
value: "NY", |
search: false, |
||||||
}, |
type: "select", |
||||||
], |
headerAlign: "center", |
||||||
}, |
align: "center", |
||||||
{ |
value: "NY", |
||||||
label: "计量单位", |
disabled: true, |
||||||
prop: "unit", |
dicData: [ |
||||||
headerAlign: "center", |
{ |
||||||
align: "center", |
label: "易耗品", |
||||||
}, |
value: "YH", |
||||||
{ |
}, |
||||||
label: "数量", |
{ |
||||||
prop: "num", |
label: "耐用品", |
||||||
headerAlign: "center", |
value: "NY", |
||||||
align: "center", |
}, |
||||||
}, |
], |
||||||
{ |
}, |
||||||
label: "单价", |
{ |
||||||
prop: "unitPrice", |
label: "计量单位", |
||||||
headerAlign: "center", |
prop: "unit", |
||||||
align: "center", |
headerAlign: "center", |
||||||
formatter: (row, column) => { |
align: "center", |
||||||
const value = row.unitPrice; |
}, |
||||||
if (value === null || value === undefined || value === "") { |
{ |
||||||
return "-"; |
label: "数量", |
||||||
} |
prop: "num", |
||||||
return value; |
headerAlign: "center", |
||||||
} |
align: "center", |
||||||
}, |
}, |
||||||
], |
{ |
||||||
|
label: "单价", |
||||||
|
prop: "unitPrice", |
||||||
|
headerAlign: "center", |
||||||
|
align: "center", |
||||||
|
formatter: (row, column) => { |
||||||
|
const value = row.unitPrice; |
||||||
|
if (value === null || value === undefined || value === "") { |
||||||
|
return "-"; |
||||||
|
} |
||||||
|
return value; |
||||||
}, |
}, |
||||||
data: [], |
}, |
||||||
dialogLogVisible: false, |
], |
||||||
transactionType: "YH", |
}, |
||||||
tableData: [], |
data: [], |
||||||
ckTable: [], |
dialogLogVisible: false, |
||||||
rkTable: [], |
transactionType: "YH", |
||||||
currentRow: null, |
tableData: [], |
||||||
allSelectedList: [], |
ckTable: [], |
||||||
isUpdatingSelection: false, |
rkTable: [], |
||||||
} |
currentRow: null, |
||||||
|
allSelectedList: [], |
||||||
|
isUpdatingSelection: false, |
||||||
|
}; |
||||||
|
}, |
||||||
|
mounted() { |
||||||
|
// 初始化时使用传入的selectionData |
||||||
|
this.allSelectedList = [...this.selectionData]; |
||||||
|
this.onLoad(this.page); |
||||||
|
}, |
||||||
|
methods: { |
||||||
|
//清空搜索 |
||||||
|
searchReset() { |
||||||
|
this.query = {}; |
||||||
|
this.onLoad(this.page); |
||||||
}, |
}, |
||||||
mounted() { |
searchChange(params, done) { |
||||||
// 初始化时使用传入的selectionData |
this.query = params; |
||||||
this.allSelectedList = [...this.selectionData]; |
this.page.currentPage = 1; |
||||||
this.onLoad(this.page); |
this.onLoad(this.page, params); |
||||||
|
done(); |
||||||
}, |
}, |
||||||
methods: { |
|
||||||
//清空搜索 |
|
||||||
searchReset() { |
|
||||||
this.query = {}; |
|
||||||
this.onLoad(this.page); |
|
||||||
}, |
|
||||||
searchChange(params, done) { |
|
||||||
this.query = params; |
|
||||||
this.page.currentPage = 1; |
|
||||||
this.onLoad(this.page, params); |
|
||||||
done(); |
|
||||||
}, |
|
||||||
|
|
||||||
// 更新当前页面的勾选状态 |
// 更新当前页面的勾选状态 |
||||||
updateCurrentPageSelection() { |
updateCurrentPageSelection() { |
||||||
if (!this.$refs.crud || !this.data) return; |
if (!this.$refs.crud || !this.data) return; |
||||||
this.isUpdatingSelection = true; |
|
||||||
const currentPageData = this.data |
|
||||||
// 先清除所有选择 |
|
||||||
this.$refs.crud.toggleSelection(); |
|
||||||
|
|
||||||
// 检查当前页面的数据中有哪些在 allSelectedList 中 |
this.isUpdatingSelection = true; |
||||||
currentPageData.forEach((item) => { |
|
||||||
const isSelected = this.allSelectedList.some(selectedItem => |
|
||||||
selectedItem.id === item.id |
|
||||||
); |
|
||||||
|
|
||||||
if (isSelected) { |
const currentPageData = this.data || []; |
||||||
this.$refs.crud.toggleRowSelection(item, true); |
|
||||||
} |
|
||||||
|
|
||||||
}); |
// 先清除所有选择 |
||||||
|
this.$refs.crud.toggleSelection(); |
||||||
|
|
||||||
// 延迟 确保选择状态已完全更新 |
// 检查当前页面的数据中有哪些在 allSelectedList 中 |
||||||
this.$nextTick(() => { |
currentPageData.forEach((item) => { |
||||||
setTimeout(() => { |
const isSelected = this.allSelectedList.some( |
||||||
this.isUpdatingSelection = false |
(selectedItem) => selectedItem.id === item.id |
||||||
}, 100); |
); |
||||||
}); |
|
||||||
}, |
|
||||||
|
|
||||||
|
if (isSelected) { |
||||||
selectionChange(selection) { |
this.$refs.crud.toggleRowSelection(item, true); |
||||||
console.log(selection,'selection-------') |
} |
||||||
console.log(this.selectionData, '---selectionData') |
}); |
||||||
const currentPageIds = this.selectionData.map(item => item.id) |
|
||||||
let arr = selection.filter(item => !currentPageIds.includes(item.id)) //未选择的数据 |
|
||||||
const selectionWithTwoInventoryId = arr.map(item => ({ |
|
||||||
...item, |
|
||||||
twoInventoryId: item.id |
|
||||||
})) |
|
||||||
this.allSelectedList.push(...selectionWithTwoInventoryId); |
|
||||||
this.allSelectedList = this.uniqueById(this.allSelectedList); |
|
||||||
}, |
|
||||||
//去重 |
|
||||||
uniqueById(arr) { |
|
||||||
const uniqueObj = {}; |
|
||||||
arr.forEach(item => { |
|
||||||
if (item.id && !uniqueObj[item.id]) { |
|
||||||
uniqueObj[item.id] = item; |
|
||||||
} |
|
||||||
}); |
|
||||||
return Object.values(uniqueObj); |
|
||||||
}, |
|
||||||
|
|
||||||
//点击确定 |
// 延迟 确保选择状态已完全更新 |
||||||
handleConfirm() { |
this.$nextTick(() => { |
||||||
const uniqueList = this.uniqueById(this.allSelectedList) |
setTimeout(() => { |
||||||
this.$emit("confirm", uniqueList) |
this.isUpdatingSelection = false; |
||||||
}, |
}, 100); |
||||||
|
}); |
||||||
|
}, |
||||||
|
|
||||||
handleCloseDetail() { |
//勾选选中 |
||||||
this.$emit('handleCloseDetail') |
selectionChange(selection,row) { |
||||||
}, |
|
||||||
|
|
||||||
selectionClear() { |
let isSelectedInfo = selection.filter( |
||||||
this.allSelectedList = [] |
(item) => item.id==row.id |
||||||
if (this.$refs.crud) { |
); |
||||||
this.$refs.crud.toggleSelection() |
if (this.isUpdatingSelection) { |
||||||
} |
return; |
||||||
}, |
} |
||||||
|
|
||||||
currentChange(currentPage) { |
// 获取当前页面的数据ID |
||||||
this.page.currentPage = currentPage; |
const currentPageIds = this.data.map((item) => item.id); |
||||||
this.onLoad(this.page, this.query) |
|
||||||
}, |
|
||||||
|
|
||||||
sizeChange(pageSize) { |
const otherPageSelected = this.allSelectedList.filter( |
||||||
this.page.pageSize = pageSize; |
(item) => !currentPageIds.includes(item.id) |
||||||
this.onLoad(this.page, this.query) |
); |
||||||
}, |
|
||||||
|
|
||||||
refreshChange() { |
const currentSelected = selection.map((item) => ({ |
||||||
this.onLoad(this.page, this.query) |
...item, |
||||||
}, |
twoInventoryId: item.id, |
||||||
|
})); |
||||||
|
|
||||||
handleTabClick() { |
// 组合所有勾选数据 |
||||||
this.page.currentPage = 1 |
const combinedSelection = [ |
||||||
this.onLoad(this.page) |
...otherPageSelected, // 其他页面的数据 |
||||||
}, |
...currentSelected, // 当前页面新勾选的数据 |
||||||
|
]; |
||||||
|
|
||||||
onLoad(page, params = {}) { |
// 去重并更新 allSelectedList |
||||||
this.loading = true |
this.allSelectedList = this.uniqueById(combinedSelection); |
||||||
const requestParams = Object.assign({}, params, this.query, { |
|
||||||
num: 0, |
|
||||||
departmentId: this.departmentId |
|
||||||
}); |
|
||||||
const apiPromise = this.transactionType === "YH" |
|
||||||
? getList(page.currentPage, page.pageSize, requestParams) |
|
||||||
: fetchDurableApi(page.currentPage, page.pageSize, requestParams) |
|
||||||
apiPromise.then((res) => { |
|
||||||
this.data = res.data.result.list |
|
||||||
this.page.total = res.data.result.total |
|
||||||
|
|
||||||
// 数据加载完成后，更新当前页面的勾选状态 |
if(isSelectedInfo.length<=0){ |
||||||
this.$nextTick(() => { |
this.allSelectedList=this.allSelectedList.filter( |
||||||
this.updateCurrentPageSelection() |
(item) => item.id!==row.id |
||||||
}); |
); |
||||||
}).catch(error => { |
} |
||||||
this.$message.error('加载数据失败: ' + error.message) |
console.log('isSelectedInfo', this.allSelectedList); |
||||||
}).finally(() => { |
this.allSelectedList.forEach(item=>{ |
||||||
this.loading = false; |
item.num = 0 |
||||||
}) |
}) |
||||||
}, |
// console.log("更新后的allSelectedList:", this.allSelectedList); |
||||||
|
}, |
||||||
|
|
||||||
handleCancel() { |
//去重 |
||||||
this.categoryVisible = false |
uniqueById(arr) { |
||||||
|
const uniqueObj = {}; |
||||||
|
arr.forEach((item) => { |
||||||
|
if (item.id && !uniqueObj[item.id]) { |
||||||
|
uniqueObj[item.id] = item; |
||||||
} |
} |
||||||
|
}); |
||||||
|
return Object.values(uniqueObj); |
||||||
}, |
}, |
||||||
} |
|
||||||
|
//点击确定 |
||||||
|
handleConfirm() { |
||||||
|
const uniqueList = this.uniqueById(this.allSelectedList); |
||||||
|
this.$emit("confirm", uniqueList); |
||||||
|
}, |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
selectionClear() { |
||||||
|
this.allSelectedList = []; |
||||||
|
if (this.$refs.crud) { |
||||||
|
this.$refs.crud.toggleSelection(); |
||||||
|
} |
||||||
|
}, |
||||||
|
|
||||||
|
currentChange(currentPage) { |
||||||
|
this.page.currentPage = currentPage; |
||||||
|
this.onLoad(this.page, this.query); |
||||||
|
}, |
||||||
|
|
||||||
|
sizeChange(pageSize) { |
||||||
|
this.page.pageSize = pageSize; |
||||||
|
this.onLoad(this.page, this.query); |
||||||
|
}, |
||||||
|
|
||||||
|
refreshChange() { |
||||||
|
this.onLoad(this.page, this.query); |
||||||
|
}, |
||||||
|
|
||||||
|
handleTabClick() { |
||||||
|
this.page.currentPage = 1; |
||||||
|
this.onLoad(this.page); |
||||||
|
}, |
||||||
|
|
||||||
|
onLoad(page, params = {}) { |
||||||
|
this.loading = true; |
||||||
|
const requestParams = Object.assign({}, params, this.query, { |
||||||
|
num: 0, |
||||||
|
departmentId: this.departmentId, |
||||||
|
}); |
||||||
|
const apiPromise = |
||||||
|
this.transactionType === "YH" |
||||||
|
? getList(page.currentPage, page.pageSize, requestParams) |
||||||
|
: fetchDurableApi(page.currentPage, page.pageSize, requestParams); |
||||||
|
apiPromise |
||||||
|
.then((res) => { |
||||||
|
this.data = res.data.result.list; |
||||||
|
this.page.total = res.data.result.total; |
||||||
|
|
||||||
|
// 数据加载完成后，更新当前页面的勾选状态 |
||||||
|
this.$nextTick(() => { |
||||||
|
this.updateCurrentPageSelection(); |
||||||
|
}); |
||||||
|
}) |
||||||
|
.catch((error) => { |
||||||
|
this.$message.error("加载数据失败: " + error.message); |
||||||
|
}) |
||||||
|
.finally(() => { |
||||||
|
this.loading = false; |
||||||
|
}); |
||||||
|
}, |
||||||
|
|
||||||
|
handleCancel() { |
||||||
|
this.categoryVisible = false; |
||||||
|
this.$emit("categoryClose"); |
||||||
|
}, |
||||||
|
}, |
||||||
|
}; |
||||||
</script> |
</script> |
||||||
<style lang="scss" scoped> |
<style lang="scss" scoped> |
||||||
::v-deep.el-dialog__footer { |
::v-deep.el-dialog__footer { |
||||||
position: fixed !important; |
position: fixed !important; |
||||||
bottom: 0 !important; |
bottom: 0 !important; |
||||||
right: 0 !important; |
right: 0 !important; |
||||||
} |
} |
||||||
|
|
||||||
::v-deep.dialog-content { |
::v-deep.dialog-content { |
||||||
max-height: calc(100vh - 200px); |
max-height: calc(100vh - 200px); |
||||||
overflow-y: auto; |
overflow-y: auto; |
||||||
padding-right: 10px; |
padding-right: 10px; |
||||||
overflow-x: hidden; |
overflow-x: hidden; |
||||||
} |
} |
||||||
</style> |
</style> |
||||||
|
|||||||
Loading…
Reference in new issue