From 85d35dcc5899e54128e63a11ad8da2fec6e9394f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 26 八月 2023 15:43:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/experiment/inspectionApplication/index.vue | 89 ++++++++++++++++++--------------------------
1 files changed, 36 insertions(+), 53 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 8fbad77..e53dd3a 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -180,16 +180,17 @@
title="鏂板妫�楠屽崟"
:visible.sync="checkTypeVisible"
width="50%"
+ top="10vh"
>
<div class="check-box">
- <el-radio-group v-model="type" @change="handleRadioChange">
- <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="0" border >鍘熸潗鏂欐楠�</el-radio>
- <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="1" border>濮旀墭妫�楠�</el-radio>
- <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="2" border>鎴愬搧妫�楠�</el-radio>
+ <el-radio-group v-model="type" @click.native="handleRadioChange">
+ <el-radio :style="`background-color: ${type==0?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="0" border>鍘熸潗鏂欐楠�</el-radio>
+ <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="1" border>濮旀墭妫�楠�</el-radio>
+ <el-radio :style="`background-color: ${type==2?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="2" border>鎴愬搧妫�楠�</el-radio>
</el-radio-group>
</div>
- <div v-if="type === 0 || type === ''">
- <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="mini">
+ <div v-if="type === 0">
+ <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="medium">
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
@@ -395,8 +396,6 @@
height="calc(100vh - 250px)"
default-expand-all
ref="multipleTable"
- @select="selectTr"
- @select-all="selectAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column type="selection" label="搴忓彿"> </el-table-column>
@@ -611,7 +610,6 @@
</template>
<template v-else>
<router-view />
-
</template>
</div>
</template>
@@ -665,7 +663,7 @@
amount: '',
checkdate: []
},
- infoForm:'',
+ infoForm:{},
commisionSelection:{
entrust_coding: '',
entrusted: '',
@@ -706,11 +704,12 @@
pageSize: 8, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
- type: '', // 榛樿涓嶉�変腑鐨勭姸鎬�
+ type: 0, // 榛樿涓嶉�変腑鐨勭姸鎬�
rawmaterialVisible: false,
commisionVisible: false,
tmp: '',
- Standardframe: false
+ Standardframe: false,
+ tableData: []
}
},
watch: {
@@ -731,16 +730,7 @@
},
methods: {
async handleClick(row){
- // console.log(item);
- // const res = await ddd({goodId:id})
- // this.$message({
- // message: '鎭枩浣狅紝杩欐槸涓�鏉℃垚鍔熸秷鎭�',
- // type: 'success'
- // });
-
- // console.log(res);
this.inspectionTable = row;
- console.log(row.id);
this.id = row.id
this.$router.push({name:'Viewdetails',query: {id:row.id}});
this.selectInspectsList()
@@ -783,7 +773,6 @@
item['checkdate'] = checkdate // 妫�楠屾棩鏈�
item['createTime'] = createTime // 鐧昏鏃ユ湡
})
- console.log('data:',data)
this.inspectionTable = data
if(this.searchData.type !== ''){
if(this.searchData.state !== ''){
@@ -826,35 +815,29 @@
this.infoForm = this.tmp
this.rawmaterialVisible = false
},
- async handleRadioChange(){
- if(this.type === 0){
- 鍘熸潗鏂欐姤妫�
-
- this.rawmaterialVisible = true
- const res = await selectAll({type: this.type})
- var data = res.data
- data.forEach((item)=>{
- var checkdate = []
- checkdate.push(item['createTime'])
- checkdate.push(item['updateTime'])
- item['checkdate'] = checkdate // 妫�楠屾棩鏈�
- })
- // this.infoForm = res.data
- // this.$router.push({ name: 'ReportForInspection' });
- }else if(this.type === 1){
- this.commisionVisible = true
- const res = await getCommisionList({pageNo:1,pageSize:10})
- // var data = res.data
- // data.forEach((item)=>{
- // var checkdate = []
- // checkdate.push(item['startTime'])
- // checkdate.push(item['endTime'])
- // item['checkdate_'] = item['startTime'] + '~' + item['endTime']
- // item['checkdate'] = checkdate // 妫�楠屾棩鏈�
- // })
- this.commisionTable = res.data
- // this.$router.push({ name: 'CommissionInspection' });
- }
+ handleRadioChange(){
+ setTimeout(()=>{
+ if(this.type === 0){
+ // 鍘熸潗鏂欐姤妫�
+ this.rawmaterialVisible = true
+ selectAll({type: this.type}).then(res=>{
+ var data = res.data
+ data.forEach((item)=>{
+ var checkdate = []
+ checkdate.push(item['createTime'])
+ checkdate.push(item['updateTime'])
+ item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ })
+ this.rawMaterialTable = res.data
+ })
+ // this.$router.push({ name: 'ReportForInspection' });
+ }else if(this.type === 1){
+ this.commisionVisible = true
+ getCommisionList({pageNo:1,pageSize:10}).then(res=>{
+ this.commisionTable = res.data
+ })
+ }
+ },100)
},
// 鏂板妫�楠�
async addInspection(){
@@ -897,7 +880,7 @@
type: this.type,
unit: this.finishedTable.unit })
}
- this.type = ''
+ this.type = 0
this.checkTypeVisible = false
this.$message({
message: '娣诲姞鎴愬姛锛�',
@@ -944,7 +927,7 @@
}
height: auto;
font-size: 22px !important;
- padding: 20px 40px !important;
+ padding: 40px 50px !important;
::v-deep .el-radio__label{
font-size: 22px !important;
padding-left: 0px !important;
--
Gitblit v1.9.3