mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生产报工修改

Browse Source
This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu 2022-11-01 22:51:16 +08:00
parent 67cc80eebb
commit a7a444de4f
4 changed files with 303 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

278
src/components/TaskSelect/taskSelectSingle.vue Normal file
View File

@ -0,0 +1,278 @@
<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="100px">
<el-row>
<el-col :span="8">
<el-form-item label="所属工序" prop="processName">
<el-select v-model="queryParams.processId" placeholder="请选择工序">
<el-option
v-for="item in processOptions"
:key="item.processId"
:label="item.processName"
:value="item.processId"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属工作站" prop="workstationCode">
<el-input
v-model="queryParams.workstationCode"
placeholder="请输入工作站编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="任务编号" prop="taskCode">
<el-input
v-model="queryParams.taskCode"
placeholder="请输入生产任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<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-col>
</el-row>
</el-form>
<el-table v-loading="loading" :data="protaskList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center" >
<template v-slot="scope">
<el-radio v-model="selectedTaskId" :label="scope.row.taskId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template>
</el-table-column>
<el-table-column label="任务编号" align="center" width="100px" prop="taskCode" :show-overflow-tooltip="true"/>
<el-table-column label="任务名称" align="center" width="120px" prop="taskName" :show-overflow-tooltip="true"/>
<el-table-column label="工作站编号" align="center" width="150px" prop="workstationCode" :show-overflow-tooltip="true"/>
<el-table-column label="工作站名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/>
<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="startTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime,'{y}-{m}-{d} {h}') }}</span>
</template>
</el-table-column>
<el-table-column label="生产时长" align="center" prop="duration" />
<el-table-column label="预计完成时间" align="center" prop="endTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime,'{y}-{m}-{d} {h}') }}</span>
</template>
</el-table-column>
<el-table-column label="显示颜色" align="center" prop="colorCode" >
<template slot-scope="scope">
<el-color-picker v-model="scope.row.colorCode" disabled></el-color-picker>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100px" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['pro:protask:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['pro:protask:remove']"
>删除</el-button>
</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 { listProtask, getProtask, delProtask, addProtask, updateProtask } from "@/api/mes/pro/protask";
import {listAllProcess} from "@/api/mes/pro/process";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
export default {
name: "ProtaskSelect",
components: {WorkstationSelect},
props: {
workorderId: null,
workorderCode: null,
processId: null,
processCode: null,
workstationId: null,
workstationCode: null
},
watch: {
workorderId(v){
this.queryParams.workorderId = v;
}
},
data() {
return {
showFlag: false,
selectedTaskId: undefined,
selectedRow: undefined,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 生产任务表格数据
protaskList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
taskCode: null,
taskName: null,
workorderId: this.workorderId,
workorderCode: null,
workorderName: null,
workstationId: null,
workstationCode: null,
workstationName: null,
processId: this.processId,
processCode: null,
processName: null,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantity: null,
quantityProduced: null,
quantityChanged: null,
clientId: null,
clientCode: null,
clientName: null,
clientNick: null,
startTime: null,
duration: null,
endTime: null,
colorCode: null,
requestDate: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
workstationId: [
{ required: true, message: "工作站不能为空", trigger: "blur" }
],
quantity: [
{ required: true, message: "排产数量不能为空", trigger: "blur" }
],
startTime: [
{ required: true, message: "请选择开始生产日期",trigger: "blur"}
],
duration: [
{ required: true, message: "清输入估算的生产用时",trigger: "blur"}
]
}
};
},
created() {
this.getList();
this.getProcess();
},
methods: {
/** 查询生产任务列表 */
getList() {
this.loading = true;
listProtask(this.queryParams).then(response => {
this.protaskList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//查询工序信息
getProcess(){
listAllProcess().then( response =>{
this.processOptions = response.data;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row){
if(row){
this.selectedRow = row;
}
},
//行双击选中
handleRowDbClick(row){
if(row){
this.selectedRow = row;
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
},
// 单选选中数据
handleRowChange(row) {
debugger;
if(row){
this.selectedRow = row;
}
},
//确定选中
confirmSelect(){
if(this.selectedTaskId ==null || this.selectedTaskId==0){
this.$notify({
title:'提示',
type:'warning',
message: '请至少选择一条数据!'
});
return;
}
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
}
};
</script>

2
src/views/index.vue
View File

@ -33,7 +33,7 @@
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="生产进度" align="center" width="200px" >
<template slot-scope="scope">
<el-progress :text-inside="true" :stroke-width="20" :percentage="scope.row.quantityProduced/scope.row.quantity*100"></el-progress>
<el-progress :text-inside="true" :stroke-width="20" :percentage="parseFloat(((scope.row.quantityProduced/scope.row.quantity*100).toFixed(2)))"></el-progress>
</template>
</el-table-column>
<el-table-column label="需求日期" align="center" prop="requestDate" width="180">

10
src/views/mes/md/workstation/index.vue
View File

@ -208,16 +208,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="线边库">
<el-cascader v-model="warehouseInfo"
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
</el-cascader>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="enableFlag">
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">

42
src/views/mes/pro/feedback/index.vue
View File

@ -136,14 +136,6 @@
</el-table-column>
<el-table-column label="操作" align="center" width="100px" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-if="scope.row.status =='PREPARE'"
@click="handleExecute(scope.row)"
v-hasPermi="['mes:wm:feedback:edit']"
>执行入库</el-button>
<el-button
size="mini"
type="text"
@ -197,12 +189,12 @@
<WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
</el-col>
<el-col :span="8">
<el-form-item label="工作站名称" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请输入工作站名称" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
<el-form-item label="生产任务" prop="taskName">
<el-input v-model="form.taskCode" placeholder="请选择生产任务" >
<el-button slot="append" icon="el-icon-search" @click="handleTaskSelect"></el-button>
</el-input>
</el-form-item>
<WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
<ProtaskSelect ref="taskSelect" :workorderId="form.workorderId" @onSelected="onTaskSelected"> </ProtaskSelect>
</el-col>
</el-row>
<el-row>
@ -285,7 +277,7 @@
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
<el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view' && form.workorderId !=null">审 批</el-button>
<el-button type="success" @click="handleExecute" v-if="form.status =='PREPARE' && optType !='view' && form.workorderId !=null">审 批</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -297,9 +289,10 @@ import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback, ex
import WorkorderSelect from "@/components/workorderSelect/single.vue"
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import UserSingleSelect from "@/components/userSelect/single.vue"
import ProtaskSelect from "@/components/TaskSelect/taskSelectSingle.vue"
export default {
name: "Feedback",
components: {WorkorderSelect,WorkstationSelect,UserSingleSelect},
components: {WorkorderSelect,WorkstationSelect,UserSingleSelect,ProtaskSelect},
dicts: ['mes_order_status', 'mes_feedback_type'],
data() {
return {
@ -406,6 +399,9 @@ export default {
workstationId: null,
workstationCode: null,
workstationName: null,
processId: null,
processCode: null,
processName: null,
workorderId: null,
workorderCode: null,
workorderName: null,
@ -508,8 +504,8 @@ export default {
});
},
//执行
handleExecute(row){
const recordIds = row.recordId || this.ids;
handleExecute(){
const recordIds = this.form.recordId;
this.$modal.confirm('确认执行报工？').then(function() {
return execute(recordIds)//执行报工
}).then(() => {
@ -539,6 +535,7 @@ export default {
},
onWorkorderSelected(row){
if(row != undefined && row != null){
debugger;
this.form.workorderId = row.workorderId;
this.form.workorderCode = row.workorderCode;
this.form.workorderName = row.workorderName;
@ -549,14 +546,21 @@ export default {
this.form.unitOfMeasure = row.unitOfMeasure;
}
},
handleWorkstationSelect(){
this.$refs.wsSelect.showFlag = true;
handleTaskSelect(){
this.$refs.taskSelect.showFlag = true;
this.$refs.taskSelect.getList();
},
onWorkstationSelected(row){
onTaskSelected(row){
if(row != undefined && row != null){
this.form.taskId = row.taskId;
this.form.taskCode = row.taskCode;
this.form.taskName = row.taskName;
this.form.workstationId = row.workstationId;
this.form.workstationCode = row.workstationCode;
this.form.workstationName = row.workstationName;
this.form.processId = row.processId;
this.form.processCode = row.processCode;
this.form.processName = row.processName;
}
},
//点击人员选择按钮