From 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 16:47:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/experiment/inspectionApplication/index.vue | 178 ++++++++++++++++++++++++++++------------------------------
1 files changed, 86 insertions(+), 92 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 874e0d6..5f63b6c 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -39,49 +39,42 @@
</el-form>
</div>
<div class="library-table">
- <div class="table-header">
- <div class="search-bar">
- <el-radio-group v-model="radioValue">
- <el-radio-button label="鍏ㄩ儴" />
- <el-radio-button label="寰呮彁浜�" />
- <el-radio-button label="宸叉彁浜�" />
- <el-radio-button label="宸蹭綔搴�" />
- </el-radio-group>
- </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'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600"
+ :cell-style="{textAlign: 'left'}"
+ :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
:data="inspectionTable">
<el-table-column type="selection" min-width="30px" />
- <el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="150px" />
- <el-table-column prop="type" label="妫�楠岀被鍨�" min-width="80px">
+ <el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="160px" />
+ <el-table-column prop="type" label="妫�楠岀被鍨�" min-width="100px">
<template slot-scope="scope">
- <div v-if="scope.row.type === 0"><span>鍘熸潗鏂欐楠�</span></div>
- <div v-if="scope.row.type === 1"><span>濮旀墭妫�楠�</span></div>
- <div v-if="scope.row.type === 2"><span>鎴愬搧妫�楠�</span></div>
+ <div v-if="scope.row.type === 0"><el-tag type="success">鍘熸潗鏂欐楠�</el-tag></div>
+ <div v-if="scope.row.type === 2"><el-tag>濮旀墭妫�楠�</el-tag></div>
+ <div v-if="scope.row.type === 1"><el-tag type="warning">鎴愬搧妫�楠�</el-tag></div>
</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="name" label="鍘熸潗鏂欏悕绉�" min-width="80px" />
+ <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="90px" />
<el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" min-width="160px" />
<el-table-column prop="unit" label="鍗曚綅" min-width="50px" />
<el-table-column prop="num" label="鏁伴噺" min-width="50px" />
- <el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="80px" />
- <el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="80px">
+ <el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="90px" />
+ <el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="95px">
<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" effect="dark" type="danger" disable-transitions
+ v-if="scope.row.inspection_status == 0">涓嶅悎鏍�</el-tag>
+ <el-tag class="tag" effect="dark" 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" />
- <el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="160px" />
- <el-table-column label="鎿嶄綔" min-width="150" fixed="right">
+ <el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="170px" />
+ <el-table-column label="鎿嶄綔" min-width="120" 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>
@@ -295,7 +288,6 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="checkTypeVisible = false">鍙� 娑�</el-button>
- <!-- <el-button type="primary" @click="addInspection">纭� 瀹�</el-button> -->
<el-button type="primary" @click="QUEding">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -311,27 +303,26 @@
</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;overflow-y: auto;" row-key="id" border height="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>
</span>
</el-dialog>
<!-- 鍘熸潗鏂欐楠屾ā鎬佹 -->
- <el-dialog title="鍘熸潗鏂欐楠�" :visible.sync="rawmaterialVisible" width="60%">
+ <el-dialog title="鍘熸潗鏂欐楠�" :visible.sync="rawmaterialVisible" width="60%" top="100px">
<div class="table-box">
- <el-table ref="multipleTable" :max-height="800" :cell-style="{textAlign: 'center'}"
+ <el-table ref="multipleTable" :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="rawMaterialTable" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="10%" />
@@ -347,10 +338,8 @@
<el-table-column prop="surveyor" label="妫�楠屼汉" min-width="8%" />
<el-table-column prop="startTime" label="妫�楠屾棩鏈�" min-width="8%" />
<el-table-column prop="type" label="鐘舵��" min-width="8%">
- <template slot-scope="scope">
- <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
- {{ scope.row.state===1 ? '宸叉娴�':'寰呮娴�' }}
- </span>
+ <template>
+ <span style="color: red">寰呮楠�</span>
</template>
</el-table-column>
</el-table>
@@ -413,6 +402,7 @@
addInspect,
chooseVer,
lookProByVer,
+ delInspect
} from '@/api/experiment/planAssignments'
export default {
data() {
@@ -490,14 +480,13 @@
tableRow: {},
BANben: [],
version: null,
- listdata:[],
- ddd:{}
+ listdata: [],
+ ddd: {}
}
},
watch: {
$route: {
- handler(val, oldval) {
- },
+ handler(val, oldval) {},
// 娣卞害瑙傚療鐩戝惉
deep: true
}
@@ -538,7 +527,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]
@@ -618,8 +607,12 @@
},
reset() {
this.countSize = 1;
- this.pageSize = 8;
- this.searchData = {};
+ this.pageSize = 10;
+ this.searchData = {
+ applicationnumber: '',
+ type: '',
+ state: '',
+ };
this.selectInspectsList();
},
//琚�変腑鐨勪俊鎭� 鍗曢��
@@ -647,14 +640,17 @@
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
+ let arr = res.data.filter((val)=>{
+ return val.type === 0;
+ })
+ this.rawMaterialTable = arr
})
} else if (this.type === 1) {
this.commisionVisible = true
@@ -662,11 +658,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 +670,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 +683,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 +704,7 @@
supplier: this.commisionSelection.supplier,
type: this.type,
unit: this.commisionSelection.unit,
- version:this.version
+ version: this.version
})
}
if (this.type === 2) {
@@ -723,7 +719,7 @@
supplier: this.finishedTable.supplier,
type: this.type,
unit: this.finishedTable.unit,
- version:this.version
+ version: this.version
})
}
this.type = 0
@@ -750,7 +746,7 @@
// console.log(this.infoForm);
// if (infoForm.checkdate == undefined) {
- // alert('璇疯緭鍏ユ楠屾椂闂�');
+ // alert('璇疯緭鍏ユ楠屾椂闂�');
// return false;
// }
// // 鏍￠獙閫氳繃
@@ -758,10 +754,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 +772,21 @@
},
//纰哄畾瑭虫儏闋�
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){
+ this.$confirm('鎮ㄧ‘璁ゅ垹闄よ繖鏉℃暟鎹悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ delInspect({
+ id: row.id
+ }).then(()=>{
+ this.$message.success('宸蹭綔搴�')
+ this.selectInspectsList()
+ })
+ }).catch(() => {});
}
}
}
@@ -871,16 +875,6 @@
margin-top: 50px;
display: flex;
flex-direction: column;
-
- .table-header {
- padding: 20px;
- display: flex;
- justify-content: space-between;
-
- .el-form-item {
- margin-bottom: 30px !important;
- }
- }
.table-box {
padding: 0px 20px;
--
Gitblit v1.9.3