From 5a15331883386cb2206acd081ee54b873a08858b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 31 八月 2023 15:42:42 +0800
Subject: [PATCH] bug修复
---
src/views/inspectionManagement/reportForInspection/index.vue | 41 ++++++++++-------------------------------
1 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index 6dbbd6f..c70ac79 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -82,7 +82,7 @@
<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="createTime" label="鏉ユ枡鏃ユ湡" min-width="8%" />
+ <el-table-column prop="dateSurvey" label="鏉ユ枡鏃ユ湡" min-width="8%" />
<el-table-column prop="supplierName" label="渚涘簲鍟嗗悕绉�" min-width="12%" />
<el-table-column prop="materialCoding" label="鏉愭枡缂栫爜" min-width="8%" />
<el-table-column prop="materialName" label="鏉愭枡鍚嶇О" min-width="8%" />
@@ -91,7 +91,7 @@
<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="dateSurvey" 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' }">
@@ -347,19 +347,7 @@
label: '鏈姤妫�'
}],
radioValue: null,
- inspectionTable: [{
- 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',
- condition: 1
- }],
+ inspectionTable: [],
currentPage: 1,
pageSize: 10,
total: 20,
@@ -437,7 +425,6 @@
});
},
blurOptions(row) {
- console.log("鏇存柊", row);
},
async initNewSelection() {
const res = await selectUser();
@@ -456,7 +443,6 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- console.log(row.id);
this.deleteMaterialFun(row, index);
}).catch(() => {});
},
@@ -469,7 +455,6 @@
},
handleSelectionChange(val) {
this.checkData = val;
- console.log(val);
},
//鐢熸垚鎶ユ鍗曟寜閽�
addReportBtn() {
@@ -483,7 +468,6 @@
let name = this.checkData[0].materialName;
let specifications = this.checkData[0].specificationsModels;
this.getChooseVersionFun(mcode,name,specifications);
- console.log(this.standardLibraryData);
this.addReportDialog = true;
}
}
@@ -504,7 +488,6 @@
specifications : specifications,
version: version
}).then((res)=>{
- console.log(res);
vm.standardLibraryData = res.data;
})
@@ -548,20 +531,17 @@
"unit": val.unit,
"version": this.addInspectionForm.version
}
- // this.createReport(obj);
- this.addReportDialog = false;
- this.initNewSelection();
- this.showNewPage = true;
+ this.createReport(obj);
+ // this.addReportDialog = false;
+ // this.initNewSelection();
+ // this.showNewPage = true;
},
//鐢熸垚鎶ユ鍗�
async createReport(param) {
let res = await addInspect(param);
- const res2 = await selectInspectsListById({
- id: res.data
- });
- this.resultData = res2.data;
- this.inspectionForm = res2.data;
- this.inspectionItems = res2.data.insProducts;
+ if(res.data==null)return
+ this.$message.success('鎶ユ鎴愬姛')
+ this.$router.push(`/experiment/Viewdetails/${res.data}`)
},
// 鑾峰彇鍒嗛〉鍒楄〃鏁版嵁
async getRawMaterialList() {
@@ -597,7 +577,6 @@
this.getRawMaterialList()
},
radioclick() {
- console.log(this.inspectionTable);
if (this.radioValue === 0) {
}
--
Gitblit v1.9.3