入库修改

master
zhangdi 2 months ago
parent c67bc258f2
commit ba06792402
  1. 6
      src/views/firstOrder/components/outDialog.vue
  2. 22
      src/views/secondOrder/components/inDialog.vue
  3. 1
      src/views/secondOrder/components/outDialog.vue

@ -580,6 +580,7 @@ export default {
item.materialCode === stat.materialCode && item.materialCode === stat.materialCode &&
item.materialName === stat.materialName item.materialName === stat.materialName
); );
console.log(898989,detailList)
detail.theOutboundQuantity = detailList.reduce( detail.theOutboundQuantity = detailList.reduce(
(acc, cur) => acc + cur.num, (acc, cur) => acc + cur.num,
0 0
@ -904,13 +905,16 @@ export default {
const deptId = row.department; const deptId = row.department;
const dept = this.list.find((item) => item.departmentId === deptId); const dept = this.list.find((item) => item.departmentId === deptId);
const oneFormId = row.id; const oneFormId = row.id;
let select = this.materials.find(
(item) => item.materialId === row.materialId
);
return { return {
...row, ...row,
department: department:
this.sizeForm.options == "1" ? arr.departmentId : deptId, this.sizeForm.options == "1" ? arr.departmentId : deptId,
departmentName: departmentName:
this.sizeForm.options == "1" ? arr.department : dept.department, this.sizeForm.options == "1" ? arr.department : dept.department,
oneFormId: oneFormId, oneFormId: select.id,
}; };
} }
); );

@ -18,14 +18,14 @@
> >
<div class="form-title">基本信息</div> <div class="form-title">基本信息</div>
<el-row> <el-row>
<el-col :span="12"> <!-- <el-col :span="12" v-if="sizeForm.ldTwoPutStorage.warehouseName">
<el-form-item label="仓库名称"> <el-form-item label="仓库名称">
<el-input <el-input
v-model="sizeForm.ldTwoPutStorage.warehouseName" v-model="sizeForm.ldTwoPutStorage.warehouseName"
:disabled="true" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="入库单号"> <el-form-item label="入库单号">
<el-input <el-input
@ -117,13 +117,13 @@ export default {
return { return {
inDialogVisible: false, inDialogVisible: false,
sizeForm: { sizeForm: {
code: "", // // code: "", //
applyNmae: "", // // applyNmae: "", //
submitName: "", // // submitName: "", //
waNmae: "", // // waNmae: "", //
argument: "", // // argument: "", //
inTableData: [], // inTableData: [],
userInfoVO: {}, // userInfoVO: {},
}, },
}; };
}, },
@ -140,6 +140,7 @@ export default {
mounted() { mounted() {
this.inDialogVisible = this.repairVisible; this.inDialogVisible = this.repairVisible;
this.sizeForm.userInfoVO = this.userInfo; this.sizeForm.userInfoVO = this.userInfo;
console.log(this.userInfo,'userInfo');
if (this.inDialogType == "add") { if (this.inDialogType == "add") {
this.addInit(); this.addInit();
} else { } else {
@ -151,6 +152,7 @@ export default {
inInit() { inInit() {
getDetails({ twoPutStorageId: this.inDialogData.id }).then((res) => { getDetails({ twoPutStorageId: this.inDialogData.id }).then((res) => {
this.sizeForm = res.data.result; this.sizeForm = res.data.result;
this.sizeForm.userInfoVO = this.userInfo;
}); });
}, },
addInit() { addInit() {
@ -175,7 +177,9 @@ export default {
sumbit() { sumbit() {
let query = { let query = {
...this.sizeForm, ...this.sizeForm,
userInfoVO:this.sizeForm.userInfoVO,
}; };
console.log("提交参数:", this.sizeForm);
submit(query).then((res) => { submit(query).then((res) => {
this.$message({ this.$message({
type: "success", type: "success",

@ -504,6 +504,7 @@ export default {
this.inInit(); this.inInit();
} }
this.sizeForm.userInfoVO = this.userInfo; this.sizeForm.userInfoVO = this.userInfo;
console.log(this.userInfo,'userInfo');
this.getDetailedItems(); this.getDetailedItems();
this.getOutGroupName(); this.getOutGroupName();
}, },

Loading…
Cancel
Save