一级库出库调整

master
taozi 3 months ago
parent 44c02725fe
commit e637c7f1cb
  1. 4
      src/views/firstOrder/components/batchSelectionDialog.vue
  2. 104
      src/views/firstOrder/components/consumableDialog.vue
  3. 22
      src/views/firstOrder/components/outDialog.vue
  4. 30
      src/views/materials/expend.vue
  5. 7
      src/views/secondOrder/inbound.vue
  6. 24
      src/views/secondOrder/list.vue

@ -107,7 +107,7 @@ export default {
//
handleSelectionChange(selection, parentRow) {
console.log('666666',selection, parentRow)
//
//
const selectionWithParent = selection.map(item => ({
...item,
parentMaterialId: parentRow.materialId, // ID
@ -148,10 +148,8 @@ export default {
// this.$emit('handleCloseDetail')
this.$emit('selectionChange', this.selectedRows);
},
},
mounted() {
console.log(9999999,this.inBatchForm)

@ -50,7 +50,7 @@ export default {
selection: true,
viewBtn: true,
dialogClickModal: false,
menu: true,
menu: false,
printBtn: false,
refreshBtn: false,
gridBtn: false,
@ -61,6 +61,7 @@ export default {
menuAlign: "left",
searchMenuPosition: "right",
menuWidth: 80,
selectable: (row, index) => row.num !== 0,
column: [
{
label: "存货编号",
@ -84,7 +85,7 @@ export default {
{
label: "类别",
prop: "type",
search: true,
search: false,
type: "select",
headerAlign: "center",
align: "center",
@ -112,6 +113,9 @@ export default {
prop: "num",
headerAlign: "center",
align: "center",
// selectDisabled: (row) => {
// return row.num === 0 || row.num === null || row.num === undefined;
// },
},
{
label: "单价",
@ -119,12 +123,12 @@ export default {
headerAlign: "center",
align: "center",
},
{
label: "金额",
prop: "amount",
headerAlign: "center",
align: "center",
},
// {
// label: "",
// prop: "amount",
// headerAlign: "center",
// align: "center",
// },
{
label: "描述",
prop: "remark",
@ -250,11 +254,85 @@ export default {
this.$refs.crud.toggleSelection();
},
handleRowChange(row, index, data) {
console.log('Selected data:', data);
console.log('select row', row)
//
//
this.$nextTick(() => {
const currentPageData = this.data
console.log(this.data,0)
this.$refs.crud.toggleAllSelection(false);
currentPageData.forEach((item) => {
// 0
const isSelected = this.allSelectedList.some(selectedItem =>
selectedItem.id === item.id && !(item.num === 0 || item.num === null || item.num === undefined || item.num === '')
);
if (isSelected) {
this.$refs.crud.toggleRowSelection(item, true);
}
});
});
},
// handleRowChange(row, index, data) {
// //
// this.$nextTick(() => {
// //
// const currentPageData = this.data || [];
// //
// this.$refs.crud.toggleAllSelection(false);
// // allSelectedList
// currentPageData.forEach((item, index) => {
// const isSelected = this.allSelectedList.some(selectedItem =>
// selectedItem.id === item.id
// );
// //
// if (isSelected) {
// this.$refs.crud.toggleRowSelection(item, true);
// }
// });
// });
// },
// currentChange(currentPage) {
// console.log(currentPage, 1);
// this.page.currentPage = currentPage;
// // onLoad handleRowChange
// this.onLoad(this.page, this.query);
// },
// onLoad(page, params = {}) {
// this.loading = true;
// console.log(this.query, 2);
// getList(
// page.currentPage,
// page.pageSize,
// Object.assign(params, this.query)
// ).then((res) => {
// this.data = res.data.result.list;
// this.loading = false;
// this.page.total = res.data.result.total;
// //
// this.$nextTick(() => {
// this.updateCurrentPageSelection();
// });
// });
// this.loading = false;
// },
// //
// updateCurrentPageSelection() {
// if (!this.$refs.crud) return;
// const currentPageData = this.data || [];
// currentPageData.forEach((item) => {
// const isSelected = this.allSelectedList.some(selectedItem =>
// selectedItem.id === item.id
// );
// if (isSelected) {
// this.$refs.crud.toggleRowSelection(item, true);
// }
// });
// },
currentChange(currentPage) {
console.log(currentPage, 1)
this.handleRowChange()
@ -283,8 +361,6 @@ export default {
},
},
}
</script>
<style lang="scss" scoped>
::v-deep.el-dialog__footer {

@ -92,7 +92,7 @@
:key="'account-dept-' + sizeForm.options">
<template slot-scope="scope">
<el-select v-model="scope.row.department" placeholder="请选择部门名称" style="width: 100%;"
v-if='inDialogType != "details"'>
v-if='outDialogType != "details"'>
<el-option v-for="item in list" :key="item.departmentId" :label="item.department"
:value="item.departmentId">
</el-option>
@ -100,6 +100,17 @@
<span v-else> {{ scope.row.departmentName }}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="departmentName" label="部门" :key="'account-dept-' + sizeForm.options">
<template slot-scope="scope">
<el-select v-model="scope.row.department" placeholder="请选择部门名称" style="width: 100%;"
v-if='outDialogType != "details" && sizeForm.options === 2 && sizeForm.optionType'>
<el-option v-for="item in list" :key="item.departmentId" :label="item.department"
:value="item.departmentId">
</el-option>
</el-select>
<span v-else>{{ scope.row.departmentName }}</span>
</template>
</el-table-column> -->
<el-table-column prop="applicationQuantity" label="申请数量" v-if="sizeForm.options == 1">
</el-table-column>
<!-- <el-table-column prop="outboundQuantity" label="已出库数量" v-if="sizeForm.options == 1">
@ -219,9 +230,11 @@
<consumableDialog v-if="consumableVisible" :consumableVisible='consumableVisible'
:demandDialogTitle="demandDialogTitle" @handleCloseDetail="handleCloseDetail" @confirm="confirm">
</consumableDialog>
<!-- 批量耐用品弹窗 -->
<batchSelectionDialog v-if="batchSelectionVisible" :batchSelectionVisible='batchSelectionVisible'
:batchSelectionTitle="batchSelectionTitle" :tableData="batchTableData"
@batchclose="batchclose" :inBatchForm="inBatchForm" @confirm-selection="handleConfirmSelection" @selectionChange="selectionChange"></batchSelectionDialog>
:batchSelectionTitle="batchSelectionTitle" :tableData="batchTableData" @batchclose="batchclose"
:inBatchForm="inBatchForm" @confirm-selection="handleConfirmSelection" @selectionChange="selectionChange">
</batchSelectionDialog>
</div>
</template>
@ -754,7 +767,6 @@ async batchSubmit() {
editList(this.id).then(res => {
console.log(res.data.result, '详情数据')
const { ldOneOutStorage, ldOneOutStorageDetails } = res.data.result || {};
// this.sizeForm = res.data.result.ldOneOutStorage
this.sizeForm.inTableData = res.data.result.ldOneOutStorageDetails
this.sizeForm.orderNo = ldOneOutStorage.orderNo
@ -776,8 +788,6 @@ async batchSubmit() {
// materialld: '',//Id
this.$set(this.sizeForm, 'inTableData', res.data.result.ldOneOutStorageDetails)
console.log(this.sizeForm, '111')
})
}
},

@ -156,11 +156,11 @@ export default {
dicDta: [
{
label: "易耗品",
value: "1",
value: "YH",
},
{
label: "耐用品",
value: "2",
value: "NY",
},
],
},
@ -182,12 +182,12 @@ export default {
headerAlign: "center",
align: "center",
},
{
label: "金额",
prop: "amount",
headerAlign: "center",
align: "center",
},
// {
// label: "",
// prop: "amount",
// headerAlign: "center",
// align: "center",
// },
{
label: "状态",
prop: "isBorrow",
@ -208,12 +208,26 @@ export default {
value: "2",
},
],
formatter: (row, column) => {
const value = row.purchaseEndInfo;
if (value === null || value === undefined || value === "") {
return "无"; //
}
return value; //
}
},
{
label: "归还时间",
prop: "returnTime",
headerAlign: "center",
align: "center",
formatter: (row, column) => {
const value = row.returnTime;
if (value === null || value === undefined || value === "") {
return "无"; //
}
return value; //
}
},
],
},

@ -111,6 +111,13 @@ export default {
width: 180,
headerAlign: "center",
align: "center",
formatter: (row, column) => {
const value = row.demandEndInfo;
if (value === null || value === undefined || value === "") {
return "无"; //
}
return value; //
}
},
// {
// label: "",

@ -135,18 +135,18 @@ export default {
headerAlign: "center",
align: "center",
},
{
label: "单价",
prop: "unitPrice",
headerAlign: "center",
align: "center",
},
{
label: "金额",
prop: "amount",
headerAlign: "center",
align: "center",
},
// {
// label: "",
// prop: "unitPrice",
// headerAlign: "center",
// align: "center",
// },
// {
// label: "",
// prop: "amount",
// headerAlign: "center",
// align: "center",
// },
],
},
data: [],

Loading…
Cancel
Save