设备与工单基础CRUD
This commit is contained in:
@@ -2,7 +2,7 @@ import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder',
|
||||
url: 'api/produceWorkorder',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -10,7 +10,7 @@ export function add(data) {
|
||||
|
||||
export function addRows(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/addRows',
|
||||
url: 'api/produceWorkorder/addRows',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -18,7 +18,7 @@ export function addRows(data) {
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/',
|
||||
url: 'api/produceWorkorder/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
@@ -26,7 +26,7 @@ export function del(ids) {
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder',
|
||||
url: 'api/produceWorkorder',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
@@ -34,7 +34,7 @@ export function edit(data) {
|
||||
|
||||
export function submits(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/submits',
|
||||
url: 'api/produceWorkorder/submits',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
@@ -42,7 +42,7 @@ export function submits(data) {
|
||||
|
||||
export function getDevice(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/getDevice',
|
||||
url: 'api/produceWorkorder/getDevice',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -50,7 +50,7 @@ export function getDevice(data) {
|
||||
|
||||
export function getTable(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/getTable',
|
||||
url: 'api/produceWorkorder/getTable',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -58,7 +58,7 @@ export function getTable(data) {
|
||||
|
||||
export function openStart(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/openStart',
|
||||
url: 'api/produceWorkorder/openStart',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -66,7 +66,7 @@ export function openStart(data) {
|
||||
|
||||
export function saveReport(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/saveReport',
|
||||
url: 'api/produceWorkorder/saveReport',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -74,7 +74,7 @@ export function saveReport(data) {
|
||||
|
||||
export function finish(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/finish',
|
||||
url: 'api/produceWorkorder/finish',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -82,7 +82,7 @@ export function finish(data) {
|
||||
|
||||
export function forceFinish(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/forceFinish',
|
||||
url: 'api/produceWorkorder/forceFinish',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -90,7 +90,7 @@ export function forceFinish(data) {
|
||||
|
||||
export function getReportWork(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/getReportWork',
|
||||
url: 'api/produceWorkorder/getReportWork',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -98,7 +98,7 @@ export function getReportWork(data) {
|
||||
|
||||
export function getDtl(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/getDtl',
|
||||
url: 'api/produceWorkorder/getDtl',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -106,7 +106,7 @@ export function getDtl(data) {
|
||||
|
||||
export function excelImport(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/excelImport',
|
||||
url: 'api/produceWorkorder/excelImport',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -114,7 +114,7 @@ export function excelImport(data) {
|
||||
|
||||
export function getNotWorkDeviceByWorkproceduceId(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/getNotWorkDeviceByWorkproceduceId',
|
||||
url: 'api/produceWorkorder/getNotWorkDeviceByWorkproceduceId',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -122,17 +122,10 @@ export function getNotWorkDeviceByWorkproceduceId(data) {
|
||||
|
||||
export function replaceDevice(data) {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/replaceDevice',
|
||||
url: 'api/produceWorkorder/replaceDevice',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getUser() {
|
||||
return request({
|
||||
url: 'api/produceshiftorder/getUser',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, addRows, edit, del, submits, getDevice, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl, excelImport, getNotWorkDeviceByWorkproceduceId, replaceDevice, getUser }
|
||||
export default { add, addRows, edit, del, submits, getDevice, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl, excelImport, getNotWorkDeviceByWorkproceduceId, replaceDevice }
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<div style="margin: 5px" v-loading="loading">
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick">
|
||||
<el-tab-pane :label="d.label" :name="d.value" v-for="d in dict.notice_type" :key="d.id">
|
||||
<el-empty v-show="notReadMsgList[d.value-1].length == 0" description="暂无信息" ></el-empty>
|
||||
<!-- <el-empty v-show="notReadMsgList[d.value-1].length == 0" description="暂无信息" ></el-empty>-->
|
||||
<div v-for="o in notReadMsgList[d.value-1]" :key="o.notice_id">
|
||||
<a href="javascript:" @click="showMessage(o)">
|
||||
<el-row @click="showMessage">
|
||||
|
||||
@@ -10,17 +10,7 @@
|
||||
<el-card class="box-card" shadow="never">
|
||||
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="180px">
|
||||
<el-form-item label="工单编码">
|
||||
<el-input v-model="form.produceorder_code" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工单类型">
|
||||
<el-select v-model="form.order_type_scode" style="width: 200px" filterable placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in dict.PDM_BI_ORDERTYPE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-input v-model="form.workorder_code" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属工序">
|
||||
<el-select
|
||||
@@ -38,9 +28,6 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="生产日期">
|
||||
<el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="false" label="物料标识">
|
||||
<el-input v-model="form.material_id" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
@@ -89,9 +76,6 @@
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="报工数量">
|
||||
<el-input v-model="form.report_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="实际开始时间">
|
||||
<el-date-picker
|
||||
v-model="form.realproducestart_date"
|
||||
@@ -178,17 +162,20 @@
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
>
|
||||
<el-table-column prop="device_code" label="设备编码" align="center" />
|
||||
<el-table-column prop="workorder_code" label="工单编号" />
|
||||
<el-table-column prop="shift_type_scode" label="班次类型" />
|
||||
<el-table-column prop="product_area" label="生产区域" />
|
||||
<el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip/>
|
||||
<el-table-column prop="produce_qty" label="生产数量" align="center" />
|
||||
<el-table-column prop="init_qty" label="期初数量" align="center" />
|
||||
<el-table-column prop="finish_qty" label="期末数量" align="center" />
|
||||
<el-table-column prop="finishproduct_qty" label="完成数量" align="center" />
|
||||
<el-table-column prop="report_qty" label="报工数量" align="center" />
|
||||
<el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip/>
|
||||
<el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip />
|
||||
<el-table-column prop="dq_init_qty" label="电气期初数量" />
|
||||
<el-table-column prop="person_init_qty" label="人员期初数量" />
|
||||
<el-table-column prop="dq_report_qty" label="电气报工数量" />
|
||||
<el-table-column prop="person_report_qty" label="人员报工数量" />
|
||||
<el-table-column prop="dq_finish_qty" label="电气期末数量" />
|
||||
<el-table-column prop="person_finish_qty" label="人员期末数量" />
|
||||
<el-table-column prop="operatetime_start" label="开工时间" />
|
||||
<el-table-column prop="operatetime_end" label="完工时间" />
|
||||
<el-table-column prop="nick_name" label="操作人" align="center" />
|
||||
</el-table>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="dialogVisible = false">确定</el-button>
|
||||
@@ -227,8 +214,8 @@ export default {
|
||||
classes3: [],
|
||||
form: {
|
||||
sale_id: null,
|
||||
produceorder_id: null,
|
||||
produceorder_code: null,
|
||||
workorder_id: null,
|
||||
workorder_code: null,
|
||||
producedeviceorder_code: null,
|
||||
shift_type_scode: null,
|
||||
workprocedure_id: null,
|
||||
@@ -278,7 +265,7 @@ export default {
|
||||
this.getworkprocedure()
|
||||
this.initClass3()
|
||||
this.is_null()
|
||||
crudProduceshiftorder.getDtl({ produceorder_id: this.form.produceorder_id }).then(res => {
|
||||
crudProduceshiftorder.getDtl({ workorder_id: this.form.workorder_id }).then(res => {
|
||||
this.tableData = res
|
||||
})
|
||||
},
|
||||
|
||||
@@ -31,23 +31,6 @@
|
||||
class="filter-item"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="工单类型">
|
||||
<el-select
|
||||
v-model="query.order_type_scode"
|
||||
style="width: 200px"
|
||||
clearable
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
@change="crud.toQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.PDM_BI_ORDERTYPE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label=" 工单状态">
|
||||
<el-select
|
||||
@@ -120,21 +103,14 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否异常">
|
||||
<el-select
|
||||
<el-switch
|
||||
v-model="query.is_error"
|
||||
style="width: 200px"
|
||||
clearable
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
active-value="0"
|
||||
inactive-value="1"
|
||||
active-color="#C0CCDA"
|
||||
inactive-color="#409EFF"
|
||||
@change="crud.toQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.IS_OR_NOT"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation :crud="crud" />
|
||||
</el-form>
|
||||
@@ -204,16 +180,6 @@
|
||||
width="1200px"
|
||||
>
|
||||
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
|
||||
<el-form-item label="工单类型" prop="order_type_scode">
|
||||
<el-select v-model="form.order_type_scode" style="width: 200px" filterable placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in dict.PDM_BI_ORDERTYPE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属工序" prop="workprocedure_id">
|
||||
<el-select
|
||||
v-model="form.workprocedure_id"
|
||||
@@ -231,8 +197,20 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="生产日期" prop="produce_date">
|
||||
<el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;" />
|
||||
<el-form-item v-if="crud.status.add" label="生产设备" prop="current_device_code">
|
||||
<el-select
|
||||
v-model="form.current_device_code"
|
||||
clearable
|
||||
class="filter-item"
|
||||
style="width: 200px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in deviceList"
|
||||
:key="item.device_code"
|
||||
:label="item.device_name"
|
||||
:value="item.device_code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="false" label="物料标识" prop="material_id">
|
||||
<el-input v-model="form.material_id" style="width: 200px;" />
|
||||
@@ -282,9 +260,6 @@
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="crud.status.edit" label="报工数量" prop="report_qty">
|
||||
<el-input v-model="form.report_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="crud.status.edit" label="实际数量" prop="report_qty">
|
||||
<el-input v-model="form.real_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
@@ -327,42 +302,6 @@
|
||||
>{{ item.label }}
|
||||
</el-radio>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="工单数量" prop="orderNum">
|
||||
<el-input v-model="form.orderNum" type="number" :min="1" oninput="value = value.replace(/[^\d]/g, '')" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="操作人员" prop="jockey_id">
|
||||
<el-select
|
||||
v-model="form.jockey_id"
|
||||
clearable
|
||||
size="mini"
|
||||
class="filter-item"
|
||||
style="width: 200px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in userList"
|
||||
:key="item.id"
|
||||
:label="item.nickName"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="crud.status.add" label="生产设备" prop="device_id">
|
||||
<el-select
|
||||
v-model="form.device_id"
|
||||
clearable
|
||||
size="mini"
|
||||
class="filter-item"
|
||||
style="width: 200px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in deviceList"
|
||||
:key="item.device_id"
|
||||
:label="item.device_name"
|
||||
:value="item.device_id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="text" @click="crud.cancelCU">取消</el-button>
|
||||
@@ -379,71 +318,69 @@
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column v-if="false" prop="produceorder_id" label="生产班次工单标识" />
|
||||
<el-table-column prop="produceorder_code" label="工单编号" width="140px">
|
||||
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
|
||||
<el-table-column prop="workorder_code" label="工单编号" width="140px">
|
||||
<template slot-scope="scope">
|
||||
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>
|
||||
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_code }}</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="producedeviceorder_code" label="机台工单号" width="100px" />
|
||||
<el-table-column prop="order_status" label="工单状态">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.MPS_BD_ORDERSTATUS[scope.row.order_status] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="shift_type_scode" label="班次类型">
|
||||
<el-table-column prop="shift_type_scode" label="班次类型" >
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="false" prop="workprocedure_id" label="工序标识" />
|
||||
<el-table-column prop="produce_date" label="生产日期" width="100px" />
|
||||
<el-table-column prop="device_code" label="设备编码" />
|
||||
<el-table-column prop="device_name" label="设备名称" />
|
||||
<el-table-column prop="jockey_name" label="操作工" />
|
||||
<el-table-column prop="workprocedure_code" label="工序编码" />
|
||||
<el-table-column prop="product_area" label="生产区域" />
|
||||
<el-table-column prop="plan_qty" label="计划数量" />
|
||||
<el-table-column prop="real_qty" label="实际数量" />
|
||||
<el-table-column prop="report_qty" label="报工数量" />
|
||||
<el-table-column prop="is_error" label="是否异常">
|
||||
<el-table-column prop="person_name" label="操作员" />
|
||||
<el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip/>
|
||||
<el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip/>
|
||||
<el-table-column prop="material_weight" label="物料单重" width="100"/>
|
||||
<el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="current_device_code" label="当前设备编码" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="is_canupdate_update" label="操作工是否允许修改报工数量" width="200" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.IS_OR_NOT[scope.row.is_error] }}
|
||||
{{ dict.label.IS_OR_NOT[scope.row.is_canupdate_update] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
|
||||
<el-table-column v-if="false" prop="material_id" label="物料标识" />
|
||||
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="sale_id" label="销售单标识" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="class_name" label="产品系列" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="material_weight" label="物料单重" />
|
||||
<el-table-column prop="planproducestart_date" label="计划生产开始时间" width="150" />
|
||||
<el-table-column prop="planproduceend_date" label="计划生产结束时间" width="150" />
|
||||
<el-table-column prop="realproducestart_date" label="实际生产开始时间" width="150" />
|
||||
<el-table-column prop="realproduceend_date" label="实际生产结束时间" width="150" />
|
||||
<el-table-column prop="is_needmove" label="是否搬运">
|
||||
<el-table-column prop="workorder_status" label="工单状态">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.MPS_BD_ORDERSTATUS[scope.row.workorder_status] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="is_needmove" label="是否搬运" >
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.IS_OR_NOT[scope.row.is_needmove] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="order_type_scode" label="工单类型">
|
||||
<el-table-column prop="create_type" label="创建类型">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.PDM_BI_ORDERTYPE[scope.row.order_type_scode] }}
|
||||
{{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="create_name" label="创建人" />
|
||||
<el-table-column prop="create_time" label="创建时间" width="150" />
|
||||
<el-table-column prop="update_optname" label="修改人" />
|
||||
<el-table-column prop="update_time" label="修改时间" width="150" />
|
||||
<el-table-column prop="is_error" label="是否异常" >
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.IS_OR_NOT[scope.row.is_error] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip/>
|
||||
<el-table-column prop="remark" label="备注" />
|
||||
<el-table-column prop="create_name" label="创建人" show-overflow-tooltip/>
|
||||
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip />
|
||||
<el-table-column prop="update_name" label="修改人" show-overflow-tooltip/>
|
||||
<el-table-column prop="update_time" label="修改时间" show-overflow-tooltip/>
|
||||
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
/>
|
||||
<el-button slot="right" :disabled="scope.row.order_status === '04' || scope.row.order_status === '02'" size="mini" type="text" icon="el-icon-warning" @click="replaceDevice(scope.row.workprocedure_id, scope.row.produceorder_code)">
|
||||
更换设备
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -481,50 +418,47 @@ import UploadDialog from '@/views/wms/mps/produce/UploadDialog'
|
||||
import ReplaceDeviceDialog from '@/views/wms/mps/produce/ReplaceDeviceDialog'
|
||||
|
||||
const defaultForm = {
|
||||
produceorder_id: null,
|
||||
produceorder_code: null,
|
||||
producedeviceorder_code: null,
|
||||
shift_type_scode: '01',
|
||||
workorder_id: null,
|
||||
workorder_code: null,
|
||||
shift_type_scode: null,
|
||||
workprocedure_id: null,
|
||||
produce_date: null,
|
||||
product_area: null,
|
||||
plan_qty: null,
|
||||
real_qty: null,
|
||||
report_qty: null,
|
||||
person_real_qty: null,
|
||||
dq_real_qty: null,
|
||||
material_id: null,
|
||||
material_code: null,
|
||||
material_weight: null,
|
||||
planproducestart_date: null,
|
||||
planproduceend_date: null,
|
||||
realproducestart_date: null,
|
||||
realproduceend_date: null,
|
||||
order_status: '00',
|
||||
is_needmove: '0',
|
||||
order_type_scode: '01',
|
||||
current_device_code: null,
|
||||
current_produce_person_id: null,
|
||||
is_canupdate_update: null,
|
||||
workorder_status: null,
|
||||
is_needmove: null,
|
||||
sale_id: null,
|
||||
create_type: null,
|
||||
is_error: null,
|
||||
error_info: null,
|
||||
remark: null,
|
||||
create_id: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
update_optid: null,
|
||||
update_optname: null,
|
||||
update_id: null,
|
||||
update_name: null,
|
||||
update_time: null,
|
||||
sysdeptid: null,
|
||||
syscompanyid: null,
|
||||
is_delete: null,
|
||||
material_name: null,
|
||||
device_id: null,
|
||||
is_canupdate_update: '1',
|
||||
material_spec: null,
|
||||
sale_id: null,
|
||||
orderNum: 1,
|
||||
jockey_id: ''
|
||||
is_delete: null
|
||||
}
|
||||
export default {
|
||||
name: 'Produceshiftorder',
|
||||
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog, UploadDialog, ReplaceDeviceDialog },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
|
||||
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: '工单', url: 'api/produceshiftorder', idField: 'produceorder_id', sort: 'produceorder_id,desc',
|
||||
title: '工单', url: 'api/produceWorkorder', idField: 'produceorder_id', sort: 'produceorder_id,desc',
|
||||
optShow: {
|
||||
add: true,
|
||||
edit: false,
|
||||
@@ -533,7 +467,8 @@ export default {
|
||||
reset: true
|
||||
},
|
||||
query: {
|
||||
order_status: '-1'
|
||||
order_status: '-1',
|
||||
is_error: '0'
|
||||
},
|
||||
crudMethod: { ...crudProduceshiftorder }
|
||||
})
|
||||
@@ -555,12 +490,6 @@ export default {
|
||||
produceorder_code: [
|
||||
{ required: true, message: '生产班次工单编号不能为空', trigger: 'blur' }
|
||||
],
|
||||
jockey_id: [
|
||||
{ required: true, message: '操作人员不能为空', trigger: 'blur' }
|
||||
],
|
||||
producedeviceorder_code: [
|
||||
{ required: true, message: '机台工单号不能为空', trigger: 'blur' }
|
||||
],
|
||||
shift_type_scode: [
|
||||
{ required: true, message: '班次类型不能为空', trigger: 'blur' }
|
||||
],
|
||||
@@ -585,14 +514,11 @@ export default {
|
||||
order_type_scode: [
|
||||
{ required: true, message: '工单类型不能为空', trigger: 'blur' }
|
||||
],
|
||||
orderNum: [
|
||||
{ required: true, message: '生成工单数量不能为空', trigger: 'blur' }
|
||||
],
|
||||
is_canupdate_update: [
|
||||
{ required: true, message: '不能为空', trigger: 'blur' }
|
||||
],
|
||||
device_id: [
|
||||
{ required: true, message: '不能为空', trigger: 'blur' }
|
||||
current_device_code: [
|
||||
{ required: true, message: '设备不能为空', trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -600,22 +526,16 @@ export default {
|
||||
created() {
|
||||
this.getworkprocedure()
|
||||
this.initClass3()
|
||||
this.getUser()
|
||||
},
|
||||
methods: {
|
||||
tableChanged3() {
|
||||
this.crud.toQuery()
|
||||
},
|
||||
getNotWorkDeviceByWorkproceduceId(workproceduce_id) {
|
||||
getNotWorkDeviceByWorkproceduceId(workproceduce_id) { // 根据工序标识获取设备列表
|
||||
crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ workproceduce_id: workproceduce_id }).then(res => {
|
||||
this.deviceList = res
|
||||
})
|
||||
},
|
||||
getUser() {
|
||||
crudProduceshiftorder.getUser().then(res => {
|
||||
this.userList = res
|
||||
})
|
||||
},
|
||||
initDataPlan() {
|
||||
const date = this.dateFormatter(new Date())
|
||||
const formatter1 = this.dateFormatter1(new Date())
|
||||
|
||||
@@ -50,46 +50,62 @@
|
||||
</el-button>
|
||||
</crudOperation>
|
||||
<!--表单组件-->
|
||||
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
|
||||
<el-form-item label="设备编码" prop="device_code">
|
||||
<el-input v-model="form.device_code" style="width: 370px;" />
|
||||
<el-dialog
|
||||
:close-on-click-modal="false"
|
||||
:before-close="crud.cancelCU"
|
||||
:visible.sync="crud.status.cu > 0"
|
||||
:title="crud.status.title"
|
||||
width="1200px">
|
||||
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
|
||||
<el-form-item label="设备编码" prop="material_code">
|
||||
<el-input
|
||||
v-model="form.device_code"
|
||||
style="width: 200px;"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备名称" prop="device_name">
|
||||
<el-input v-model="form.device_name" style="width: 370px;" />
|
||||
<el-form-item label="设备名称" prop="material_code">
|
||||
<el-input
|
||||
v-model="form.device_name"
|
||||
style="width: 200px;"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="生产区域" prop="product_area">
|
||||
<el-input v-model="form.product_area" style="width: 370px;" />
|
||||
<el-input v-model="form.product_area" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备编码2">
|
||||
<el-input v-model="form.device_code2" style="width: 370px;" />
|
||||
<el-input v-model="form.device_code2" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备来料仓上限数" prop="inupperlimit_qty">
|
||||
<el-input v-model="form.inupperlimit_qty" style="width: 370px;" />
|
||||
<el-input v-model="form.inupperlimit_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备来料仓下限数" prop="inlowerlimit_qty">
|
||||
<el-input v-model="form.inlowerlimit_qty" style="width: 370px;" />
|
||||
<el-input v-model="form.inlowerlimit_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备产品仓上限数" prop="outupperlimit_qty">
|
||||
<el-input v-model="form.outupperlimit_qty" style="width: 370px;" />
|
||||
<el-input v-model="form.outupperlimit_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备产品仓下限数" prop="outlowerlimit_qty">
|
||||
<el-input v-model="form.outlowerlimit_qty" style="width: 370px;" />
|
||||
<el-input v-model="form.outlowerlimit_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备初始来料仓数" prop="deviceinitinstor_qty">
|
||||
<el-input v-model="form.deviceinitinstor_qty" style="width: 370px;" />
|
||||
<el-input v-model="form.deviceinitinstor_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备实时来料仓数" prop="deviceinstor_qty">
|
||||
<el-input v-model="form.deviceinstor_qty" style="width: 370px;" />
|
||||
<el-input v-model="form.deviceinstor_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备实时产品仓数" prop="deviceoutstor_qty">
|
||||
<el-input v-model="form.deviceoutstor_qty" style="width: 370px;" />
|
||||
<el-input v-model="form.deviceoutstor_qty" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否人工" prop="is_artificial">
|
||||
<el-input v-model="form.is_artificial" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" style="width: 370px;" />
|
||||
<el-radio
|
||||
v-for="item in dict.IS_OR_NOT"
|
||||
:key="item.id"
|
||||
v-model="form.is_artificial"
|
||||
:label="item.value"
|
||||
>{{ item.label }}
|
||||
</el-radio>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
@@ -150,16 +166,37 @@ import DeviceItemDialog from '@/views/wms/pdm/device/DeviceItemDialog'
|
||||
import DeviceInfoDialog from '@/views/wms/pdm/device/DeviceInfoDialog'
|
||||
import CopyDialog from '@/views/wms/pdm/device/CopyDialog'
|
||||
|
||||
const defaultForm = {device_code: null, device_name: null, product_area: null, workprocedure_id: null, ext_code: null,
|
||||
material_id: null, workorder_code: null, device_code2: null, inupperlimit_qty: null, inlowerlimit_qty: null,
|
||||
outupperlimit_qty: null, outlowerlimit_qty: null, deviceinitinstor_qty: null, deviceinstor_qty: null,
|
||||
deviceoutstor_qty: null, is_artificial: null, remark: null, create_id: null, create_name: null, create_time: null,
|
||||
update_id: null, update_name: null, update_time: null, is_delete: null }
|
||||
const defaultForm = {
|
||||
device_code: null,
|
||||
device_name: null,
|
||||
product_area: null,
|
||||
workprocedure_id: null,
|
||||
ext_code: null,
|
||||
material_id: null,
|
||||
workorder_code: null,
|
||||
device_code2: null,
|
||||
inupperlimit_qty: null,
|
||||
inlowerlimit_qty: null,
|
||||
outupperlimit_qty: null,
|
||||
outlowerlimit_qty: null,
|
||||
deviceinitinstor_qty: null,
|
||||
deviceinstor_qty: null,
|
||||
deviceoutstor_qty: null,
|
||||
is_artificial: null,
|
||||
remark: null,
|
||||
create_id: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
update_id: null,
|
||||
update_name: null,
|
||||
update_time: null,
|
||||
is_delete: null
|
||||
}
|
||||
export default {
|
||||
name: 'Device',
|
||||
components: { pagination, crudOperation, rrOperation, udOperation, DeviceItemDialog, CopyDialog, DeviceInfoDialog },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
dicts: ['is_used'],
|
||||
dicts: ['is_used', 'IS_OR_NOT'],
|
||||
cruds() {
|
||||
return CRUD({ title: '生产设备', url: 'api/device', idField: 'device_code', sort: 'device_code,desc',
|
||||
optShow: {
|
||||
|
||||
Reference in New Issue
Block a user