From a4b23bbf535f10c5ecc31b16bc8177bcfc23e996 Mon Sep 17 00:00:00 2001
From: hailin <1356886193@qq.com>
Date: 星期一, 07 八月 2023 09:44:13 +0800
Subject: [PATCH] 添加原材料检验单第一次
---
src/components/view/finishedProductInspection.vue | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/src/components/view/finishedProductInspection.vue b/src/components/view/finishedProductInspection.vue
index 4b4781f..7dc48e2 100644
--- a/src/components/view/finishedProductInspection.vue
+++ b/src/components/view/finishedProductInspection.vue
@@ -5,9 +5,9 @@
<el-row>
<el-col :span="12">鎴愬搧妫�楠�</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button @click="handleAddNew" type="primary" icon="el-icon-plus" style="background: #004EA2; ">鏂板</el-button>
- <el-button icon="el-icon-delete">鍒犻櫎</el-button>
- <el-button icon="el-icon-download">瀵煎嚭</el-button>
+ <el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus" style="background: #004EA2; ">鏂板</el-button>
+ <el-button icon="el-icon-delete" size="mini">鍒犻櫎</el-button>
+ <el-button icon="el-icon-download" size="mini">瀵煎嚭</el-button>
</el-col>
</el-row>
</div>
@@ -36,13 +36,17 @@
<div class="inspectionTable">
<el-table
ref="inspectionTable"
- :height="500"
- :max-height="500"
+ :height="400"
+ :max-height="400"
:cell-style="{textAlign: 'center'}"
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
:data="inspectionTable"
style="width: 100%"
>
+ <el-table-column
+ type="selection"
+ width="50">
+ </el-table-column>
<el-table-column
prop="number"
label="璁㈠崟鍙�"
@@ -51,12 +55,12 @@
<el-table-column
prop="username"
label="瀹㈡埛鍚嶇О"
- min-width="100"
+ min-width="80"
/>
<el-table-column
prop="projectname"
label="宸ョ▼鍚嶇О"
- min-width="100"
+ min-width="80"
/>
<el-table-column
prop="tracenumber"
@@ -81,27 +85,27 @@
<el-table-column
prop="unit"
label="鍗曚綅"
- min-width="32"
+ min-width="50"
/>
<el-table-column
prop="quantity"
label="鏁伴噺"
- min-width="32"
+ min-width="50"
/>
<el-table-column
prop="machine"
label="鏈哄彴"
- min-width="44"
+ min-width="60"
/>
<el-table-column
prop="group"
label="鐝粍"
- min-width="38"
+ min-width="50"
/>
<el-table-column
prop="worker"
label="涓绘満宸�"
- min-width="50"
+ min-width="60"
/>
<el-table-column
prop="date"
@@ -111,11 +115,11 @@
<el-table-column
prop="result"
label="妫�娴嬬粨鏋�"
- min-width="30"
+ min-width="80"
/>
<el-table-column
label="鎿嶄綔"
- min-width="100"
+ min-width="80"
>
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
@@ -138,15 +142,14 @@
</div>
</div>
</div>
- <div v-if="showAddPage">
+ <div class="newPage" v-if="showAddPage">
<!-- 鏂板椤甸潰 -->
- <div class="newPage">
<div class="addInspection">
<el-row class="header">
<el-col :span="12">鏂板鎴愬搧妫�楠屽崟</el-col>
<el-col :span="12" style="text-align: right;">
<!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
- <el-button @click="showAddPage = false" type="primary" icon="el-icon-back" style="background: #004EA2; ">杩斿洖</el-button>
+ <el-button @click="showAddPage = false" type="primary" size="mini" icon="el-icon-back" style="background: #004EA2; ">杩斿洖</el-button>
</el-col>
</el-row>
<el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="left" label-width="100px" size="mini" >
@@ -180,7 +183,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="浜у搧鍚嶇О锛�">
- <el-select style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="璇烽�夋嫨浜у搧澶х被">
+ <el-select style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
<el-option value="閫夐」1"></el-option>
<el-option value="閫夐」2"></el-option>
</el-select>
@@ -240,14 +243,14 @@
</div>
<div class="inspectionProject">
<span>妫�楠岄」鐩�</span>
- <el-table :data="inspectionItems" style="width: 100%">
+ <el-table :data="inspectionItems">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column prop="project" label="椤圭洰"></el-table-column>
<el-table-column prop="unit" label="鍗曚綅"></el-table-column>
<el-table-column prop="standardVal" label="鏍囧噯鍊�"></el-table-column>
<el-table-column prop="controlVal" label="鍐呮祴鍊�"></el-table-column>
<el-table-column prop="detectionVal" label="妫�楠屽��"></el-table-column>
- <el-table-column prop="device" label="璇曢獙璁惧">
+ <el-table-column label="璇曢獙璁惧">
<template slot-scope="scope">
{{ scope.row.device }}
<el-select v-model="scope.row.device" size="small" slot="append" style="width: 100px;">
@@ -256,12 +259,17 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="conclusion" label="缁撹"></el-table-column>
+ <el-table-column prop="conclusion" label="缁撹">
+ <template slot-scope="scope">
+ <span style="color: #34BD66;" v-if="scope.row.insState==1">鍚堟牸</span>
+ <span style="color: #E84738;" v-else-if="scope.row.insState==0">涓嶅悎鏍�</span>
+ </template>
+ </el-table-column>
</el-table>
</div>
<div class="inspectionResult">
<span>妫�娴嬬粨鏋�</span>
- <el-table :data="inspectionResultForm" style="width: 100%">
+ <el-table :data="inspectionResultForm">
<el-table-column prop="id" label="鐗╂枡缂栧彿"></el-table-column>
<el-table-column prop="name" label="鐗╂枡鍚嶇О"></el-table-column>
<el-table-column prop="inspecter" label="妫�楠屽憳"></el-table-column>
@@ -271,7 +279,6 @@
</div>
</div>
- </div>
</div>
</template>
@@ -343,9 +350,9 @@
conclusion:'鍚堟牸'
}],
inspectionResultForm:[{
- id:'',
- name:'',
- inspecter:'',
+ id:'274024',
+ name:'111',
+ inspecter:'111',
conclusion:'',
operation:''
}]
@@ -378,15 +385,17 @@
}
.nav{
display: flex;
- padding: 12px 12px;
+ padding: 20px 20px;
align-items: center;
background-color: #fff;
}
.nav *{
font-size: 14px;
}
-.content-body{
+.content-body {
background-color: #fff;
+ overflow: hidden;
+ margin-top: 12px;
}
.inspectionTable{
padding: 20px 20px;
@@ -396,7 +405,7 @@
margin-right: 20px;
}
.newPage{
- height: 100px;
+ overflow: hidden;
}
.header{
padding: 12px;
@@ -414,7 +423,7 @@
}
.inspectionProject .el-table{
background-color: #fff;
- padding: 20px 12px;
+ padding: 10px 12px;
}
.inspectionResult span{
display: block;
@@ -422,6 +431,6 @@
}
.inspectionResult .el-table{
background-color: #fff;
- padding: 20px 12px;
+ padding: 10px 12px;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3