Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wws 1 year ago
parent cc26f66dd2 537d3e57f8
commit 311c47dc06
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File

9
src/views/mes/prepare/index.vue
Unescape Escape View File

@ -128,8 +128,8 @@
</el-table-column> </el-table-column>
<el-table-column label="班次" align="center" prop="shiftId" /> <el-table-column label="班次" align="center" prop="shiftId" />
<el-table-column label="单据状态" align="center" prop="status" /> <el-table-column label="单据状态" align="center" prop="status" />
<el-table-column label="物料编号" align="center" prop="materialCode" /> <el-table-column label="物料编号" align="center" prop="materialCode" width="180"/>
<el-table-column label="物料名称" align="center" prop="materialName" /> <el-table-column label="物料名称" align="center" prop="materialName" width="250"/>
<el-table-column label="物料规格型号" align="center" prop="materialSpc" /> <el-table-column label="物料规格型号" align="center" prop="materialSpc" />
<el-table-column label="单位" align="center" prop="unit" /> <el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="生产数量" align="center" prop="quantity" /> <el-table-column label="生产数量" align="center" prop="quantity" />
@ -156,7 +156,7 @@
<!-- 添加或修改备料单对话框 --> <!-- 添加或修改备料单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="工单编码" prop="workorderCode"> <el-form-item label="工单编码" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入工单编码" /> <el-input v-model="form.workorderCode" placeholder="请输入工单编码" />
</el-form-item> </el-form-item>
@ -186,7 +186,8 @@
v-model="form.productDate" v-model="form.productDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择工单生产日期"> placeholder="请选择工单生产日期"
style="width:350px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="班次" prop="shiftId"> <el-form-item label="班次" prop="shiftId">

43
src/views/mes/reportWork/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
<el-form-item label="报工单编号" prop="reportCode"> <el-form-item label="报工单编号" prop="reportCode">
<el-input <el-input
v-model="queryParams.reportCode" v-model="queryParams.reportCode"
@ -17,15 +17,31 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="报工时间" prop="feedbackTime"> <el-form-item label="生产工单编码" prop="workorderCode">
<el-date-picker clearable <el-input
v-model="queryParams.feedbackTime" v-model="queryParams.workorderCode"
type="date" placeholder="请输入生产工单编码"
value-format="yyyy-MM-dd" clearable
placeholder="请选择报工时间"> @keyup.enter.native="handleQuery"
</el-date-picker> />
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input
v-model="queryParams.productCode"
placeholder="请输入产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
@ -87,10 +103,10 @@
>{{scope.row.reportCode}}</el-button> >{{scope.row.reportCode}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报工类型" align="center" prop="reportType" /> <el-table-column label="报工类型" align="center" prop="reportType" width="150"/>
<el-table-column label="生产工单编码" align="center" prop="workorderCode" width="100"/> <el-table-column label="生产工单编码" align="center" prop="workorderCode" width="200"/>
<el-table-column label="产品编码" align="center" prop="productCode" /> <el-table-column label="产品编码" align="center" prop="productCode" width="200"/>
<el-table-column label="产品名称" align="center" prop="productName" /> <el-table-column label="产品名称" align="center" prop="productName" width="200"/>
<el-table-column label="规格型号" align="center" prop="spec" /> <el-table-column label="规格型号" align="center" prop="spec" />
<el-table-column label="单位" align="center" prop="unit" /> <el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="排产数量" align="center" prop="quantity" /> <el-table-column label="排产数量" align="center" prop="quantity" />
@ -118,7 +134,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="录入人员" align="center" prop="recordUser" /> <el-table-column label="录入人员" align="center" prop="recordUser" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="工时" align="center" prop="workTime" /> <el-table-column label="工时" align="center" prop="workTime" />
<el-table-column label="线体编码" align="center" prop="machineCode" /> <el-table-column label="线体编码" align="center" prop="machineCode" />

Write Preview
Loading…
Cancel
Save