Skip to content

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

任务单2

parent 8faa183f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 441 additions and 371 deletions
src/components/workunitSelect/single.vue
View file @ f2ff72cf
This diff is collapsed.
src/views/mes/pro/prototypeMake/prototypeMakeApply.vue
View file @ f2ff72cf
......@@ -47,7 +47,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
......@@ -57,7 +57,7 @@
v-hasPermi="['mes:pro:prototypeMake:add']"
>新增</el-button
>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
type="success"
......
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @ f2ff72cf
......@@ -133,7 +133,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<!-- <el-col :md="8" :xs="12">
<el-form-item label="NG原因" prop="ngReason">
<el-input
v-model="form.ngReason"
......@@ -141,7 +141,7 @@
disabled
></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :md="8" :xs="12">
<el-form-item label="计划完成日期" prop="plannedFinishDate">
<el-date-picker
......
src/views/mes/pro/schedule/ganttedit.vue
View file @ f2ff72cf
......@@ -59,10 +59,10 @@ export default {
workorderName: null,
orderSource: null,
sourceCode: null,
productId: null,
productCode: null,
productName: null,
productSpc: null,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantity: null,
quantityProduced: null,
......
src/views/mes/pro/schedule/ganttx.vue
View file @ f2ff72cf
This diff is collapsed.
src/views/mes/pro/schedule/index.vue
View file @ f2ff72cf
......@@ -287,68 +287,74 @@
>
<el-form ref="form" :model="form" label-width="80px">
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-col :lg="8" :md="8" :sm="12" :xs="12">
<el-form-item label="编号" prop="taskCode">
<el-input v-model="form.taskCode" readonly="readonly" />
<el-input v-model="form.taskCode" readonly="readonly" disabled/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-col :lg="8" :md="8" :sm="12" :xs="12">
<el-form-item label="名称" prop="taskName">
<el-input v-model="form.taskName" readonly="readonly" />
<el-input v-model="form.taskName" readonly="readonly" disabled />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-col :lg="8" :md="8" :sm="12" :xs="12">
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.itemName" readonly="readonly" />
<el-input v-model="form.itemName" readonly="readonly" disabled/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
</el-row>
<el-row>
<el-col :lg="8" :md="8" :sm="12" :xs="12">
<el-form-item label="工序名称" prop="processName">
<el-input v-model="form.processName" readonly="readonly" />
<el-input v-model="form.processName" readonly="readonly" disabled />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-col :lg="8" :md="8" :sm="12" :xs="12">
<el-form-item label="工作站" prop="workstationName">
<el-input v-model="form.workstationName" readonly="readonly" />
<el-input v-model="form.workstationName" readonly="readonly" disabled />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工作单元" prop="workunitId">
<el-input v-model="form.workunitName" />
<el-col :lg="8" :md="8" :sm="12" :xs="12">
<el-form-item label="工作单元" prop="workunitId" required: true>
<el-input v-model="form.workunitName" >
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['WorkunitSelect'].showFlag = true"
></el-button>
</el-input>
<WorkuintSelect
ref="WorkunitSelect"
:workstationName="form.workstationName"
@onSelected="onWorkunitSelect"
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="排产数量" prop="quantity">
<el-input v-model="form.quantity" readonly="readonly" />
</el-row>
<el-row>
<el-col :lg="8" :md="8" :sm="12" :xs="12">
<el-form-item label="排产数量" prop="quantity" required: true>
<el-input-number :step="1" :min="0" v-model="form.quantity" placeholder="请输入排产数量" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="开始生产时间" prop="startTime">
<el-col :lg="8" :md="8" :sm="12" :xs="12">
<el-form-item label="开始时间" prop="startTime" required: true>
<el-date-picker
v-model="form.startTime"
type="date"
value-format="yyyy-MM-dd:hh-mm-ss"
type="datetime"
value-format="yyyy-MM-dd hh:mm:ss"
placeholder="请选择开始时间"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="生产时长" prop="duration">
<el-input v-model="form.duration" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="需求日期" prop="requestDate">
<el-date-picker
v-model="form.requestDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择需求日期"
>
</el-date-picker>
<el-col :lg="8" :md="8" :sm="12" :xs="12">
<el-form-item label="生产时长" prop="duration" required: true>
<el-input-number :step="1" :min="0" v-model="form.duration" placeholder="请输入生产时长" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input
......@@ -360,21 +366,21 @@
</el-col>
</el-row>
</el-form>
<el-steps
<!-- <el-steps
:active="activeProcess"
v-if="form.taskId != null"
align-center
simple
>
<el-step
> -->
<!-- <el-step
v-for="(item, index) in processOptions"
:title="item.itemName"
:key="item.itemId"
@click.native="handleStepClick(index)"
>
</el-step>
</el-steps>
<template v-if="activeProcess == index && form.taskId != null">
</el-steps> -->
<!-- <template v-if="activeProcess == index && form.taskId != null">
<el-card v-for="(item, index) in processOptions" :key="index">
<ProTask
:workorderId="form.taskId"
......@@ -384,7 +390,7 @@
:optType="optType"
></ProTask>
</el-card>
</template>
</template> -->
<div slot="footer" class="dialog-footer">
<el-button
type="primary"
......@@ -432,8 +438,10 @@ import {
addProtaskList,
} from "@/api/mes/pro/protask";
import { listProductprocess } from "@/api/mes/pro/routeprocess";
import WorkuintSelect from "@/components/workunitSelect/single.vue";
import ProTask from "./proTask.vue";
import GanttChar from "./ganttx.vue";
import { listWorkunit } from "@/api/mes/md/workunit";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
......@@ -444,6 +452,7 @@ export default {
Treeselect,
ProTask,
GanttChar,
WorkuintSelect,
},
data() {
return {
......@@ -554,10 +563,22 @@ export default {
this.$refs.ganttChar.reload();
});
},
// 获取工作单元
onWorkunitSelect(row) {
console.log(45456, row);
if (row != undefined && row != null) {
this.form.workunitId = row.workunitId;
this.form.workunitName = row.workunitName;
console.log(111111, this.form)
}
},
//获取当前产品对应的生产工序
getProcess() {
listProductprocess(this.form.productId).then((response) => {
listProductprocess(this.form.itemId).then((response) => {
this.processOptions = response.data;
});
},
......
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