From 675420f7779ccf72bf81df11c25ba2549c2fd89d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 31 八月 2023 17:15:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/experiment/inspectionApplication/index.vue | 106 +++++++++++++++++++++++++++-------------------------
src/api/experiment/planAssignments.js | 10 ++++
2 files changed, 64 insertions(+), 52 deletions(-)
diff --git a/src/api/experiment/planAssignments.js b/src/api/experiment/planAssignments.js
index d0f384a..bb475f4 100644
--- a/src/api/experiment/planAssignments.js
+++ b/src/api/experiment/planAssignments.js
@@ -109,4 +109,12 @@
method: 'get',
params
})
-}
\ No newline at end of file
+}
+
+export function delInspect(params) {
+ return request({
+ url: '/inspection/delInspect',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 874e0d6..a3ea6ff 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -50,7 +50,8 @@
</div>
</div>
<div class="table-box">
- <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600" :cell-style="{textAlign: 'center'}"
+ <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :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">
<el-table-column type="selection" min-width="30px" />
@@ -63,8 +64,8 @@
</template>
</el-table-column>
<el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="90px" />
- <el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" show-overflow-tooltip/>
- <el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="170px"/>
+ <el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" show-overflow-tooltip />
+ <el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="170px" />
<el-table-column prop="name" label="鍘熸潗鏂欏悕绉�" min-width="80px" />
<el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" min-width="160px" />
<el-table-column prop="unit" label="鍗曚綅" min-width="50px" />
@@ -72,8 +73,10 @@
<el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="80px" />
<el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="80px">
<template slot-scope="scope">
- <el-tag class="tag" type="danger" disable-transitions v-if="scope.row.inspection_status == 0">涓嶅悎鏍�</el-tag>
- <el-tag class="tag" type="success" disable-transitions v-else-if="scope.row.inspection_status == 1">鍚堟牸</el-tag>
+ <el-tag class="tag" type="danger" disable-transitions
+ v-if="scope.row.inspection_status == 0">涓嶅悎鏍�</el-tag>
+ <el-tag class="tag" type="success" disable-transitions
+ v-else-if="scope.row.inspection_status == 1">鍚堟牸</el-tag>
</template>
</el-table-column>
<el-table-column prop="userName" label="鐧昏浜�" min-width="80px" />
@@ -81,7 +84,7 @@
<el-table-column label="鎿嶄綔" min-width="150" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
- <el-button type="text" size="small">浣滃簾</el-button>
+ <el-button type="text" size="small" @click="delInspect(scope.row)">浣滃簾</el-button>
</template>
</el-table-column>
</el-table>
@@ -311,18 +314,17 @@
</el-select>
</template>
</el-card>
- <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border
- height="calc(40vh)" default-expand-all ref="multipleTable"
- :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
- <el-table-column type="index" width="50px" label="搴忓彿"></el-table-column>
- <el-table-column prop="name" label="椤圭洰鍚嶇О" sortable>
- </el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" sortable></el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" sortable>
- </el-table-column>
- <el-table-column prop="internal" label="鍐呮帶鍊�" sortable>
- </el-table-column>
- </el-table>
+ <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border height="calc(40vh)"
+ default-expand-all ref="multipleTable" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+ <el-table-column type="index" width="50px" label="搴忓彿"></el-table-column>
+ <el-table-column prop="name" label="椤圭洰鍚嶇О" sortable>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" sortable></el-table-column>
+ <el-table-column prop="required" label="鏍囧噯鍊�" sortable>
+ </el-table-column>
+ <el-table-column prop="internal" label="鍐呮帶鍊�" sortable>
+ </el-table-column>
+ </el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="Standardframe = false">鍙� 娑�</el-button>
<el-button type="primary" @click="GOfrom">纭� 瀹�</el-button>
@@ -413,6 +415,7 @@
addInspect,
chooseVer,
lookProByVer,
+ delInspect
} from '@/api/experiment/planAssignments'
export default {
data() {
@@ -490,14 +493,13 @@
tableRow: {},
BANben: [],
version: null,
- listdata:[],
- ddd:{}
+ listdata: [],
+ ddd: {}
}
},
watch: {
$route: {
- handler(val, oldval) {
- },
+ handler(val, oldval) {},
// 娣卞害瑙傚療鐩戝惉
deep: true
}
@@ -538,7 +540,7 @@
specifications: this.tmp.specifications
})
this.BANben = []
- res.data.forEach(a=>{
+ res.data.forEach(a => {
this.BANben.push('V ' + a)
})
this.version = this.BANben[0]
@@ -647,12 +649,12 @@
selectAll({
type: 0
}).then(res => {
- var data = res.data
- data.forEach((item)=>{
- var checkdate = []
- checkdate.push(item['createTime'])
- checkdate.push(item['updateTime'])
- item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ var data = res.data
+ data.forEach((item) => {
+ var checkdate = []
+ checkdate.push(item['createTime'])
+ checkdate.push(item['updateTime'])
+ item['checkdate'] = checkdate // 妫�楠屾棩鏈�
})
this.rawMaterialTable = res.data
})
@@ -662,11 +664,11 @@
type: 2
}).then(res => {
var data = res.data
- data.forEach((item)=>{
- var checkdate = []
- checkdate.push(item['createTime'])
- checkdate.push(item['updateTime'])
- item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ data.forEach((item) => {
+ var checkdate = []
+ checkdate.push(item['createTime'])
+ checkdate.push(item['updateTime'])
+ item['checkdate'] = checkdate // 妫�楠屾棩鏈�
})
this.commisionTable = res.data
})
@@ -674,9 +676,9 @@
}, 100)
},
// 鏂板妫�楠�
- async addInspection() {
+ async addInspection() {
if (this.type === 0) {
- addInspect({
+ addInspect({
endTime: this.infoForm.checkdate[1],
formTime: this.infoForm.formTime,
mcode: this.infoForm.mcode,
@@ -687,8 +689,8 @@
supplier: this.infoForm.supplier,
type: this.type,
unit: this.infoForm.unit,
- version:this.version.replace('V ', '')
- }).then(res=>{
+ version: this.version.replace('V ', '')
+ }).then(res => {
this.$message({
message: '娣诲姞鎴愬姛锛�',
type: 'success'
@@ -708,7 +710,7 @@
supplier: this.commisionSelection.supplier,
type: this.type,
unit: this.commisionSelection.unit,
- version:this.version
+ version: this.version
})
}
if (this.type === 2) {
@@ -723,7 +725,7 @@
supplier: this.finishedTable.supplier,
type: this.type,
unit: this.finishedTable.unit,
- version:this.version
+ version: this.version
})
}
this.type = 0
@@ -750,7 +752,7 @@
// console.log(this.infoForm);
// if (infoForm.checkdate == undefined) {
- // alert('璇疯緭鍏ユ楠屾椂闂�');
+ // alert('璇疯緭鍏ユ楠屾椂闂�');
// return false;
// }
// // 鏍￠獙閫氳繃
@@ -758,10 +760,10 @@
// },
//纭畾璺宠浆
QUEding() {
- if (this.infoForm.checkdate[0] == undefined||this.infoForm.checkdate[1] == undefined) {
+ if (this.infoForm.checkdate[0] == undefined || this.infoForm.checkdate[1] == undefined) {
this.$message({
- message: '璇烽�夋嫨妫�楠屾椂闂�',
- type: 'warning'
+ message: '璇烽�夋嫨妫�楠屾椂闂�',
+ type: 'warning'
});
return;
}
@@ -776,13 +778,15 @@
},
//纰哄畾瑭虫儏闋�
async GOfrom() {
- // this.addInspect()
- this.addInspection()
- // this.kk = res.data
- console.log(this.kk)
- // this.$router.push({name: 'Viewdetails',query: {id: res.data}})
- // console.log(res);
-
+ this.addInspection()
+ },
+ delInspect(row){
+ delInspect({
+ id: row.id
+ }).then(res=>{
+ this.$message.success('宸蹭綔搴�')
+ this.selectInspectsList()
+ })
}
}
}
--
Gitblit v1.9.3