|
|
|
@ -129,11 +129,13 @@
|
|
|
|
|
|
|
|
|
|
<el-table v-loading="loading" :data="rawOutstockDetailList" @selection-change="handleSelectionChange">
|
|
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
|
|
<el-table-column label="原材料出库记录明细ID" align="center" prop="rawOutstockDetailId" width="160" v-if="columns[0].visible"/>
|
|
|
|
|
<el-table-column label="原材料出库记录明细ID" align="center" prop="rawOutstockDetailId" width="160"
|
|
|
|
|
v-if="columns[0].visible"/>
|
|
|
|
|
<el-table-column label="原材料出库ID" align="center" prop="rawOutstockId" width="140" v-if="columns[1].visible"/>
|
|
|
|
|
<el-table-column label="任务编号" align="center" prop="taskCode" width="140" v-if="columns[25].visible"/>
|
|
|
|
|
<el-table-column label="计划编号" align="center" prop="planCode" width="140" v-if="columns[26].visible"/>
|
|
|
|
|
<el-table-column label="计划明细编号" align="center" prop="planDetailCode" width="140" v-if="columns[27].visible"/>
|
|
|
|
|
<el-table-column label="计划明细编号" align="center" prop="planDetailCode" width="140"
|
|
|
|
|
v-if="columns[27].visible"/>
|
|
|
|
|
<el-table-column label="销售订单编号" align="center" prop="saleorderCode" width="140" v-if="columns[28].visible"/>
|
|
|
|
|
<el-table-column label="仓库ID" align="center" prop="warehouseId" width="120" v-if="columns[3].visible"/>
|
|
|
|
|
<el-table-column label="库位编码" align="center" prop="locationCode" width="120" v-if="columns[4].visible"/>
|
|
|
|
@ -198,23 +200,32 @@
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="每托数量" align="center" prop="stackAmount" width="100" v-if="columns[23].visible"/>
|
|
|
|
|
<el-table-column label="备注" align="center" prop="tips" width="120" v-if="columns[24].visible"/>
|
|
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
<!-- size="mini"-->
|
|
|
|
|
<!-- type="text"-->
|
|
|
|
|
<!-- icon="el-icon-edit"-->
|
|
|
|
|
<!-- @click="handleUpdate(scope.row)"-->
|
|
|
|
|
<!-- v-hasPermi="['wms:rawOutstockDetail:edit']"-->
|
|
|
|
|
<!-- >修改-->
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
<!-- size="mini"-->
|
|
|
|
|
<!-- type="text"-->
|
|
|
|
|
<!-- icon="el-icon-delete"-->
|
|
|
|
|
<!-- @click="handleDelete(scope.row)"-->
|
|
|
|
|
<!-- v-hasPermi="['wms:rawOutstockDetail:remove']"-->
|
|
|
|
|
<!-- >删除-->
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
<el-button
|
|
|
|
|
size="mini"
|
|
|
|
|
type="text"
|
|
|
|
|
icon="el-icon-edit"
|
|
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
|
|
v-hasPermi="['wms:rawOutstockDetail:edit']"
|
|
|
|
|
>修改
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
size="mini"
|
|
|
|
|
type="text"
|
|
|
|
|
icon="el-icon-delete"
|
|
|
|
|
@click="handleDelete(scope.row)"
|
|
|
|
|
v-hasPermi="['wms:rawOutstockDetail:remove']"
|
|
|
|
|
>删除
|
|
|
|
|
icon="el-icon-link"
|
|
|
|
|
v-if="scope.row.executeStatus == '2' && scope.row.erpStatus !== '1'"
|
|
|
|
|
@click="handleRelateSaleOrder(scope.row)"
|
|
|
|
|
>
|
|
|
|
|
关联销售订单
|
|
|
|
|
</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
@ -349,6 +360,103 @@
|
|
|
|
|
</div>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<!-- 关联销售订单对话框 -->
|
|
|
|
|
<el-dialog
|
|
|
|
|
title="关联销售订单"
|
|
|
|
|
:visible.sync="relateSaleOrderDialogVisible"
|
|
|
|
|
width="900px"
|
|
|
|
|
append-to-body
|
|
|
|
|
>
|
|
|
|
|
<!-- 优化:顶部明细信息卡片 -->
|
|
|
|
|
<el-card shadow="never" style="margin-bottom: 18px; background: #f8f8f8; border-radius: 6px;">
|
|
|
|
|
<el-row :gutter="16">
|
|
|
|
|
<el-col :span="8"><b>任务编号:</b><span style="color:#333">{{ relateSaleOrderForm.taskCode || getCurrentDetail('taskCode') }}</span></el-col>
|
|
|
|
|
<el-col :span="8"><b>计划编号:</b><span style="color:#333">{{ relateSaleOrderForm.planCode || getCurrentDetail('planCode') }}</span></el-col>
|
|
|
|
|
<el-col :span="8"><b>物料编号:</b><span style="color:#333">{{ relateSaleOrderForm.materialCode || getCurrentDetail('materialCode') }}</span></el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row :gutter="16" style="margin-top: 8px;">
|
|
|
|
|
<el-col :span="8"><b>物料名称:</b><span style="color:#333">{{ relateSaleOrderForm.materialName || getCurrentDetail('materialName') }}</span></el-col>
|
|
|
|
|
<el-col :span="8"><b>计划数量:</b><span style="color:#333">{{ relateSaleOrderForm.planAmount || getCurrentDetail('planAmount') }}</span></el-col>
|
|
|
|
|
<el-col :span="8"><b>出库数量:</b><span style="color:#333">{{ relateSaleOrderForm.outstockAmount || getCurrentDetail('outstockAmount') }}</span></el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-card>
|
|
|
|
|
<!-- 优化:每条销售订单卡片分隔 -->
|
|
|
|
|
<el-form :model="relateSaleOrderForm" label-width="0px" style="margin-bottom: 0;">
|
|
|
|
|
<div v-for="(item, index) in relateSaleOrderForm.saleOrders" :key="index" style="margin-bottom: 14px;">
|
|
|
|
|
<el-card shadow="never" style="background: #fcfcfc; border-radius: 6px; padding: 12px 12px 0 12px;">
|
|
|
|
|
<el-row :gutter="12" align="middle">
|
|
|
|
|
<el-col :span="7">
|
|
|
|
|
<el-form-item style="margin-bottom: 10px;">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="item.saleorderCode"
|
|
|
|
|
placeholder="请选择销售订单"
|
|
|
|
|
style="width: 100%; height: 36px;"
|
|
|
|
|
readonly
|
|
|
|
|
>
|
|
|
|
|
<el-button slot="append" icon="el-icon-search" @click="openSaleOrderSelect(index)"></el-button>
|
|
|
|
|
</el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="5">
|
|
|
|
|
<el-form-item style="margin-bottom: 10px;">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="item.materialCode"
|
|
|
|
|
placeholder="物料编码"
|
|
|
|
|
style="width: 100%; height: 36px;"
|
|
|
|
|
readonly
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="5">
|
|
|
|
|
<el-form-item style="margin-bottom: 10px;">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="item.materialName"
|
|
|
|
|
placeholder="物料名称"
|
|
|
|
|
style="width: 100%; height: 36px;"
|
|
|
|
|
readonly
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="5">
|
|
|
|
|
<el-form-item style="margin-bottom: 10px;">
|
|
|
|
|
<el-input-number
|
|
|
|
|
v-model="item.outstockAmount"
|
|
|
|
|
:min="0.0001"
|
|
|
|
|
placeholder="出库数量"
|
|
|
|
|
style="width: 100%; height: 36px;"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="2" style="text-align: right;">
|
|
|
|
|
<el-button
|
|
|
|
|
type="danger"
|
|
|
|
|
icon="el-icon-delete"
|
|
|
|
|
@click="removeSaleOrder(index)"
|
|
|
|
|
v-if="relateSaleOrderForm.saleOrders.length > 1"
|
|
|
|
|
style="margin-top: 2px;"
|
|
|
|
|
/>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-card>
|
|
|
|
|
</div>
|
|
|
|
|
<el-form-item style="margin-top: 0;">
|
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="addSaleOrder">添加销售订单</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-form>
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
<el-button type="primary" @click="submitRelateSaleOrder">确 定</el-button>
|
|
|
|
|
<el-button @click="relateSaleOrderDialogVisible = false">取 消</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<!-- 选择销售订单弹窗 -->
|
|
|
|
|
<el-dialog title="选择销售订单" :visible.sync="saleOrderSelectDialogVisible" append-to-body>
|
|
|
|
|
<add-SaleOrder @selection="handleSaleOrderSelected" ref="saleOrderRef"></add-SaleOrder>
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
<el-button type="primary" @click="submitSaleOrderSelect">确 定</el-button>
|
|
|
|
|
<el-button @click="saleOrderSelectDialogVisible = false">取 消</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
@ -359,12 +467,17 @@ import {
|
|
|
|
|
getRawOutstockDetail,
|
|
|
|
|
delRawOutstockDetail,
|
|
|
|
|
addRawOutstockDetail,
|
|
|
|
|
updateRawOutstockDetail
|
|
|
|
|
updateRawOutstockDetail,
|
|
|
|
|
relateSaleOrder
|
|
|
|
|
} from "@/api/wms/rawOutstockDetail";
|
|
|
|
|
import addSaleOrder from '@/views/mes/productOrder/addSaleOrder.vue';
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: "RawOutstockDetail",
|
|
|
|
|
dicts: ['wms_product_outstock_manualflag', 'qms_check_status', 'wms_erp_status', 'wms_execute_status', 'wms_audit_status', 'wms_raw_outstock_task_type'],
|
|
|
|
|
components: {
|
|
|
|
|
'add-SaleOrder': addSaleOrder,
|
|
|
|
|
},
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
// 遮罩层
|
|
|
|
@ -455,6 +568,15 @@ export default {
|
|
|
|
|
{key: 29, label: `物料编号`, visible: true},
|
|
|
|
|
{key: 30, label: `物料名称`, visible: true},
|
|
|
|
|
],
|
|
|
|
|
relateSaleOrderDialogVisible: false,
|
|
|
|
|
relateSaleOrderForm: {
|
|
|
|
|
rawOutstockDetailId: null,
|
|
|
|
|
saleOrders: [
|
|
|
|
|
// { saleorderCode: '', outstockAmount: 0 }
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
saleOrderSelectDialogVisible: false,
|
|
|
|
|
saleOrderSelectIndex: 0, // 当前操作的saleOrders下标
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
@ -544,7 +666,77 @@ export default {
|
|
|
|
|
this.download('wms/rawOutstockDetail/export', {
|
|
|
|
|
...this.queryParams
|
|
|
|
|
}, `rawOutstockDetail_${new Date().getTime()}.xlsx`)
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
handleRelateSaleOrder(row) {
|
|
|
|
|
this.relateSaleOrderForm = {
|
|
|
|
|
rawOutstockDetailId: row.rawOutstockDetailId,
|
|
|
|
|
outstockAmount: row.outstockAmount,
|
|
|
|
|
saleOrders: [
|
|
|
|
|
{saleorderCode: '', outstockAmount: row.outstockAmount}
|
|
|
|
|
]
|
|
|
|
|
};
|
|
|
|
|
this.relateSaleOrderDialogVisible = true;
|
|
|
|
|
},
|
|
|
|
|
addSaleOrder() {
|
|
|
|
|
// 新增一项并弹出选择销售订单弹窗
|
|
|
|
|
const newIndex = this.relateSaleOrderForm.saleOrders.length;
|
|
|
|
|
this.relateSaleOrderForm.saleOrders.push({saleorderCode: '', outstockAmount: 1});
|
|
|
|
|
this.saleOrderSelectIndex = newIndex;
|
|
|
|
|
this.saleOrderSelectDialogVisible = true;
|
|
|
|
|
},
|
|
|
|
|
removeSaleOrder(index) {
|
|
|
|
|
this.relateSaleOrderForm.saleOrders.splice(index, 1);
|
|
|
|
|
},
|
|
|
|
|
submitRelateSaleOrder() {
|
|
|
|
|
// 校验出库数量总和不能大于原出库数量
|
|
|
|
|
const total = this.relateSaleOrderForm.saleOrders.reduce((sum, item) => sum + Number(item.outstockAmount), 0);
|
|
|
|
|
// 新增校验:出库数量不能小于等于0
|
|
|
|
|
const hasInvalidAmount = this.relateSaleOrderForm.saleOrders.some(item => item.outstockAmount == null);
|
|
|
|
|
if (hasInvalidAmount) {
|
|
|
|
|
this.$message.error('出库数量不能为空!');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// 这里假设原出库数量在第一个saleOrders的outstockAmount里
|
|
|
|
|
const originAmount = this.rawOutstockDetailList.find(
|
|
|
|
|
item => item.rawOutstockDetailId === this.relateSaleOrderForm.rawOutstockDetailId
|
|
|
|
|
)?.outstockAmount || 0;
|
|
|
|
|
if (total > originAmount) {
|
|
|
|
|
this.$message.error('出库数量总和不能大于原出库数量');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// 发送请求到后端
|
|
|
|
|
relateSaleOrder(this.relateSaleOrderForm).then(res => {
|
|
|
|
|
this.$message.success('关联成功');
|
|
|
|
|
this.relateSaleOrderDialogVisible = false;
|
|
|
|
|
this.getList();
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
openSaleOrderSelect(index) {
|
|
|
|
|
this.saleOrderSelectIndex = index;
|
|
|
|
|
this.saleOrderSelectDialogVisible = true;
|
|
|
|
|
},
|
|
|
|
|
submitSaleOrderSelect() {
|
|
|
|
|
let selectedRow = this.$refs.saleOrderRef.selectedRow;
|
|
|
|
|
if (!selectedRow) {
|
|
|
|
|
this.$message.error('请选择销售订单');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// 回填到对应的saleOrders项,增加物料编码和物料名称
|
|
|
|
|
this.$set(this.relateSaleOrderForm.saleOrders, this.saleOrderSelectIndex, {
|
|
|
|
|
...this.relateSaleOrderForm.saleOrders[this.saleOrderSelectIndex],
|
|
|
|
|
saleOrderId: selectedRow.saleOrderId,
|
|
|
|
|
saleorderCode: selectedRow.saleorderCode,
|
|
|
|
|
materialCode: selectedRow.materialCode,
|
|
|
|
|
materialName: selectedRow.materialName,
|
|
|
|
|
});
|
|
|
|
|
this.saleOrderSelectDialogVisible = false;
|
|
|
|
|
},
|
|
|
|
|
getCurrentDetail(field) {
|
|
|
|
|
// 根据 rawOutstockDetailId 查找当前明细行
|
|
|
|
|
const detail = this.rawOutstockDetailList.find(item => item.rawOutstockDetailId === this.relateSaleOrderForm.rawOutstockDetailId) || {};
|
|
|
|
|
return detail[field] || '';
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
;
|
|
|
|
|