From ca9b5d4118f4c29119359503859fa953495496e9 Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期四, 03 八月 2023 13:23:39 +0800
Subject: [PATCH] 成品检验,过程检验页面和技术文件模态框
---
src/components/view/finishedProductInspection.vue | 71 +++--
src/components/view/technical.vue | 125 +++++++++++
src/components/view/processInspection.vue | 435 +++++++++++++++++++++++++++++++++++++++
src/view/index.vue | 7
4 files changed, 600 insertions(+), 38 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
diff --git a/src/components/view/processInspection.vue b/src/components/view/processInspection.vue
new file mode 100644
index 0000000..8f116db
--- /dev/null
+++ b/src/components/view/processInspection.vue
@@ -0,0 +1,435 @@
+<template>
+ <div class="content-main">
+ <div v-if="!showAddPage" class="rawPage">
+ <div class="title">
+ <el-row>
+ <el-col :span="12">杩囩▼妫�楠�</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <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>
+ <div class="nav">
+ <span>妫�楠岀粨鏋滐細</span>
+ <el-select v-model="inspectionResult" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ <span>妫�楠屾棩鏈燂細</span>
+ <el-date-picker
+ v-model="inspectionDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ style="margin-right: 52px">
+ </el-date-picker>
+ <span>妫�楠屼汉锛�</span>
+ <el-select v-model="inspecter" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ <el-button size="mini"><span>閲� 缃�</span></el-button>
+ <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌� 璇�</span></el-button>
+ </div>
+ <div class="content-body">
+ <div class="inspectionTable">
+ <el-table
+ ref="inspectionTable"
+ :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="璁㈠崟鍙�"
+ min-width="100"
+ />
+ <el-table-column
+ prop="username"
+ label="瀹㈡埛鍚嶇О"
+ min-width="80"
+ />
+ <el-table-column
+ prop="projectname"
+ label="宸ョ▼鍚嶇О"
+ min-width="80"
+ />
+ <el-table-column
+ prop="tracenumber"
+ label="璐ㄩ噺杩芥函鍙�"
+ min-width="108"
+ />
+ <el-table-column
+ prop="code"
+ label="浜у搧缂栫爜"
+ min-width="100"
+ />
+ <el-table-column
+ prop="class"
+ label="浜у搧澶х被"
+ min-width="72"
+ />
+ <el-table-column
+ prop="specificationmodel"
+ label="瑙勬牸鍨嬪彿"
+ min-width="110"
+ />
+ <el-table-column
+ prop="unit"
+ label="鍗曚綅"
+ min-width="50"
+ />
+ <el-table-column
+ prop="quantity"
+ label="鏁伴噺"
+ min-width="50"
+ />
+ <el-table-column
+ prop="machine"
+ label="鏈哄彴"
+ min-width="60"
+ />
+ <el-table-column
+ prop="group"
+ label="鐝粍"
+ min-width="50"
+ />
+ <el-table-column
+ prop="worker"
+ label="涓绘満宸�"
+ min-width="60"
+ />
+ <el-table-column
+ prop="date"
+ label="妫�楠屾棩鏈�"
+ min-width="80"
+ />
+ <el-table-column
+ prop="result"
+ label="妫�娴嬬粨鏋�"
+ min-width="80"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ min-width="80"
+ >
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
+ <el-button type="text" size="small">鎵撳嵃</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!-- 鍒嗛〉鍣� -->
+ <div class="pagination">
+ <el-pagination
+ :current-page="currentPage"
+ :page-sizes="[100, 200, 300, 400]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="this.inspectionTable.length"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+ </div>
+ </div>
+ <div class="newPage" v-if="showAddPage">
+ <!-- 鏂板椤甸潰 -->
+ <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" 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" >
+ <div class="formwrapper">
+ <el-row :gutter="450">
+ <el-col :span="5">
+ <el-form-item label="璁㈠崟鍙凤細">
+ <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="瀹㈡埛鍚嶇О锛�">
+ <el-input style="width: 180px;" v-model="addInspectionform.username" placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="宸ョ▼鍚嶇О锛�">
+ <el-input style="width: 180px;" v-model="addInspectionform.projectname" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="450">
+ <el-col :span="5">
+ <el-form-item label="璐ㄩ噺杩芥函鍙凤細" >
+ <el-input style="width: 180px;" v-model="addInspectionform.tracenumber" placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="浜у搧缂栫爜锛�">
+ <el-input style="width: 180px;" v-model="addInspectionform.code" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" /> </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="浜у搧鍚嶇О锛�">
+ <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>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="450">
+ <el-col :span="5">
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" >
+ <el-select style="width: 180px;" v-model="addInspectionform.specificationmodel" size="small" placeholder="璇烽�夋嫨瑙勬牸鍨嬪彿">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鍗曚綅锛�" >
+ <el-select style="width: 180px;" v-model="addInspectionform.unit" size="small" placeholder="璇烽�夋嫨鍗曚綅">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鏁伴噺锛�">
+ <el-input style="width: 180px;" v-model="addInspectionform.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="450">
+ <!-- <el-col :span="5">
+ <el-form-item label="鐝粍锛�" >
+ <el-select style="width: 180px;" v-model="addInspectionform.group" size="small" placeholder="璇烽�夋嫨鐝粍">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select> </el-form-item>
+ </el-col> -->
+ <el-col :span="5">
+ <el-form-item label="涓绘満宸ワ細" >
+ <el-select style="width: 180px;" v-model="addInspectionform.worker" size="small" placeholder="璇烽�夋嫨涓绘満宸�">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鏈哄彴锛�" >
+ <el-select style="width: 180px;" v-model="addInspectionform.machine" size="small" placeholder="璇烽�夋嫨浜у搧鏈哄彴">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ </el-form>
+ </div>
+ <div class="inspectionProject">
+ <span>妫�楠岄」鐩�</span>
+ <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 label="璇曢獙璁惧">
+ <template slot-scope="scope">
+ {{ scope.row.device }}
+ <el-select v-model="scope.row.device" size="small" slot="append" style="width: 100px;">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </template>
+ </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">
+ <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>
+ <el-table-column prop="conclusion" label="妫�楠岀粨璁�"></el-table-column>
+ <el-table-column prop="operation" label="涓婃姤"></el-table-column>
+ </el-table>
+ </div>
+ </div>
+
+ </div>
+ </template>
+
+
+ <script>
+ export default {
+ data(){
+ return {
+ inspectionResult: '',
+ inspectionDate: '',
+ inspecter: '',
+ inspectionTable:[{
+ number: '8540395029753',
+ username: 'jack',
+ projectname: '甯冮殕杩�',
+ tracenumber: '826403164021',
+ code: 'C-982164',
+ class: '鎴愬搧',
+ specificationmodel: '8.8/15kV JLS-3.2',
+ unit: '鍚�',
+ quantity: '15',
+ machine: '鎷夐椄鏈�',
+ group: '1缁�',
+ worker: '榛勫皬鏄�',
+ date: '2023-08-01',
+ result: '鍚堟牸',
+ operation: ''
+ },{
+ number: '2497320327652',
+ username: 'rose',
+ projectname: '甯冮殕杩�',
+ tracenumber: '826403164021',
+ code: 'C-24114',
+ class: '鎴愬搧',
+ specificationmodel: '8.6/15kV JAD-3.2',
+ unit: '鍚�',
+ quantity: '43',
+ machine: '鎷夐椄鏈�',
+ group: '1缁�',
+ worker: '榛勫皬鏄�',
+ date: '2023-08-01',
+ result: '鍚堟牸',
+ operation: ''
+ }],
+ currentPage: 1, // 褰撳墠椤电爜
+ pageSize: 100,
+ showAddPage: false,
+ addInspectionform: [{
+ number: '',
+ username: '',
+ projectname: '',
+ tracenumber: '',
+ code: '',
+ class: '',
+ specificationmodel: '',
+ unit: '',
+ quantity: '',
+ group: '',
+ worker: '',
+ machine: ''
+ }],
+ inspectionItems:[{
+ project:'甯冮殕杩�',
+ unit:'鍚�',
+ standardVal: '8219384314',
+ controlVal:'9823401',
+ detectionVal:'11111',
+ device:'',
+ conclusion:'鍚堟牸'
+ }],
+ inspectionResultForm:[{
+ id:'274024',
+ name:'111',
+ inspecter:'111',
+ conclusion:'',
+ operation:''
+ }]
+ }
+ },
+ methods:{
+ // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
+ handleSizeChange(val) {
+ console.log(`姣忛〉 ${val} 鏉)
+ this.currentPage = 1
+ this.pageSize = val
+ },
+ // 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
+ handleCurrentChange(val) {
+ console.log(`褰撳墠椤�: ${val}`)
+ this.currentPage = val
+ },
+ handleAddNew(){
+ this.showAddPage=true
+ }
+ }
+
+ }
+ </script>
+
+ <style>
+ .title{
+ padding: 12px;
+
+ }
+ .nav{
+ display: flex;
+ padding: 20px 20px;
+ align-items: center;
+ background-color: #fff;
+ }
+ .nav *{
+ font-size: 14px;
+ }
+ .content-body .rawPage{
+ background-color: #fff;
+ overflow: hidden;
+ }
+ .inspectionTable{
+ padding: 20px 20px;
+ }
+ .pagination{
+ float: right;
+ margin-right: 20px;
+ }
+ .newPage{
+ overflow: hidden;
+ }
+ .header{
+ padding: 12px;
+ }
+ .addInspectionform{
+ background-color: #fff;
+ }
+ .addInspectionform .formwrapper{
+ padding: 20px 0px;
+ margin-left: 100px;
+ }
+ .inspectionProject span{
+ display: block;
+ padding: 5px 0px;
+ }
+ .inspectionProject .el-table{
+ background-color: #fff;
+ padding: 10px 12px;
+ }
+ .inspectionResult span{
+ display: block;
+ padding: 5px 0px;
+ }
+ .inspectionResult .el-table{
+ background-color: #fff;
+ padding: 10px 12px;
+ }
+ </style>
\ No newline at end of file
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 69c0446..3e8e839 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -48,7 +48,7 @@
color: #fff;
}
/* 杈撳叆妗嗙殑鏍峰紡 */
->>>.search-header .el-form-item .el-input .el-input__inner{
+.search-header .el-form-item .el-input .el-input__inner{
width: 224px;
height: 32px ;
box-sizing: border-box;
@@ -80,6 +80,11 @@
margin-top: 23px;
display: flex;
justify-content: end;
+}
+.formtitle{
+ display: block;
+ margin-bottom: 24px;
+ font-size: 16px;
}
</style>
@@ -185,8 +190,8 @@
fixed="right"
label="鎿嶄綔"
width="194">
- <template>
- <el-button type="text" size="small">鏌ョ湅璇︽儏</el-button>
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="showDetails(scope.row)">鏌ョ湅璇︽儏</el-button>
<el-button type="text" size="small">缂栬緫闄勪欢</el-button>
</template>
</el-table-column>
@@ -201,6 +206,110 @@
layout="total, sizes, prev, pager, next, jumper"
:total="400">
</el-pagination>
+ <!-- 鏌ョ湅璇︽儏妯℃�佹 -->
+ <el-dialog title="鏂囦欢璇︽儏" :visible.sync="showDetail" width="687px" @close="showDetail = false">
+ <el-form label-position="right" label-width="70px" :model="selectedRow">
+ <span class="formtitle">鍩烘湰淇℃伅</span>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="璁㈠崟鍙�">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="宸ョ▼鍚嶇О">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="浜у搧缂栫爜">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浜у搧澶х被">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="瑙勬牸鍨嬪彿">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍗曚綅">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="鏁伴噺">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="涓嬪崟浜�">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="涓嬪崟鏃ユ湡">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浜よ揣鏃ユ湡">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="鐘舵��">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <span class="formtitle">瀹㈡埛淇℃伅</span>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="瀹㈡埛鍚嶇О">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐪佷唤">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <el-form-item label="浜嬩笟閮�">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="涓氬姟鍛�">
+ <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <span class="formtitle">闄勪欢淇℃伅</span>
+ <el-row :gutter="31">
+ <el-col :span="12">
+ <span style="height: 32px; width: 224px; color:rgb(0, 78, 162);">xxx椤圭洰涔�.docx</span>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-dialog>
</div>
</div>
</template>
@@ -258,8 +367,16 @@
name: '鐜嬪皬铏�',
address: '涓婃捣甯�'
}
- ]
+ ],
+ showDetail: false,
+ selectedRow: ''
}
},
+ methods: {
+ showDetails(row){
+ this.showDetail = true
+ this.selectedRow = row
+ }
+ },
}
</script>
diff --git a/src/view/index.vue b/src/view/index.vue
index 67a9dbd..a4ec2a4 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -302,7 +302,7 @@
k: 5,
v: "杩囩▼妫�楠�",
i: "font icon-shouye",
- u: ""
+ u: "processInspection"
}, {
k: 6,
v: "鎴愬搧妫�楠�",
@@ -349,14 +349,15 @@
methods: {
addTab(ob) {
if (ob.k == 0) this.activeBox = 0
- this.activeP = ob.k
- this.tabActive = ob.k
+ this.activeP = ob.k //0
+ this.tabActive = ob.k //0
let num = -1;
this.tabs.forEach((a, ai) => {
if (ob.k == a.k) {
num = a.k
}
})
+ // 濡傛灉娌℃湁閬嶅巻鍒皌abs閲屾病鏈夎ob瀵瑰簲鐨則able锛屽線tabs閲岄潰鍔犲叆璇b
if (num == -1) {
this.tabs.push(ob)
}
--
Gitblit v1.9.3