From efcf450e8e7e375ef4ffe9f421ec0d34c5378180 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 14:02:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/views/experiment/inspectionApplication/index.vue | 59 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index bdf2da8..31f2a90 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -29,7 +29,7 @@
</el-form>
<el-form class="rightBtn">
<el-form-item class="createBtn">
- <el-button size="small" type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true"
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="checkTypeVisible = true"
style="background-color: rgb(1, 102, 226);">鏂板妫�楠屽崟</el-button>
</el-form-item>
<el-form-item class="getDataBtn">
@@ -229,13 +229,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.deliverydate"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate"
placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -243,13 +243,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鎴愬搧缂栫爜锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.code" placeholder="璇疯緭鍏ユ垚鍝佺紪鐮�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="璇疯緭鍏ユ垚鍝佺紪鐮�"
autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鎴愬搧鍚嶇О锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.name" placeholder="璇疯緭鍏ユ垚鍝佸悕绉�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="璇疯緭鍏ユ垚鍝佸悕绉�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -257,13 +257,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.modelandspecification"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification"
placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍗曚綅锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -271,7 +271,7 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" disabled v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�"
+ <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -673,8 +673,9 @@
},
// 鏂板妫�楠�
async addInspection() {
+ let obj = {};
if (this.type === 0) {
- addInspect({
+ obj = {
endTime: this.infoForm.checkdate[1],
formTime: this.infoForm.formTime,
mcode: this.infoForm.mcode,
@@ -687,18 +688,10 @@
type: this.type,
unit: this.infoForm.unit,
version: this.version
- }).then(res => {
- this.$message({
- message: '娣诲姞鎴愬姛锛�',
- type: 'success'
- });
- this.$router.push(`Viewdetails/${res.data}`)
- }).catch(error=>{
- this.$message.error(error.message);
- })
+ }
}
if (this.type === 1) {
- const res = await addInspect({
+ obj = {
endTime: this.commisionSelection.checkdate[1],
formTime: this.commisionSelection.formTime,
mcode: this.commisionSelection.mcode,
@@ -710,30 +703,34 @@
type: this.type,
unit: this.commisionSelection.unit,
version: this.version
- })
+ }
}
if (this.type === 2) {
- const res = await addInspect({
- endTime: '2023-08-15',
+ obj = {
+ endTime: this.finishedTable.checkdate[1],
formTime: this.finishedTable.deliverydate,
mcode: this.finishedTable.code,
name: this.finishedTable.name,
num: parseInt(this.finishedTable.amount),
specifications: this.finishedTable.modelandspecification,
- startTime: '2023-08-14',
+ startTime: this.finishedTable.checkdate[1],
supplier: this.finishedTable.supplier,
type: this.type,
unit: this.finishedTable.unit,
version: this.version
- })
+ }
}
- this.type = 0
- this.checkTypeVisible = false
- // this.$message({
- // message: '娣诲姞鎴愬姛锛�',
- // type: 'success'
- // });
- // this.$router.push({name: 'Viewdetails'})
+ addInspect(obj).then(res => {
+ this.$message({
+ message: '娣诲姞鎴愬姛锛�',
+ type: 'success'
+ });
+ this.type = 2
+ this.checkTypeVisible = false
+ this.$router.push(`Viewdetails/${res.data}`)
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
--
Gitblit v1.9.3