Skip to content

M
mes-ui
Commit 28e469f3 authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents d33264c9 c996b867
Hide whitespace changes
Inline Side-by-side
Showing with 442 additions and 71 deletions
.env.development
View file @ 28e469f3
# 页面标题
VUE_APP_TITLE = 宝绅系统
VUE_APP_TITLE = 宝绅-生产执行系统
# 开发环境配置
ENV = 'development'
......
.env.mes
View file @ 28e469f3
# 页面标题
VUE_APP_TITLE = 宝绅系统
VUE_APP_TITLE = 宝绅-生产执行系统
NODE_ENV = production
......
.env.production
View file @ 28e469f3
# 页面标题
VUE_APP_TITLE = 宝绅系统
VUE_APP_TITLE = 宝绅-生产执行系统
# 生产环境配置
ENV = 'production'
......
.env.staging
View file @ 28e469f3
# 页面标题
VUE_APP_TITLE = 宝绅系统
VUE_APP_TITLE = 宝绅-生产执行系统
NODE_ENV = production
......
src/api/mes/pro/scheduleLog.js 0 → 100644
View file @ 28e469f3
import request from '@/utils/request'
// 查询排产日志列表
export function listScheduleLog(query) {
return request({
url: '/pro/scheduleLog/list',
method: 'get',
params: query
})
}
// 查询排产日志详细
export function getScheduleLog(id) {
return request({
url: '/pro/scheduleLog/' + id,
method: 'get'
})
}
// 新增排产日志
export function addScheduleLog(data) {
return request({
url: '/pro/scheduleLog',
method: 'post',
data: data
})
}
// 修改排产日志
export function updateScheduleLog(data) {
return request({
url: '/pro/scheduleLog',
method: 'put',
data: data
})
}
// 删除排产日志
export function delScheduleLog(id) {
return request({
url: '/pro/scheduleLog/' + id,
method: 'delete'
})
}
src/api/mes/pro/workorder.js
View file @ 28e469f3
......@@ -151,3 +151,12 @@ export function getWorkOrderSoDirectivePkgRequireTypeEnum(workorderId) {
method: 'get'
})
}
// 转急单
export function updateRequestDateApi(data) {
return request({
url: "/mes/pro/workorder/updateRequestDate",
method: "post",
data: data,
});
}
src/api/mes/tm/maintenance.js
View file @ 28e469f3
......@@ -36,7 +36,7 @@ export function updateMaintenance(data) {
}
// 开始维护刀模版
export function delMaintenance(toolMaintenanceId) {
export function startMaintenance(toolMaintenanceId) {
return request({
url: '/md/maintenance/' + toolMaintenanceId,
method: 'Post'
......@@ -48,4 +48,4 @@ export function delMaintenan(toolMaintenanceId) {
url: '/md/maintenance/' + toolMaintenanceId,
method: 'delete'
})
}
\ No newline at end of file
}
src/components/TmTool/index.vue
View file @ 28e469f3
......@@ -115,6 +115,11 @@
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_tool_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="库存数量" align="center" prop="quantity" />
<el-table-column label="可用数量" align="center" prop="quantityAvail" />
......
src/views/mes/pro/productionSolution/components/ProogingSpecificationSheet.vue
View file @ 28e469f3
......@@ -123,6 +123,15 @@
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度mm" prop="thick">
<el-input
v-model="form.thick"
placeholder
type="number"
:precision="2" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="印张长度" prop="printingPaperlenth"
><el-input
......@@ -550,7 +559,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
......@@ -561,14 +570,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="排版要求" prop="dtaRemark">
<el-input v-model="form.dtaRemark" placeholder />
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="23">
<el-form-item label="备注" prop="remark">
......@@ -698,6 +707,7 @@ export default {
layerNum: "",
width: "",
height: "",
thick:"",
printingPaperlenth: "",
printPaperwidth: "",
sendworkMultiple: "",
......@@ -720,7 +730,6 @@ export default {
backImg: "",
blownFilmWidth: "",
blownFilmThickness: "",
printPaperwidth: "",
inlay: "",
customerConfirmedBy: "",
customerConfirmedDate: "",
......@@ -761,7 +770,7 @@ export default {
/**更新行 */
updateRow(row, idx) {
Object.assign(this.form, row);
this.currentRowIndex = idx;
this.showFlag = true;
......@@ -780,7 +789,7 @@ export default {
},
getComData() {
return this.form;
},
/**重置表单 */
resetForm() {
......@@ -797,6 +806,7 @@ export default {
layerNum: "",
width: "",
height: "",
thick: "",
printingPaperlenth: "",
printPaperwidth: "",
sendworkMultiple: "",
......@@ -819,7 +829,6 @@ export default {
backImg: "",
blownFilmWidth: "",
blownFilmThickness: "",
printPaperwidth: "",
inlay: "",
customerConfirmedBy: "",
customerConfirmedDate: "",
......@@ -839,7 +848,7 @@ export default {
dtaRemark: "",
dta: "",
};
},
/**重置组件状态 */
resetState() {
......
src/views/mes/pro/request/components/requestIndex.vue
View file @ 28e469f3
......@@ -39,7 +39,7 @@
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="工作中心编码" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作中心编码">
<el-input v-model="form.workstationCode" disabled placeholder="请输入工作中心编码">
<el-button slot="append" icon="el-icon-search" @click="handleItemSelect('WorkstationSelectrRef')" />
</el-input>
<WorkstationSelect
......@@ -58,7 +58,7 @@
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="工作单元编码" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="请输入工作单元编码">
<el-input v-model="form.workunitCode" disabled placeholder="请输入工作单元编码">
<el-button slot="append" icon="el-icon-search" @click="handleItemSelect('WorkunitSelectRef')" />
</el-input>
<WorkuintSelect
......
src/views/mes/pro/request/index.vue
View file @ 28e469f3
......@@ -102,7 +102,7 @@
</el-button>
</template>
</el-table-column>
<el-table-column label="物料编码" align="center" prop="sapItemCode" width="100" />
<!-- <el-table-column label="物料编码" align="center" prop="sapItemCode" width="100" /> -->
<el-table-column label="工作单元" align="center" prop="workunitName" width="100" />
<el-table-column label="领料类型" align="center" prop="applyType">
<template slot-scope="scope">
......@@ -271,6 +271,7 @@
<el-button slot="append" icon="el-icon-search" @click="$refs.workorderselect.showFlag = true"
:disabled="form.materialRequestId"></el-button>
</el-input>
<workorderSelect ref="workorderselect" key="workorderselect" @onSelected="onWorkorderSelect"></workorderSelect>
</el-form-item>
</el-col>
</el-row>
......@@ -281,6 +282,7 @@
<el-button slot="append" icon="el-icon-search" @click="$refs.arangeSelect.showFlag = true"
:disabled="form.materialRequestId"></el-button>
</el-input>
<arangeSelect ref="arangeSelect" :workorderId="form.workorderId" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'arangeSelect')"></arangeSelect>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -289,13 +291,10 @@
<el-button slot="append" icon="el-icon-search" @click="handleBrandSelect"
:disabled="form.materialRequestId"></el-button>
</el-input>
<BrandSelect ref="brSelect" :workorderId="form.workorderId" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'BrandSelect')"></BrandSelect>
</el-form-item>
</el-col>
</el-row>
<BrandSelect ref="brSelect" :workorderId="form.workorderId" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'BrandSelect')"></BrandSelect>
<arangeSelect ref="arangeSelect" :workorderId="form.workorderId" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'arangeSelect')"></arangeSelect>
<workorderSelect ref="workorderselect" key="workorderselect" @onSelected="onWorkorderSelect"></workorderSelect>
<el-row>
<el-col :span="12">
<el-form-item label="申请时间" prop="createTime">
......@@ -458,18 +457,18 @@ export default {
optType: null,
// 表单校验
rules: {
// taskCode: [
// { required: true, message: "任务单号称不能为空", trigger: "blur" }
// ],
taskCode: [
{ required: true, message: "任务单号称不能为空", trigger: "change" }
],
arrangeCode: [
{ required: true, message: "编排单号称不能为空", trigger: "blur" }
{ required: true, message: "编排单号称不能为空", trigger: "change" }
],
createTime: [
{ required: true, message: "申请时间不能为空", trigger: "blur" }
{ required: true, message: "申请时间不能为空", trigger: "change" }
],
workorderCode: [
{ required: true, message: "工单号称不能为空", trigger: "change" }
],
// workorderCode: [
// { required: true, message: "工单号称不能为空", trigger: "blur" }
// ],
}
};
......@@ -530,13 +529,18 @@ export default {
this.form.taskName = row.taskName;
this.form.arrangeCode = row.arrangeCode;
this.form.startTime = row.scheduleStartDate;
this.$set(this.form,'workstationCode',row.workstationCode)
this.$set(this.form,'workunitName',row.workunitName)
this.form.workstationCode = row.workstationCode;
this.form.workunitName = row.workunitName;
// this.$set(this.form,'workstationCode',row.workstationCode)
// this.$set(this.form,'workunitName',row.workunitName)
this.form.workunitCode=row.workunitCode;
this.form.workstationName=row.workstationName;
this.$set(this.form,'endTime',row.scheduleEndDate)
this.form.endTime=row.scheduleEndDate;
// this.$set(this.form,'endTime',row.scheduleEndDate)
} else if (type === 'arangeSelect') {
this.form.arrangeCode = row.arrangeCode;
this.form.workorderCode = row.workorderCode;
this.form.workorderId = row.workorderId;
}
}
......@@ -544,12 +548,16 @@ export default {
onWorkorderSelect(row){
if (row != undefined && row != null) {
this.$set(this.form,'workorderCode',row.workorderCode)
this.form.workorderId=row.workorderId;
this.form.taskCode = '';
this.form.taskId = '';
this.form.arrangeCode = '';
this.form.taskName = '';
// this.$set(this.form,'workorderCode',row.workorderCode)
this.form.workorderId = row.workorderId;
this.form.workorderCode = row.workorderCode;
if(row.arrangeCode) {
this.form.arrangeCode = row.arrangeCode;
}
// this.form.taskCode = '';
// this.form.taskId = '';
// this.form.arrangeCode = '';
// this.form.taskName = '';
}
},
......
src/views/mes/pro/scheduleList/index.vue
View file @ 28e469f3
......@@ -123,8 +123,8 @@
</el-form-item>
<el-form-item label="工单类型" prop="workorderTypes">
<el-select v-model="queryParams.workorderTypes" multiple clearable placeholder="请选择状态" >
<el-option v-for="dict in dict.type.mes_workorder_type"
:key="dict.value"
<el-option v-for="dict in dict.type.mes_workorder_type"
:key="dict.value"
:label="dict.label"
:value="dict.value">
</el-option>
......@@ -1008,7 +1008,7 @@ export default {
type: 'info'
});
makeSchedule(formData).then(response => {
this.$modal.msgSuccess("排程成功");
this.$modal.msgSuccess(response.msg);
this.scheduleVisible = false
this.scheduleBtnDis = false
this.getList();
......
src/views/mes/pro/scheduleLog/index.vue 0 → 100644
View file @ 28e469f3
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="排产开始时间" prop="finishDate">
<el-date-picker clearable
v-model="queryParams.dateRange"
type="datetimerange"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
placeholder="请选择排产开始时间">
</el-date-picker>
</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-row :gutter="10" class="mb8"></el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="scheduleLogList" @selection-change="handleSelectionChange">
<el-table-column label="编排单号" align="center" prop="arrangeCodes" />
<el-table-column label="排产开始时间" align="center" prop="createTime" width="180"/>
<el-table-column label="排产完成时间" align="center" prop="finishDate" width="180"/>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" 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:scheduleLog:edit']"
>查看</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"
/>
<!-- 添加或修改排产日志对话框 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="编排单号" prop="arrangeCodes">
<el-input v-model="form.arrangeCodes" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="排产开始时间" prop="createTime">
<el-date-picker clearable
v-model="form.createTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择排产完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="排产完成时间" prop="finishDate">
<el-date-picker clearable
v-model="form.finishDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择排产完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listScheduleLog, getScheduleLog, delScheduleLog, addScheduleLog, updateScheduleLog } from "@/api/mes/pro/scheduleLog";
export default {
name: "ScheduleLog",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 排产日志表格数据
scheduleLogList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderByColumn:'createTime',
isAsc:'desc'
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询排产日志列表 */
getList() {
this.loading = true;
if(this.queryParams.dateRange){
this.queryParams.createTimeGt=this.queryParams.dateRange[0];
this.queryParams.createTimeLe=this.queryParams.dateRange[1];
}
listScheduleLog(this.queryParams).then(response => {
this.scheduleLogList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null, arrangeCodes: null, createBy: null, createTime: null, finishDate: null, remark: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
orderByColumn:'createTime',
isAsc:'desc'
}
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加排产日志";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getScheduleLog(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看排产日志";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateScheduleLog(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addScheduleLog(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除排产日志编号为"' + ids + '"的数据项？').then(function() {
return delScheduleLog(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('pro/scheduleLog/export', {
...this.queryParams
}, `scheduleLog_${new Date().getTime()}.xlsx`)
}
}
};
</script>
src/views/mes/pro/workorder/indexApply.vue
View file @ 28e469f3
......@@ -53,8 +53,8 @@
</el-form-item>
<el-form-item label="工单类型" prop="workorderType">
<el-select v-model="queryParams.workorderType" clearable placeholder="请选择状态" >
<el-option v-for="dict in dict.type.mes_workorder_type"
:key="dict.value"
<el-option v-for="dict in dict.type.mes_workorder_type"
:key="dict.value"
:label="dict.label"
:value="dict.value">
</el-option>
......@@ -129,6 +129,11 @@
v-hasPermi="['pro:combination:add']">订单组合
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="single" @click="handleTurnWorry">
转急单
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-edit" size="mini" @click="()=>handleCombination('del')" :disabled="combinationDisable"
>取消组合
......@@ -552,7 +557,7 @@
</el-dialog>
<WorkorderRecordSelect ref="WorkorderRecordSelectRef" :data="currentData" />
<div style="overflow: hidden;width: 0;height: 0;">
<div id="productOrderDetail">
<div v-for="(item, index) in productionSolutionTable" :key="'productionSolutionTable' + index">
<productOrderSpecification :productionSolutionTable="item" style="page-break-after:always"></productOrderSpecification>
......@@ -560,6 +565,22 @@
</div>
</div>
</div>
<el-dialog title="添加转急单" :visible.sync="turnWorryVisible" width="340px" append-to-body>
<el-form ref="turnWorryFormRef" :model="turnWorryForm" :rules="turnWorryFormRules" label-width="80px">
<el-form-item label="需求时间" prop="requestDate">
<el-date-picker
v-model="turnWorryForm.requestDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleTurnWorrySubmit">确 定</el-button>
<el-button @click="handleTurnWorryCancle">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -580,7 +601,8 @@ import {
doCheckToolNum,
delComWorkorder,
closeWorkorder,
closeCheck
closeCheck,
updateRequestDateApi
} from "@/api/mes/pro/workorder";
import { addProtaskList } from "@/api/mes/pro/protask";
import shiftSelectMixin from '@/utils/shiftSelectMixin'
......@@ -760,7 +782,17 @@ export default {
},
productionSolutionTable: [],
workOrderTable: [],
printloading: false
printloading: false,
turnWorryVisible: false,
turnWorryForm: {
workorderId: '',
requestDate: ''
},
turnWorryFormRules: {
requestDate: [
{ required: true, message: "需求时间不能为空", trigger: "blur" },
],
},
};
},
activated() {
......@@ -774,7 +806,7 @@ export default {
this.$nextTick(()=>{
this.tableHeight = window.innerHeight - 358
})
},
methods: {
//筛选日期设置默认值
......@@ -870,7 +902,7 @@ export default {
})
}
})
},
showArrangDetail(row, arrangeCode) {
......@@ -982,7 +1014,7 @@ export default {
this.combinationCodes = response
this.$modal.msgSuccess("新增组合单成功2");
}
} else{
this.$modal
.confirm(
......@@ -1203,7 +1235,7 @@ export default {
}
} else {
this.startIndex = lastindex
}
this.ids = this.selectedRows.map(item => item.workorderId)
this.single = this.selectedRows.length !== 1
......@@ -1448,6 +1480,32 @@ export default {
this.form.workorderCode = null;
}
},
handleTurnWorry() {
console.log(this.selectedRows);
if(["PREPARE", "PUBLISHED"].includes(this.selectedRows[0].status)) {
this.turnWorryForm.workorderId = this.selectedRows[0].workorderId;
this.turnWorryVisible = true;
} else {
this.$message({
message: '所选工单不处于已发布或者待发布状态不允许更改！',
type: 'warning'
});
}
},
handleTurnWorrySubmit() {
this.$refs["turnWorryFormRef"].validate(valid => {
if (valid) {
updateRequestDateApi(this.turnWorryForm).then(response => {
this.$modal.msgSuccess("操作成功");
this.handleTurnWorryCancle();
this.getList();
});
}
});
},
handleTurnWorryCancle() {
this.turnWorryVisible = false;
},
},
};
</script>
......
src/views/mes/tm/maintenance/index.vue
View file @ 28e469f3
......@@ -92,10 +92,10 @@
<el-button
type="danger"
plain
icon="el-icon-delete"
icon="el-icon-video-play"
size="mini"
:disabled="single"
@click="handleDelete"
:disabled="multiple"
@click="handleStartMaintain"
v-hasPermi="['md:maintenance:remove']"
>开始维护</el-button>
</el-col>
......@@ -103,7 +103,7 @@
<el-button
type="success"
plain
icon="el-icon-edit"
icon="el-icon-video-pause"
size="mini"
:disabled="single"
@click="handleUpdate(new Date().getTime)"
......@@ -141,11 +141,14 @@
<el-table-column label="SN编码" align="center" prop="toolCode" />
<el-table-column label="存放位置" align="center" prop="location" />
<el-table-column label="维护人" align="center" prop="processPerson" />
<el-table-column label="开始时间" align="center" prop="startTime" />
<el-table-column label="结束时间" align="center" prop="endTime" />
<el-table-column label="维护时间" align="center" prop="processTime" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_tool_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <template slot-scope="scope">
......@@ -209,7 +212,6 @@
icon="el-icon-search"
@click="handleBrandSelect"
:disabled="form.toolMaintenanceId"
></el-button>
</el-input>
<BrandSelect
......@@ -323,11 +325,11 @@
</template>
<script>
import { listMaintenance, getMaintenance, delMaintenance, addMaintenance, updateMaintenance,delMaintenan } from "@/api/mes/tm/maintenance";
import { listMaintenance, getMaintenance, startMaintenance, addMaintenance, updateMaintenance,delMaintenan } from "@/api/mes/tm/maintenance";
import BrandSelect from "@/components/TmTool/index.vue";
export default {
components: {BrandSelect},
dicts: ['mes_maintenance_status','mes_course_type','mes_to_status'],
dicts: ['mes_maintenance_status','mes_course_type','mes_to_status','mes_tool_status'],
name: "Maintenance",
data() {
return {
......@@ -352,7 +354,7 @@ export default {
// 是否显示弹出层
opena: false,
selections: [],
optType: 'add',
// 查询参数
queryParams: {
pageNum: 1,
......@@ -372,8 +374,6 @@ export default {
processTime: null,
startTime: null,
endTime: null,
},
// 表单参数
form: {},
......@@ -438,6 +438,24 @@ export default {
this.$refs.brSelect.showFlag = true;
},
onBrandSelected(row){
console.log(row);
if(row.status == "SCRAP") {
this.$confirm('当前所选刀模已报废，是否继续选择！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if(row != undefined && row != null){
this.form.toolId = row.toolId;
this.form.toolName = row.toolName;
this.form.toolCode = row.toolCode;
this.form.itemCode = row.sapItemCode;
this.form.location = row.location;
}
}).catch(() => {
this.$refs.brSelect.showFlag = true;
});
} else {
if(row != undefined && row != null){
this.form.toolId = row.toolId;
this.form.toolName = row.toolName;
......@@ -445,16 +463,12 @@ export default {
this.form.itemCode = row.sapItemCode;
this.form.location = row.location;
}
}
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.toolMaintenanceId)
this.selections = selection
this.single = selection.length!==1
this.multiple = !selection.length
},
......@@ -503,7 +517,7 @@ export default {
if (this.form.toolMaintenanceId != null) {
updateMaintenance(this.form).then(response => {
this.$modal.msgSuccess("维护结束");
this.opena = false;2
this.opena = false;
this.getList();
});
} else {
......@@ -517,13 +531,13 @@ export default {
});
},
/** 维护 */
handleDelete(row) {
handleStartMaintain(row) {
if (this.selections.some(v => v.startTime)) {
return
return;
}
const toolMaintenanceId = row.toolMaintenanceId || this.ids;
this.$modal.confirm('是否确认要维护刀模版编号为"' + toolMaintenanceId + '"的数据项？').then(function() {
return delMaintenance(toolMaintenanceId);
return startMaintenance(toolMaintenanceId);
}).then(() => {
this.getList();
this.$modal.msgSuccess("开始维护");
......
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