|
|
@@ -488,7 +488,7 @@ const handleInput = async ()=>{
|
|
|
const gitReceiptNumberdata = await gitReceiptNumber({number:'RK'});
|
|
|
danhao.value = gitReceiptNumberdata.data.number
|
|
|
chukuren.value = userStore.userInfo.nickName
|
|
|
- riqi.value = currentDates
|
|
|
+ riqi.value = currentDates
|
|
|
}else{
|
|
|
restableData.splice(0,orderSearchdata.length,...orderSearchdata.data);
|
|
|
}
|
|
|
@@ -646,6 +646,15 @@ const dj_Dialog = () => {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ if (
|
|
|
+ mianliaotabData.value.部门 === '' ||
|
|
|
+ mianliaotabData.value.部门 === undefined ||
|
|
|
+ mianliaotabData.value.部门 === null
|
|
|
+ ){
|
|
|
+ ElMessage({ type: 'warning', message: '请选择部门' });
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
// 获取 mianliaotabData 的物料名称和颜色
|
|
|
const { 物料名称, 颜色, 入库数量, 库存数量 } = mianliaotabData.value;
|
|
|
|
|
|
@@ -668,7 +677,7 @@ const dj_Dialog = () => {
|
|
|
实际门幅: mianliaotabData.value.实际门幅 || mianliaotabData.value.定额门幅,
|
|
|
});
|
|
|
mianliaotabData.value.入库数量 = '';
|
|
|
- mianliaotabData.value.库存数量 = mianliaotabData.value.库存数量 + Number(入库数量);
|
|
|
+// mianliaotabData.value.库存数量 = mianliaotabData.value.库存数量 + Number(入库数量);
|
|
|
};
|
|
|
|
|
|
//操作移除按钮
|
|
|
@@ -800,6 +809,12 @@ const res_bomenterDialog = async () => {
|
|
|
ElMessage({type: 'warning',message: '入库数量不能为空'})
|
|
|
return
|
|
|
}
|
|
|
+ //日期转换
|
|
|
+let lhrq_formattedDeliveryDate = '';
|
|
|
+ if (riqi.value) {
|
|
|
+ const date = new Date(riqi.value);
|
|
|
+ lhrq_formattedDeliveryDate = `${date.getFullYear()}-${('0' + (date.getMonth() + 1)).slice(-2)}-${('0' + date.getDate()).slice(-2)}`;
|
|
|
+ }
|
|
|
// 构造一个包含所有数据的数组
|
|
|
const formattedDataArray = danjutableData.value.map(item => ({
|
|
|
order_id: item['订单编号'],
|
|
|
@@ -812,7 +827,7 @@ const res_bomenterDialog = async () => {
|
|
|
receipt_number: danhao.value,
|
|
|
客户编号: item['客户编号'],
|
|
|
款式: item['款式'],
|
|
|
- rq: currentDate,
|
|
|
+ rq: lhrq_formattedDeliveryDate,
|
|
|
批次号: item['批次号'],
|
|
|
关联编号: item['关联号'],
|
|
|
departname: item['部门'],
|
|
|
@@ -831,6 +846,7 @@ const res_bomenterDialog = async () => {
|
|
|
restableData.splice(0, restableData.length);
|
|
|
ElMessage({ type: 'success', message: '入库成功' });
|
|
|
danjutableData.value.splice(0, danjutableData.value.length); // 清空表格数据
|
|
|
+ getTreeData();
|
|
|
records_onSubmit();
|
|
|
} else {
|
|
|
ElMessage({ type: 'error', message: '入库失败' });
|