yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update - 电检添加异常结果项显示

Browse Source
master
yinq 6 months ago
parent 80d6d07ccf
commit 70d3097b2b
1 changed files with 52 additions and 59 deletions
Show Stats Download Patch File Download Diff File

111
src/views/report/electricalInspection/index.vue
Unescape Escape View File

@ -45,29 +45,29 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['report:electricalInspection:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['report:electricalInspection:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['report:electricalInspection:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['report:electricalInspection:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="danger"
@ -98,7 +98,9 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="唯一标识" align="center" prop="uuid" v-if="columns[0].visible"/>
<el-table-column label="产品条码" align="center" prop="barcode" v-if="columns[2].visible"/>
<el-table-column label="产品型号" align="center" prop="materialModel" v-if="columns[6].visible"/>
<el-table-column label="测试总结果" align="center" prop="result" v-if="columns[1].visible"/>
<el-table-column label="异常描述" align="center" prop="qualityDefectNames" v-if="columns[7].visible"/>
<el-table-column label="测试时间" align="center" prop="testTime" v-if="columns[3].visible"/>
<el-table-column label="测试数据" align="center" prop="testData" v-if="columns[4].visible"/>
<el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[5].visible">
@ -153,21 +155,21 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item label="测试时间" prop="testTime">-->
<!-- <el-input v-model="form.testTime" placeholder="请输入测试时间"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="测试数据" prop="testData">-->
<!-- <el-input v-model="form.testData" placeholder="请输入测试数据"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="记录时间" prop="recordTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="form.recordTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择记录时间"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="测试时间" prop="testTime">-->
<!-- <el-input v-model="form.testTime" placeholder="请输入测试时间"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="测试数据" prop="testData">-->
<!-- <el-input v-model="form.testData" placeholder="请输入测试数据"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="记录时间" prop="recordTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="form.recordTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择记录时间"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-divider content-position="center">电检数据明细信息</el-divider>
<!-- <el-row :gutter="10" class="mb8">-->
<!-- <el-col :span="1.5">-->
@ -181,33 +183,22 @@
@selection-change="handleDetailElectricalinspectionSelectionChange" ref="detailElectricalinspection"
>
<el-table-column type="selection" width="50" align="center"/>
<!-- <el-table-column label="序号" align="center" prop="index" width="50"/>-->
<el-table-column label="序号" prop="serialnumber" width="150">
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.serialnumber" placeholder="请输入序号" />-->
<!-- </template>-->
<el-table-column label="序号" align="center" prop="serialnumber">
</el-table-column>
<el-table-column label="项目名称" prop="projectname" width="150">
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.projectname" placeholder="请输入项目名称" />-->
<!-- </template>-->
<el-table-column label="项目名称" align="center" prop="projectname">
</el-table-column>
<el-table-column label="测试条件" prop="testcondition" width="150">
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.testcondition" placeholder="请输入测试条件" />-->
<!-- </template>-->
<el-table-column label="测试条件" align="center" prop="testcondition" width="150">
</el-table-column>
<el-table-column label="测试值" prop="testvalue" width="150">
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.testvalue" placeholder="请输入测试值" />-->
<!-- </template>-->
<el-table-column label="测试值" align="center" prop="testvalue" width="150">
</el-table-column>
<el-table-column label="测试结果" prop="testresult" width="150">
<el-table-column label="测试结果" align="center" prop="testresult">
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.testresult" placeholder="请输入测试结果" />-->
<!-- </template>-->
</el-table-column>
<el-table-column label="记录时间" prop="recordtime" width="240">
<el-table-column label="异常描述" align="center" prop="qualityDefectName" width="150">
</el-table-column>
<el-table-column label="记录时间" align="center" prop="recordtime" width="240">
<!-- <template slot-scope="scope">-->
<!-- <el-date-picker clearable v-model="scope.row.recordtime" type="date" value-format="yyyy-MM-dd" placeholder="请选择记录时间" />-->
<!-- </template>-->
@ -215,7 +206,7 @@
</el-table>
</el-form>
<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>
</div>
</el-dialog>
@ -282,7 +273,9 @@ export default {
{ key: 2, label: `产品条码`, visible: true },
{ key: 3, label: `测试时间`, visible: true },
{ key: 4, label: `测试数据`, visible: false },
{ key: 5, label: `记录时间`, visible: false }
{ key: 5, label: `记录时间`, visible: false },
{ key: 6, label: `产品型号`, visible: true },
{ key: 7, label: `异常描述`, visible: true }
]
}
},

Write Preview
Loading…
Cancel
Save