From b580f0402ff66d0c5b74460edcb920a516b1ce6e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 九月 2023 18:00:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/views/inspectionManagement/reportForInspection/index.vue | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index f61d75c..e3dd70b 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -4,27 +4,27 @@
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
<el-form-item label="鏉愭枡缂栫爜:" position="left" class="sermargin">
- <el-input v-model="searchData.code" class="input-form" placeholder="璇疯緭鍏�">
+ <el-input size="small" v-model="searchData.code" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
<el-form-item label="鏉愭枡鍚嶇О:" class="sermargin">
- <el-input v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏ユ潗鏂欏悕绉�">
+ <el-input size="small" v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏ユ潗鏂欏悕绉�">
</el-input>
</el-form-item>
<el-form-item label="鐘舵��:" class="sermargin">
- <el-select v-model="searchData.state" placeholder="鍏ㄩ儴">
+ <el-select size="small" v-model="searchData.state" placeholder="鍏ㄩ儴">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鏉ユ枡鏃ユ湡:" style="margin-right: 20px;">
- <el-date-picker value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="璇烽�夋嫨鏉ユ枡鏃ユ湡">
+ <el-date-picker size="small" value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="璇烽�夋嫨鏉ユ枡鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="search">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
- <el-button type="primary" icon="el-icon-plus" @click="addReportVisible = true">鏂板</el-button>
+ <el-button size="small" type="primary" @click="search">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="reset">閲嶇疆</el-button>
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="addReportVisible = true">鏂板</el-button>
</el-form-item>
</el-form>
</div>
@@ -146,9 +146,6 @@
import {
getRawMaterialList,
addInspect,
- selectInspectsListById,
- selectUser,
- selectEquipment,
deleteMaterial,
addMaterial,
getMaterielName,
@@ -156,7 +153,6 @@
getChooseVersion,
lookProByVer
} from '@/api/inspection/rawmaterial'
-import ItemVue from '@/layout/components/Sidebar/Item.vue'
export default {
data() {
return {
@@ -406,7 +402,7 @@
"name": val.materialName,
"num": val.quantity,
"specifications": val.specificationsModels,
- "specificationsId": val.specificationsId,
+ "specificationId": val.specificationsId,
"startTime": dateArr[0],
"supplier": val.supplierName,
"type": val.type,
@@ -425,7 +421,7 @@
this.$message.success('鎶ユ鎴愬姛')
this.$router.push(`/experiment/Viewdetails/${res.data}`)
}).catch(error =>{
- this.$message.error('鎶ユ澶辫触')
+ this.$message.error(error.message)
});
},
// 鑾峰彇鍒嗛〉鍒楄〃鏁版嵁
--
Gitblit v1.9.3