成品检验表格宽度修改
This commit is contained in:
parent
136eff089f
commit
6beafdc9f2
|
|
@ -13,13 +13,8 @@
|
||||||
<div>
|
<div>
|
||||||
<el-card style="width: 100%" header="检验记录" shadow="hover">
|
<el-card style="width: 100%" header="检验记录" shadow="hover">
|
||||||
<!-- 预制棒 -->
|
<!-- 预制棒 -->
|
||||||
<sc-form-table
|
<sc-form-table ref="formTable" v-if="type == 'bang'" v-model="formTableData" :addTemplate="addTemplate"
|
||||||
ref="formTable"
|
placeholder="暂无数据">
|
||||||
v-if="type=='bang'"
|
|
||||||
v-model="formTableData"
|
|
||||||
:addTemplate="addTemplate"
|
|
||||||
placeholder="暂无数据"
|
|
||||||
>
|
|
||||||
<el-table-column prop="val" label="抽检编号" min-width="120">
|
<el-table-column prop="val" label="抽检编号" min-width="120">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.id">{{ scope.row.test_numer }}</span>
|
<span v-if="scope.row.id">{{ scope.row.test_numer }}</span>
|
||||||
|
|
@ -28,23 +23,19 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="检验记录" align="center">
|
<el-table-column label="检验记录" align="center">
|
||||||
<template v-for="(item0, $index) in ftestitems" :key="item0.id">
|
<template v-for="(item0, $index) in ftestitems" :key="item0.id">
|
||||||
<el-table-column prop="test_val" :label="item0.name">
|
<el-table-column prop="test_val" :label="item0.name" min-width="130">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-input-number v-model="scope.row.ftestitems[$index].test_val" :disabled="!scope.row.isEdit" :min="0" style="width:100%" controls-position="right">
|
<el-input-number v-model="scope.row.ftestitems[$index].test_val"
|
||||||
|
:disabled="!scope.row.isEdit" :min="0" style="width:100%" controls-position="right">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="test_val" label="合格判定" width="100">
|
<el-table-column prop="test_val" label="合格判定" min-width="90">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-select
|
<el-select v-model="scope.row.is_ok" placeholder="是否合格" clearable :disabled="!scope.row.isEdit"
|
||||||
v-model="scope.row.is_ok"
|
style="width:100%">
|
||||||
placeholder="是否合格"
|
|
||||||
clearable
|
|
||||||
:disabled="!scope.row.isEdit"
|
|
||||||
style="width:100%"
|
|
||||||
>
|
|
||||||
<el-option label="是" :value="true" />
|
<el-option label="是" :value="true" />
|
||||||
<el-option label="否" :value="false" />
|
<el-option label="否" :value="false" />
|
||||||
</el-select>
|
</el-select>
|
||||||
|
|
@ -52,54 +43,23 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="test_user" label="检验人" width="120">
|
<el-table-column prop="test_user" label="检验人" width="120">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-select
|
<el-select v-model="scope.row.test_user" placeholder="检验人" clearable filterable
|
||||||
v-model="scope.row.test_user"
|
:disabled="!scope.row.isEdit" style="width:100%">
|
||||||
placeholder="检验人"
|
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
:disabled="!scope.row.isEdit"
|
|
||||||
style="width:100%"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in userList"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="open" label="操作" width="80" align="center">
|
<el-table-column prop="open" label="操作" fixed="right" width="90" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button
|
<el-link type="primary" v-if="scope.row.isEdit" @click="saveCheck(scope.row)">保存</el-link>
|
||||||
text type="primary"
|
<el-link type="primary" v-else @click="editCheck(scope.row)">编辑</el-link>
|
||||||
size="small"
|
<el-link type="danger" @click="delCheck(scope.row.id)" style="margin-left: 2px;">删除</el-link>
|
||||||
v-if="scope.row.isEdit"
|
|
||||||
@click="saveCheck(scope.row)"
|
|
||||||
>保存</el-button>
|
|
||||||
<el-button
|
|
||||||
text type="primary"
|
|
||||||
size="small"
|
|
||||||
v-else
|
|
||||||
@click="editCheck(scope.row)"
|
|
||||||
>编辑</el-button>
|
|
||||||
<el-button
|
|
||||||
text
|
|
||||||
type="danger"
|
|
||||||
size="small"
|
|
||||||
@click="delCheck(scope.row.id)"
|
|
||||||
>删除</el-button>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</sc-form-table>
|
</sc-form-table>
|
||||||
<!-- 预制管 -->
|
<!-- 预制管 -->
|
||||||
<sc-form-table
|
<sc-form-table ref="formTable" v-else-if="type == 'guan'" v-model="formTableData" :addTemplate="addTemplate"
|
||||||
ref="formTable"
|
placeholder="暂无数据">
|
||||||
v-else-if="type=='guan'"
|
|
||||||
v-model="formTableData"
|
|
||||||
:addTemplate="addTemplate"
|
|
||||||
placeholder="暂无数据"
|
|
||||||
>
|
|
||||||
<el-table-column prop="val" label="抽检编号">
|
<el-table-column prop="val" label="抽检编号">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.id">{{ scope.row.test_numer }}</span>
|
<span v-if="scope.row.id">{{ scope.row.test_numer }}</span>
|
||||||
|
|
@ -108,23 +68,19 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="检验记录" align="center">
|
<el-table-column label="检验记录" align="center">
|
||||||
<template v-for="(item, $index) in ftestitems" :key="item.id">
|
<template v-for="(item, $index) in ftestitems" :key="item.id">
|
||||||
<el-table-column prop="test_val" :label="item.name">
|
<el-table-column prop="test_val" :label="item.name" min-width="130">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-input-number v-model="scope.row.ftestitems[$index].test_val" :disabled="!scope.row.isEdit" :min="0" style="width:100%" controls-position="right">
|
<el-input-number v-model="scope.row.ftestitems[$index].test_val"
|
||||||
|
:disabled="!scope.row.isEdit" :min="0" style="width:100%" controls-position="right">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="test_val" label="合格判定" min-width="120" align="center">
|
<el-table-column prop="test_val" label="合格判定" min-width="90" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-select
|
<el-select v-model="scope.row.is_ok" placeholder="是否合格" clearable :disabled="!scope.row.isEdit"
|
||||||
v-model="scope.row.is_ok"
|
style="width:100%">
|
||||||
placeholder="是否合格"
|
|
||||||
clearable
|
|
||||||
:disabled="!scope.row.isEdit"
|
|
||||||
style="width:100%"
|
|
||||||
>
|
|
||||||
<el-option label="是" :value="true" />
|
<el-option label="是" :value="true" />
|
||||||
<el-option label="否" :value="false" />
|
<el-option label="否" :value="false" />
|
||||||
</el-select>
|
</el-select>
|
||||||
|
|
@ -132,54 +88,26 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="test_user" label="检验人" min-width="120" align="center">
|
<el-table-column prop="test_user" label="检验人" min-width="120" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-select
|
<el-select v-model="scope.row.test_user" placeholder="检验人" clearable filterable
|
||||||
v-model="scope.row.test_user"
|
:disabled="!scope.row.isEdit" style="width:100%">
|
||||||
placeholder="检验人"
|
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
:disabled="!scope.row.isEdit"
|
|
||||||
style="width:100%"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in userList"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="open" label="操作" width="80" align="center">
|
<el-table-column prop="open" label="操作" fixed="right" width="90" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button
|
<el-link type="primary" v-if="scope.row.isEdit" @click="saveCheck(scope.row)">保存</el-link>
|
||||||
text type="primary"
|
<el-link type="primary" v-else @click="editCheck(scope.row)">编辑</el-link>
|
||||||
size="small"
|
<el-link type="danger" @click="delCheck(scope.row.id)" style="margin-left: 2px;">删除</el-link>
|
||||||
v-if="scope.row.isEdit"
|
|
||||||
@click="saveCheck(scope.row)"
|
|
||||||
>保存</el-button>
|
|
||||||
<el-button
|
|
||||||
text type="primary"
|
|
||||||
size="small"
|
|
||||||
v-else
|
|
||||||
@click="editCheck(scope.row)"
|
|
||||||
>编辑</el-button>
|
|
||||||
<el-button
|
|
||||||
text
|
|
||||||
type="danger"
|
|
||||||
size="small"
|
|
||||||
@click="delCheck(scope.row.id)"
|
|
||||||
>删除</el-button>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</sc-form-table>
|
</sc-form-table>
|
||||||
</el-card>
|
</el-card>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<save-dialog v-if="dialog.save" ref="saveDialog"
|
<save-dialog v-if="dialog.save" ref="saveDialog" :mioId="mioId" :belongDeptId="belongDeptId"
|
||||||
:mioId="mioId" :belongDeptId="belongDeptId"
|
:belongDeptName="mioObj.belong_dept_name" :mioObj="mioObj" :cate="cate" @success="handleSaveSuccess"
|
||||||
:belongDeptName="mioObj.belong_dept_name"
|
@closed="dialog.save = false">
|
||||||
:mioObj="mioObj" :cate="cate"
|
|
||||||
@success="handleSaveSuccess" @closed="dialog.save = false">
|
|
||||||
</save-dialog>
|
</save-dialog>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
|
|
@ -194,9 +122,6 @@ export default {
|
||||||
addTemplate: {
|
addTemplate: {
|
||||||
ftestitems: [
|
ftestitems: [
|
||||||
{ test_val: '', check_val: '', testitem: '' },
|
{ test_val: '', check_val: '', testitem: '' },
|
||||||
{test_val:'',check_val:'',testitem:''},
|
|
||||||
{test_val:'',check_val:'',testitem:''},
|
|
||||||
{test_val:'',check_val:'',testitem:''},
|
|
||||||
],
|
],
|
||||||
test_date: '',//work获取
|
test_date: '',//work获取
|
||||||
test_numer: '',
|
test_numer: '',
|
||||||
|
|
@ -245,7 +170,6 @@ export default {
|
||||||
getTestItem(tag, ftestWork) {
|
getTestItem(tag, ftestWork) {
|
||||||
let that = this;
|
let that = this;
|
||||||
that.$API.qm.getTestItem.get({ tag: tag, page: 0, ftest_work: ftestWork }).then(res => {
|
that.$API.qm.getTestItem.get({ tag: tag, page: 0, ftest_work: ftestWork }).then(res => {
|
||||||
// console.log(res)
|
|
||||||
let arr = res;
|
let arr = res;
|
||||||
that.ftestitems = res;
|
that.ftestitems = res;
|
||||||
let ftestitems = [];
|
let ftestitems = [];
|
||||||
|
|
@ -307,12 +231,23 @@ export default {
|
||||||
}).catch(() => { });
|
}).catch(() => { });
|
||||||
},
|
},
|
||||||
saveCheck(row) {
|
saveCheck(row) {
|
||||||
|
console.log(row);
|
||||||
|
if (row.id && row.id !== '') {
|
||||||
|
this.$API.qm.ftest.update.req(row.id, row).then((res) => {
|
||||||
|
this.$message.success("操作成功");
|
||||||
|
this.$refs.table.refresh();
|
||||||
|
}).catch((err) => {
|
||||||
|
return err;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
this.$API.qm.ftest.create.req(row).then((res) => {
|
this.$API.qm.ftest.create.req(row).then((res) => {
|
||||||
this.$message.success("操作成功");
|
this.$message.success("操作成功");
|
||||||
this.$refs.table.refresh();
|
this.$refs.table.refresh();
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
return err;
|
return err;
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
//本地更新数据
|
//本地更新数据
|
||||||
handleSaveSuccess(data, mode) {
|
handleSaveSuccess(data, mode) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue