Skip to content

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

车间异常单

parent 94c12985
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 52 deletions
src/views/mes/pro/secretSend/index.vue
View file @ 5e073604
......@@ -38,13 +38,11 @@
<el-form-item label="状态" prop="statusList">
<el-select v-model="queryParams.statusList" multiple placeholder="请选择状态" clearable>
<el-option
label="发料"
:value="0"
/>
<el-option
label="完成"
:value="1"
/>
v-for="dict in dict.type.se_issue_table_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
......@@ -71,6 +69,9 @@
<el-table-column label="组合单号" align="center" prop="combinationCode" />
<el-table-column label="生产工单" align="center" prop="workorderCode" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.se_issue_table_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="物料编码" align="center" prop="sapItemCode" />
<el-table-column label="物料名称" align="center" prop="itemName" />
......@@ -107,6 +108,7 @@
<script>
import { listSecrecyissue, putSecrecyissue } from "@/api/mes/pro/secretSend";
export default {
dicts: ['se_issue_table_status'],
name: "secretSend",
data() {
return {
......@@ -178,19 +180,17 @@ export default {
this.getList();
},
handleSend(row) {
const ids = row.id || this.ids;
// {
// "id": 4,
// "ids": [
// 1,
// 2,
// 3
// ],
// "status": 0:发料/1:完成
// }
// putSecrecyissue({
// })
const ids = row.id ? [row.id] : this.ids;
this.$modal.confirm('是否发料？').then(function() {
return putSecrecyissue({
status: 0,
ids: ids
});
}).then((res) => {
if(res.code === 200) {
this.getList()
}
})
},
handleSubmit(row) {
const ids = row.id ? [row.id] : this.ids;
......@@ -212,7 +212,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.abnormalId)
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
}
......
src/views/mes/qc/report/index.vue
View file @ 5e073604
......@@ -9,10 +9,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工序编号" prop="processCode">
<el-form-item label="工序名称" prop="processName">
<el-input
v-model="queryParams.processCode"
placeholder="请输入工序编号"
v-model="queryParams.processName"
placeholder="请输入工序名称"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -33,25 +33,28 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车间异常单号" prop="abnormalReportCode">
<el-input
v-model="queryParams.abnormalReportCode"
placeholder="请输入车间异常单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="异常时间">
<el-date-picker
v-model="daterangePurchaseDate"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-row>
<el-form-item label="车间异常单号" prop="abnormalReportCode" label-width="100px">
<el-input
v-model="queryParams.abnormalReportCode"
placeholder="请输入车间异常单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="异常时间">
<el-date-picker
v-model="daterangePurchaseDate"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
</el-row>
<!-- <el-form-item label="单据状态" prop="abnormalStatus">
<el-select v-model="queryParams.abnormalStatus" placeholder="请选择单据状态" clearable>
<el-option label="请选择字典生成" value="" />
......@@ -111,6 +114,16 @@
<el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="车间异常单号" align="center" prop="abnormalReportCode" >
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleUpdate(scope.row, false)"
>{{ scope.row.abnormalReportCode }}</el-button
>
</template>
</el-table-column>
<el-table-column label="编排单号" align="center" prop="batchNumber" />
<el-table-column label="工序编号" align="center" prop="processCode" />
<el-table-column label="工序名称" align="center" prop="processName" />
......@@ -122,25 +135,27 @@
</template>
</el-table-column>
<el-table-column label="异常原因" align="center" prop="abnormalReason" />
<el-table-column label="异常人员" align="center" prop="createNickName" />
<el-table-column label="提交人员" align="center" prop="submitNickName" />
<el-table-column label="处理建议" align="center" prop="handlingSuggestions" />
<el-table-column label="车间异常单号" align="center" prop="abnormalReportCode" />
<el-table-column label="异常时间" align="center" prop="abnormalTime" width="180">
<el-table-column label="异常时间" align="center" prop="abnormalTime" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.abnormalTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="单据状态" align="center" prop="abnormalStatus">
<el-table-column label="单据状态" align="center" prop="abnormalStatus" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.qc_submit_status" :value="scope.row.abnormalStatus"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="300" fixed="right" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" width="230" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleComplete(scope.row)"
:disabled="scope.row.abnormalStatus !== 'NOT'"
v-hasPermi="['qc:report:edit']"
>完成</el-button>
<el-button
......@@ -148,13 +163,13 @@
type="text"
icon="el-icon-upload2"
@click="handleSubmit(scope.row)"
:disabled="!scope.row.userId"
:disabled="!scope.row.userId || scope.row.abnormalStatus !== 'NOT'"
>提交</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
:disabled="!scope.row.userId"
:disabled="!scope.row.userId || scope.row.abnormalStatus !== 'NOT'"
@click="handleUpdate(scope.row)"
v-hasPermi="['qc:report:edit']"
>修改</el-button>
......@@ -163,6 +178,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
:disabled="scope.row.abnormalStatus !== 'NOT'"
v-hasPermi="['qc:report:remove']"
>删除</el-button>
</template>
......@@ -304,7 +320,7 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button type="primary" @click="submitForm" v-if="title === '修改车间异常单'">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......@@ -512,7 +528,7 @@ export default {
this.title = "添加车间异常单";
},
/** 修改按钮操作 */
handleUpdate(row) {
handleUpdate(row, isEdit = true) {
this.reset();
const abnormalReportId = row.abnormalReportId || this.ids
getReport(abnormalReportId).then(response => {
......@@ -526,7 +542,7 @@ export default {
this.getAllBomMaterial()
}
})
this.title = "修改车间异常单";
this.title = isEdit ? "修改车间异常单" : "查看车间异常单";
});
},
/** 提交按钮 */
......
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