Commit eca0e3f4 authored by 沈翠玲's avatar 沈翠玲

修改bug

parent 73d8e3d0
...@@ -24,6 +24,14 @@ ...@@ -24,6 +24,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="检测项编码" prop="indexCode">
<el-input
v-model="queryParams.indexCode"
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 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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
...@@ -170,7 +178,6 @@ export default { ...@@ -170,7 +178,6 @@ export default {
}, },
// 单选选中数据 // 单选选中数据
handleRowChange(row) { handleRowChange(row) {
debugger;
if(row){ if(row){
this.selectedRows = row; this.selectedRows = row;
} }
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-query" @click="handleView(scope.row)" <el-button size="mini" type="text" icon="el-icon-query" @click="handleView(scope.row)"
v-hasPermi="['mes:pro:feedback:query']">查看</el-button> v-hasPermi="['mes:pro:feedback:query']">查看</el-button>
<el-button size="mini" type="text" @click="handleQrcode(scope.row)" v-if="!scope.isPackage" <el-button size="mini" type="text" @click="handleQrcode(scope.row)" v-if="!scope.row.isPackage"
v-hasPermi="['mes:pro:feedback:print']">补打</el-button> v-hasPermi="['mes:pro:feedback:print']">补打</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:feedback:edit']">修改</el-button> v-hasPermi="['mes:pro:feedback:edit']">修改</el-button>
......
...@@ -16,6 +16,30 @@ ...@@ -16,6 +16,30 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料名称" prop="itemName">
<el-input
v-model="queryParams.itemName"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="sapItemCode">
<el-input
v-model="queryParams.sapItemCode"
placeholder="请输入物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="刀模SN" prop="toolCode">
<el-input
v-model="queryParams.toolCode"
placeholder="请输入刀模SN"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="申请时间"> <el-form-item label="申请时间">
<el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-" <el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
...@@ -96,6 +120,7 @@ ...@@ -96,6 +120,7 @@
<el-table-column <el-table-column
label="领用单编码" label="领用单编码"
align="center" align="center"
width="180"
prop="toolRequestUseCode" prop="toolRequestUseCode"
/> />
<!-- <el-table-column <!-- <el-table-column
...@@ -103,8 +128,11 @@ ...@@ -103,8 +128,11 @@
align="center" align="center"
prop="toolRequestCode" prop="toolRequestCode"
/> --> /> -->
<el-table-column label="工序" align="center" prop="processName" /> <el-table-column label="工序" align="center" prop="processName" width="180"/>
<el-table-column label="作业单元" align="center" prop="workunitName" /> <el-table-column label="作业单元" align="center" prop="workunitName" width="180"/>
<el-table-column label="物料名称" align="center" prop="itemName" width="180"/>
<el-table-column label="物料编码" align="center" prop="sapItemCode" width="180"/>
<el-table-column label="刀模SN" align="center" prop="toolCode" width="180"/>
<el-table-column <el-table-column
label="申请时间" label="申请时间"
align="center" align="center"
...@@ -421,6 +449,9 @@ export default { ...@@ -421,6 +449,9 @@ export default {
toolRequestId: null, toolRequestId: null,
processId: null, processId: null,
workunitId: null, workunitId: null,
itemName: null,
sapItemCode: null,
toolCode: null,
requestDate: null, requestDate: null,
startTime: null, startTime: null,
endTime: null, endTime: null,
......
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