fix:检验管理-性能检验放平

This commit is contained in:
shijing 2025-02-17 16:13:37 +08:00
parent 5b169b9545
commit a3c77fc0d7
2 changed files with 232 additions and 300 deletions

View File

@ -11,7 +11,7 @@
> >
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-select <!-- <el-select
v-model="query.testitem" v-model="query.testitem"
clearable clearable
style="width: 150px" style="width: 150px"
@ -24,7 +24,7 @@
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select> -->
<el-date-picker <el-date-picker
v-model="query.test_date" v-model="query.test_date"
type="date" type="date"
@ -45,156 +45,131 @@
> >
</div> </div>
</el-header> </el-header>
<scTable <el-main class="nopadding">
ref="table" <scTable
:data="tableData" ref="table"
:apiObj="apiObj" :data="tableData"
row-key="id" :apiObj="apiObj"
stripe row-key="id"
:params="query" stripe
:query="query" :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 type="index" width="50" />
<el-table-column label="样品编号" prop="sample_number"> <el-table-column label="样品编号" prop="sample_number" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="实验日期" prop="test_date" show-overflow-tooltip>
label="样品厚度/mm" </el-table-column>
prop="val_hd" <el-table-column
v-if="activeName == '透过率'" label="仪器状态"
> prop="factory"
</el-table-column> show-overflow-tooltip
<el-table-column >
label="型号规格" <template #default="scope">
prop="specification" <el-tag>{{state_[scope.row.equip_state]}}</el-tag>
v-if=" </template>
activeName == '中温粘度' || activeName == '膨胀' </el-table-column>
" <el-table-column
> label="折射率(589nm)"
</el-table-column> prop="val_zsl"
<el-table-column >
label="样品数量" </el-table-column>
prop="sample_count" <el-table-column
v-if="activeName == '析晶'" label="样品厚度/mm"
> prop="val_hd"
</el-table-column> >
<el-table-column </el-table-column>
label="样品密度" <el-table-column
prop="sample_density" label="透过率(550nm)"
v-if="activeName == '高温粘度'" prop="val_tgl"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="检验员" label="Ts/℃"
prop="test_user_name" prop="val_ts"
show-overflow-tooltip >
> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label="型号规格"
label="实验温度及保温时间" prop="specification"
prop="sample_number" >
v-if="activeName == '析晶'" </el-table-column>
> <el-table-column
</el-table-column> label="30-300℃膨胀系数"
<el-table-column prop="val_pzxs"
label="升至最高温度/℃" >
prop="val_zgwd" </el-table-column>
v-if="activeName == '高温粘度'" <el-table-column
> label="Tg/℃"
</el-table-column> prop="val_tg"
<el-table-column >
label="仪器状态" </el-table-column>
prop="factory" <el-table-column
show-overflow-tooltip label="Tf/℃"
> prop="val_tf"
<template #default="scope"> >
<el-tag>{{ </el-table-column>
state_[scope.row.equip_state] <el-table-column
}}</el-tag> label="样品数量"
</template> prop="sample_count"
</el-table-column> >
<el-table-column </el-table-column>
label="折射率(589nm)" <el-table-column
prop="val_zsl" label="析晶"
v-if="activeName == '折射率'" prop="val_xj"
> >
</el-table-column> <template #default="scope">
<el-table-column <el-tag>{{state_xj[scope.row.val_xj]}}</el-tag>
label="透过率(550nm)" </template>
prop="val_tgl" </el-table-column>
v-if="activeName == '透过率'" <el-table-column
> label="样品密度"
</el-table-column> prop="sample_density"
<el-table-column >
label="Ts/℃" </el-table-column>
prop="val_ts" <el-table-column
v-if="activeName == '中温粘度'" label="升至最高温度/℃"
> prop="val_zgwd"
</el-table-column> >
<el-table-column </el-table-column>
label="30-300℃膨胀系数" <el-table-column
prop="val_pzxs" label="检验员"
v-if="activeName == '膨胀'" prop="test_user_name"
> show-overflow-tooltip
</el-table-column> >
<el-table-column </el-table-column>
label="Tg/℃" <el-table-column label="操作" fixed="right" width="160">
prop="val_tg" <template #default="scope">
v-if="activeName == '膨胀'" <el-link
> type="primary"
</el-table-column> @click="table_edit(scope.row)"
<el-table-column v-auth="'ptest.update'"
label="Tf/℃" >编辑</el-link
prop="val_tf" >
v-if="activeName == '膨胀'" <el-divider
> direction="vertical"
</el-table-column> v-auth="'ptest.update'"
<el-table-column ></el-divider>
label="析晶" <el-link
prop="val_xj" type="primary"
v-if="activeName == '析晶'" @click="table_show(scope.row)"
> >查看</el-link
<template #default="scope"> >
<el-tag>{{ <el-divider
state_xj[scope.row.val_xj] direction="vertical"
}}</el-tag> v-auth="'ptest.delete'"
</template> ></el-divider>
</el-table-column> <el-link
<el-table-column label="操作" fixed="right" width="160"> type="danger"
<template #default="scope"> @click="table_del(scope.row)"
<el-link v-auth="'ptest.delete'"
type="primary" >删除</el-link
@click="table_edit(scope.row)" >
v-auth="'ptest.update'" </template>
>编辑</el-link </el-table-column>
> </scTable>
<el-divider </el-main>
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>
<save-dialog <save-dialog
v-if="visible" v-if="visible"
ref="saveDialog" ref="saveDialog"
@ -269,7 +244,7 @@ export default {
}, },
], ],
}, },
activeName: "折射率", // activeName: "",
visible: false, visible: false,
isSaveing: false, isSaveing: false,
selection: [], selection: [],
@ -288,7 +263,7 @@ export default {
.get({ tags__contains: "performance", page: 0 }) .get({ tags__contains: "performance", page: 0 })
.then((res) => { .then((res) => {
that.behaviors = res; that.behaviors = res;
that.query.testitem = res[0].id; // that.query.testitem = res[0].id;
that.apiObj = that.$API.qm.ptest.list; that.apiObj = that.$API.qm.ptest.list;
}); });
}, },

