Skip to content

M
mes-ui
Commit c0268649 authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

任务单--未完成版

parent ed46a900
Hide whitespace changes
Inline Side-by-side
Showing with 692 additions and 270 deletions
src/api/mes/pro/protask.js
View file @ c0268649
...@@ -52,3 +52,11 @@ export function delProtask(taskId) { ...@@ -52,3 +52,11 @@ export function delProtask(taskId) {
method: 'delete' method: 'delete'
}) })
} }
// 生成任务单、合并任务单
export function addProtaskList(taskId) {
return request({
url: '/mes/pro/protask' + taskId,
method: 'post',
})
}
src/components/workunitSelect/single.vue 0 → 100644
View file @ c0268649
<template>
<el-dialog title="工作单元选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="工作单元编码" prop="workunitCode">
<el-input
v-model="queryParams.workunitCode"
placeholder="请输入工单编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作单元名称" prop="workunitName">
<el-input
v-model="queryParams.workunitName"
placeholder="请输入工作单元名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作站" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
placeholder="请输入工作站名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<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-form-item>
</el-form>
<el-table v-loading="loading" :data="workorderList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center" >
<template v-slot="scope">
<el-radio v-model="selectedWorkorderId" :label="scope.row.workorderId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template>
</el-table-column>
<el-table-column label="工单编码" width="180" prop="workorderCode" >
</el-table-column>
<el-table-column label="工单名称" width="200" align="center" prop="workorderName" :show-overflow-tooltip="true"/>
<el-table-column label="工单来源" align="center" prop="orderSource" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_workorder_sourcetype" :value="scope.row.orderSource"/>
</template>
</el-table-column>
<el-table-column label="订单编号" width="140" align="center" prop="sourceCode" />
<el-table-column label="产品编号" width="120" align="center" prop="productCode" />
<el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="工单数量" align="center" prop="quantity" />
<el-table-column label="客户编码" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
<el-table-column label="需求日期" align="center" prop="requestDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag=false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listWorkorder} from "@/api/mes/pro/workunit";
export default {
name: 'WorkOrderSelectSingle',
components: {},
dicts: ['mes_order_status','mes_workorder_sourcetype'],
props:{
workunit: {
type: Object,
default: function(){
return {'workorderType': 'SELF'}
}} //外部传入的工单过滤信息
},
data() {
return {
showFlag: false,
// 遮罩层
loading: true,
// 选中数组
selectedWorkorderId: undefined,
selectedRows: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 生产工单表格数据
workorderList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
workorderCode: null,
workorderName: null,
workorderType: this.workunit.workunitType,
orderSource: null,
sourceCode: null,
productId: null,
productCode: null,
productName: null,
productSpc: null,
unitOfMeasure: null,
quantity: null,
quantityProduced: null,
quantityChanged: null,
quantityScheduled: null,
clientId: null,
clientCode: null,
clientName: null,
requestDate: null,
parentId: null,
ancestors: null,
status: 'CONFIRMED',
},
}
},
created() {
this.getList();
},
methods:{
/** 查询生产工单列表 */
getList() {
this.loading = true;
listWorkorder(this.queryParams).then(response => {
this.workorderList = response.rows;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row){
if(row){
this.selectedRows = row;
}
},
// 单选选中数据
handleRowChange(row) {
if(row){
this.selectedRows = row;
}
},
//双击选中
handleRowDbClick(row){
if(row){
this.selectedRows = row;
this.$emit('onSelected',this.selectedRows);
this.showFlag = false;
}
},
//确定选中
confirmSelect(){
if(this.selectedWorkorderId == null || this.selectedWorkorderId == 0){
this.$notify({
title:'提示',
type:'warning',
message: '请至少选择一条数据!'
});
return;
}
this.$emit('onSelected',this.selectedRows);
this.showFlag = false;
}
}
}
</script>
\ No newline at end of file
src/views/mes/pro/schedule/index.vue
View file @ c0268649
<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="68px"> <el-form
<el-form-item label="工单编码" prop="workorderCode"> :model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item prop="taskCode">
<el-input <el-input
v-model="queryParams.workorderCode" v-model="queryParams.taskCode"
placeholder="请输入工单编码" placeholder="请输入任务单编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
<template slot="label">
<TipLabel title="编码" tip="任务单编码" />
</template>
</el-form-item> </el-form-item>
<el-form-item label="工单名称" prop="workorderName"> <el-form-item prop="taskName">
<el-input <el-input
v-model="queryParams.workorderName" v-model="queryParams.taskName"
placeholder="请输入工单名称" placeholder="请输入任务单名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
<template slot="label">
<TipLabel title="名称" tip="任务单名称" />
</template>
</el-form-item> </el-form-item>
<el-form-item label="来源单据" prop="sourceCode"> <el-form-item prop="workstationName">
<el-input <el-input
v-model="queryParams.sourceCode" v-model="queryParams.workstationName"
placeholder="请输入来源单据" placeholder="请输入工作站名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
<template slot="label">
<TipLabel title="工作站" tip="工作站名称" />
</template>
</el-form-item> </el-form-item>
<el-form-item label="产品编号" prop="productCode"> <el-form-item label="产品编号" prop="itemCode">
<el-input <el-input
v-model="queryParams.productCode" v-model="queryParams.itemCode"
placeholder="请输入产品编号" placeholder="请输入产品编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="产品名称" prop="productName"> <el-form-item label="产品名称" prop="itemName">
<el-input <el-input
v-model="queryParams.productName" v-model="queryParams.itemName"
placeholder="请输入产品名称" placeholder="请输入产品名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="客户编码" prop="clientCode"> <!-- <el-form-item label="客户编码" prop="clientCode">
<el-input <el-input
v-model="queryParams.clientCode" v-model="queryParams.clientCode"
placeholder="请输入客户编码" placeholder="请输入客户编码"
...@@ -60,86 +76,202 @@ ...@@ -60,86 +76,202 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="需求日期" prop="requestDate"> <el-form-item label="需求日期" prop="requestDate">
<el-date-picker clearable <el-date-picker
clearable
v-model="queryParams.requestDate" v-model="queryParams.requestDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择需求日期"> placeholder="请选择需求日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </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
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-refresh" v-hasPermi="['mes:pro:protask:list']" circle="" @click="getList"></el-button> <el-button
<el-button type="primary" icon="el-icon-edit" v-hasPermi="['mes:pro:protask:edit']" circle="" @click="handleOpenGantt"></el-button> type="primary"
icon="el-icon-refresh"
v-hasPermi="['mes:pro:protask:list']"
circle=""
@click="getList"
></el-button>
<el-button
type="primary"
icon="el-icon-edit"
v-hasPermi="['mes:pro:protask:edit']"
circle=""
@click="handleOpenGantt"
></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="wrapper"> <div class="wrapper">
<div class="container"> <div class="container">
<GanttChar class="left-container" ref="ganttChar" :tasks="tasks"></GanttChar> <GanttChar
</div> class="left-container"
</div> ref="ganttChar"
:tasks="tasks"
></GanttChar>
</div>
</div>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="workorderList" :data="taskList"
row-key="workorderId" row-key="taskId"
default-expand-all default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
> >
<el-table-column label="工单编码" width="180" prop="workorderCode" > <el-table-column label="任务单编码" width="120" prop="taskCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:pro:protask:query']" v-hasPermi="['mes:pro:protask:query']"
>{{scope.row.workorderCode}}</el-button> >{{ scope.row.taskCode }}</el-button
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工单名称" width="200" align="center" prop="workorderName" :show-overflow-tooltip="true"/> <el-table-column
<el-table-column label="工单来源" align="center" prop="orderSource" > label="任务单名称"
width="200"
align="center"
prop="taskName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="工作站名称"
align="center"
prop="workstationName"
width="180"
/>
<el-table-column
label="工艺名称"
width="140"
align="center"
prop="routeName"
/>
<el-table-column
label="工序名称"
align="center"
prop="processName"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
label="产品编号"
width="120"
align="center"
prop="itemCode"
/> -->
<el-table-column
label="产品名称"
width="180"
align="center"
prop="itemName"
:show-overflow-tooltip="true"
/>
<el-table-column label="规格型号" align="center" prop="specification" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="排产数量" align="center" prop="quantity" />
<!-- <el-table-column
label="已生产数量"
align="center"
width="100px"
prop="quantityProduced"
/>
<el-table-column
label="合格品数量"
align="center"
prop="quantityQuanlify"
width="100"
/>
<el-table-column
label="不良品数量"
align="center"
width="100px"
prop="quantityUnquanlify"
/>
<el-table-column label="调整数量" align="center" prop="quantityChanged" /> -->
<el-table-column
label="开始生产时间"
align="center"
prop="startTime"
width="180"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_workorder_sourcetype" :value="scope.row.orderSource"/> <span>{{
parseTime(scope.row.startTime, "{y}-{m}-{d}:{h}-{m}-{s}")
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单编号" width="140" align="center" prop="sourceCode" /> <el-table-column
<el-table-column label="产品编号" width="120" align="center" prop="productCode" /> label="生产时长"
<el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/> align="center"
<el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/> prop="duration"
<el-table-column label="单位" align="center" prop="unitOfMeasure" /> width="120"
<el-table-column label="工单数量" align="center" prop="quantity" /> >
<el-table-column label="调整数量" align="center" prop="quantityChanged" /> </el-table-column>
<el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" /> <el-table-column
<el-table-column label="客户编码" align="center" prop="clientCode" /> label="完成生产时间"
<el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/> align="center"
<el-table-column label="需求日期" align="center" prop="requestDate" width="180"> prop="endTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span> <span>{{
parseTime(scope.row.endTime, "{y}-{m}-{d}:{h}-{m}-{s}")
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="排产状态" align="center" prop="status"> <el-table-column
label="需求日期"
align="center"
prop="requestDate"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/> <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150px" align="center" class-name="small-padding fixed-width"> <el-table-column
label="生产状态"
align="center"
prop="status"
width="120"
/>
<el-table-column label="备注" align="center" prop="remark" width="120" />
<el-table-column
label="操作"
width="150px"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.status =='CONFIRMED'" v-if="scope.row.status == 'NORMARL'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:protask:edit']" v-hasPermi="['mes:pro:protask:edit']"
>排产</el-button> >排产</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
...@@ -147,126 +279,135 @@ ...@@ -147,126 +279,135 @@
/> />
<!-- 添加或修改生产工单对话框 --> <!-- 添加或修改生产工单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
width="1000px"
append-to-body
>
<el-form ref="form" :model="form" label-width="80px"> <el-form ref="form" :model="form" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工单编号" prop="workorderCode"> <el-form-item label="编号" prop="taskCode">
<el-input v-model="form.workorderCode" readonly="readonly" /> <el-input v-model="form.taskCode" readonly="readonly" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工单名称" prop="workorderName"> <el-form-item label="名称" prop="taskName">
<el-input v-model="form.workorderName" readonly="readonly" /> <el-input v-model="form.taskName" readonly="readonly" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="来源类型" prop="orderSource">
<el-radio-group v-model="form.orderSource" disabled>
<el-radio
v-for="dict in dict.type.mes_workorder_sourcetype"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="form.orderSource == 'ORDER'"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="订单编号" prop="sourceCode"> <el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.sourceCode" readonly="readonly" /> <el-input v-model="form.itemName" readonly="readonly" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="排产状态" prop="status"> <el-form-item label="工序名称" prop="processName">
<el-select v-model="form.status" disabled> <el-input v-model="form.processName" readonly="readonly" />
<el-option
v-for="dict in dict.type.mes_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-row> <el-form-item label="工作站" prop="workstationName">
<el-col :span="12"> <el-input v-model="form.workstationName" readonly="readonly" />
<el-form-item label="产品编号" prop="productCode">
<el-input v-model="form.productCode" readonly="readonly" >
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品名称" prop="productName"> <el-form-item label="工作单元" prop="workunitId">
<el-input v-model="form.productName" readonly="readonly" /> <el-input v-model="form.workunitName" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-row> <el-form-item label="排产数量" prop="quantity">
<el-col :span="12"> <el-input v-model="form.quantity" readonly="readonly" />
<el-form-item label="规格型号" prop="productSpc">
<el-input v-model="form.productSpc" readonly="readonly" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单位" prop="unitOfMeasure"> <el-form-item label="开始生产时间" prop="startTime">
<el-input v-model="form.unitOfMeasure" readonly="readonly" /> <el-date-picker
v-model="form.startTime"
type="date"
value-format="yyyy-MM-dd:hh-mm-ss"
placeholder="请选择开始时间"
>
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-row> <el-form-item label="生产时长" prop="duration">
<el-col :span="12"> <el-input v-model="form.duration" />
<el-form-item label="工单数量" prop="quantity">
<el-input v-model="form.quantity" readonly="readonly" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="需求日期" prop="requestDate"> <el-form-item label="需求日期" prop="requestDate">
<el-date-picker disabled <el-date-picker
v-model="form.requestDate" v-model="form.requestDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择需求日期"> placeholder="请选择需求日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row v-if="form.orderSource == 'ORDER'">
<el-col :span="12">
<el-form-item label="客户编号" prop="clientCode">
<el-input v-model="form.clientCode" readonly="readonly" >
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户名称" prop="clientName">
<el-input v-model="form.clientName" readonly="readonly" />
</el-form-item>
</el-col> </el-col>
<el-col></el-col>
</el-row>
<el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" readonly="readonly" /> <el-input
v-model="form.remark"
type="textarea"
readonly="readonly"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-steps :active="activeProcess" v-if="form.workorderId !=null" align-center simple> <el-steps
<el-step v-for="(item,index) in processOptions" :active="activeProcess"
:title="item.processName" @click.native="handleStepClick(index)"> v-if="form.taskId != null"
align-center
simple
>
<el-step
v-for="(item, index) in processOptions"
:title="item.itemName"
:key="item.itemId"
@click.native="handleStepClick(index)"
>
</el-step> </el-step>
</el-steps> </el-steps>
<el-card v-for=" (item,index) in processOptions " :key="index" v-if="activeProcess == index && form.workorderId !=null"> <template v-if="activeProcess == index && form.taskId != null">
<ProTask :workorderId="form.workorderId" :routeId="item.routeId" :processId="item.processId" :colorCode="item.colorCode" :optType="optType"></ProTask> <el-card v-for="(item, index) in processOptions" :key="index">
</el-card> <ProTask
:workorderId="form.taskId"
:routeId="item.routeId"
:processId="item.itemId"
:colorCode="item.colorCode"
:optType="optType"
></ProTask>
</el-card>
</template>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button> type="primary"
<el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view' && form.workorderId !=null">完成</el-button> @click="cancel"
v-if="optType == 'view' || form.status != 'NORMARL'"
>返回</el-button
>
<el-button
type="primary"
@click="submitForm"
v-if="form.status == 'NORMARL' && optType != 'view'"
>确 定</el-button
>
<el-button
type="success"
@click="handleFinish"
v-if="
form.status == 'NORMARL' &&
optType != 'view' &&
form.workorderId != null
"
>完成</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -274,8 +415,22 @@ ...@@ -274,8 +415,22 @@
</template> </template>
<script> <script>
import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder } from "@/api/mes/pro/workorder"; import {
import {listGanttTaskList} from "@/api/mes/pro/protask"; listWorkorder,
getWorkorder,
delWorkorder,
addWorkorder,
updateWorkorder,
} from "@/api/mes/pro/workorder";
import {
listProtask,
listGanttTaskList,
getProtask,
addProtask,
updateProtask,
delProtask,
addProtaskList,
} from "@/api/mes/pro/protask";
import { listProductprocess } from "@/api/mes/pro/routeprocess"; import { listProductprocess } from "@/api/mes/pro/routeprocess";
import ProTask from "./proTask.vue"; import ProTask from "./proTask.vue";
import GanttChar from "./ganttx.vue"; import GanttChar from "./ganttx.vue";
...@@ -284,16 +439,16 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; ...@@ -284,16 +439,16 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "Workorder", name: "Workorder",
dicts: ['mes_order_status','mes_workorder_sourcetype'], dicts: ["mes_order_status", "mes_workorder_sourcetype"],
components: { components: {
Treeselect, Treeselect,
ProTask, ProTask,
GanttChar GanttChar,
}, },
data() { data() {
return { return {
//自动生成编码 //自动生成编码
autoGenFlag:false, autoGenFlag: false,
optType: undefined, optType: undefined,
activeProcess: 0, activeProcess: 0,
// 遮罩层 // 遮罩层
...@@ -306,10 +461,10 @@ export default { ...@@ -306,10 +461,10 @@ export default {
single: true, single: true,
// 非多个禁用 // 非多个禁用
multiple: true, multiple: true,
// 生产工单表格数据 // 任务单表格数据
workorderList: [], taskList: [],
// 生产工单树选项 // 任务单工单树选项
workorderOptions: [], taskOptions: [],
//当前生产工单中产品对应的工序列表 //当前生产工单中产品对应的工序列表
processOptions: [], processOptions: [],
// 弹出层标题 // 弹出层标题
...@@ -322,29 +477,50 @@ export default { ...@@ -322,29 +477,50 @@ export default {
pageSize: 10, pageSize: 10,
workorderCode: null, workorderCode: null,
workorderName: null, workorderName: null,
workorderType: 'SELF', //这里的排产要排除自产之外的外协和外购 workorderType: "SELF", //这里的排产要排除自产之外的外协和外购
taskCode: null,
taskId: null,
taskName: null,
workstationCode: null,
workstationName: null,
workstationid: null,
orderSource: null, orderSource: null,
sourceCode: null, sourceCode: null,
productId: null, itemId: null,
productCode: null, itemCode: null,
productName: null, itemName: null,
productSpc: null, routeId: null,
routeName: null,
routeCode: null,
processId: null,
processName: null,
processCode: null,
specification: null,
unitOfMeasure: null, unitOfMeasure: null,
quantity: null, quantity: null,
quantityProduced: null, quantityProduced: null,
quantityQuanlify: null,
quantityUnquanlify: null,
quantityChanged: null, quantityChanged: null,
quantityScheduled: null,
clientId: null, clientId: null,
clientCode: null, clientCode: null,
clientName: null, clientName: null,
requestDate: null, requestDate: null,
parentId: null, parentId: null,
ancestors: null, ancestors: null,
status: 'CONFIRMED', startTime: null,
duration: null,
endTime: null,
colorCode: null,
requestDate: null,
remark: null,
status: "NORMARL",
workunitName: null,
workunitId: null,
}, },
tasks:{ tasks: {
data: [], data: [],
links: [] links: [],
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -355,20 +531,24 @@ export default { ...@@ -355,20 +531,24 @@ export default {
this.getGanttTasks(); this.getGanttTasks();
}, },
methods: { methods: {
/** 查询生产工单列表 */ /** 查询任务单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listWorkorder(this.queryParams).then(response => { listProtask(this.queryParams).then((response) => {
this.workorderList = this.handleTree(response.rows, "workorderId", "parentId"); this.taskList = this.handleTree(
response.rows,
"taskId"
// "parentId"
);
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
handleOpenGantt(){ handleOpenGantt() {
this.$router.push({ path: '/mes/pro/schedule/ganttedit'}) this.$router.push({ path: "/mes/pro/schedule/ganttedit" });
}, },
getGanttTasks(){ getGanttTasks() {
listGanttTaskList(this.queryParams).then(response =>{ listGanttTaskList(this.queryParams).then((response) => {
this.tasks.data = response.data.data; this.tasks.data = response.data.data;
this.tasks.links = response.data.links; this.tasks.links = response.data.links;
this.$refs.ganttChar.reload(); this.$refs.ganttChar.reload();
...@@ -376,30 +556,34 @@ export default { ...@@ -376,30 +556,34 @@ export default {
}, },
//获取当前产品对应的生产工序 //获取当前产品对应的生产工序
getProcess(){ getProcess() {
listProductprocess(this.form.productId).then(response =>{ listProductprocess(this.form.productId).then((response) => {
this.processOptions = response.data; this.processOptions = response.data;
}); });
}, },
/** 转换生产工单数据结构 */ /** 转换任务单数据结构 */
normalizer(node) { normalizer(node) {
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
delete node.children; delete node.children;
} }
return { return {
id: node.workorderId, id: node.taskId,
label: node.workorderName, label: node.taskName,
children: node.children children: node.children,
}; };
}, },
/** 查询生产工单下拉树结构 */ /** 查询生产工单下拉树结构 */
getTreeselect() { getTreeselect() {
listWorkorder().then(response => { listProtask().then((response) => {
this.workorderOptions = []; this.taskOptions = [];
const data = { workorderId: 0, workorderName: '顶级节点', children: [] }; const data = {
data.children = this.handleTree(response.data, "workorderId", "parentId"); taskId: 0,
this.workorderOptions.push(data); taskName: "顶级节点",
children: [],
};
data.children = this.handleTree(response.data, "taskId", "parentId");
this.taskOptions.push(data);
}); });
}, },
// 取消按钮 // 取消按钮
...@@ -414,39 +598,58 @@ export default { ...@@ -414,39 +598,58 @@ export default {
workorderCode: null, workorderCode: null,
workorderName: null, workorderName: null,
orderSource: null, orderSource: null,
taskCode: null,
taskId: null,
taskName: null,
workstationCode: null,
workstationName: null,
workstationid: null,
sourceCode: null, sourceCode: null,
productId: null, itemId: null,
productCode: null, itemCode: null,
productName: null, itemName: null,
productSpc: null, routeId: null,
routeName: null,
routeCode: null,
processId: null,
processName: null,
processCode: null,
specification: null,
unitOfMeasure: null, unitOfMeasure: null,
quantity: null, quantity: null,
quantityProduced: null, quantityProduced: null,
quantityQuanlify: null,
quantityUnquanlify: null,
quantityChanged: null, quantityChanged: null,
quantityScheduled: null,
clientId: null, clientId: null,
clientCode: null, clientCode: null,
clientName: null, clientName: null,
requestDate: null, requestDate: null,
parentId: null, parentId: null,
status: "PREPARE", status: "NORMARL",
startTime: null,
duration: null,
endTime: null,
colorCode: null,
remark: null, remark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null updateTime: null,
workunitName: null,
workunitId: null,
}; };
this.activeProcess =0; this.activeProcess = 0;
this.autoGenFlag = false; this.autoGenFlag = false;
this.resetForm("form"); this.resetForm("form");
}, },
//甘特图按钮点击 //甘特图按钮点击
openGanttChart(){ openGanttChart() {
this.$refs.ganttChar.showFlag =true; this.$refs.ganttChar.showFlag = true;
}, },
//Step点击 //Step点击
handleStepClick(index){ handleStepClick(index) {
this.activeProcess =index; this.activeProcess = index;
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
...@@ -458,50 +661,52 @@ export default { ...@@ -458,50 +661,52 @@ export default {
this.handleQuery(); this.handleQuery();
}, },
//从BOM行中直接新增 //从BOM行中直接新增
handleSubAdd(row){ handleSubAdd(row) {
this.open = false; this.open = false;
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
if (row != null && row.workorderId) { if (row != null && row.taskId) {
this.form = row; this.form = row;
this.form.parentId = row.workorderId; this.form.parentId = row.taskId;
this.form.workorderId = null; this.form.taskId = null;
this.form.workorderCode = null; this.form.taskCode = null;
} else { } else {
this.form.parentId = 0; this.form.parentId = 0;
} }
this.open = true; this.open = true;
this.title = "添加生产工单"; this.title = "添加任务单";
this.optType="add"; this.optType = "add";
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd(row) { handleAdd(row) {
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
if (row != null && row.workorderId) { if (row != null && row.taskId) {
this.form.parentId = row.workorderId; this.form.parentId = row.workorderId;
this.form.orderSource = row.orderSource; this.form.orderSource = row.orderSource;
this.form.sourceCode = row.sourceCode; this.form.sourceCode = row.sourceCode;
this.form.clientId = row.clientId; this.form.clientId = row.clientId;
this.form.clientCode = row.clientCode; this.form.clientCode = row.clientCode;
this.form.clientName = row.clientName; this.form.clientName = row.clientName;
this.form.workunitName = row.workunitName;
this.form.workunitId = row.workunitId;
} else { } else {
this.form.parentId = 0; this.form.parentId = 0;
} }
this.open = true; this.open = true;
this.title = "添加生产工单"; this.title = "添加任务单";
this.optType="add"; this.optType = "add";
}, },
// 查询明细按钮操作 // 查询明细按钮操作
handleView(row){ handleView(row) {
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
const workorderId = row.workorderId || this.ids; const taskId = row.taskId || this.ids;
getWorkorder(workorderId).then(response => { getProtask(taskId).then((response) => {
this.form = response.data; this.form = response.data;
this.getProcess(); this.getProcess();
this.open = true; this.open = true;
this.title = "查看工单信息"; this.title = "查看任务单信息";
this.optType = "view"; this.optType = "view";
}); });
}, },
...@@ -510,32 +715,32 @@ export default { ...@@ -510,32 +715,32 @@ export default {
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
if (row != null) { if (row != null) {
this.form.parentId = row.workorderId; this.form.parentId = row.taskId;
} }
getWorkorder(row.workorderId).then(response => { getProtask(row.taskId).then((response) => {
this.form = response.data; this.form = response.data;
this.getProcess(); this.getProcess();
this.open = true; this.open = true;
this.title = "生产排产"; this.title = "生产排产";
this.optType="edit"; this.optType = "edit";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.workorderId != null) { if (this.form.taskId != null) {
updateWorkorder(this.form).then(response => { updateProtask(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
//this.open = false; //this.open = false;
this.$refs["bomlist"].getList(); this.$refs["bomlist"].getList();
this.getList(); this.getList();
}); });
} else { } else {
addWorkorder(this.form).then(response => { addProtask(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
//this.open = false; //this.open = false;
this.form.workorderId = response.data; this.form.taskId = response.data;
this.getList(); this.getList();
}); });
} }
...@@ -544,66 +749,76 @@ export default { ...@@ -544,66 +749,76 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除生产工单编号为"' + row.workorderId + '"的数据项？').then(function() { this.$modal
return delWorkorder(row.workorderId); .confirm('是否确认删除生产工单编号为"' + row.taskId + '"的数据项？')
}).then(() => { .then(function () {
this.getList(); return delProtask(row.taskId);
this.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}, },
handleSelectProduct(){ handleSelectProduct() {
this.$refs.itemSelect.showFlag = true; this.$refs.itemSelect.showFlag = true;
}, },
handleSelectClient(){ handleSelectClient() {
this.$refs.clientSelect.showFlag = true; this.$refs.clientSelect.showFlag = true;
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('mes/pro/workorder/export', { this.download(
...this.queryParams "mes/pro/protask/export",
}, `workorder_${new Date().getTime()}.xlsx`) {
...this.queryParams,
},
`workorder_${new Date().getTime()}.xlsx`
);
}, },
handleFinish(){ handleFinish() {
let that = this; let that = this;
this.$modal.confirm('是否完成工单编制？【完成后将不能更改】').then(function(){ this.$modal
that.form.status = 'CONFIRMED'; .confirm("是否完成任务单编制？【完成后将不能更改】")
that.submitForm(); .then(function () {
}); that.form.status = "CONFIRMED";
that.submitForm();
});
}, },
//物料选择弹出框 //物料选择弹出框
onItemSelected(obj){ onItemSelected(obj) {
if(obj != undefined && obj != null){ if (obj != undefined && obj != null) {
this.form.productId = obj.itemId; this.form.itemId = obj.itemId;
this.form.productCode = obj.itemCode; this.form.itemCode = obj.itemCode;
this.form.productName = obj.itemName; this.form.itemName = obj.itemName;
this.form.productSpc = obj.specification; this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure; this.form.unitOfMeasure = obj.unitOfMeasure;
} }
}, },
//客户选择弹出框 //客户选择弹出框
onClientSelected(obj){ onClientSelected(obj) {
if(obj != undefined && obj != null){ if (obj != undefined && obj != null) {
this.form.clientId = obj.clientId; this.form.clientId = obj.clientId;
this.form.clientCode = obj.clientCode; this.form.clientCode = obj.clientCode;
this.form.clientName = obj.clientName; this.form.clientName = obj.clientName;
} }
}, },
//自动生成编码 //自动生成编码
handleAutoGenChange(autoGenFlag){ handleAutoGenChange(autoGenFlag) {
if(autoGenFlag){ if (autoGenFlag) {
genCode('WORKORDER_CODE').then(response =>{ genCode("TASK_CODE").then((response) => {
this.form.workorderCode = response; this.form.taskCode = response;
}); });
}else{ } else {
this.form.workorderCode = null; this.form.taskCode = null;
} }
} },
} },
}; };
</script> </script>
<style scoped> <style scoped>
.wrapper{ .wrapper {
height: 400px; height: 400px;
} }
.container { .container {
height: 100%; height: 100%;
......
src/views/mes/proofing/components/ProogingBom.vue
View file @ c0268649
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
<el-dialog :visible.sync="showFlag" width="700px" title="添加BOM"> <el-dialog :visible.sync="showFlag" width="700px" title="添加BOM">
<el-form <el-form
ref="form" ref="form"
class="page-form"
:model="form" :model="form"
:rules="rules" :rules="rules"
inline inline
...@@ -120,7 +121,7 @@ ...@@ -120,7 +121,7 @@
size="small" size="small"
> >
<el-row> <el-row>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="物料" prop="itemId"> <el-form-item label="物料" prop="itemId">
<el-input <el-input
v-model="form.itemName" v-model="form.itemName"
......
src/views/mes/proofing/proofingInfo.vue
View file @ c0268649
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
label-width="100px" label-width="100px"
> >
<el-row> <el-row>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item prop="prototypeRequestCode"> <el-form-item prop="prototypeRequestCode">
<template slot="label"> 申请单编码 </template> <template slot="label"> 申请单编码 </template>
<el-input <el-input
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品" prop="itemId"> <el-form-item label="产品" prop="itemId">
<el-input <el-input
v-model="form.itemName" v-model="form.itemName"
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工艺路线" prop="routeId"> <el-form-item label="工艺路线" prop="routeId">
<el-input <el-input
v-model="form.routeName" v-model="form.routeName"
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="简称" prop="abbreviation"> <el-form-item label="简称" prop="abbreviation">
<el-input <el-input
v-model="form.abbreviation" v-model="form.abbreviation"
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品英文名" prop="enName"> <el-form-item label="样品英文名" prop="enName">
<el-input <el-input
v-model="form.enName" v-model="form.enName"
...@@ -88,14 +88,14 @@ ...@@ -88,14 +88,14 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品数量" prop="num"> <el-form-item label="样品数量" prop="num">
<el-input v-model="form.num" placeholder="请输入样品数量"> <el-input v-model="form.num" placeholder="请输入样品数量">
<template slot="suffix">{{ form.unit }}</template> <template slot="suffix">{{ form.unit }}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="打样形式" prop="type"> <el-form-item label="打样形式" prop="type">
<el-input <el-input
v-model="form.type" v-model="form.type"
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="分配方式" prop="modality"> <el-form-item label="分配方式" prop="modality">
<el-input <el-input
v-model="form.modality" v-model="form.modality"
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="表面处理" prop="surfaceTreatment"> <el-form-item label="表面处理" prop="surfaceTreatment">
<el-input <el-input
v-model="form.surfaceTreatment" v-model="form.surfaceTreatment"
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="NG原因" prop="ngReason"> <el-form-item label="NG原因" prop="ngReason">
<el-input <el-input
v-model="form.ngReason" v-model="form.ngReason"
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item prop="plannedFinishDate"> <el-form-item prop="plannedFinishDate">
<template slot="label"> <template slot="label">
<TipLabel title="完成日期" tip="计划完成日期" /> <TipLabel title="完成日期" tip="计划完成日期" />
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item prop="plannedLayoutDate"> <el-form-item prop="plannedLayoutDate">
<template slot="label"> <template slot="label">
<TipLabel title="版面时间" tip="版面需求时间" /> <TipLabel title="版面时间" tip="版面需求时间" />
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="测试标准" prop="testStandard"> <el-form-item label="测试标准" prop="testStandard">
<el-input <el-input
v-model="form.testStandard" v-model="form.testStandard"
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :md="6" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input
type="textarea" type="textarea"
...@@ -254,7 +254,7 @@ export default { ...@@ -254,7 +254,7 @@ export default {
created() { created() {
this.getFormInfo(); this.getFormInfo();
if (this.mode == "apply") { if (this.mode == "apply") {
this.gCode(); this.gCode();
} }
}, },
methods: { methods: {
......
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