From bd4fdac0fee9cf4f96dd947fef6f6ae950a450fe Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 01 九月 2023 17:07:48 +0800
Subject: [PATCH] modified: package.json modified: src/components/experiment/template_testReport/index.vue modified: src/views/experiment/checkTheReport/index.vue modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/inspectionManagement/commissionInspection/index.vue modified: src/views/inspectionManagement/reportForInspection/index.vue
---
src/views/inspectionManagement/reportForInspection/index.vue | 226 ++++++++++----------------------------------------------
1 files changed, 40 insertions(+), 186 deletions(-)
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index c70ac79..f89e215 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="content-main">
- <div class="rawPage" v-if="!showNewPage">
+ <div class="rawPage">
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
<el-form-item label="鏉愭枡缂栫爜:" position="left" class="sermargin">
@@ -64,12 +64,6 @@
</el-dialog>
<div class="library-table">
<div class="table-header">
- <div class="search-bar">
- <el-radio-group v-model="radioValue" @change="radioclick">
- <el-radio-button v-for="option in radioOptions" :key="option.value"
- :label="option.value">{{ option.label }}</el-radio-button>
- </el-radio-group>
- </div>
<div class="generateInsp">
<el-button @click="addReportBtn" type="primary" size="mini" icon="el-icon-document"
style="background-color: rgb(1, 102, 226);">鐢熸垚鎶ユ鍗�</el-button>
@@ -79,8 +73,7 @@
<el-table ref="inspectionTable" :max-height="600" :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%" @selection-change="handleSelectionChange">
- <el-table-column type="selection" :selectable="checkSelect" min-width="5%">
- </el-table-column>
+ <el-table-column type="selection" :selectable="checkSelect" min-width="5%"></el-table-column>
<el-table-column type="index" label="搴忓彿" min-width="8%" />
<el-table-column prop="dateSurvey" label="鏉ユ枡鏃ユ湡" min-width="8%" />
<el-table-column prop="supplierName" label="渚涘簲鍟嗗悕绉�" min-width="12%" />
@@ -91,7 +84,6 @@
<el-table-column prop="quantity" label="鏁伴噺" min-width="5%" />
<el-table-column prop="inspectionDate" label="鎶ユ鏃ユ湡" min-width="8%" />
<el-table-column prop="surveyor" label="妫�楠屼汉" min-width="8%" />
- <el-table-column prop="insTime" label="妫�楠屾棩鏈�" min-width="8%" />
<el-table-column prop="type" label="鐘舵��" min-width="8%">
<template slot-scope="scope">
<span :style="{ color: scope.row.type === 1 ? 'green' : 'red' }">
@@ -116,7 +108,7 @@
</div>
</div>
<el-dialog title="閫夋嫨鏃ユ湡" :visible.sync="addReportDialog" width="60%">
- <el-form :model="addInspectionForm" :rules="addInspectionFormRules" rule="addInspectionForm">
+ <el-form :model="addInspectionForm" :rules="addInspectionFormRules" ref="addInspectionForm">
<el-form-item label="妫�楠屾棩鏈�" label-width="100px" prop="inspectionDate">
<el-date-picker v-model="addInspectionForm.inspectionDate" type="daterange" value-format="yyyy-MM-dd"
range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
@@ -144,105 +136,6 @@
<el-button type="primary" @click="confirmBtn('addInspectionForm')">纭� 瀹�</el-button>
</div>
</el-dialog>
-
- <!-- 鐢熸垚鎶ユ鍗� -->
- <div class="newPage" v-if="showNewPage">
- <!-- 鏂板椤甸潰 -->
- <div class="inspectionForm">
- <el-form :model="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.formTime" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 180px;" :value="inspectionForm.supplier" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鏍峰搧缂栧彿锛�">
- <el-input style="width: 180px;" :value="inspectionForm.code" 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.name" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 180px;" :value="inspectionForm.specifications" 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.num" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鎶ユ鏃ユ湡锛�">
- <el-input style="width: 180px;" :value="inspectionForm.endTime" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鎶ユ浜猴細">
- <el-input style="width: 180px;" :value="inspectionForm.userName" 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="name" label="椤圭洰" width="250"></el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="125"></el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="125"></el-table-column>
- <el-table-column prop="internal" label="鍐呮祴鍊�" width="125"></el-table-column>
- <el-table-column prop="testValue" label="妫�楠屽��" width="125"></el-table-column>
- <el-table-column prop="userName" label="妫�楠屼汉">
- <template slot-scope="scope">
- <el-select @blur="blurOptions(scope.row)" v-model="scope.row.check" size="small" slot="append"
- style="width: 260px;">
- <el-option v-for="(item,index) in checkeroptions" :key="index" :value="item.id"
- :label="item.name"></el-option>
- </el-select>
- </template>
- </el-table-column>
- <el-table-column prop="device" label="璇曢獙璁惧">
- <template slot-scope="scope">
- <el-select @blur="blurOptions(scope.row)" v-model="scope.row.device" size="small" slot="append"
- style="width: 260px;">
- <el-option v-for="(item,index) in deviceoptions" :key="index" :value="item.id"
- :label="item.equipmentName"></el-option>
- </el-select>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </div>
</div>
</template>
@@ -265,8 +158,6 @@
return {
standardLibraryData:[],
chooseVersion: [],
- userName: "",
- devices: "",
addInspectionForm: {
inspectionDate: [],
version: null
@@ -322,20 +213,6 @@
value: 0,
label: '鏈姤妫�'
}],
- deviceoptions: [{
- value: 0,
- label: '鎷夊姏鏈�'
- }, {
- value: 1,
- label: '鎷栨媺鏈�'
- }],
- checkeroptions: [{
- value: 0,
- label: '榛勫皬鏄�'
- }, {
- value: 1,
- label: '寮犱笁'
- }],
radioOptions: [{
label: '鍏ㄩ儴',
value: null
@@ -352,18 +229,6 @@
pageSize: 10,
total: 20,
data: '',
- showNewPage: false,
- inspectionForm: {},
- inspectionItems: [{
- index: 1,
- name: "aaa",
- unit: "KB",
- required: "1",
- internal: "2",
- testValue: "3",
- userName: "",
- device: ""
- }],
insertRule: {
fromDate: [{
required: true,
@@ -424,17 +289,9 @@
this.$message.error(error.message);
});
},
- blurOptions(row) {
- },
- async initNewSelection() {
- const res = await selectUser();
- const res2 = await selectEquipment();
- this.checkeroptions = res.data;
- this.deviceoptions = res2.data;
- },
resetForm(formName) {
- // this.addInspectionForm.inspectionDate = [],
- // this.$refs[formName].resetFields();
+ this.addInspectionForm.inspectionDate = [],
+ this.$refs[formName].resetFields();
this.addReportDialog = false
},
removeFun(row, index) {
@@ -446,7 +303,7 @@
this.deleteMaterialFun(row, index);
}).catch(() => {});
},
- checkSelect(row, index) {
+ checkSelect(row) {
if (row.type === 1) {
return false;
} else {
@@ -454,6 +311,10 @@
}
},
handleSelectionChange(val) {
+ if (val.length > 1) {
+ this.$refs.inspectionTable.clearSelection();
+ this.$refs.inspectionTable.toggleRowSelection(val.pop())
+ }
this.checkData = val;
},
//鐢熸垚鎶ユ鍗曟寜閽�
@@ -513,28 +374,30 @@
},
//鐢熸垚鎶ユ鍗曠‘璁ゆ寜閽�
confirmBtn(formName) {
- let dateArr = this.addInspectionForm.inspectionDate;
- //娣诲姞鎶ユ鍗�
- let val = this.checkData[0];
- let obj = {
- "endTime": dateArr[1],
- "experiment": "",
- "formTime": val.createTime,
- "id": val.id,
- "mcode": val.materialCoding,
- "name": val.materialName,
- "num": val.quantity,
- "specifications": val.specificationsModels,
- "startTime": dateArr[0],
- "supplier": val.supplierName,
- "type": val.type,
- "unit": val.unit,
- "version": this.addInspectionForm.version
- }
- this.createReport(obj);
- // this.addReportDialog = false;
- // this.initNewSelection();
- // this.showNewPage = true;
+ this.$refs[formName].validate((valid=>{
+ if(valid){
+ let dateArr = this.addInspectionForm.inspectionDate;
+ //娣诲姞鎶ユ鍗�
+ let val = this.checkData[0];
+ let obj = {
+ "endTime": dateArr[1],
+ "experiment": "",
+ "formTime": val.createTime,
+ "id": val.id,
+ "mcode": val.materialCoding,
+ "name": val.materialName,
+ "num": val.quantity,
+ "specifications": val.specificationsModels,
+ "startTime": dateArr[0],
+ "supplier": val.supplierName,
+ "type": val.type,
+ "unit": val.unit,
+ "version": this.addInspectionForm.version
+ }
+ this.createReport(obj);
+ this.addReportDialog = false;
+ }
+ }));
},
//鐢熸垚鎶ユ鍗�
async createReport(param) {
@@ -575,20 +438,6 @@
date: ''
}
this.getRawMaterialList()
- },
- radioclick() {
- if (this.radioValue === 0) {
-
- }
- },
- getAllTableData() {
- this.getRawMaterialList()
- },
- getCheckData() {
-
- },
- getUnCheckData() {
-
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
@@ -686,10 +535,15 @@
flex-direction: column;
.table-header {
+ width: 100%;
+ height: 70px;
padding: 20px;
display: flex;
justify-content: space-between;
-
+ .generateInsp{
+ position: relative;
+ left: 92%;
+ }
.el-form-item {
margin-bottom: 30px !important;
}
--
Gitblit v1.9.3