|
@@ -21,18 +21,28 @@
|
|
|
row-key="id"
|
|
row-key="id"
|
|
|
height="50vh"
|
|
height="50vh"
|
|
|
>
|
|
>
|
|
|
- <template v-slot:textType="{ row }">
|
|
|
|
|
- {{ row.textType == 1 ? '数值' : row.textType == 2 ? '选择' : row.textType == 3 ? '产品参数' : row.textType == 4 ? '规格' :
|
|
|
|
|
- row.textType == 5 ? '时间' : '' }}
|
|
|
|
|
- </template>
|
|
|
|
|
-
|
|
|
|
|
|
|
+ <template v-slot:textType="{ row }">
|
|
|
|
|
+ {{
|
|
|
|
|
+ row.textType == 1
|
|
|
|
|
+ ? '数值'
|
|
|
|
|
+ : row.textType == 2
|
|
|
|
|
+ ? '选择'
|
|
|
|
|
+ : row.textType == 3
|
|
|
|
|
+ ? '产品参数'
|
|
|
|
|
+ : row.textType == 4
|
|
|
|
|
+ ? '规格'
|
|
|
|
|
+ : row.textType == 5
|
|
|
|
|
+ ? '时间'
|
|
|
|
|
+ : ''
|
|
|
|
|
+ }}
|
|
|
|
|
+ </template>
|
|
|
</ele-pro-table>
|
|
</ele-pro-table>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="12" class="table_col" v-if="equipmentdialog">
|
|
<el-col :span="12" class="table_col" v-if="equipmentdialog">
|
|
|
<div class="title">质检项</div>
|
|
<div class="title">质检项</div>
|
|
|
-
|
|
|
|
|
|
|
+ <search ref="search" @search="search"></search>
|
|
|
<ele-pro-table
|
|
<ele-pro-table
|
|
|
- ref="equiTable"
|
|
|
|
|
|
|
+ ref="equiTable1"
|
|
|
:columns="columns1"
|
|
:columns="columns1"
|
|
|
:datasource="datasource1"
|
|
:datasource="datasource1"
|
|
|
:current.sync="current1"
|
|
:current.sync="current1"
|
|
@@ -54,9 +64,10 @@
|
|
|
<script>
|
|
<script>
|
|
|
import { parameterList } from '@/api/inspectionStandard';
|
|
import { parameterList } from '@/api/inspectionStandard';
|
|
|
import { getList } from '@/api/inspectionProject';
|
|
import { getList } from '@/api/inspectionProject';
|
|
|
|
|
+import search from './projectSearch.vue';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
- components: {},
|
|
|
|
|
|
|
+ components: { search },
|
|
|
props: {
|
|
props: {
|
|
|
selectList: Array,
|
|
selectList: Array,
|
|
|
type: {
|
|
type: {
|
|
@@ -147,7 +158,7 @@ export default {
|
|
|
label: '质检标准',
|
|
label: '质检标准',
|
|
|
prop: 'inspectionStandard',
|
|
prop: 'inspectionStandard',
|
|
|
formatter: (row, column, cellValue) => {
|
|
formatter: (row, column, cellValue) => {
|
|
|
- return row.symbol+' '+cellValue+' '+row.unit
|
|
|
|
|
|
|
+ return row.symbol + ' ' + cellValue + ' ' + row.unit;
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
|
|
@@ -195,6 +206,12 @@ export default {
|
|
|
size: limit
|
|
size: limit
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
|
|
+ search(where) {
|
|
|
|
|
+ this.$refs.equiTable1.reload({
|
|
|
|
|
+ where: where,
|
|
|
|
|
+ page: 1
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
open() {
|
|
open() {
|
|
|
this.equipmentdialog = true;
|
|
this.equipmentdialog = true;
|
|
|
},
|
|
},
|