Skip to content

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

任务单2

parent 8faa183f
Show whitespace changes
Inline Side-by-side
Showing with 441 additions and 371 deletions
src/components/workunitSelect/single.vue
View file @ f2ff72cf
<template> <template>
<el-dialog title="工作单元选择" <el-dialog
title="工作单元选择"
v-if="showFlag" v-if="showFlag"
:visible.sync="showFlag" :visible.sync="showFlag"
:modal= false :modal="false"
width="80%" width="80%"
center center
> >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="工作单元编码" prop="workunitCode"> <el-form-item label="工作单元编码" prop="workunitCode">
<el-input <el-input
v-model="queryParams.workunitCode" v-model="queryParams.workunitCode"
...@@ -32,40 +40,46 @@ ...@@ -32,40 +40,46 @@
/> />
</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> </el-form>
<el-table v-loading="loading" :data="workorderList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick"> <el-table
<el-table-column width="55" align="center" > v-loading="loading"
:data="workunitList"
@current-change="handleCurrent"
@row-dblclick="handleRowDbClick"
>
<el-table-column width="55" align="center">
<template v-slot="scope"> <template v-slot="scope">
<el-radio v-model="selectedWorkorderId" :label="scope.row.workorderId" @change="handleRowChange(scope.row)">{{""}}</el-radio> <el-radio
</template> v-model="selectedWorkunitId"
</el-table-column> :label="scope.row.workunitId"
<el-table-column label="工单编码" width="180" prop="workorderCode" > @change="handleRowChange(scope.row)"
</el-table-column> >{{ "" }}</el-radio
<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> </template>
</el-table-column> </el-table-column>
<el-table-column label="工作站名称" width="180" prop="workunitCode" />
<el-table-column
label="工作单元编码"
width="200"
align="center"
prop="workunitName"
:show-overflow-tooltip="true"
/>
<el-table-column label="工作单元名称" align="center" prop="orderSource" />
</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"
...@@ -73,23 +87,25 @@ ...@@ -73,23 +87,25 @@
/> />
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button> <el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag=false">取 消</el-button> <el-button @click="showFlag = false">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { listWorkorder} from "@/api/mes/pro/workunit"; import { listWorkunit } from "@/api/mes/md/workunit";
export default { export default {
name: 'WorkOrderSelectSingle', name: "WorkunitSelectSingle",
components: {}, components: {},
dicts: ['mes_order_status','mes_workorder_sourcetype'], dicts: [],
props:{ props: {
workunit: { workstationName: {
type: Object, type: String,
default: function(){ default: "",
return {'workorderType': 'SELF'} },
}} //外部传入的工单过滤信息 workunitId: {
type: Number | undefined,
default: undefined,
}, //外部传入的工单过滤信息
}, },
data() { data() {
return { return {
...@@ -97,7 +113,7 @@ ...@@ -97,7 +113,7 @@
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
selectedWorkorderId: undefined, selectedWorkunitId: undefined,
selectedRows: [], selectedRows: [],
// 非单个禁用 // 非单个禁用
single: true, single: true,
...@@ -108,47 +124,32 @@ ...@@ -108,47 +124,32 @@
// 总条数 // 总条数
total: 0, total: 0,
// 生产工单表格数据 // 生产工单表格数据
workorderList: [], workunitList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
workorderCode: null, workunitCode: null,
workorderName: null, workunitName: null,
workorderType: this.workunit.workunitType, workstationId: null,
orderSource: null, workstationName: this.workstationName,
sourceCode: null, workunitId: null,
productId: null, enableFlag: "Y",
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() { created() {
this.getList(); this.getList();
this.queryParams.workstationName = this.workstationName;
}, },
methods:{ methods: {
/** 查询生产工单列表 */ /** 查询生产工单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listWorkorder(this.queryParams).then(response => { listWorkunit(this.queryParams).then((response) => {
this.workorderList = response.rows; this.workunitList = response.rows;
this.loading = false; this.loading = false;
}); });
}, },
...@@ -161,38 +162,38 @@ ...@@ -161,38 +162,38 @@
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
handleCurrent(row){ handleCurrent(row) {
if(row){ if (row) {
this.selectedRows = row; this.selectedRows = row;
} }
}, },
// 单选选中数据 // 单选选中数据
handleRowChange(row) { handleRowChange(row) {
if(row){ if (row) {
this.selectedRows = row; this.selectedRows = row;
} }
}, },
//双击选中 //双击选中
handleRowDbClick(row){ handleRowDbClick(row) {
if(row){ if (row) {
this.selectedRows = row; this.selectedRows = row;
this.$emit('onSelected',this.selectedRows); this.$emit("onSelected", this.selectedRows);
this.showFlag = false; this.showFlag = false;
} }
}, },
//确定选中 //确定选中
confirmSelect(){ confirmSelect() {
if(this.selectedWorkorderId == null || this.selectedWorkorderId == 0){ if (this.selectedWorkunitId == null || this.selectedWorkunitId == 0) {
this.$notify({ this.$notify({
title:'提示', title: "提示",
type:'warning', type: "warning",
message: '请至少选择一条数据!' message: "请至少选择一条数据!",
}); });
return; return;
} }
this.$emit('onSelected',this.selectedRows); this.$emit("onSelected", this.selectedRows);
this.showFlag = false; this.showFlag = false;
} },
} },
} };
</script> </script>
src/views/mes/pro/prototypeMake/prototypeMakeApply.vue
View file @ f2ff72cf
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
v-hasPermi="['mes:pro:prototypeMake:add']" v-hasPermi="['mes:pro:prototypeMake:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
......
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @ f2ff72cf
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <!-- <el-col :md="8" :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"
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
disabled disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :md="8" :xs="12"> <el-col :md="8" :xs="12">
<el-form-item label="计划完成日期" prop="plannedFinishDate"> <el-form-item label="计划完成日期" prop="plannedFinishDate">
<el-date-picker <el-date-picker
......
src/views/mes/pro/schedule/ganttedit.vue
View file @ f2ff72cf
...@@ -59,10 +59,10 @@ export default { ...@@ -59,10 +59,10 @@ export default {
workorderName: null, workorderName: null,
orderSource: null, orderSource: null,
sourceCode: null, sourceCode: null,
productId: null, itemId: null,
productCode: null, itemCode: null,
productName: null, itemName: null,
productSpc: null, specification: null,
unitOfMeasure: null, unitOfMeasure: null,
quantity: null, quantity: null,
quantityProduced: null, quantityProduced: null,
......
src/views/mes/pro/schedule/ganttx.vue
View file @ f2ff72cf
...@@ -3,43 +3,42 @@ ...@@ -3,43 +3,42 @@
</template> </template>
<script> <script>
import { gantt } from 'dhtmlx-gantt'; import { gantt } from "dhtmlx-gantt";
export default { export default {
name: 'GanttChar', name: "GanttChar",
data() { data() {
return { return {
newObj: {} newObj: {},
} };
}, },
props: { props: {
tasks: { tasks: {
type: Object, type: Object,
default () { default() {
return {data: [], links: []} return { data: [], links: [] };
} },
}, },
optType: { optType: {
type: String, type: String,
default (){ default() {
return 'view' return "view";
} },
}, },
ids: { ids: {
type: Array, type: Array,
default (){ default() {
return [] return [];
} },
}
}, },
created() {
}, },
created() {},
mounted: function () { mounted: function () {
// 初始化甘特图配置 // 初始化甘特图配置
this.initConfig(); this.initConfig();
gantt.plugins({ gantt.plugins({
marker: true marker: true,
}); });
// 甘特图初始化和导入数据 // 甘特图初始化和导入数据
gantt.init(this.$refs.gantt); gantt.init(this.$refs.gantt);
...@@ -48,9 +47,7 @@ export default { ...@@ -48,9 +47,7 @@ export default {
methods: { methods: {
// 初始化甘特图数据 // 初始化甘特图数据
initData() { initData() {},
},
reload() { reload() {
gantt.clearAll(); gantt.clearAll();
this.addTodayLine(); this.addTodayLine();
...@@ -65,53 +62,83 @@ export default { ...@@ -65,53 +62,83 @@ export default {
start_date: today, start_date: today,
css: "today", css: "today",
text: "今天", text: "今天",
title: "今天: " + date_to_str(today) title: "今天: " + date_to_str(today),
}); });
}, },
// 初始化甘特图配置 // 初始化甘特图配置
initConfig() { initConfig() {
// 1 基础配置 // 1 基础配置
// 1.1 甘特图是否只读 // 1.1 甘特图是否只读
if(this.optType =='view'){ if (this.optType == "view") {
gantt.config.readonly = true; gantt.config.readonly = true;
}else{ } else {
gantt.config.readonly = false; gantt.config.readonly = false;
} }
// 1.2 表格列设置 // 1.2 表格列设置
gantt.config.duration_unit="hour"; gantt.config.duration_unit = "hour";
gantt.config.duration_step=8; gantt.config.duration_step = 8;
gantt.config.grid_width=520; gantt.config.grid_width = 520;
gantt.config.columns = [ gantt.config.columns = [
{name:"text", label:"任务名", tree:true, width:'200' }, { name: "text", label: "任务名", tree: true, width: "200" },
{name:"workstation",label:"工作站",align:"center",width:'*'}, { name: "workstation", label: "工作站", align: "center", width: "*" },
{name:"process",label:"工序",align:"center",width:'*'}, { name: "process", label: "工序", align: "center", width: "*" },
{name:"start_date", label:"开始时间", align:"center", width:'*' }, { name: "start_date", label: "开始时间", align: "center", width: "*" },
{name:"end_date", label:"结束时间", align:"center" , width:'*'}, { name: "end_date", label: "结束时间", align: "center", width: "*" },
]; ];
// 1.3 设置中文 // 1.3 设置中文
gantt.i18n.setLocale("cn"); gantt.i18n.setLocale("cn");
// 1.4 鼠标悬浮框 // 1.4 鼠标悬浮框
gantt.plugins({tooltip: true});// 启用tooltip悬浮框 gantt.plugins({ tooltip: true }); // 启用tooltip悬浮框
gantt.templates.tooltip_text = function(start, end, task) { gantt.templates.tooltip_text = function (start, end, task) {
if(task.type=='project'){ if (task.type == "project") {
return "<b style='text-align:left;'>生产工单:</b> " + task.text +" <span style='text-align:left;'>" +" 完成比例："+ Math.round(task.progress * 100) + "% </span>"; return (
}else{ "<b style='text-align:left;'>生产任务:</b> " +
return "<b style='text-align:left;'>生产任务:</b> "+task.process+" "+ task.text +" <span style='text-align:left;'>" +" 完成比例："+ Math.round(task.progress * 100) + "% </span>"; task.text +
" <span style='text-align:left;'>" +
" 完成比例：" +
Math.round(task.progress * 100) +
"% </span>"
);
} else {
return (
"<b style='text-align:left;'>生产任务:</b> " +
task.process +
" " +
task.text +
" <span style='text-align:left;'>" +
" 完成比例：" +
Math.round(task.progress * 100) +
"% </span>"
);
} }
}; };
// 1.5 初始化的时候就展开树结构 // 1.5 初始化的时候就展开树结构
gantt.config.open_tree_initially = true; gantt.config.open_tree_initially = true;
// 1.6 显示到任务上的文本 // 1.6 显示到任务上的文本
gantt.templates.task_text = function (start, end, task) { gantt.templates.task_text = function (start, end, task) {
if(task.type=='project'){ if (task.type == "project") {
return "<b style='text-align:left;'>生产工单:</b> " + task.text +" <span style='text-align:left;'>" +" 完成比例："+ Math.round(task.progress * 100) + "% </span>"; return (
}else{ "<b style='text-align:left;'>生产工单:</b> " +
return "<b style='text-align:left;'>生产任务:</b> "+task.process+" "+ task.text +" <span style='text-align:left;'>" +" 完成比例："+ Math.round(task.progress * 100) + "% </span>"; task.text +
" <span style='text-align:left;'>" +
" 完成比例：" +
Math.round(task.progress * 100) +
"% </span>"
);
} else {
return (
"<b style='text-align:left;'>生产任务:</b> " +
task.process +
" " +
task.text +
" <span style='text-align:left;'>" +
" 完成比例：" +
Math.round(task.progress * 100) +
"% </span>"
);
} }
}; };
// 1.7 显示单元格 // 1.7 显示单元格
gantt.config.show_task_cells = true; gantt.config.show_task_cells = true;
...@@ -126,32 +153,37 @@ export default { ...@@ -126,32 +153,37 @@ export default {
var weekScaleTemplate = function (date) { var weekScaleTemplate = function (date) {
var dateToStr = gantt.date.date_to_str("%M %d"); var dateToStr = gantt.date.date_to_str("%M %d");
var endDate = gantt.date.add(gantt.date.add(date, 1, "week"), -1, "day"); var endDate = gantt.date.add(
gantt.date.add(date, 1, "week"),
-1,
"day"
);
return dateToStr(date) + " - " + dateToStr(endDate); return dateToStr(date) + " - " + dateToStr(endDate);
}; };
var dayTemplate = function(date){ var dayTemplate = function (date) {
var dateToStr = gantt.date.date_to_str("%M %d"); var dateToStr = gantt.date.date_to_str("%M %d");
var weekDay = gantt.date.date_to_str("%D"); var weekDay = gantt.date.date_to_str("%D");
return dateToStr(date); + "(" + weekDay(date) + ")"; return dateToStr(date);
+"(" + weekDay(date) + ")";
}; };
var daysStyle = function(date){ var daysStyle = function (date) {
// you can use gantt.isWorkTime(date) // you can use gantt.isWorkTime(date)
// when gantt.config.work_time config is enabled // when gantt.config.work_time config is enabled
// In this sample it's not so we just check week days // In this sample it's not so we just check week days
if(date.getDay() === 0 || date.getDay() === 6){ if (date.getDay() === 0 || date.getDay() === 6) {
return "weekend"; return "weekend";
} }
return ""; return "";
}; };
gantt.config.scales =[ gantt.config.scales = [
{unit:"week", step:1,format: weekScaleTemplate}, { unit: "week", step: 1, format: weekScaleTemplate },
{unit:"day", step:1,format: dayTemplate,css: daysStyle}, { unit: "day", step: 1, format: dayTemplate, css: daysStyle },
{unit:"hour", step:8,format: "%H:%i"}, //这里的step要根据当前的班次设置来。如果是三班倒则是8，如果是两班倒则是12。 { unit: "hour", step: 8, format: "%H:%i" }, //这里的step要根据当前的班次设置来。如果是三班倒则是8，如果是两班倒则是12。
] ];
gantt.config.scale_height = 50; gantt.config.scale_height = 50;
...@@ -178,118 +210,134 @@ export default { ...@@ -178,118 +210,134 @@ export default {
let t = this.$props.tasks; let t = this.$props.tasks;
let c = this.$props.ids; let c = this.$props.ids;
gantt.attachEvent("onAfterTaskUpdate",function(id,obj){ gantt.attachEvent("onAfterTaskUpdate", function (id, obj) {
debugger; debugger;
let tt = t.data.filter( item=> item.id == id); let tt = t.data.filter((item) => item.id == id);
tt=obj; tt = obj;
c.push(id); c.push(id);
}); });
},
},
} };
}
}
</script> </script>
<style> <style>
@import "~dhtmlx-gantt/codebase/dhtmlxgantt.css"; @import "~dhtmlx-gantt/codebase/dhtmlxgantt.css";
/* 任务名前的logo */ /* 任务名前的logo */
.gantt_tree_icon.gantt_file, .gantt_tree_icon.gantt_folder_open, .gantt_tree_icon.gantt_folder_closed{width: 10px; background-image: none;} .gantt_tree_icon.gantt_file,
/* 任务线 */ .gantt_tree_icon.gantt_folder_open,
.gantt_task_line{ .gantt_tree_icon.gantt_folder_closed {
width: 10px;
background-image: none;
}
/* 任务线 */
.gantt_task_line {
height: 16px !important; height: 16px !important;
line-height: 16px !important; line-height: 16px !important;
margin-top: 8px; margin-top: 8px;
border: none !important; border: none !important;
border-radius: 8px; border-radius: 8px;
} }
.gantt_task_line.gantt_milestone{border-radius: 0;} .gantt_task_line.gantt_milestone {
/* 里程碑 */ border-radius: 0;
.gantt_task_line.gantt_milestone{ }
/* 里程碑 */
.gantt_task_line.gantt_milestone {
width: 12px !important; width: 12px !important;
height: 16px !important; height: 16px !important;
border: none !important; border: none !important;
background-color: inherit !important; background-color: inherit !important;
background-size: cover; background-size: cover;
} }
/* 里程碑icon */ /* 里程碑icon */
.gantt_task_line.gantt_milestone .gantt_task_content{ .gantt_task_line.gantt_milestone .gantt_task_content {
width: 12px; width: 12px;
height: 16px; height: 16px;
margin-left: 40px; margin-left: 40px;
transform: rotate(0deg) !important; transform: rotate(0deg) !important;
background-image: url('../../../../assets/logo/logo.png') !important; background-image: url("../../../../assets/logo/logo.png") !important;
} }
/* 左侧悬浮单元格背景色 */ /* 左侧悬浮单元格背景色 */
.gantt_grid_data .gantt_row.odd:hover, .gantt_grid_data .gantt_row:hover{background-color: #f3f1fe !important;} .gantt_grid_data .gantt_row.odd:hover,
/* 选中一行背景色 */ .gantt_grid_data .gantt_row:hover {
.gantt_grid_data .gantt_row.gantt_selected, .gantt_grid_data .gantt_row.odd.gantt_selected, .gantt_task_row.gantt_selected{background-color: #f3f1fe !important;} background-color: #f3f1fe !important;
/* 选中一行每个单元格右border颜色 */ }
.gantt_task_row.gantt_selected .gantt_task_cell{border-right-color: #f3f1fe !important;} /* 选中一行背景色 */
.gantt_grid_data .gantt_row.gantt_selected,
/* 标记线 */ .gantt_grid_data .gantt_row.odd.gantt_selected,
.gantt_marker{background-color: #f4ae05;opacity: .8;} .gantt_task_row.gantt_selected {
background-color: #f3f1fe !important;
}
/* 选中一行每个单元格右border颜色 */
.gantt_task_row.gantt_selected .gantt_task_cell {
border-right-color: #f3f1fe !important;
}
/* 标记线 */
.gantt_marker {
background-color: #f4ae05;
opacity: 0.8;
}
/*滚动条整体样式*/ /*滚动条整体样式*/
.gantt-wrapper ::-webkit-scrollbar { .gantt-wrapper ::-webkit-scrollbar {
width: 14px; /*宽分别对应竖滚动条的尺寸*/ width: 14px; /*宽分别对应竖滚动条的尺寸*/
height: 6px; /*高分别对应横滚动条的尺寸*/ height: 6px; /*高分别对应横滚动条的尺寸*/
} }
/*滚动条里面轨道*/ /*滚动条里面轨道*/
.gantt-wrapper ::-webkit-scrollbar-track { .gantt-wrapper ::-webkit-scrollbar-track {
background-color: rgba(0,0,0,.2); background-color: rgba(0, 0, 0, 0.2);
border-radius: 5px; border-radius: 5px;
} }
/*滚动条里面拖动条*/ /*滚动条里面拖动条*/
.gantt-wrapper ::-webkit-scrollbar-thumb { .gantt-wrapper ::-webkit-scrollbar-thumb {
background-color: rgba(0,0,0,.3); background-color: rgba(0, 0, 0, 0.3);
border-radius: 5px; border-radius: 5px;
} }
.gantt-wrapper ::-webkit-scrollbar-thumb:hover { .gantt-wrapper ::-webkit-scrollbar-thumb:hover {
background-color: rgba(0,0,0,.5); background-color: rgba(0, 0, 0, 0.5);
border-radius: 5px; border-radius: 5px;
} }
/* 展开收起背景图片 */ /* 展开收起背景图片 */
.gantt_tree_icon.gantt_close, .gantt_tree_icon.gantt_open{ .gantt_tree_icon.gantt_close,
.gantt_tree_icon.gantt_open {
background-image: none !important; background-image: none !important;
position: relative; position: relative;
} }
/* 收起小三角 */ /* 收起小三角 */
.gantt_tree_icon.gantt_close::after{ .gantt_tree_icon.gantt_close::after {
position: absolute; position: absolute;
content: ''; content: "";
top: 14px; top: 14px;
left: 10px; left: 10px;
border-right: 6px solid transparent; border-right: 6px solid transparent;
border-left: 6px solid transparent; border-left: 6px solid transparent;
border-top: 6px solid #999999; border-top: 6px solid #999999;
}
} /* 展开小三角 */
/* 展开小三角 */ .gantt_tree_icon.gantt_open::after {
.gantt_tree_icon.gantt_open::after{
position: absolute; position: absolute;
content: ''; content: "";
top: 12px; top: 12px;
left: 12px; left: 12px;
border-bottom: 6px solid transparent; border-bottom: 6px solid transparent;
border-top: 6px solid transparent; border-top: 6px solid transparent;
border-left: 6px solid #999999; border-left: 6px solid #999999;
} }
/* 下方滚动条宽度 */ /* 下方滚动条宽度 */
.gantt_layout_cell .gantt_hor_scroll{ .gantt_layout_cell .gantt_hor_scroll {
width: calc(100% - 199px) !important; width: calc(100% - 199px) !important;
left: 199px; left: 199px;
} }
.scaleStyle{ .scaleStyle {
height: 20px; height: 20px;
} }
/* 周末背景颜色 */ /* 周末背景颜色 */
.weekend{ .weekend {
background: rgb(189, 185, 186) !important; background: rgb(189, 185, 186) !important;
width: 30s width: 30s;
} }
</style> </style>
src/views/mes/pro/schedule/index.vue
View file @ f2ff72cf
...@@ -287,68 +287,74 @@ ...@@ -287,68 +287,74 @@
> >
<el-form ref="form" :model="form" label-width="80px"> <el-form ref="form" :model="form" label-width="80px">
<el-row> <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-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-form-item>
</el-col> </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-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-form-item>
</el-col> </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-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-form-item>
</el-col> </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-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-form-item>
</el-col> </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-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-form-item>
</el-col> </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="workunitId"> <el-form-item label="工作单元" prop="workunitId" required: true>
<el-input v-model="form.workunitName" /> <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-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> </el-row>
<el-form-item label="排产数量" prop="quantity"> <el-row>
<el-input v-model="form.quantity" readonly="readonly" /> <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-form-item>
</el-col> </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="startTime"> <el-form-item label="开始时间" prop="startTime" required: true>
<el-date-picker <el-date-picker
v-model="form.startTime" v-model="form.startTime"
type="date" type="datetime"
value-format="yyyy-MM-dd:hh-mm-ss" value-format="yyyy-MM-dd hh:mm:ss"
placeholder="请选择开始时间" placeholder="请选择开始时间"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </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="duration"> <el-form-item label="生产时长" prop="duration" required: true>
<el-input v-model="form.duration" /> <el-input-number :step="1" :min="0" v-model="form.duration" placeholder="请输入生产时长" />
</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-form-item> </el-form-item>
</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 <el-input
...@@ -360,21 +366,21 @@ ...@@ -360,21 +366,21 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-steps <!-- <el-steps
:active="activeProcess" :active="activeProcess"
v-if="form.taskId != null" v-if="form.taskId != null"
align-center align-center
simple simple
> > -->
<el-step <!-- <el-step
v-for="(item, index) in processOptions" v-for="(item, index) in processOptions"
:title="item.itemName" :title="item.itemName"
:key="item.itemId" :key="item.itemId"
@click.native="handleStepClick(index)" @click.native="handleStepClick(index)"
> >
</el-step> </el-step>
</el-steps> </el-steps> -->
<template v-if="activeProcess == index && form.taskId != null"> <!-- <template v-if="activeProcess == index && form.taskId != null">
<el-card v-for="(item, index) in processOptions" :key="index"> <el-card v-for="(item, index) in processOptions" :key="index">
<ProTask <ProTask
:workorderId="form.taskId" :workorderId="form.taskId"
...@@ -384,7 +390,7 @@ ...@@ -384,7 +390,7 @@
:optType="optType" :optType="optType"
></ProTask> ></ProTask>
</el-card> </el-card>
</template> </template> -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button <el-button
type="primary" type="primary"
...@@ -432,8 +438,10 @@ import { ...@@ -432,8 +438,10 @@ import {
addProtaskList, addProtaskList,
} from "@/api/mes/pro/protask"; } from "@/api/mes/pro/protask";
import { listProductprocess } from "@/api/mes/pro/routeprocess"; import { listProductprocess } from "@/api/mes/pro/routeprocess";
import WorkuintSelect from "@/components/workunitSelect/single.vue";
import ProTask from "./proTask.vue"; import ProTask from "./proTask.vue";
import GanttChar from "./ganttx.vue"; import GanttChar from "./ganttx.vue";
import { listWorkunit } from "@/api/mes/md/workunit";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
...@@ -444,6 +452,7 @@ export default { ...@@ -444,6 +452,7 @@ export default {
Treeselect, Treeselect,
ProTask, ProTask,
GanttChar, GanttChar,
WorkuintSelect,
}, },
data() { data() {
return { return {
...@@ -554,10 +563,22 @@ export default { ...@@ -554,10 +563,22 @@ export default {
this.$refs.ganttChar.reload(); 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() { getProcess() {
listProductprocess(this.form.productId).then((response) => { listProductprocess(this.form.itemId).then((response) => {
this.processOptions = response.data; 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