Commit 8d838949 authored by 何远江's avatar 何远江

添加工装夹具领用单新增修改功能

parent 67c2ea8f
...@@ -17,6 +17,15 @@ export function getTmToolRequestUse(toolRequestUseId) { ...@@ -17,6 +17,15 @@ export function getTmToolRequestUse(toolRequestUseId) {
}) })
} }
// 通过申请单id查询申请单刀模板数据
export function getTmToolRequestList(toolRequestId) {
return request({
url: 'tm/tmToolRequestUse/getToolsBytoolRequestId/' + toolRequestId,
method: 'get'
})
}
// 新增刀模板领用单 // 新增刀模板领用单
export function addTmToolRequestUse(data) { export function addTmToolRequestUse(data) {
return request({ return request({
......
...@@ -18,22 +18,24 @@ ...@@ -18,22 +18,24 @@
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item label="作业单元" prop="workunitName"> <el-form-item label="作业单元" prop="workunitName">
<el-input <el-input
v-model="queryParams.workunitName" v-model="queryParams.workunitName"
placeholder="请输入作业单元" placeholder="请输入作业单元"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="申请时间" prop="requestDate"> <el-form-item label="申请时间" prop="requestDate">
<el-date-picker clearable <el-date-picker
v-model="queryParams.requestDate" clearable
type="date" v-model="queryParams.requestDate"
value-format="yyyy-MM-dd" type="date"
placeholder="请选择申请时间"> value-format="yyyy-MM-dd"
</el-date-picker> placeholder="请选择申请时间"
</el-form-item> >
</el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
...@@ -144,7 +146,7 @@ ...@@ -144,7 +146,7 @@
</template> </template>
<script> <script>
import { listTmToolRequestUse } from "@/api/mes/tm/tmToolRequestUse"; import { listTmToolRequest } from "@/api/mes/tm/tmToolRequest";
export default { export default {
name: "TmRequestSelectSingle", name: "TmRequestSelectSingle",
components: {}, components: {},
...@@ -152,7 +154,7 @@ export default { ...@@ -152,7 +154,7 @@ export default {
return { return {
showFlag: false, showFlag: false,
// 选中数组 // 选中数组
selectedBrandId: undefined, selectedToolRequestId: undefined,
selectedRows: [], selectedRows: [],
// 非单个禁用 // 非单个禁用
single: true, single: true,
...@@ -213,7 +215,7 @@ export default { ...@@ -213,7 +215,7 @@ export default {
/** 查询品牌列表 */ /** 查询品牌列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listTmToolRequestUse(this.queryParams).then((response) => { listTmToolRequest(this.queryParams).then((response) => {
this.toolRequestList = response.rows; this.toolRequestList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
...@@ -249,7 +251,10 @@ export default { ...@@ -249,7 +251,10 @@ export default {
}, },
//确定选中 //确定选中
confirmSelect() { confirmSelect() {
if (this.selectedToolRequestId == null || this.selectedToolRequestId == 0) { if (
this.selectedToolRequestId == null ||
this.selectedToolRequestId == 0
) {
this.$notify({ this.$notify({
title: "提示", title: "提示",
type: "warning", type: "warning",
......
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
<!-- <el-form-item label="领用单编码" prop="toolRequestUseCode"> :model="queryParams"
<el-input ref="queryForm"
v-model="queryParams.toolRequestUseCode" size="small"
placeholder="请输入领用单编码" :inline="true"
clearable v-show="showSearch"
@keyup.enter.native="handleQuery" label-width="68px"
/> >
</el-form-item>
<el-form-item label="申请单id" prop="toolRequestId">
<el-input
v-model="queryParams.toolRequestId"
placeholder="请输入申请单id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工序id" prop="processId">
<el-input
v-model="queryParams.processId"
placeholder="请输入工序id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="作业单元" prop="workunitName"> <el-form-item label="作业单元" prop="workunitName">
<el-input <el-input
v-model="queryParams.workunitName" v-model="queryParams.workunitName"
...@@ -34,56 +17,26 @@ ...@@ -34,56 +17,26 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="申请时间" prop="requestDate"> <el-form-item label="申请时间" prop="requestDate">
<el-date-picker clearable <el-date-picker
clearable
v-model="queryParams.requestDate" v-model="queryParams.requestDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择申请时间"> placeholder="请选择申请时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="预计开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择预计开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="预计结束时间" prop="endTime">
<el-date-picker clearable
v-model="queryParams.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择预计结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="申请数量" prop="requestNum">
<el-input
v-model="queryParams.requestNum"
placeholder="请输入申请数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物品存放位置" prop="location">
<el-input
v-model="queryParams.location"
placeholder="请输入物品存放位置"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-input
v-model="queryParams.arrangeCode"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
/> -->
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-item>
</el-form> </el-form>
...@@ -96,7 +49,8 @@ ...@@ -96,7 +49,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['tm:tmToolRequestUse:add']" v-hasPermi="['tm:tmToolRequestUse:add']"
>新增</el-button> >新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -107,7 +61,8 @@ ...@@ -107,7 +61,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['tm:tmToolRequestUse:edit']" v-hasPermi="['tm:tmToolRequestUse:edit']"
>修改</el-button> >修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -118,7 +73,8 @@ ...@@ -118,7 +73,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['tm:tmToolRequestUse:remove']" v-hasPermi="['tm:tmToolRequestUse:remove']"
>删除</el-button> >删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -128,35 +84,70 @@ ...@@ -128,35 +84,70 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['tm:tmToolRequestUse:export']" v-hasPermi="['tm:tmToolRequestUse:export']"
>导出</el-button> >导出</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="tmToolRequestUseList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="tmToolRequestUseList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="领用单编码" align="center" prop="toolRequestUseCode" /> <el-table-column
<el-table-column label="申请单编码" align="center" prop="toolRequestCode" /> label="领用单编码"
align="center"
prop="toolRequestUseCode"
/>
<el-table-column
label="申请单编码"
align="center"
prop="toolRequestCode"
/>
<el-table-column label="工序" align="center" prop="processName" /> <el-table-column label="工序" align="center" prop="processName" />
<el-table-column label="作业单元" align="center" prop="workunitName" /> <el-table-column label="作业单元" align="center" prop="workunitName" />
<el-table-column label="申请时间" align="center" prop="requestDate" width="180"> <el-table-column
label="申请时间"
align="center"
prop="requestDate"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计开始时间" align="center" prop="startTime" width="180"> <el-table-column
label="预计开始时间"
align="center"
prop="startTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计结束时间" align="center" prop="endTime" width="180"> <el-table-column
label="预计结束时间"
align="center"
prop="endTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请数量" align="center" prop="requestNum" /> <el-table-column label="申请数量" align="center" prop="requestNum" />
<!-- <el-table-column label="编排单号" align="center" prop="arrangeCode" /> --> <!-- <el-table-column label="编排单号" align="center" prop="arrangeCode" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -164,20 +155,22 @@ ...@@ -164,20 +155,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['tm:tmToolRequestUse:edit']" v-hasPermi="['tm:tmToolRequestUse:edit']"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['tm:tmToolRequestUse:remove']" v-hasPermi="['tm:tmToolRequestUse:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
...@@ -185,103 +178,132 @@ ...@@ -185,103 +178,132 @@
/> />
<!-- 添加或修改刀模板领用单对话框 --> <!-- 添加或修改刀模板领用单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1080px" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
width="1080px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="领用单编码" prop="toolRequestUseCode"> <el-form-item label="领用单编码" prop="toolRequestUseCode">
<el-input v-model="form.toolRequestUseCode" placeholder="请输入领用单编码" /> <el-input
</el-form-item> readonly
</el-col> v-model="form.toolRequestUseCode"
<el-col :span="4"> placeholder="请输入领用单编码"
<el-form-item label-width="80"> />
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-col :span="6"> <el-form-item label="申请单" prop="toolRequestId">
<el-form-item label="申请单" prop="toolRequestId"> <el-input v-model="form.toolRequestCode" readonly>
<el-input v-model="form.toolRequestCode" readonly="readonly"> <el-button
<el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="handleToolRequestSelect" @click="$refs.ToolRequestSelectRef.showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<ToolRequestSelect <ToolRequestSelect
ref="trSelect" ref="ToolRequestSelectRef"
@onSelected="onToolRequestSelected" @onSelected="onToolRequestSelected"
></ToolRequestSelect> ></ToolRequestSelect>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="工序" prop="processId"> <el-form-item label="工序" prop="processId">
<el-input v-model="form.processId" placeholder="请输入工序" /> <el-input v-model="form.processId" placeholder="请输入工序" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="作业单元" prop="workunitId"> <el-form-item label="作业单元" prop="workunitId">
<el-input v-model="form.workunitId" placeholder="作业单元" /> <el-input v-model="form.workunitId" placeholder="作业单元" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申请时间" prop="requestDate"> <el-form-item label="申请时间" prop="requestDate">
<el-date-picker clearable <el-date-picker
v-model="form.requestDate" clearable
type="date" v-model="form.requestDate"
value-format="yyyy-MM-dd" type="date"
placeholder="请选择申请时间"> value-format="yyyy-MM-dd"
</el-date-picker> placeholder="请选择申请时间"
</el-form-item> >
</el-col> </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="预计开始时间" prop="startTime"> <el-form-item label="预计开始时间" prop="startTime">
<el-date-picker clearable <el-date-picker
v-model="form.startTime" clearable
type="date" v-model="form.startTime"
value-format="yyyy-MM-dd" type="date"
placeholder="请选择预计开始时间"> value-format="yyyy-MM-dd"
</el-date-picker> placeholder="请选择预计开始时间"
</el-form-item> >
</el-col> </el-date-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="预计结束时间" prop="endTime"> <el-form-item label="预计结束时间" prop="endTime">
<el-date-picker clearable <el-date-picker
v-model="form.endTime" clearable
type="date" v-model="form.endTime"
value-format="yyyy-MM-dd" type="date"
placeholder="请选择预计结束时间"> value-format="yyyy-MM-dd"
</el-date-picker> placeholder="请选择预计结束时间"
</el-form-item> >
</el-col> </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申请数量" prop="requestNum"> <el-form-item label="申请数量" prop="requestNum">
<el-input v-model="form.requestNum" placeholder="请输入申请数量" /> <el-input
</el-form-item> v-model="form.requestNum"
</el-col> placeholder="请输入申请数量"
/>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="编排单号" prop="arrangeCode"> <el-form-item label="编排单号" prop="arrangeCode">
<el-input v-model="form.arrangeCode" placeholder="请输入编排单号" /> <el-input
</el-form-item> v-model="form.arrangeCode"
</el-col> placeholder="请输入编排单号"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-divider content-position="left">申请单刀模版具数据</el-divider>
<el-table :data="tmToolRequestList">
<el-table-column label="itemName" prop="itemName" />
<el-table-column label="allQuantity" prop="allQuantity" />
<el-table-column label="tmToolList">
<template slot-scope="{ row }">
<el-select v-model="row.isCheck" clearable>
<el-option
v-for="item in row.tmToolList"
:label="item.toolName"
:key="item.toolId"
:value="item.toolId"
></el-option>
</el-select>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
...@@ -291,15 +313,22 @@ ...@@ -291,15 +313,22 @@
</template> </template>
<script> <script>
import { listTmToolRequestUse, getTmToolRequestUse, delTmToolRequestUse, addTmToolRequestUse, updateTmToolRequestUse } from "@/api/mes/tm/tmToolRequestUse"; import {
import {genCode} from "@/api/system/autocode/rule"; listTmToolRequestUse,
getTmToolRequestUse,
delTmToolRequestUse,
addTmToolRequestUse,
updateTmToolRequestUse,
getTmToolRequestList,
} from "@/api/mes/tm/tmToolRequestUse";
import { genCode } from "@/api/system/autocode/rule";
import ToolRequestSelect from "@/components/toolRequest/single.vue"; import ToolRequestSelect from "@/components/toolRequest/single.vue";
export default { export default {
name: "TmToolRequestUse", name: "TmToolRequestUse",
components: { ToolRequestSelect },
data() { data() {
return { return {
autoGenFlag:false, autoGenFlag: false,
components: { ToolRequestSelect },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -322,25 +351,25 @@ export default { ...@@ -322,25 +351,25 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
toolRequestUseCode: null, toolRequestUseCode: null,
toolRequestId: null, toolRequestId: null,
processId: null, processId: null,
workunitId: null, workunitId: null,
requestDate: null, requestDate: null,
startTime: null, startTime: null,
endTime: null, endTime: null,
requestNum: null, requestNum: null,
location: null, location: null,
arrangeCode: null, arrangeCode: null,
toolRequestCode: null, toolRequestCode: null,
processName: null, processName: null,
workunitName: null, workunitName: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {},
} tmToolRequestList: [],
}; };
}, },
created() { created() {
...@@ -350,7 +379,7 @@ export default { ...@@ -350,7 +379,7 @@ export default {
/** 查询刀模板领用单列表 */ /** 查询刀模板领用单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listTmToolRequestUse(this.queryParams).then(response => { listTmToolRequestUse(this.queryParams).then((response) => {
this.tmToolRequestUseList = response.rows; this.tmToolRequestUseList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
...@@ -364,26 +393,26 @@ export default { ...@@ -364,26 +393,26 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
toolRequestUseId: null, toolRequestUseId: null,
toolRequestUseCode: null, toolRequestUseCode: null,
toolRequestId: null, toolRequestId: null,
processId: null, processId: null,
workunitId: null, workunitId: null,
requestDate: null, requestDate: null,
startTime: null, startTime: null,
endTime: null, endTime: null,
requestNum: null, requestNum: null,
location: null, location: null,
arrangeCode: null, arrangeCode: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
toolRequestCode: null, toolRequestCode: null,
processName: null, processName: null,
workunitName: null workunitName: null,
}; };
this.resetForm("form"); this.tmToolRequestList = []
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
...@@ -392,43 +421,55 @@ export default { ...@@ -392,43 +421,55 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.toolRequestUseId) this.ids = selection.map((item) => item.toolRequestUseId);
this.single = selection.length!==1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加刀模板领用单"; this.title = "添加刀模板领用单";
this.handleAutoGenChange(true);
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const toolRequestUseId = row.toolRequestUseId || this.ids const toolRequestUseId = row.toolRequestUseId || this.ids;
getTmToolRequestUse(toolRequestUseId).then(response => { getTmToolRequestUse(toolRequestUseId).then((response) => {
this.form = response.data; this.form = response.data;
this.tmToolRequestList = res.tmToolRequestUseItemList
this.open = true; this.open = true;
this.title = "修改刀模板领用单"; this.title = "修改刀模板领用单";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.toolRequestUseId != null) { if (this.form.toolRequestUseId != null) {
updateTmToolRequestUse(this.form).then(response => { updateTmToolRequestUse(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addTmToolRequestUse(this.form).then(response => { const params = {
...this.form,
tmToolRequestItemList: this.tmToolRequestList.map((item) => {
return {
...item,
tmToolList: item.tmToolList.filter((v) => {
return item.isCheck == v.toolId;
}),
};
}),
};
addTmToolRequestUse(params).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
...@@ -440,32 +481,38 @@ export default { ...@@ -440,32 +481,38 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const toolRequestUseIds = row.toolRequestUseId || this.ids; const toolRequestUseIds = row.toolRequestUseId || this.ids;
this.$modal.confirm('是否确认删除刀模板领用单编号为"' + toolRequestUseIds + '"的数据项?').then(function() { this.$modal
return delTmToolRequestUse(toolRequestUseIds); .confirm(
}).then(() => { '是否确认删除刀模板领用单编号为"' + toolRequestUseIds + '"的数据项?'
this.getList(); )
this.$modal.msgSuccess("删除成功"); .then(function () {
}).catch(() => {}); return delTmToolRequestUse(toolRequestUseIds);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('tm/tmToolRequestUse/export', { this.download(
...this.queryParams "tm/tmToolRequestUse/export",
}, `tmToolRequestUse_${new Date().getTime()}.xlsx`) {
...this.queryParams,
},
`tmToolRequestUse_${new Date().getTime()}.xlsx`
);
}, },
//自动生成编码 //自动生成编码
handleAutoGenChange(autoGenFlag){ handleAutoGenChange(autoGenFlag) {
if(autoGenFlag){ if (autoGenFlag) {
genCode('TOOL_REQUEST_USE_CODE').then(response =>{ genCode("TOOL_REQUEST_USE_CODE").then((response) => {
this.form.toolRequestUseCode = response; this.form.toolRequestUseCode = response;
}); });
}else{ } else {
this.form.toolRequestUseCode = null; this.form.toolRequestUseCode = null;
} }
},
//选择申请单
handleToolRequestSelect() {
this.$refs.trSelect.showFlag = true;
}, },
onToolRequestSelected(row) { onToolRequestSelected(row) {
if (row != undefined && row != null) { if (row != undefined && row != null) {
...@@ -478,8 +525,16 @@ export default { ...@@ -478,8 +525,16 @@ export default {
this.form.endTime = row.endTime; this.form.endTime = row.endTime;
this.form.requestNum = row.requestNum; this.form.requestNum = row.requestNum;
this.form.scope = row.scope; this.form.scope = row.scope;
this.queryToolList(row.toolRequestId);
} }
}, },
}
queryToolList(toolRequestId) {
getTmToolRequestList(toolRequestId).then((res) => {
this.tmToolRequestList = res.data;
});
},
},
}; };
</script> </script>
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