Commit 34ce6fa5 authored by chenzj's avatar chenzj

领料申请页面修改

parent e71445cd
...@@ -121,17 +121,17 @@ ...@@ -121,17 +121,17 @@
<el-table v-loading="loading" :data="materialRequestList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="materialRequestList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="产品编号" align="center" prop="itemCode" /> <el-table-column label="产品编号" align="center" prop="itemCode" width="150" />
<el-table-column label="产品名称" align="center" prop="itemName" /> <el-table-column label="产品名称" align="center" prop="itemName" width="100" />
<el-table-column label="生产工单" align="center" prop="workorderCode" /> <el-table-column label="生产工单" align="center" prop="workorderCode" width="150" />
<el-table-column label="工作单元" align="center" prop="workunitName" /> <el-table-column label="工作单元" align="center" prop="workunitName" width="100" />
<el-table-column label="申请单号" align="center" prop="applyNo" /> <el-table-column label="申请单号" align="center" prop="applyNo" width="150"/>
<el-table-column label="领料类型" align="center" prop="applyType"> <el-table-column label="领料类型" align="center" prop="applyType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.pro_requisition_type" :value="scope.row.applyType"/> <dict-tag :options="dict.type.pro_requisition_type" :value="scope.row.applyType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="编排单号" align="center" prop="arrangeCode" /> <el-table-column label="编排单号" align="center" prop="arrangeCode" width="150"/>
<el-table-column label="领用数量" align="center" prop="applyNum" /> <el-table-column label="领用数量" align="center" prop="applyNum" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="领料方式" align="center" prop="materialType"> <el-table-column label="领料方式" align="center" prop="materialType">
...@@ -139,6 +139,12 @@ ...@@ -139,6 +139,12 @@
<dict-tag :options="dict.type.pro_material_from" :value="scope.row.materialType"/> <dict-tag :options="dict.type.pro_material_from" :value="scope.row.materialType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否结案" align="center" prop="windCase">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.windCase"/>
</template>
</el-table-column>
<el-table-column label="已发放数量" align="center" prop="grantNum"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.CreateTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.CreateTime, '{y}-{m}-{d}') }}</span>
...@@ -146,7 +152,7 @@ ...@@ -146,7 +152,7 @@
</el-table-column> </el-table-column>
<el-table-column label="预开始时间" align="center" prop="startTime" width="180"/> <el-table-column label="预开始时间" align="center" prop="startTime" width="180"/>
<el-table-column label="预结束时间" align="center" prop="endTime" width="180"/> <el-table-column label="预结束时间" align="center" prop="endTime" width="180"/>
<el-table-column label="操作" width="100" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" width="80" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -263,7 +269,7 @@ import { listMaterialRequest, getMaterialRequest, delMaterialRequest, addMateria ...@@ -263,7 +269,7 @@ import { listMaterialRequest, getMaterialRequest, delMaterialRequest, addMateria
export default { export default {
name: "MaterialRequest", name: "MaterialRequest",
dicts: ['pro_requisition_type','pro_material_from'], dicts: ['pro_requisition_type','pro_material_from','sys_yes_no'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -302,6 +308,8 @@ export default { ...@@ -302,6 +308,8 @@ export default {
attr4: null, attr4: null,
workorderCode: null, workorderCode: null,
WorkunitName: null, WorkunitName: null,
windCase: null,
grantNum: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -357,7 +365,9 @@ export default { ...@@ -357,7 +365,9 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null }; updateTime: null,
windCase: null,
grantNum: null, };
this.resetForm("form"); this.resetForm("form");
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment