From 4adc7c77ffa7fa3e5758814ebe928b0befddbb7d Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 29 八月 2023 09:01:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/inspectionManagement/reportForInspection/index.vue | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 213 insertions(+), 11 deletions(-)
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index 3ff10a1..a2d7b1e 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -1,8 +1,9 @@
<template>
<div class="content-main">
+ <div class="rawPage" v-if="!showNewPage">
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
- <el-form-item label="鏉愭枡缂栫爜:" class="sermargin">
+ <el-form-item label="鏉愭枡缂栫爜:" position="left" class="sermargin">
<el-input
v-model="searchData.code"
class="input-form"
@@ -50,7 +51,7 @@
</el-radio-group>
</div>
<div class="generateInsp">
- <el-button type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">鐢熸垚鎶ユ鍗�</el-button>
+ <el-button @click="showNewPage = true" type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">鐢熸垚鎶ユ鍗�</el-button>
</div>
</div>
<div class="table-box">
@@ -122,13 +123,13 @@
min-width="8%"
/>
<el-table-column
- prop="condition"
+ prop="type"
label="鐘舵��"
min-width="8%"
>
<template slot-scope="scope">
- <span :style="{ color: scope.row.condition === 1 ? 'green' : 'red' }">
- {{ scope.row.condition === 1 ? '宸叉娴�':'鏈娴�' }}
+ <span :style="{ color: scope.row.type === 1 ? 'green' : 'red' }">
+ {{ scope.row.type === 1 ? '宸叉娴�':'鏈娴�' }}
</span>
</template>
</el-table-column>
@@ -147,11 +148,108 @@
</div>
</div>
</div>
- </div>
+ </div>
+
+ <!-- 鐢熸垚鎶ユ鍗� -->
+ <div class="newPage" v-if="showNewPage">
+ <!-- 鏂板椤甸潰 -->
+ <div class="inspectionForm">
+ <el-form :model="inspectionForm" ref="inspectionForm" label-position="right" label-width="100px" size="mini" >
+ <div class="formwrapper">
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="鏉ユ枡鏃ユ湡锛�">
+ <el-input style="width: 180px;" :value="inspectionForm.createTime" disabled autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="渚涘簲鍟嗗悕绉帮細">
+ <el-input style="width: 180px;" :value="inspectionForm.supplier_name" disabled autocomplete="off" /> </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鏍峰搧缂栧彿锛�">
+ <el-input style="width: 180px;" :value="inspectionForm.materialCoding" disabled autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row >
+ <el-col :span="8">
+ <el-form-item label="鏍峰搧鍚嶇О锛�" >
+ <el-input style="width: 180px;" :value="inspectionForm.materialName" disabled autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-input style="width: 180px;" :value="inspectionForm.specificationsModels" disabled autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鍗曚綅锛�">
+ <el-input style="width: 180px;" :value="inspectionForm.unit" disabled autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row >
+ <el-col :span="8">
+ <el-form-item label="鏁伴噺锛�" >
+ <el-input style="width: 180px;" :value="inspectionForm.quantity" disabled autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鎶ユ鏃ユ湡锛�" >
+ <el-input style="width: 180px;" :value="inspectionForm.dateSurvey" disabled autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鎶ユ浜猴細">
+ <el-input style="width: 180px;" :value="inspectionForm.surveyor" disabled autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ </el-form>
+ </div>
+ <div class="inspectionProject">
+ <div class="header">
+ <span style="font-size: 14px">妫�楠岄」鐩�</span>
+ <div>
+ <el-button type="primary" plain size="mini">淇濆瓨</el-button>
+ <el-button @click="showNewPage = false" type="primary" plain size="mini" icon="el-icon-back">杩斿洖</el-button>
+ </div>
+ </div>
+ <el-table
+ :max-height="800"
+ :cell-style="{textAlign: 'center'}"
+ :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ :data="inspectionItems">
+ <el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
+ <el-table-column prop="project" label="椤圭洰" width="250"></el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" width="125"></el-table-column>
+ <el-table-column prop="standardVal" label="鏍囧噯鍊�" width="125"></el-table-column>
+ <el-table-column prop="controlVal" label="鍐呮祴鍊�" width="125"></el-table-column>
+ <el-table-column prop="detectionVal" label="妫�楠屽��" width="125"></el-table-column>
+ <el-table-column prop="checker" label="妫�楠屼汉">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.checker" size="small" slot="append" style="width: 260px;">
+ <el-option v-for="item in checkeroptions" :key="item.value" :label="item.label">{{ item.label }}</el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="device" label="璇曢獙璁惧">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.device" size="small" slot="append" style="width: 260px;">
+ <el-option v-for="item in deviceoptions" :key="item.value" :label="item.label">{{ item.label }}</el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </div>
</template>
<script>
-import {getRawMaterialList } from '@/api/inspection/rawmaterial'
+import { getRawMaterialList } from '@/api/inspection/rawmaterial'
export default {
data() {
return {
@@ -170,7 +268,21 @@
label: '宸叉楠�'
}, {
value: 2,
- label: '鏈楠�'
+ label: '寰呮楠�'
+ }],
+ deviceoptions:[{
+ value: 0,
+ label: '鎷夊姏鏈�'
+ },{
+ value: 1,
+ label: '鎷栨媺鏈�'
+ }],
+ checkeroptions:[{
+ value: 0,
+ label: '榛勫皬鏄�'
+ },{
+ value: 1,
+ label: '寮犱笁'
}],
radioOptions:[{
label: '鍏ㄩ儴',
@@ -199,7 +311,69 @@
currentPage: 1,
pageSize: 5,
total:20,
- data: ''
+ data: '',
+ showNewPage: false,
+ inspectionForm:{
+ createTime: '2023-07-28',
+ supplier_name: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
+ materialCoding: 'BP214274',
+ materialName: '閾濆寘閽㈢粸绾�',
+ specificationsModels: 'JLHA/G1A-185/30-26/7',
+ unit: '鍚�',
+ quantity: 21,
+ dateSurvey: '2023-08-02',
+ surveyor: '榛勫皬鏄�',
+ inspectionDate: '2023-12-09',
+ },
+ inspectionItems:[{
+ project:'瀵肩嚎澶栧緞',
+ unit: 'mm',
+ standardVal: '30.0',
+ controlVal: '30.0',
+ detectionVal: '30.0',
+ device:'',
+ checker: '',
+ },{
+ project:'瀵肩嚎澶栧緞',
+ unit: 'mm',
+ standardVal: '30.0',
+ controlVal: '30.0',
+ detectionVal: '30.0',
+ device:'',
+ checker: ''
+ },{
+ project:'瀵肩嚎澶栧緞',
+ unit: 'mm',
+ standardVal: '30.0',
+ controlVal: '30.0',
+ detectionVal: '30.0',
+ device:'',
+ checker: ''
+ },{
+ project:'瀵肩嚎澶栧緞',
+ unit: 'mm',
+ standardVal: '30.0',
+ controlVal: '30.0',
+ detectionVal: '30.0',
+ device:'',
+ checker: ''
+ },{
+ project:'瀵肩嚎澶栧緞',
+ unit: 'mm',
+ standardVal: '30.0',
+ controlVal: '30.0',
+ detectionVal: '30.0',
+ device:'',
+ checker: ''
+ },{
+ project:'瀵肩嚎澶栧緞',
+ unit: 'mm',
+ standardVal: '30.0',
+ controlVal: '30.0',
+ detectionVal: '30.0',
+ device:'',
+ checker: ''
+ }]
}
},
created(){
@@ -212,6 +386,7 @@
// console.log(res)
this.inspectionTable = res.data.row
this.data = res.data.row
+ console.log(res.data.row);
this.total = res.data.total
},
async search(){
@@ -265,8 +440,9 @@
</script>
<style scoped>
-
-.top-bar{
+.content-main{
+ height: 100%;
+ .top-bar{
margin: -25px -15px;
background: #fff;
display: flex;
@@ -320,4 +496,30 @@
color: red;
}
+.newPage{
+ margin: -25px -15px;
+ .inspectionForm{
+ background-color:#fff;
+ .formwrapper{
+ margin-left: 80px;
+ padding:10px 0px;
+ }
+ }
+ .inspectionProject{
+ margin:10px 0px;
+ .header{
+ display:flex;
+ justify-content: space-between;
+ padding-top: -3px;
+ padding-bottom: 3px;
+ }
+ .el-table{
+ padding: 10px 10px;
+ height: 65vh;
+ overflow-y: auto;
+ }
+ }
+}
+}
+
</style>
--
Gitblit v1.9.3