Skip to content

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

维护保养，生产工单

parent 80081a25
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 38 deletions
src/api/mes/tm/maintenance.js
View file @ 24e606a5
......@@ -34,6 +34,14 @@ export function updateMaintenance(data) {
data: data
})
}
export function updateMaintenance1(data) {
return request({
url: '/md/maintenance/update',
method: 'put',
data: data
})
}
// 开始维护刀模版
export function startMaintenance(toolMaintenanceId) {
......
src/views/mes/pro/workorder/indexApply.vue
View file @ 24e606a5
......@@ -1060,7 +1060,7 @@ export default {
})
});
checkArrangeRulesApi(cparams).then(res => {
if(res.msg) {
if(res.msg && res.msg !== '操作完成') {
const list = res.msg.split(',');
this.$confirm(
`工单编号: ${res.msg}产品分类未设置编排规则，是否继续编排`,
......@@ -1086,27 +1086,27 @@ export default {
this.getList();
});
}).catch((action) => {
if (action === 'cancel') {
let params = [];
this.selectedRows.forEach((item, index) => {
if(!list.includes(item.workorderCode)) {
params.push({
arrangeSort: index + 1,
workorderId: item.workorderId,
workorderCode: item.workorderCode,
arrangeCode: null
})
}
});
if(params.length > 0) {
batchAddArrange(params).then(response => {
this.arrangeOpen2 = true;
this.groupCode = response;
this.$modal.msgSuccess("新增编排单成功");
this.getList();
});
}
}
// if (action === 'cancel') {
// let params = [];
// this.selectedRows.forEach((item, index) => {
// if(!list.includes(item.workorderCode)) {
// params.push({
// arrangeSort: index + 1,
// workorderId: item.workorderId,
// workorderCode: item.workorderCode,
// arrangeCode: null
// })
// }
// });
// if(params.length > 0) {
// batchAddArrange(params).then(response => {
// this.arrangeOpen2 = true;
// this.groupCode = response;
// this.$modal.msgSuccess("新增编排单成功");
// this.getList();
// });
// }
// }
})
} else {
let params = [];
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ 24e606a5
......@@ -723,7 +723,8 @@ export default {
this.$refs["WorkOrderSizeRef"].tableData = data.sizeList;
if (this.mode === 'make') {
this.$refs["WorkOrderSizeRef"].tableData.forEach((item) => {
item.quantity = 0;
const quantity = item.quantity - (isNaN(item.packageNumSum) ? 0 : item.packageNumSum);
item.quantity = quantity < 0 ? 0 : quantity
})
}
this.$refs["WorkOrderSizeRef"].tableColums = [];
......
src/views/mes/proTable/supplementaryOrder/index.vue
View file @ 24e606a5
......@@ -5,6 +5,9 @@
<el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
:start-placeholder="'开始日期'" :end-placeholder="'结束日期'"></el-date-picker>
</el-form-item>
<el-form-item :label="'工单号'">
<el-input v-model="queryParams.workorderCode" placeholder="请输入工单号" clearable />
</el-form-item>
<el-form-item :label="'车间'" prop="workshopName">
<el-select filterable v-model="queryParams.workshopName" placeholder="请选择工作中心" clearable>
<el-option
......@@ -35,7 +38,7 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="'是否完工'" prop="workunitId">
<el-form-item :label="'是否完工'">
<el-select v-model="queryParams.complate" placeholder="请选择是否完工" clearable>
<el-option label="否"
value="Incomplete"></el-option>
......@@ -43,7 +46,14 @@
value="Completed"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'是否已补'">
<el-select v-model="queryParams.complement" placeholder="请选择是否已补" clearable>
<el-option label="否"
:value="1"></el-option>
<el-option label="是"
:value="0"></el-option>
</el-select>
</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>
......@@ -164,6 +174,7 @@ import dayjs from 'dayjs'
"userName": null,
"nickName": null,
"workorderCode": null,
complement: null,
"workorderType": null,
"workshopId": null,
"workshopName": null,
......@@ -234,10 +245,17 @@ import dayjs from 'dayjs'
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0]
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1]
}
const params = {...this.queryParams}
const params = {...JSON.parse(JSON.stringify(this.queryParams))}
for(let i = 0; i<Object.keys(params).length; i++){
const arr = Object.keys(params)
const key = arr[i]
if (!params[key] || params[key] == '') params[key] = null
}
if (Number(this.tabIndex) === 1) {
this.theaders = [
{label: '工单编码', value: 'workorder_code'},
{label: '尺码ID', value: 'workorder_so_size_item_id'},
{label: 'SIZE类型', value: 'standard_size_type'},
{label: '缺失SIZE', value: 'size_quantity'},
{label: '差异数量', value: 'diff'},
{label: '已补数量', value: 'complements_sum'}
......
src/views/mes/qc/ipqc/index.vue
View file @ 24e606a5
......@@ -104,6 +104,7 @@
</template>
</el-table-column>
<el-table-column label="检测人员" align="center" prop="inspector" />
<el-table-column label="确认人" align="center" prop="confirmInspectorNickName" />
<el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status" />
......
src/views/mes/tm/maintenance/index.vue
View file @ 24e606a5
......@@ -166,6 +166,14 @@
@click="handleView(scope.row)"
v-hasPermi="['md:maintenance:query']"
>查看</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-query"
v-if="scope.row.maintenanceStatus === 'NON'"
@click="handleUpdata(scope.row)"
v-hasPermi="['md:maintenance:query']"
>修改</el-button>
<el-button
size="mini"
type="text"
......@@ -191,7 +199,6 @@
ref="form"
:model="form"
:rules="rules"
:disabled="form.toolMaintenanceId&&optType!='add'"
label-width="80px" >
<!-- <el-form-item label="单据状态">
<el-radio-group v-model="form.maintenanceStatus">
......@@ -202,12 +209,12 @@
<el-input v-model="form.itemCode" placeholder="请输入物料编码" />
</el-form-item> -->
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择物料号" readonly="readonly" >
<el-input v-model="form.itemCode" placeholder="请选择物料号" readonly="readonly" :disabled="form.toolMaintenanceId&&optType!='add'" >
<el-button
slot="append"
icon="el-icon-search"
@click="handleBrandSelect"
:disabled="form.toolMaintenanceId"
:disabled="form.toolMaintenanceId ? true : false"
></el-button>
</el-input>
<BrandSelect
......@@ -219,21 +226,21 @@
<el-form-item label="名称" prop="toolName">
<el-input v-model="form.toolName" readonly="readonly" />
<el-input v-model="form.toolName" readonly="readonly" :disabled="form.toolMaintenanceId&&optType!='add'" />
</el-form-item>
<el-form-item label="SN编码" prop="toolCode">
<el-input v-model="form.toolCode" readonly="readonly" />
<el-input v-model="form.toolCode" readonly="readonly" :disabled="form.toolMaintenanceId&&optType!='add'" />
</el-form-item>
<el-form-item label="存放位置" prop="location" >
<el-input
v-model="form.location"
readonly="readonly"
:disabled="optType === 'view'"
></el-input>
</el-form-item>
<el-form-item label="维护类型" prop="maintenanceType">
<el-select style="width:100%;" v-model="form.maintenanceType" placeholder="请选择维护类型">
<el-select style="width:100%;" v-model="form.maintenanceType" placeholder="请选择维护类型" :disabled="optType === 'view'">
<el-option
v-for="dict in dict.type.mes_course_type"
:key="dict.value"
......@@ -321,7 +328,7 @@
</template>
<script>
import { listMaintenance, getMaintenance, startMaintenance, addMaintenance, updateMaintenance,delMaintenan } from "@/api/mes/tm/maintenance";
import { listMaintenance, getMaintenance, startMaintenance, addMaintenance, updateMaintenance,delMaintenan,updateMaintenance1 } from "@/api/mes/tm/maintenance";
import BrandSelect from "@/components/TmTool/index.vue";
export default {
components: {BrandSelect},
......@@ -503,17 +510,33 @@ export default {
this.optType = "view";
});
},
handleUpdata(row){
this.reset();
const toolMaintenanceId = row.toolMaintenanceId || this.ids;
getMaintenance(toolMaintenanceId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改刀模版具信息";
this.optType = "edit";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.optType === 'edit') {
updateMaintenance1(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
return
}
if (this.form.toolMaintenanceId != null) {
updateMaintenance(this.form).then(response => {
this.$modal.msgSuccess("维护结束");
this.opena = false;
this.open = false;
this.getList();
});
} else {
......
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