From 2e9370979f871bf47f6dc145c49d7bf32ffa4b51 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 03 六月 2024 09:08:02 +0800
Subject: [PATCH] 完成光纤配置进行检验
---
src/components/do/b1-sample/detail.vue | 101 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 68 insertions(+), 33 deletions(-)
diff --git a/src/components/do/b1-sample/detail.vue b/src/components/do/b1-sample/detail.vue
index c4c1a06..cd913d4 100644
--- a/src/components/do/b1-sample/detail.vue
+++ b/src/components/do/b1-sample/detail.vue
@@ -1,5 +1,5 @@
<template>
- <div style="width: 100%;height: 100%;overflow-y: auto;">
+ <div style="width: 100%;height: 100%;overflow-y: auto;" class="detail">
<div>
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">鏍峰搧璇︽儏</el-col>
@@ -13,14 +13,7 @@
<div class="search_label">鏍峰搧缂栧彿锛�</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
- </div>
- </div>
- <div class="search_thing">
- <div class="search_label">鏍峰搧鏁伴噺锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
+ v-model="entity.sampleCode" disabled></el-input>
</div>
</div>
<div class="search_thing">
@@ -31,67 +24,82 @@
</div>
</div>
<div class="search_thing">
+ <div class="search_label">鏍峰搧鏁伴噺锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="entity.num" disabled></el-input>
+ </div>
+ </div>
+ <div class="search_thing">
<div class="search_label">鍗曚綅锛�</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
+ v-model="entity.unit" disabled></el-input>
</div>
</div>
<div class="search_thing">
<div class="search_label">鍏ュ簱鏃堕棿锛�</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
+ v-model="entity.date" disabled></el-input>
</div>
</div>
<div class="search_thing">
<div class="search_label">鍏ュ簱浜猴細</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
+ v-model="entity.user" disabled></el-input>
</div>
</div>
- <div class="search_thing">
+ <div class="search_thing" >
<div class="search_label">搴撲綅鍙凤細</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
+ v-model="entity.code" disabled style="min-width: 230px;"></el-input>
</div>
</div>
</div>
<h4>妫�楠岄」鐩�</h4>
<div class="table">
- <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border>
+ <el-table class="el-table" ref="productTable" :data="products" height="380px" tooltip-effect="dark" border>
<el-table-column type="index" align="center" label="搴忓彿" width="70" :key="Math.random()">
</el-table-column>
- <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」" min-width="100"
+ <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="100"
show-overflow-tooltip></el-table-column>
- <el-table-column prop="sonLaboratory" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="method" label="瀹為獙瀹�" min-min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="laboratory" label="瀹為獙瀹�" min-min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="unit" label="鍗曚綅" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="price" label="璁惧" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="manDay" label="濮旀墭缂栧彿" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="manHourGroup" label="妫�楠屼汉" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="section" label="妫�楠屾椂闂�" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="ask" label="缁撹" min-width="100">
+ <el-table-column prop="equipName" label="璁惧" min-width="100" show-overflow-tooltip>
+ <template slot-scope="scope">
+ {{handleData(scope.row.equipName)}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="entrustCode" label="濮旀墭缂栧彿" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="updateUserName" label="妫�楠屼汉" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="updateTime" label="妫�楠屾椂闂�" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="insResult" label="缁撹" min-width="100">
<template slot-scope="scope">
<el-tag
- :type="scope.row.type" size="medium">{{scope.row.label}}</el-tag>
+ :type="scope.row.insResult==1?'success':'danger'" size="medium">{{scope.row.insResult==1?'鍚堟牸':'涓嶅悎鏍�'}}</el-tag>
</template>
</el-table-column>
</el-table>
</div>
<h4>鍑哄叆搴撳巻鍙�</h4>
<div class="table" style="margin-bottom: 20px;">
- <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border>
+ <el-table class="el-table" ref="productTable" :data="histories" height="380px" tooltip-effect="dark" border>
<el-table-column type="index" align="center" label="搴忓彿" width="70" :key="Math.random()">
</el-table-column>
- <el-table-column prop="inspectionItemSubclass" label="绫诲瀷"
- show-overflow-tooltip></el-table-column>
- <el-table-column prop="sonLaboratory" label="鎿嶄綔浜�" show-overflow-tooltip></el-table-column>
- <el-table-column prop="method" label="鎿嶄綔鏃堕棿" show-overflow-tooltip></el-table-column>
- <el-table-column prop="unit" label="搴撲綅鍙�" show-overflow-tooltip></el-table-column>
- <el-table-column prop="price" label="瀛樻斁鍛ㄦ湡锛坔锛�" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="state" label="绫诲瀷"
+ show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-tag :type="scope.row.state==1?'success':'danger'">{{ scope.row.state==1?'鍏ュ簱':'鍑哄簱' }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createUserName" label="鎿嶄綔浜�" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="createTime" label="鎿嶄綔鏃堕棿" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="warehouseCode" label="搴撲綅鍙�" show-overflow-tooltip></el-table-column>
+ <!-- <el-table-column prop="price" label="瀛樻斁鍛ㄦ湡锛坔锛�" show-overflow-tooltip></el-table-column> -->
</el-table>
</div>
</div>
@@ -99,21 +107,48 @@
<script>
export default {
+ props:['id'],
data(vm) {
return{
- entity:{},
- productList:[]
+ entity:{
+ num:1,
+ },
+ products:[],
+ histories:[]
}
+ },
+ mounted(){
+ this.getInfo()
},
methods:{
hanldeBack(){
this.$emit('hanldeBack')
+ },
+ getInfo(){
+ this.$axios.post(this.$api.warehouse.getSampleRecord, {
+ id: this.id
+ }).then(res => {
+ let {histories,insSample,sampleHistory,products} = res.data;
+ this.entity = {num:1,...insSample,...sampleHistory};
+ this.histories = histories;
+ this.products = products;
+ })
+ },
+ handleData(e){
+ let info = JSON.parse(e).map(item => {
+ return item.v;
+ }).join(',')
+ return info
}
}
}
</script>
<style scoped>
+ .detail::-webkit-scrollbar{
+ width: 0;
+ }
+
.title {
height: 60px;
line-height: 60px;
--
Gitblit v1.9.3