|
|
|
|
@ -15,13 +15,14 @@ |
|
|
|
|
ref="dynamicValidateForm" |
|
|
|
|
label-width="100px" |
|
|
|
|
class="demo-dynamic" |
|
|
|
|
:rules="rules" |
|
|
|
|
> |
|
|
|
|
<div class="form-title">基本信息</div> |
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="出库申请时间"> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-model="sizeForm.outDate" |
|
|
|
|
v-model="sizeForm.ldTwoOutStorage.outDate" |
|
|
|
|
type="date" |
|
|
|
|
placeholder="选择日期" |
|
|
|
|
style="width: 100%" |
|
|
|
|
@ -31,17 +32,21 @@ |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="事由"> |
|
|
|
|
<el-form-item label="事由" prop="ldTwoOutStorage.reason"> |
|
|
|
|
<el-input |
|
|
|
|
v-model="sizeForm.argument" |
|
|
|
|
v-model="sizeForm.ldTwoOutStorage.reason" |
|
|
|
|
:disabled="outDialogType != 'add'" |
|
|
|
|
placeholder="请输入" |
|
|
|
|
></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="物资类型"> |
|
|
|
|
<el-form-item |
|
|
|
|
label="物资类型" |
|
|
|
|
prop="ldTwoOutStorage.materialType" |
|
|
|
|
> |
|
|
|
|
<el-select |
|
|
|
|
v-model="sizeForm.type" |
|
|
|
|
v-model="sizeForm.ldTwoOutStorage.materialType" |
|
|
|
|
placeholder="请选择" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:disabled="outDialogType != 'add'" |
|
|
|
|
@ -52,57 +57,58 @@ |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="部门"> |
|
|
|
|
<el-form-item label="部门" prop="ldTwoOutStorage.departmentInfo"> |
|
|
|
|
<el-select |
|
|
|
|
v-model="sizeForm.departmentId" |
|
|
|
|
placeholder="请选择部门" |
|
|
|
|
v-model="sizeForm.ldTwoOutStorage.departmentInfo" |
|
|
|
|
placeholder="请选择" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:disabled="outDialogType != 'add'" |
|
|
|
|
@change="deptChange" |
|
|
|
|
clearable |
|
|
|
|
filterable |
|
|
|
|
value-key="departmentId" |
|
|
|
|
> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in departmentOptions" |
|
|
|
|
:key="item.departmentId" |
|
|
|
|
:label="item.department" |
|
|
|
|
:value="item.departmentId" |
|
|
|
|
:value="item" |
|
|
|
|
></el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="领用人"> |
|
|
|
|
<!-- userOptions --> |
|
|
|
|
<el-form-item label="领用人" prop="ldTwoOutStorage.proposerInfo"> |
|
|
|
|
<el-select |
|
|
|
|
v-model="sizeForm.lingyongren" |
|
|
|
|
placeholder="请选择物资名称" |
|
|
|
|
v-model="sizeForm.ldTwoOutStorage.proposerInfo" |
|
|
|
|
placeholder="请选择" |
|
|
|
|
style="width: 100%" |
|
|
|
|
v-if="outDialogType != 'details'" |
|
|
|
|
:disabled="sizeForm.departmentId == ''" |
|
|
|
|
value-key="id" |
|
|
|
|
clearable |
|
|
|
|
filterable |
|
|
|
|
value-key="userId" |
|
|
|
|
@change="proposerChange" |
|
|
|
|
> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in userOptions" |
|
|
|
|
:key="item.materialId" |
|
|
|
|
:label="item.materialName" |
|
|
|
|
:key="item.userId" |
|
|
|
|
:label="item.name" |
|
|
|
|
:value="item" |
|
|
|
|
> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-col :span="12" v-if="outDialogType == 'details'"> |
|
|
|
|
<el-form-item label="填报人"> |
|
|
|
|
<el-input |
|
|
|
|
v-model="sizeForm.submitName" |
|
|
|
|
v-model="sizeForm.ldTwoOutStorage.submitName" |
|
|
|
|
:disabled="outDialogType != 'add'" |
|
|
|
|
></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<div class="form-title">{{ outDateInfo }} 出库信息：</div> |
|
|
|
|
<el-button |
|
|
|
|
type="primary" |
|
|
|
|
size="mini" |
|
|
|
|
@ -110,14 +116,18 @@ |
|
|
|
|
@click="inTableAdd()" |
|
|
|
|
>新增</el-button |
|
|
|
|
> |
|
|
|
|
<el-table :data="sizeForm.inTableData" border style="width: 100%"> |
|
|
|
|
<el-table |
|
|
|
|
:data="sizeForm.ldTwoOutStorageDetailList" |
|
|
|
|
border |
|
|
|
|
style="width: 100%" |
|
|
|
|
> |
|
|
|
|
<el-table-column prop="materialCode" label="物资编码" width="100"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="str2" label="物资名称" width="140"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<el-select |
|
|
|
|
v-model="scope.row.materialitem" |
|
|
|
|
placeholder="请选择物资名称" |
|
|
|
|
placeholder="请选择物" |
|
|
|
|
style="width: 100%" |
|
|
|
|
@change=" |
|
|
|
|
handleMaterialChange(scope.row.materialitem, scope.$index) |
|
|
|
|
@ -139,22 +149,17 @@ |
|
|
|
|
<el-table-column prop="model" label="规格/型号"> </el-table-column> |
|
|
|
|
<el-table-column prop="type" label="类别"> </el-table-column> |
|
|
|
|
<el-table-column prop="unit" label="单位"> </el-table-column> |
|
|
|
|
<el-table-column prop="str6" label="申请数量"> </el-table-column> |
|
|
|
|
<el-table-column prop="str9" label="已出库"> </el-table-column> |
|
|
|
|
<el-table-column prop="str7" label="出库数量"> |
|
|
|
|
<el-table-column prop="num" label="数量"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<el-input-number |
|
|
|
|
size="mini" |
|
|
|
|
v-model="scope.row.str7" |
|
|
|
|
v-model="scope.row.num" |
|
|
|
|
:min="1" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:disabled="outDialogType != 'add'" |
|
|
|
|
v-if="scope.row.str7" |
|
|
|
|
@change="numberChange($event)" |
|
|
|
|
></el-input-number> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="unitPrice" label="单价"> </el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
<div class="form-title">出库账目表格：</div> |
|
|
|
|
<el-table |
|
|
|
|
@ -181,7 +186,7 @@ |
|
|
|
|
<el-table-column prop="str4" label="类别"> </el-table-column> |
|
|
|
|
<el-table-column prop="str5" label="单位"> </el-table-column> |
|
|
|
|
<el-table-column prop="str6" label="数量"> </el-table-column> |
|
|
|
|
<el-table-column prop="str7" label="单价"> </el-table-column> |
|
|
|
|
<el-table-column prop="num" label="单价"> </el-table-column> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="date" label="出库信息"> |
|
|
|
|
<el-table-column prop="str8" label="数量"> </el-table-column> |
|
|
|
|
@ -203,8 +208,12 @@ |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
<script> |
|
|
|
|
import { getDetailedItems, getMaterialList } from "@/api/firstOrder/outbound"; |
|
|
|
|
import { getUserList } from "@/api/secondOrder/outbound"; |
|
|
|
|
import { getDetailedItems } from "@/api/firstOrder/outbound"; |
|
|
|
|
import { |
|
|
|
|
getUserList, |
|
|
|
|
getMaterialList, |
|
|
|
|
submit, |
|
|
|
|
} from "@/api/secondOrder/outbound"; |
|
|
|
|
export default { |
|
|
|
|
props: { |
|
|
|
|
repairVisible: { |
|
|
|
|
@ -224,20 +233,73 @@ export default { |
|
|
|
|
default: "", |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
computed: { |
|
|
|
|
outDateInfo() { |
|
|
|
|
const now = new Date(); |
|
|
|
|
const year = now.getFullYear(); |
|
|
|
|
const month = String(now.getMonth() + 1).padStart(2, "0"); |
|
|
|
|
const day = String(now.getDate()).padStart(2, "0"); |
|
|
|
|
return `${year}年${month}月${day}日`; |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
outDialogVisible: false, |
|
|
|
|
sizeForm: { |
|
|
|
|
code: "", //入库单号 |
|
|
|
|
applyNmae: "", //审批人 |
|
|
|
|
submitName: "", //填报人 |
|
|
|
|
waNmae: "", //仓库名称 |
|
|
|
|
argument: "", //事由 |
|
|
|
|
inAccountsTableData: [], //总计 |
|
|
|
|
inTableData: [], |
|
|
|
|
departmentId: "", //部门id |
|
|
|
|
ldTwoOutStorage: { |
|
|
|
|
outDate: "", |
|
|
|
|
reason: "", |
|
|
|
|
materialType: "", |
|
|
|
|
departmentId: "", |
|
|
|
|
department: "", |
|
|
|
|
proposerId: "", |
|
|
|
|
proposerName: "", |
|
|
|
|
submitName: "", //填报人 |
|
|
|
|
departmentInfo: null, |
|
|
|
|
proposerInfo: null, |
|
|
|
|
}, |
|
|
|
|
ldTwoOutStorageDetailList: [], //出库单详情 |
|
|
|
|
inAccountsTableData: [], //库存汇总 |
|
|
|
|
userInfoVO: { |
|
|
|
|
//登录用户的信息 |
|
|
|
|
userId: "user001", |
|
|
|
|
name: "张三2", |
|
|
|
|
mainErDepartment: "20", |
|
|
|
|
mainErDepartmentName: "实业公司", |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
rules: { |
|
|
|
|
ldTwoOutStorage: { |
|
|
|
|
reason: [ |
|
|
|
|
{ |
|
|
|
|
required: true, |
|
|
|
|
message: "请填写", |
|
|
|
|
trigger: "blur", |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
materialType: [ |
|
|
|
|
{ |
|
|
|
|
required: true, |
|
|
|
|
message: "请选择", |
|
|
|
|
trigger: "change", |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
departmentInfo: [ |
|
|
|
|
{ |
|
|
|
|
required: true, |
|
|
|
|
message: "请选择", |
|
|
|
|
trigger: "change", |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
proposerInfo: [ |
|
|
|
|
{ |
|
|
|
|
required: true, |
|
|
|
|
message: "请选择", |
|
|
|
|
trigger: "change", |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
inTableData: [], |
|
|
|
|
inBatchDialogVisible: false, //选择采购单的数据 |
|
|
|
|
batchType: "", //批量选择类型 |
|
|
|
|
materials: [], //物资列表 |
|
|
|
|
@ -252,30 +314,27 @@ export default { |
|
|
|
|
} else { |
|
|
|
|
this.inInit(); |
|
|
|
|
} |
|
|
|
|
this.getMaterialList(); |
|
|
|
|
|
|
|
|
|
this.getDetailedItems(); |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
//获取单条选择的物资名称列表 |
|
|
|
|
async getMaterialList() { |
|
|
|
|
this.loading = true; |
|
|
|
|
try { |
|
|
|
|
const res = await getMaterialList(); |
|
|
|
|
async getMaterialList(value) { |
|
|
|
|
getMaterialList({ departmentId: value }).then((res) => { |
|
|
|
|
this.materials = res.data.result; |
|
|
|
|
} catch (error) { |
|
|
|
|
this.$message.error("获取数据来源失败，请重试"); |
|
|
|
|
} finally { |
|
|
|
|
this.loading = false; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
// 选中物资获取数据 |
|
|
|
|
handleMaterialChange(row, index) { |
|
|
|
|
this.sizeForm.inTableData[index].materialId = row.materialId; |
|
|
|
|
this.sizeForm.inTableData[index].model = row.model; |
|
|
|
|
this.sizeForm.inTableData[index].materialCode = row.materialCode; |
|
|
|
|
this.sizeForm.inTableData[index].materialName = row.materialName; |
|
|
|
|
this.sizeForm.inTableData[index].type = row.type; |
|
|
|
|
this.sizeForm.inTableData[index].unit = row.unit; |
|
|
|
|
this.sizeForm.ldTwoOutStorageDetailList[index].materialId = |
|
|
|
|
row.materialId; |
|
|
|
|
this.sizeForm.ldTwoOutStorageDetailList[index].model = row.model; |
|
|
|
|
this.sizeForm.ldTwoOutStorageDetailList[index].materialCode = |
|
|
|
|
row.materialCode; |
|
|
|
|
this.sizeForm.ldTwoOutStorageDetailList[index].materialName = |
|
|
|
|
row.materialName; |
|
|
|
|
this.sizeForm.ldTwoOutStorageDetailList[index].type = row.type; |
|
|
|
|
this.sizeForm.ldTwoOutStorageDetailList[index].unit = row.unit; |
|
|
|
|
}, |
|
|
|
|
// 获取领用人列表 |
|
|
|
|
getUserList(value) { |
|
|
|
|
@ -291,7 +350,17 @@ export default { |
|
|
|
|
}, |
|
|
|
|
// 选中部门之后 获取领用人列表 |
|
|
|
|
deptChange(value) { |
|
|
|
|
this.getUserList(value); |
|
|
|
|
this.sizeForm.ldTwoOutStorage.proposerInfo = null; |
|
|
|
|
this.sizeForm.ldTwoOutStorage.departmentId = value.departmentId; |
|
|
|
|
this.sizeForm.ldTwoOutStorage.department = value.department; |
|
|
|
|
this.getUserList(value.departmentId); |
|
|
|
|
this.getMaterialList(value.departmentId); |
|
|
|
|
}, |
|
|
|
|
// 领用人选中 |
|
|
|
|
proposerChange(value) { |
|
|
|
|
console.log('领用人',value); |
|
|
|
|
this.sizeForm.ldTwoOutStorage.proposerId = value.userId; |
|
|
|
|
this.sizeForm.ldTwoOutStorage.proposerName = value.name; |
|
|
|
|
}, |
|
|
|
|
handleCloseDetail() { |
|
|
|
|
this.outDialogVisible = false; |
|
|
|
|
@ -300,7 +369,11 @@ export default { |
|
|
|
|
inInit() {}, |
|
|
|
|
|
|
|
|
|
addInit() { |
|
|
|
|
this.sizeForm.outDate = new Date(); //入库时间 |
|
|
|
|
const now = new Date(); |
|
|
|
|
const year = now.getFullYear(); |
|
|
|
|
const month = String(now.getMonth() + 1).padStart(2, "0"); |
|
|
|
|
const day = String(now.getDate()).padStart(2, "0"); |
|
|
|
|
this.sizeForm.ldTwoOutStorage.outDate = `${year}-${month}-${day} 00:00:00`; //入库时间 |
|
|
|
|
}, |
|
|
|
|
handleCloseDetail() { |
|
|
|
|
this.inDialogVisible = false; |
|
|
|
|
@ -308,15 +381,22 @@ export default { |
|
|
|
|
}, |
|
|
|
|
// 添加入库数据 |
|
|
|
|
inTableAdd() { |
|
|
|
|
this.sizeForm.inTableData.push({}); |
|
|
|
|
this.sizeForm.ldTwoOutStorageDetailList.push({}); |
|
|
|
|
}, |
|
|
|
|
// 提交 |
|
|
|
|
sumbit() { |
|
|
|
|
this.$message({ |
|
|
|
|
type: "success", |
|
|
|
|
message: "提交成功", |
|
|
|
|
console.log("form", this.sizeForm); |
|
|
|
|
this.$refs.dynamicValidateForm.validate((valid) => { |
|
|
|
|
if (valid) { |
|
|
|
|
submit(this.sizeForm).then((res) => { |
|
|
|
|
this.$message({ |
|
|
|
|
type: "success", |
|
|
|
|
message: "提交成功", |
|
|
|
|
}); |
|
|
|
|
this.handleCloseDetail(); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.handleCloseDetail(); |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
}; |
|
|
|
|
@ -336,5 +416,4 @@ export default { |
|
|
|
|
overflow-y: auto; |
|
|
|
|
padding-right: 10px; /* 预留滚动条空间 */ |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
</style> |
|
|
|
|
|
