0328
This commit is contained in:
parent
508803abcf
commit
194b0f9731
|
@ -146,19 +146,50 @@
|
|||
<template slot-scope="scope">{{ scope.row.material_.name }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格型号">
|
||||
<template slot-scope="scope">{{
|
||||
scope.row.material_.specification
|
||||
}}
|
||||
<template slot-scope="scope">{{scope.row.material_.specification }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料单位">
|
||||
<template slot-scope="scope">{{ scope.row.material_.unit }}</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="文件">
|
||||
<template slot-scope="scope" v-if="scope.row.files">
|
||||
<div v-for="item in scope.row.files_" v-bind:key="item.id">
|
||||
<el-link :href="item.path" target="_blank" type="primary">{{item.name}}</el-link>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否需要复验">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.need_test == false">否</el-tag>
|
||||
<el-tag v-else>是</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间">
|
||||
<template slot-scope="scope">{{ scope.row.create_time }}</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="操作"
|
||||
width="220px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-link
|
||||
v-if="scope.row.need_test&&scope.row.test.length>0"
|
||||
type="primary"
|
||||
@click="handleRecord(scope)"
|
||||
>
|
||||
复验记录
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="scope.row.test.length===0"
|
||||
type="info"
|
||||
disabled
|
||||
>
|
||||
复验记录
|
||||
</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="fifodetailList4.count > 0"
|
||||
|
@ -170,6 +201,91 @@
|
|||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-card>
|
||||
<!--检验记录-->
|
||||
<el-dialog
|
||||
title="复检记录"
|
||||
:close-on-click-modal="false"
|
||||
:visible.sync="limitedCheckRecord"
|
||||
>
|
||||
<el-table
|
||||
:data="recordList"
|
||||
border
|
||||
height="400"
|
||||
>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="表单名称">
|
||||
<template slot-scope="scope">{{ scope.row.form_.name }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="检查类型">
|
||||
入场检验
|
||||
</el-table-column>
|
||||
<el-table-column label="操作人">
|
||||
<template slot-scope="scope">{{ scope.row.create_by_.name }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作时间">
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.update_time.substring(0,scope.row.update_time.length-3)}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="handleRecordDetail(scope)"
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<!--<el-link @click="delTestRecord(scope)">
|
||||
删除
|
||||
</el-link>-->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="limitedCheckRecord = false">取 消</el-button>
|
||||
<el-button type="primary" @click="limitedCheckRecord = false">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!--已完成检查表查看-->
|
||||
<el-dialog
|
||||
:title="formName"
|
||||
:visible.sync="recordFinishedVisible"
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<div class="items">
|
||||
<span class="itemLabel">操作人:</span>
|
||||
<span>{{create_by_}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="items">
|
||||
<span class="itemLabel">操作时间:</span>
|
||||
<span>{{update_time}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col v-for="item in recordFieldList" :key="item.id" :span="12">
|
||||
<div class="items" v-if="item.field_type!=='draw'&&item.field_value!==null&&item.field_value!==''">
|
||||
<span class="itemLabel">{{item.field_name}}:</span>
|
||||
<span>{{item.field_value}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col v-for="item in recordFieldList" :key="item.id" :span="24">
|
||||
<div class="items" v-if="item.field_type==='draw'" style="height: 400px">
|
||||
<span class="itemLabel">{{item.field_name}}:</span>
|
||||
<img style="width: 45%;vertical-align: text-top;" :src="'http://49.232.14.174:2222'+item.field_value"/>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<div class="items">
|
||||
<span class="itemLabel">复检结果:</span>
|
||||
<span v-if="is_testOk">合格</span>
|
||||
<span v-else>不合格</span>
|
||||
</div>
|
||||
</el-row>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
|
@ -177,6 +293,7 @@
|
|||
import {getwproductticketList, getwproductList} from "@/api/wpm";
|
||||
import {ticketread} from "@/api/workflow";
|
||||
import {getfifodetailList} from "@/api/inm";
|
||||
import {getTestRecord,getTestRecordItem} from "@/api/qm";
|
||||
import checkPermission from "@/utils/permission";
|
||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||
|
||||
|
@ -211,6 +328,8 @@
|
|||
page: 1,
|
||||
page_size: 20,
|
||||
},
|
||||
recordList:[],
|
||||
recordFieldList:[],
|
||||
customfieldList: [],
|
||||
activeName: "1",
|
||||
decision_: {
|
||||
|
@ -230,6 +349,12 @@
|
|||
fifodetailList4: {
|
||||
count: 0,
|
||||
},
|
||||
formName:'',
|
||||
create_by_:'',
|
||||
update_time:'',
|
||||
is_testOk:false,
|
||||
limitedCheckRecord:false,
|
||||
recordFinishedVisible:false,
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
|
@ -245,8 +370,6 @@
|
|||
|
||||
getList() {
|
||||
this.listLoading = true;
|
||||
|
||||
|
||||
this.listQuery.material__type = 1;
|
||||
this.listQuery.tag = 'notok';
|
||||
getwproductList(this.listQuery).then((response) => {
|
||||
|
@ -254,7 +377,6 @@
|
|||
this.wproductList = response.data;
|
||||
}
|
||||
});
|
||||
|
||||
},
|
||||
|
||||
//不合格玻璃审批工单列表
|
||||
|
@ -265,11 +387,12 @@
|
|||
}
|
||||
});
|
||||
},
|
||||
|
||||
//不合格玻璃审理单查看
|
||||
handledetailbhg(scope) {
|
||||
|
||||
this.$router.push({name: "ticketDetail", params: {ticketId: scope.row.ticket}})
|
||||
},
|
||||
|
||||
//入场检验不合格
|
||||
//不合格物料
|
||||
getList4() {
|
||||
|
@ -285,6 +408,34 @@
|
|||
});
|
||||
},
|
||||
|
||||
//检验记录
|
||||
handleRecord(scope) {
|
||||
let that = this;
|
||||
that.fifo_item = scope.row.id;
|
||||
that.limitedCheckRecord = true;
|
||||
getTestRecord({fifo_item: scope.row.id}).then(res => {
|
||||
if (res.code == 200) {
|
||||
that.recordList = res.data.results;
|
||||
} else {
|
||||
this.$message.error(res.msg);
|
||||
}
|
||||
})
|
||||
},
|
||||
//点击记录里的查看
|
||||
handleRecordDetail(scope) {
|
||||
let that = this;
|
||||
that.is_testOk = scope.row.is_testok;
|
||||
that.recordFieldList = [];
|
||||
that.create_by_ = scope.row.create_by_.name;
|
||||
that.update_time = scope.row.update_time;
|
||||
getTestRecordItem(scope.row.id).then((res) => {
|
||||
if (res.code >= 200) {
|
||||
that.recordFinishedVisible = true;
|
||||
that.formName = res.data.form_.name;
|
||||
that.recordFieldList = res.data.record_data;
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
Loading…
Reference in New Issue