View File

@ -15,24 +15,6 @@
label-width="160px" label-width="160px"
> >
<el-row> <el-row>
<el-col :md="12" :sm="24">
<el-form-item label="检验类型" prop="testitem">
<el-select
v-model="form.testitem"
placeholder="检验类型"
clearable
style="width: 100%"
@change="testitemChange"
>
<el-option
v-for="item in behaviors"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="实验日期" prop="test_date"> <el-form-item label="实验日期" prop="test_date">
<el-date-picker <el-date-picker
@ -50,101 +32,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '透过率'">
<el-form-item label="样品厚度/mm" prop="val_hd">
<el-input-number
v-model="form.val_hd"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col
:md="12"
:sm="24"
v-if="
activeName == '中温粘度' || activeName == '膨胀'
"
>
<el-form-item label="规格型号" prop="specification">
<el-input
v-model="form.specification"
></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName == '析晶'">
<el-form-item label="样品数量" prop="sample_count">
<el-input-number
v-model="form.sample_count"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col
:md="12"
:sm="24"
v-if="activeName == '高温粘度'"
>
<el-form-item
label="样品密度"
prop="sample_density"
>
<el-input
v-model="form.sample_density"
></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="检验员" prop="test_user">
<el-select
v-model="form.test_user"
placeholder="检验员"
clearable
filterable
style="width: 100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName == '析晶'">
<el-form-item
label="实验温度及保温时间"
prop="sample_density"
>
<el-input
v-model="form.sample_number"
></el-input>
</el-form-item>
</el-col>
<el-col
:md="12"
:sm="24"
v-if="activeName == '高温粘度'"
>
<el-form-item
label="升至最高温度/℃"
prop="val_zgwd"
>
<el-input-number
v-model="form.val_zgwd"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="仪器状态" prop="equip_state"> <el-form-item label="仪器状态" prop="equip_state">
<el-select <el-select
@ -163,7 +50,43 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '折射率'"> <el-col :md="12" :sm="24">
<el-form-item label="检验员" prop="test_user">
<el-select
v-model="form.test_user"
placeholder="检验员"
clearable
filterable
style="width: 100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="样品厚度/mm" prop="val_hd">
<el-input-number
v-model="form.val_hd"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="规格型号" prop="specification">
<el-input
v-model="form.specification"
></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="折射率(589nm)" prop="val_zsl"> <el-form-item label="折射率(589nm)" prop="val_zsl">
<el-input-number <el-input-number
v-model="form.val_zsl" v-model="form.val_zsl"
@ -174,7 +97,7 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '透过率'"> <el-col :md="12" :sm="24">
<el-form-item label="透过率(550nm)" prop="val_tgl"> <el-form-item label="透过率(550nm)" prop="val_tgl">
<el-input-number <el-input-number
v-model="form.val_tgl" v-model="form.val_tgl"
@ -185,11 +108,18 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col <el-col :md="12" :sm="24">
:md="12" <el-form-item label="30-300℃膨胀系数" prop="val_pzxs">
:sm="24" <el-input-number
v-if="activeName == '中温粘度'" v-model="form.val_pzxs"
> :min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="Ts/℃" prop="val_ts"> <el-form-item label="Ts/℃" prop="val_ts">
<el-input-number <el-input-number
v-model="form.val_ts" v-model="form.val_ts"
@ -200,21 +130,8 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
<el-form-item <el-col :md="12" :sm="24">
label="30-300℃膨胀系数"
prop="val_pzxs"
>
<el-input-number
v-model="form.val_pzxs"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
<el-form-item label="Tg/℃" prop="val_tg"> <el-form-item label="Tg/℃" prop="val_tg">
<el-input-number <el-input-number
v-model="form.val_tg" v-model="form.val_tg"
@ -225,7 +142,7 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '膨胀'"> <el-col :md="12" :sm="24">
<el-form-item label="Tf/℃" prop="val_tf"> <el-form-item label="Tf/℃" prop="val_tf">
<el-input-number <el-input-number
v-model="form.val_tf" v-model="form.val_tf"
@ -236,7 +153,7 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '析晶'"> <el-col :md="12" :sm="24">
<el-form-item label="析晶状态" prop="val_xj"> <el-form-item label="析晶状态" prop="val_xj">
<el-select <el-select
v-model="form.val_xj" v-model="form.val_xj"
@ -254,6 +171,51 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24">
<el-form-item label="样品数量" prop="sample_count">
<el-input-number
v-model="form.sample_count"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number>
</el-form-item>
</el-col>
<!-- <el-col :md="12" :sm="24">
<el-form-item
label="实验温度及保温时间"
prop="sample_density"
>
<el-input
v-model="form.sample_number"
></el-input>
</el-form-item>
</el-col> -->
<el-col :md="12" :sm="24">
<el-form-item
label="样品密度"
prop="sample_density"
>
<el-input
v-model="form.sample_density"
></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item
label="升至最高温度/℃"
prop="val_zgwd"
>
<el-input-number
v-model="form.val_zgwd"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input <el-input
@ -283,7 +245,8 @@ export default {
data() { data() {
return { return {
loading: false, loading: false,
form: {}, form: {
},
rules: { rules: {
belong_dept: [ belong_dept: [
{ {
@ -354,7 +317,6 @@ export default {
mounted() { mounted() {
console.log(this.activeId); console.log(this.activeId);
console.log(this.activeName); console.log(this.activeName);
this.form.testitem = this.activeId;
this.getTextItem(); this.getTextItem();
this.getProcess(); this.getProcess();
this.getUserList(); this.getUserList();
@ -371,7 +333,7 @@ export default {
getTextItem() { getTextItem() {
let that = this; let that = this;
that.$API.qm.getTestItem that.$API.qm.getTestItem
.get({ tag: "performance", page: 0 }) .get({ tags__contains: "performance", page: 0 })
.then((res) => { .then((res) => {
that.behaviors = res; that.behaviors = res;
}); });
@ -416,14 +378,9 @@ export default {
try { try {
var res; var res;
if (this.mode == "add") { if (this.mode == "add") {
res = await this.$API.qm.ptest.create.req( res = await this.$API.qm.ptest.create.req(this.form);
this.form
);
} else if (this.mode == "edit") { } else if (this.mode == "edit") {
res = await this.$API.qm.ptest.update.req( res = await this.$API.qm.ptest.update.req(this.form.id,this.form);
this.form.id,
this.form
);
} }
this.isSaveing = false; this.isSaveing = false;
this.$emit("success"); this.$emit("success");