|
|
@@ -20,7 +20,7 @@
|
|
|
></zj-timegran-date>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="4">
|
|
|
<el-form-item label="编号">
|
|
|
<el-input
|
|
|
v-model="filterForm.data.Gmid"
|
|
|
@@ -29,6 +29,44 @@
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="钢种">
|
|
|
+ <el-select
|
|
|
+ filterable clearable
|
|
|
+ collapse-tags
|
|
|
+ v-model="filterForm.data.grades"
|
|
|
+ multiple
|
|
|
+ placeholder=""
|
|
|
+ style="width: 100%;"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item of nameObj.grades.arr"
|
|
|
+ :key="item.id"
|
|
|
+ :value="item.name"
|
|
|
+ :label="item.name"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="规格">
|
|
|
+ <el-select
|
|
|
+ filterable clearable
|
|
|
+ collapse-tags
|
|
|
+ v-model="filterForm.data.specifications"
|
|
|
+ multiple
|
|
|
+ placeholder=""
|
|
|
+ style="width: 100%;"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item of nameObj.specifications.arr"
|
|
|
+ :key="item.id"
|
|
|
+ :value="item.name"
|
|
|
+ :label="item.name"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<div class="box-top-gjl">
|
|
|
@@ -1187,7 +1225,9 @@ export default {
|
|
|
workprocType: that.filterForm.data.workproc_type,
|
|
|
startTime: that.filterForm.data.clock[0],
|
|
|
endTime: that.filterForm.data.clock[1],
|
|
|
- id: that.filterForm.data.Gmid
|
|
|
+ id: that.filterForm.data.Gmid,
|
|
|
+ grades: that.filterForm.data.grades.join(','),
|
|
|
+ specifications: that.filterForm.data.specifications.join(',')
|
|
|
};
|
|
|
that.pageNum1 = pageNum1 || that.pageNum1;
|
|
|
that.leftTableLoading = true;
|
