Skip to content

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

车间异常单

parent 567ce2f3
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 108 deletions
src/api/mes/qc/report.js
View file @ 2f8eb6b0
......@@ -43,10 +43,28 @@ export function delReport(abnormalReportId) {
})
}
// 完成按钮功能
export function completeReport(abnormalReportId) {
// 开始车间异常单
export function startReport(abnormalReportId) {
return request({
url: '/qc/report/complete/' + abnormalReportId,
method: 'put'
url: '/qc/report/start/' + abnormalReportId,
method: 'post'
})
}
// 完成车间异常单
export function completeReport(data) {
return request({
url: '/qc/report/complete',
method: 'put',
data: data
})
}
// 关闭车间异常单
export function closeReport(data) {
return request({
url: '/qc/report/close',
method: 'put',
data: data
})
}
\ No newline at end of file
src/i18n/lang/th_TH.json
View file @ 2f8eb6b0
......@@ -2960,5 +2960,7 @@
"菜单字段": "menuNameTh",
"工时单位必选": "หน่วยชั่วโมงการทํางานเป็นข้อบังคับ",
"委外加工商必选": "ต้องเลือกผู้ประมวลผลเอาท์ซอร์ส",
"ERP数据同步": "การซิงโครไนซ์ข้อมูล ERP"
"ERP数据同步": "การซิงโครไนซ์ข้อมูล ERP",
"车间异常单编号": "หมายเลขคําสั่งซื้อข้อยกเว้นร้านค้า",
"开始": "เริ่ม"
}
\ No newline at end of file
src/i18n/lang/zh_CN.json
View file @ 2f8eb6b0
......@@ -2960,5 +2960,7 @@
"菜单字段": "menuName",
"工时单位必选": "工时单位必选",
"委外加工商必选": "委外加工商必选",
"ERP数据同步": "ERP数据同步"
"ERP数据同步": "ERP数据同步",
"车间异常单编号": "车间异常单编号",
"开始": "开始"
}
src/views/mes/pro/productionSolution/proofingApply.vue
View file @ 2f8eb6b0
......@@ -34,6 +34,7 @@
<el-table-column :label="$t('成品物料编码')" align="center" prop="itemCode" />
<el-table-column :label="$t('成品物料名称')" align="center" prop="itemName" />
<el-table-column :label="$t('生产用途')" align="center" prop="usageName" />
<el-table-column :label="$t('单价')" align="center" prop="unitPrice" />
<el-table-column :label="$t('打样订单')" align="center" prop="sapPrototypeMakeCode" />
<el-table-column :label="$t('common.remark')" align="center" prop="remark" />
<!-- <el-table-column :label="$t('common.status')" align="center" width="100" prop="status">
......
src/views/mes/pro/productionSolution/proofingInfo.vue
View file @ 2f8eb6b0
......@@ -91,6 +91,14 @@
></el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('单价')" prop="unitPrice">
<el-input-number
v-model="form.unitPrice"
placeholder
></el-input-number>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :label="$t('common.remark')" prop="remark">
<el-input
......@@ -178,6 +186,7 @@ export default {
factoryCode: "",
sapUsageId: "",
remark: "",
unitPrice: "",
createBy: "",
createTime: "",
itemCode: "",
......@@ -363,6 +372,7 @@ export default {
sapItemCode: "",
factoryCode: "",
remark: "",
unitPrice: "",
createBy: "",
createTime: "",
updateBy: "",
......
src/views/mes/qc/report/index.vue
View file @ 2f8eb6b0
<template>
<div class="app-container">
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('车间异常单编号')" prop="abnormalNumber" label-width="110px">
<el-input
v-model="queryParams.abnormalNumber"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('工序编号')" prop="processCode">
<el-input
v-model="queryParams.processCode"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -12,7 +18,6 @@
<el-form-item :label="$t('common.workunit')" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -103,6 +108,7 @@
<el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('车间异常单编号')" align="center" prop="abnormalNumber" />
<el-table-column :label="$t('工序编号')" align="center" prop="processCode" />
<el-table-column :label="$t('工序名称')" align="center" prop="processName" />
<el-table-column :label="$t('作业单元')" align="center" prop="workstationName" />
......@@ -130,6 +136,7 @@
type="text"
icon="el-icon-edit"
@click="handleComplete(scope.row)"
:disabled="scope.row.abnormalStatus !== 'SUBMIT'"
v-hasPermi="['qc:report:edit']"
>{{$t('完成')}}</el-button>
<!-- <el-button
......@@ -141,17 +148,18 @@
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
@click="handleStart(scope.row)"
:disabled="scope.row.abnormalStatus !== 'NOT'"
v-hasPermi="['qc:report:edit']"
>{{ $t('common.edit') }}</el-button>
>{{ $t('开始') }}</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
:disabled="scope.row.abnormalStatus !== 'SUBMIT'"
@click="handleClose(scope.row)"
v-hasPermi="['qc:report:remove']"
>{{ $t('common.del') }}</el-button>
>{{ $t('关闭') }}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -169,70 +177,11 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item :label="$t('工序编号')" prop="processCode">
<el-input v-model="form.processCode" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="$t('工序名称')" prop="processName">
<el-input v-model="form.processName" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('作业单元')" prop="workstationId">
<el-input v-model="form.workstationId" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="$t('作业单元名称')" prop="workstationName">
<el-input v-model="form.workstationName" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('异常类型')" prop="abnormalType">
<el-select v-model="form.abnormalType">
<el-option
v-for="dict in dict.type.pc_abnormal_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="$t('异常原因')" prop="abnormalReason">
<el-input v-model="form.abnormalReason" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('异常时间')" prop="abnormalTime">
<el-date-picker clearable
v-model="form.abnormalTime"
type="date"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('备注')" prop="remarks">
<el-input v-model="form.remarks" />
</el-form-item>
</el-col>
</el-row>
<el-form-item :label="$t('单据状态')" prop="abnormalStatus">
<el-select v-model="form.abnormalStatus">
<el-option
v-for="dict in dict.type.qc_submit_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">{{ $t('common.confirm') }}</el-button>
......@@ -245,7 +194,7 @@
<script>
import { listReport, getReport, delReport, addReport, updateReport,completeReport } from "@/api/mes/qc/report";
import { listReport, getReport, delReport, addReport, updateReport,completeReport, startReport, closeReport } from "@/api/mes/qc/report";
import dayjs from 'dayjs'
export default {
dicts: ['qc_submit_status','pc_abnormal_type'],
......@@ -298,6 +247,19 @@ export default {
this.getList();
},
methods: {
handleStart(row){
startReport(row.abnormalReportId).then(res=>{
this.getList();
})
},
handleClose(row){
this.form = {
abnormalReportId: row.abnormalReportId,
remarks: ""
}
this.open = true;
this.title = this.$t('关闭');
},
/** 查询车间异常单列表 */
getList() {
this.loading = true;
......@@ -363,55 +325,32 @@ export default {
this.open = true;
this.title = this.$t('添加车间异常单');
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const abnormalReportId = row.abnormalReportId || this.ids
getReport(abnormalReportId).then(response => {
this.form = response.data;
this.open = true;
this.title = this.$t('修改车间异常单');
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.abnormalReportId != null) {
updateReport(this.form).then(response => {
this.$modal.msgSuccess(this.$t('common.edit_success'));
if (this.title === this.$t('完成')) {
completeReport(this.form).then(response => {
this.open = false;
this.getList();
});
} else {
addReport(this.form).then(response => {
this.$modal.msgSuccess(this.$t('common.add_success'));
closeReport(this.form).then(response => {
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const abnormalReportIds = row.abnormalReportId || this.ids;
this.$modal.confirm(this.$t('common.confirm_del_data')).then(function() {
return delReport(abnormalReportIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess(this.$t('common.del_success'));
}).catch(() => {});
},
/** 完成按钮操作 */
handleComplete(row) {
const abnormalReportIds = row.abnormalReportId || this.ids;
this.$modal.confirm(this.$t('common.confirm_del_data')).then(function() {
return completeReport(abnormalReportIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess(this.$t('提交成功'));
}).catch(() => {});
this.form = {
abnormalReportId: row.abnormalReportId,
remarks: ""
}
this.open = true;
this.title = this.$t('完成');
},
/** 导出按钮操作 */
handleExport() {
......
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