|
|
|
@ -140,7 +140,7 @@
|
|
|
|
|
<el-table-column label="线体名称" align="center" prop="machineName" />
|
|
|
|
|
<el-table-column label="班组编码" align="center" prop="teamCode" />
|
|
|
|
|
<el-table-column label="班次编码" align="center" prop="shiftCode" />
|
|
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
|
|
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-button
|
|
|
|
|
size="mini"
|
|
|
|
@ -157,7 +157,7 @@
|
|
|
|
|
v-hasPermi="['mes:reportWork:remove']"
|
|
|
|
|
>删除</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table-column> -->
|
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
<pagination
|
|
|
|
@ -170,117 +170,147 @@
|
|
|
|
|
|
|
|
|
|
<!-- 添加或修改报工报表对话框 -->
|
|
|
|
|
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
|
|
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="报工单编号" prop="reportCode">
|
|
|
|
|
<el-input v-model="form.reportCode" placeholder="请输入报工单编号" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="报工类型" prop="reportType">
|
|
|
|
|
<el-select v-model="form.reportType" placeholder="请选择报工类型" @change="$forceUpdate()" clearable>
|
|
|
|
|
<el-option v-for="item in reportTypeOptions" :key="item.reportType" :label="item.label" :value="item.reportType"></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-select v-model="form.reportType" placeholder="请选择报工类型" style="width:180px">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="dict in dict.type.report_work_type"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="生产工单编码" prop="workorderCode">
|
|
|
|
|
<el-input v-model="form.workorderCode" placeholder="请输入生产工单编码" />
|
|
|
|
|
<el-form-item label="报工人员" prop="userName">
|
|
|
|
|
<el-input v-model="form.userName" placeholder="请输入报工人员" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="产品编码" prop="productCode">
|
|
|
|
|
<el-input v-model="form.productCode" placeholder="请输入产品编码" />
|
|
|
|
|
<el-form-item label="报工途径" prop="feedbackChannel">
|
|
|
|
|
<el-select v-model="form.feedbackChannel" placeholder="请选择报工途径" style="width:180px">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="dict in dict.type.report_work_channel"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="产品名称" prop="productName">
|
|
|
|
|
<el-input v-model="form.productName" placeholder="请输入产品名称" />
|
|
|
|
|
<el-form-item label="生产工单编码" prop="workorderCode">
|
|
|
|
|
<el-input v-model="form.workorderCode" placeholder="请输入生产工单编码" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="规格型号" prop="spec">
|
|
|
|
|
<el-input v-model="form.spec" type="textarea" placeholder="请输入内容" />
|
|
|
|
|
<el-form-item label="产品编码" prop="productCode">
|
|
|
|
|
<el-input v-model="form.productCode" placeholder="请输入产品编码" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="单位" prop="unit">
|
|
|
|
|
<el-input v-model="form.unit" placeholder="请输入单位" />
|
|
|
|
|
<el-form-item label="产品名称" prop="productName">
|
|
|
|
|
<el-input v-model="form.productName" placeholder="请输入产品名称" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="排产数量" prop="quantity">
|
|
|
|
|
<el-input v-model="form.quantity" placeholder="请输入排产数量" />
|
|
|
|
|
<el-form-item label="规格型号" prop="spec">
|
|
|
|
|
<el-input v-model="form.spec" placeholder="请输入内容" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="本次报工数量" prop="quantityFeedback">
|
|
|
|
|
<el-input v-model="form.quantityFeedback" placeholder="请输入本次报工数量" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="合格数量" prop="quantityQualified">
|
|
|
|
|
<el-input v-model="form.quantityQualified" placeholder="请输入合格数量" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="不合格数量" prop="quantityUnqualified">
|
|
|
|
|
<el-input v-model="form.quantityUnqualified" placeholder="请输入不合格数量" />
|
|
|
|
|
<el-form-item label="单位" prop="unit">
|
|
|
|
|
<el-input v-model="form.unit" placeholder="请输入单位" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="报工人员" prop="userName">
|
|
|
|
|
<el-input v-model="form.userName" placeholder="请输入报工人员" />
|
|
|
|
|
<el-form-item label="线体编码" prop="machineCode">
|
|
|
|
|
<el-input v-model="form.machineCode" placeholder="请输入线体编码" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="人员名称" prop="nickName">
|
|
|
|
|
<el-input v-model="form.nickName" placeholder="请输入人员名称" />
|
|
|
|
|
<el-form-item label="线体名称" prop="machineName">
|
|
|
|
|
<el-input v-model="form.machineName" placeholder="请输入线体名称" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="报工途径" prop="feedbackChannel">
|
|
|
|
|
<el-select v-model="form.feedbackChannel" placeholder="请选择报工类型" @change="$forceUpdate()" clearable>
|
|
|
|
|
<el-option v-for="item in feedbackChannelOptions" :key="item.feedbackChannel" :label="item.label" :value="item.feedbackChannel"></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="报工时间" prop="feedbackTime">
|
|
|
|
|
<el-date-picker clearable
|
|
|
|
|
v-model="form.feedbackTime"
|
|
|
|
|
type="date"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
style="width: 180px"
|
|
|
|
|
placeholder="请选择报工时间">
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="录入人员" prop="recordUser">
|
|
|
|
|
<el-input v-model="form.recordUser" placeholder="请输入录入人员" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="排产数量" prop="quantity">
|
|
|
|
|
<el-input-number
|
|
|
|
|
:min="0"
|
|
|
|
|
:step="1"
|
|
|
|
|
v-model="form.quantity"
|
|
|
|
|
style="width: 180px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="本次报工数量" prop="quantityFeedback">
|
|
|
|
|
<el-input-number
|
|
|
|
|
:min="0"
|
|
|
|
|
:step="1"
|
|
|
|
|
v-model="form.quantityFeedback"
|
|
|
|
|
style="width: 180px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="合格数量" prop="quantityQualified">
|
|
|
|
|
<el-input-number
|
|
|
|
|
:min="0"
|
|
|
|
|
:step="1"
|
|
|
|
|
v-model="form.quantityQualified"
|
|
|
|
|
style="width: 180px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="不合格数量" prop="quantityUnqualified">
|
|
|
|
|
<el-input-number
|
|
|
|
|
:min="0"
|
|
|
|
|
:step="1"
|
|
|
|
|
v-model="form.quantityUnqualified"
|
|
|
|
|
style="width: 180px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="线体编码" prop="machineCode">
|
|
|
|
|
<el-input v-model="form.machineCode" placeholder="请输入线体编码" />
|
|
|
|
|
<el-form-item label="人员名称" prop="nickName">
|
|
|
|
|
<el-input v-model="form.nickName" placeholder="请输入人员名称" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="线体名称" prop="machineName">
|
|
|
|
|
<el-input v-model="form.machineName" placeholder="请输入线体名称" />
|
|
|
|
|
<el-form-item label="录入人员" prop="recordUser">
|
|
|
|
|
<el-input v-model="form.recordUser" placeholder="请输入录入人员" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="班组编码" prop="teamCode">
|
|
|
|
|
<el-input v-model="form.teamCode" placeholder="请输入班组编码" />
|
|
|
|
|
</el-form-item>
|
|
|
|
@ -294,24 +324,24 @@
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
|
|
<el-input v-model="form.remark"placeholder="请输入内容" />
|
|
|
|
|
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-form>
|
|
|
|
|
<el-divider content-position="center" v-if="form.reportCode !=null">物料消耗明细</el-divider>
|
|
|
|
|
<ReportWorkConsume v-if="form.reportCode !=null" :optType="optType" :reportCode="form.reportCode"></ReportWorkConsume>
|
|
|
|
|
<ReportWorkConsume v-if="form.reportCode !=null" :optType="optType" :reportCode="form.reportCode"></ReportWorkConsume>
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
|
|
|
|
|
<el-button type="primary" @click="submitForm" v-else>确定</el-button>
|
|
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
|
|
<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
|
|
|
|
|
<el-button type="primary" @click="submitForm" v-else>确定</el-button>
|
|
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<!-- 添加或修改生产报工物料消耗对话框 -->
|
|
|
|
|
<el-dialog :title="title" :visible.sync="reportWorkConsunmOpen" width="1200px" append-to-body>
|
|
|
|
|
<el-table v-loading="loading" :data="reportWorkConsumeList">
|
|
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
|
|
<el-table-column type="selection" width="100" align="center" />
|
|
|
|
|
<el-table-column label="报工编码" align="center" prop="reportCode" />
|
|
|
|
|
<el-table-column label="工单编码" align="center" prop="workorderCode" />
|
|
|
|
|
<el-table-column label="物料编号" align="center" prop="materialCode" />
|
|
|
|
@ -345,26 +375,10 @@ import ReportWorkConsume from "./reportWorkConsume.vue";
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: "ReportWork",
|
|
|
|
|
dicts: ['report_work_type','report_work_channel'],
|
|
|
|
|
components: {ReportWorkConsume},
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
reportTypeOptions: [{
|
|
|
|
|
reportType: 'SELF自行报工',
|
|
|
|
|
label: 'SELF自行报工'
|
|
|
|
|
}, {
|
|
|
|
|
reportType: 'UNI统一报工',
|
|
|
|
|
label: 'UNI统一报工'
|
|
|
|
|
}],
|
|
|
|
|
feedbackChannelOptions: [{
|
|
|
|
|
feedbackChannel: 'PAD',
|
|
|
|
|
label: 'PAD'
|
|
|
|
|
}, {
|
|
|
|
|
feedbackChannel: 'MOBILE',
|
|
|
|
|
label: 'MOBILE'
|
|
|
|
|
}, {
|
|
|
|
|
feedbackChannel: 'PC',
|
|
|
|
|
label: 'PC'
|
|
|
|
|
}],
|
|
|
|
|
optType: undefined,
|
|
|
|
|
// 遮罩层
|
|
|
|
|
loading: true,
|
|
|
|
|