Skip to content

M
mes-ui
Commit 53ff7fa0 authored by 李驰骋's avatar 李驰骋
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 28ae2cfd e5d918d9
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 46 deletions
src/api/mes/tm/maintenance.js
View file @ 53ff7fa0
......@@ -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 @ 53ff7fa0
......@@ -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/request/components/requestIndex.vue
View file @ 53ff7fa0
......@@ -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 @ 53ff7fa0
......@@ -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/tm/maintenance/index.vue
View file @ 53ff7fa0
......@@ -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