fix:coding#560二、1性能检验改动
This commit is contained in:
parent
52aa3b167b
commit
208c0aee5c
|
|
@ -11,16 +11,31 @@
|
|||
>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-select
|
||||
v-model="query.testitem"
|
||||
clearable
|
||||
style="width: 150px"
|
||||
@change="testitemChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in behaviors"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-date-picker
|
||||
v-model="query.test_date"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width: 150px"
|
||||
/>
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="编号"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
style="width: 150px"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
|
|
@ -30,192 +45,159 @@
|
|||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<!-- <el-radio-group v-model="radio1" class="ml-4">
|
||||
<el-radio
|
||||
v-for="item in behaviors"
|
||||
:key="item.id"
|
||||
:label="item.id"
|
||||
size="large"
|
||||
>
|
||||
{{ item.name }}
|
||||
</el-radio>
|
||||
</el-radio-group> -->
|
||||
<el-container>
|
||||
<el-header style="padding: 13px 15px 7px">
|
||||
<el-tabs
|
||||
v-model="activeId"
|
||||
class="demo-tabs"
|
||||
@tab-click="handleClick"
|
||||
type="card"
|
||||
<scTable
|
||||
ref="table"
|
||||
:data="tableData"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
stripe
|
||||
:params="query"
|
||||
:query="query"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="实验日期"
|
||||
prop="test_date"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="样品编号" prop="sample_number">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品厚度/mm"
|
||||
prop="val_hd"
|
||||
v-if="activeName == '透过率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="型号规格"
|
||||
prop="specification"
|
||||
v-if="
|
||||
activeName == '中温粘度' || activeName == '膨胀'
|
||||
"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品数量"
|
||||
prop="sample_count"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品密度"
|
||||
prop="sample_density"
|
||||
v-if="activeName == '高温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="检验员"
|
||||
prop="test_user_name"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="实验温度及保温时间"
|
||||
prop="sample_number"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="升至最高温度/℃"
|
||||
prop="val_zgwd"
|
||||
v-if="activeName == '高温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="仪器状态"
|
||||
prop="factory"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag>{{
|
||||
state_[scope.row.equip_state]
|
||||
}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="折射率(589nm)"
|
||||
prop="val_zsl"
|
||||
v-if="activeName == '折射率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="透过率(550nm)"
|
||||
prop="val_tgl"
|
||||
v-if="activeName == '透过率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Ts/℃"
|
||||
prop="val_ts"
|
||||
v-if="activeName == '中温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="30-300℃膨胀系数"
|
||||
prop="val_pzxs"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Tg/℃"
|
||||
prop="val_tg"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Tf/℃"
|
||||
prop="val_tf"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="析晶"
|
||||
prop="val_xj"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag>{{
|
||||
state_xj[scope.row.val_xj]
|
||||
}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" width="160">
|
||||
<template #default="scope">
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="table_edit(scope.row)"
|
||||
v-auth="'ptest.update'"
|
||||
>编辑</el-link
|
||||
>
|
||||
<el-tab-pane
|
||||
v-for="item in behaviors"
|
||||
v-bind:key="item.id"
|
||||
:label="item.name"
|
||||
:name="item.id"
|
||||
>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:data="tableData"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
stripe
|
||||
:params="query"
|
||||
<el-divider
|
||||
direction="vertical"
|
||||
v-auth="'ptest.update'"
|
||||
></el-divider>
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="table_show(scope.row)"
|
||||
>查看</el-link
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="实验日期"
|
||||
prop="test_date"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="样品编号" prop="sample_number">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品厚度/mm"
|
||||
prop="val_hd"
|
||||
v-if="activeName == '透过率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="型号规格"
|
||||
prop="specification"
|
||||
v-if="
|
||||
activeName == '中温粘度' || activeName == '膨胀'
|
||||
"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品数量"
|
||||
prop="sample_count"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品密度"
|
||||
prop="sample_density"
|
||||
v-if="activeName == '高温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="检验员"
|
||||
prop="test_user_name"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="实验温度及保温时间"
|
||||
prop="sample_number"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="升至最高温度/℃"
|
||||
prop="val_zgwd"
|
||||
v-if="activeName == '高温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="仪器状态"
|
||||
prop="factory"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag>{{
|
||||
state_[scope.row.equip_state]
|
||||
}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="折射率(589nm)"
|
||||
prop="val_zsl"
|
||||
v-if="activeName == '折射率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="透过率(550nm)"
|
||||
prop="val_tgl"
|
||||
v-if="activeName == '透过率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Ts/℃"
|
||||
prop="val_ts"
|
||||
v-if="activeName == '中温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="30-300℃膨胀系数"
|
||||
prop="val_pzxs"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Tg/℃"
|
||||
prop="val_tg"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Tf/℃"
|
||||
prop="val_tf"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="析晶"
|
||||
prop="val_xj"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag>{{
|
||||
state_xj[scope.row.val_xj]
|
||||
}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" width="160">
|
||||
<template #default="scope">
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="table_edit(scope.row)"
|
||||
v-auth="'ptest.update'"
|
||||
>编辑</el-link
|
||||
>
|
||||
<el-divider
|
||||
direction="vertical"
|
||||
v-auth="'ptest.update'"
|
||||
></el-divider>
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="table_show(scope.row)"
|
||||
>查看</el-link
|
||||
>
|
||||
<el-divider
|
||||
direction="vertical"
|
||||
v-auth="'ptest.delete'"
|
||||
></el-divider>
|
||||
<el-link
|
||||
type="danger"
|
||||
@click="table_del(scope.row)"
|
||||
v-auth="'ptest.delete'"
|
||||
>删除</el-link
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</el-main>
|
||||
<el-divider
|
||||
direction="vertical"
|
||||
v-auth="'ptest.delete'"
|
||||
></el-divider>
|
||||
<el-link
|
||||
type="danger"
|
||||
@click="table_del(scope.row)"
|
||||
v-auth="'ptest.delete'"
|
||||
>删除</el-link
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
<save-dialog
|
||||
v-if="visible"
|
||||
ref="saveDialog"
|
||||
:activeName="activeName"
|
||||
:activeId="activeId"
|
||||
@success="handleSuccess"
|
||||
@closed="visible = false"
|
||||
>
|
||||
|
|
@ -287,7 +269,6 @@ export default {
|
|||
},
|
||||
],
|
||||
},
|
||||
activeId: "3442815297965547520",
|
||||
activeName: "折射率",
|
||||
visible: false,
|
||||
isSaveing: false,
|
||||
|
|
@ -311,11 +292,14 @@ export default {
|
|||
that.apiObj = that.$API.qm.ptest.list;
|
||||
});
|
||||
},
|
||||
handleClick(val) {
|
||||
this.activeId = val.props.name;
|
||||
this.activeName = val.props.label;
|
||||
this.query.testitem = val.props.name;
|
||||
this.$refs.table.refresh();
|
||||
testitemChange(){
|
||||
let that = this;
|
||||
that.behaviors.forEach((item) => {
|
||||
if(item.id==that.query.testitem){
|
||||
that.activeName = item.name;
|
||||
}
|
||||
that.$refs.table.refresh();
|
||||
})
|
||||
},
|
||||
add() {
|
||||
this.visible = true;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
@closed="$emit('closed')"
|
||||
>
|
||||
<el-container v-loading="loading">
|
||||
<el-main style="padding: 0 20px 20px 20px">
|
||||
<el-main style="padding: 0">
|
||||
<el-form
|
||||
ref="dialogForm"
|
||||
:model="form"
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
placeholder="检验类型"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
disabled
|
||||
@change="testitemChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in behaviors"
|
||||
|
|
@ -279,7 +279,6 @@ export default {
|
|||
emits: ["success", "closed"],
|
||||
props: {
|
||||
activeId: { type: String, default: "" },
|
||||
activeName: { type: String, default: "" },
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -349,6 +348,7 @@ export default {
|
|||
belong_dept_options: [],
|
||||
group: [],
|
||||
behaviors: [],
|
||||
activeName:'折射率'
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -399,6 +399,14 @@ export default {
|
|||
that.processOptions = res;
|
||||
});
|
||||
},
|
||||
testitemChange(){
|
||||
let that = this;
|
||||
that.behaviors.forEach((item) => {
|
||||
if(item.id==that.form.testitem){
|
||||
that.activeName = item.name;
|
||||
}
|
||||
})
|
||||
},
|
||||
handleClick() {},
|
||||
//提交
|
||||
submit() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue